code clean up (#1322)

* code clean up

* happy lint

Author: fuzhenn

src/core/Browser.js

@@ -1,4 +1,4 @@
-import { IS_NODE } from './util';
+import { IS_NODE } from './util/env';
 
 let Browser = {};
 

src/geo/Position.js

@@ -1,4 +1,4 @@
-import { isNil } from '../core/util';
+import { isNil } from '../core/util/common';
 
 /**
  * Abstract parent class for Point and Coordinate

src/geo/Size.js

@@ -1,5 +1,5 @@
 import Point from './Point';
-import { isNumber } from '../core/util';
+import { isNumber } from '../core/util/common';
 
 /**
  * Represents a size.

src/map/Map.Camera.js

@@ -214,77 +214,56 @@ Map.include(/** @lends Map.prototype */{
      * @private
      * @function
      */
-    _pointToContainerPoint: function () {
+    _pointToContainerPoint: function (point, zoom, altitude = 0, out) {
+        if (!out) {
+            out = new Point(0, 0);
+        }
+        point = this._pointToPoint(point, zoom, out);
+        const isTransforming = this.isTransforming();
+        const res = this._getResolution(zoom) / this._getResolution();
+        let centerPoint;
+        if (!isTransforming && !altitude) {
+            centerPoint = this._prjToPoint(this._getPrjCenter(), undefined, TEMP_COORD);
+        }
+        this._toContainerPoint(out, isTransforming, res, altitude, centerPoint);
+        return out;
+    },
+
+    /**
+     *Batch conversion for better performance
+     */
+    _pointsToContainerPoints: function (points, zoom, altitudes = []) {
+        const altitudeIsArray = Array.isArray(altitudes);
+        const isTransforming = this.isTransforming();
+        const res = this._getResolution(zoom) / this._getResolution();
+        const centerPoint = this._prjToPoint(this._getPrjCenter(), undefined, TEMP_COORD);
+        const pts = [];
+        for (let i = 0, len = points.length; i < len; i++) {
+            const point = points[i].copy()._multi(res);
+            const altitude = altitudeIsArray ? (altitudes[i] || 0) : altitudes;
+            this._toContainerPoint(point, isTransforming, res, altitude, centerPoint);
+            pts.push(point);
+        }
+        return pts;
+    },
+
+    _toContainerPoint: function () {
         const a = [0, 0, 0];
-        return function (point, zoom, altitude = 0, out) {
-            point = this._pointToPoint(point, zoom, out);
-            if (this.isTransforming() || altitude) {
-                //convert altitude at zoom to current zoom
-                altitude *= this._getResolution(zoom) / this._getResolution();
+        return function (out, isTransforming, res, altitude, centerPoint) {
+            const w2 = this.width / 2, h2 = this.height / 2;
+            if (isTransforming || altitude) {
+                altitude *= res;
                 const scale = this._glScale;
-                set(a, point.x * scale, point.y * scale, altitude * scale);
-
+                set(a, out.x * scale, out.y * scale, altitude * scale);
                 const t = this._projIfBehindCamera(a, this.cameraPosition, this.cameraForward);
                 applyMatrix(t, t, this.projViewMatrix);
-
-                const w2 = this.width / 2, h2 = this.height / 2;
-                t[0] = (t[0] * w2) + w2;
-                t[1] = -(t[1] * h2) + h2;
-                if (out) {
-                    out.x = t[0];
-                    out.y = t[1];
-                    return out;
-                }
-                return new Point(t[0], t[1]);
+                out.x = (t[0] * w2) + w2;
+                out.y = -(t[1] * h2) + h2;
             } else {
-                const centerPoint = this._prjToPoint(this._getPrjCenter(), undefined, TEMP_COORD);
-                if (out) {
-                    out.x = point.x;
-                    out.y = point.y;
-                } else {
-                    out = point;
-                }
                 out._sub(centerPoint.x, centerPoint.y);
                 out.set(out.x, -out.y);
-                return out._add(this.width / 2, this.height / 2);
-            }
-        };
-    }(),
-
-    /**
-     *Batch conversion for better performance
-     */
-    _pointsToContainerPoints: function () {
-        const a = [0, 0, 0];
-        return function (points, zoom, altitudes = []) {
-            const altitudeIsArray = Array.isArray(altitudes);
-            const isTransforming = this.isTransforming();
-            const res = this._getResolution(zoom) / this._getResolution();
-            const w2 = this.width / 2, h2 = this.height / 2;
-            const centerPoint = this._prjToPoint(this._getPrjCenter(), undefined, TEMP_COORD);
-            const pts = [];
-            for (let i = 0, len = points.length; i < len; i++) {
-                const point = points[i].copy()._multi(res);
-                let altitude = altitudeIsArray ? (altitudes[i] || 0) : altitudes;
-                if (isTransforming || altitude) {
-                    altitude *= res;
-                    const scale = this._glScale;
-                    set(a, point.x * scale, point.y * scale, altitude * scale);
-                    const t = this._projIfBehindCamera(a, this.cameraPosition, this.cameraForward);
-                    applyMatrix(t, t, this.projViewMatrix);
-                    t[0] = (t[0] * w2) + w2;
-                    t[1] = -(t[1] * h2) + h2;
-                    point.x = t[0];
-                    point.y = t[1];
-                    pts.push(point);
-                } else {
-                    const out = point;
-                    out._sub(centerPoint.x, centerPoint.y);
-                    out.set(out.x, -out.y);
-                    pts.push(out._add(w2, h2));
-                }
+                out._add(w2, h2);
             }
-            return pts;
         };
     }(),
 

src/map/Map.js

@@ -22,8 +22,6 @@ import Coordinate from '../geo/Coordinate';
 import Layer from '../layer/Layer';
 import Renderable from '../renderer/Renderable';
 import SpatialReference from './spatial-reference/SpatialReference';
-import { set } from '../core/util/vec3';
-import { applyMatrix } from '../core/util/math';
 
 const TEMP_COORD = new Coordinate(0, 0);
 /**
@@ -2162,35 +2160,15 @@ Map.include(/** @lends Map.prototype */{
             const resolution = this._getResolution(zoom);
             const res = resolution / this._getResolution();
             const projection = this.getProjection();
-            const tempOut = [0, 0, 0];
             const prjOut = new Coordinate(0, 0);
             const isTransforming = this.isTransforming();
             const centerPoint = this._prjToPoint(this._getPrjCenter(), undefined, TEMP_COORD);
-            const w = this.width / 2, h = this.height / 2;
             for (let i = 0, len = coordinates.length; i < len; i++) {
                 const pCoordinate = projection.project(coordinates[i], prjOut);
                 let point = transformation.transform(pCoordinate, resolution);
                 point = point._multi(res);
-                if (isTransforming) {
-                    //convert altitude at zoom to current zoom
-                    // altitude=0;
-                    const scale = this._glScale;
-                    set(tempOut, point.x * scale, point.y * scale, 0);
-                    const t = this._projIfBehindCamera(tempOut, this.cameraPosition, this.cameraForward);
-                    applyMatrix(t, t, this.projViewMatrix);
-
-                    const w2 = w, h2 = h;
-                    t[0] = (t[0] * w2) + w2;
-                    t[1] = -(t[1] * h2) + h2;
-                    point.x = t[0];
-                    point.y = t[1];
-                    pts.push(point);
-                } else {
-                    const out = point;
-                    out._sub(centerPoint.x, centerPoint.y);
-                    out.set(out.x, -out.y);
-                    pts.push(out._add(w, h));
-                }
+                this._toContainerPoint(point, isTransforming, res, 0, centerPoint);
+                pts.push(point);
             }
             return pts;
         };

src/renderer/geometry/Painter.js

@@ -324,7 +324,7 @@ class Painter extends Class {
         TEMP_BBOX.miny = miny;
         TEMP_BBOX.maxx = maxx;
         TEMP_BBOX.maxy = maxy;
-        this.__bbox = TEMP_BBOX;
+        this._containerBbox = TEMP_BBOX;
         return cPoints;
     }
 

src/renderer/geometry/VectorRenderer.js

@@ -16,19 +16,19 @@ const TEMP_WITHIN = {
 };
 // bbox in pixel
 function isWithinPixel(painter) {
-    if (!painter || (!painter.__bbox)) {
+    if (!painter || !painter._containerBbox) {
         TEMP_WITHIN.within = false;
     } else {
         TEMP_WITHIN.within = false;
-        const { minx, miny, maxx, maxy } = painter.__bbox;
+        const { minx, miny, maxx, maxy } = painter._containerBbox;
         const offsetx = Math.abs(maxx - minx);
         const offsety = Math.abs(maxy - miny);
         if (offsetx <= 1 && offsety <= 1) {
             TEMP_WITHIN.within = true;
             TEMP_WITHIN.center[0] = (minx + maxx) / 2;
             TEMP_WITHIN.center[1] = (miny + maxy) / 2;
         }
-        delete painter.__bbox;
+        delete painter._containerBbox;
     }
     return TEMP_WITHIN;
 }

src/renderer/layer/vectorlayer/VectorLayerCanvasRenderer.js

@@ -8,9 +8,7 @@ const TEMP_EXTENT = new PointExtent();
 const TEMP_VEC3 = [];
 const TEMP_FIXEDEXTENT = new PointExtent();
 const PLACEMENT_CENTER = 'center';
-const TEMP_POINTS = [];
-const TEMP_ALTITUDES = [];
-const TEMP_GEOS = [];
+
 /**
  * @classdesc
  * Renderer class based on HTML5 Canvas2D for VectorLayers
@@ -248,8 +246,9 @@ class VectorLayerRenderer extends OverlayLayerCanvasRenderer {
     // 优化前 11fps
     // 优化后 15fps
     _batchConversionMarkers(glZoom) {
-        //减少临时变量的使用
-        TEMP_ALTITUDES.length = TEMP_GEOS.length = TEMP_POINTS.length = 0;
+        const cPoints = [];
+        const markers = [];
+        const altitudes = [];
         const altitudeCache = {};
         //Traverse all Geo
         let idx = 0;
@@ -264,25 +263,25 @@ class VectorLayerRenderer extends OverlayLayerCanvasRenderer {
                 const point = painter.getRenderPoints(PLACEMENT_CENTER)[0][0];
                 const altitude = geo.getAltitude();
                 //减少方法的调用
-                if (altitudeCache[altitude] == null) {
+                if (altitudeCache[altitude] === undefined) {
                     altitudeCache[altitude] = painter.getAltitude();
                 }
-                TEMP_POINTS[idx] = point;
-                TEMP_ALTITUDES[idx] = altitudeCache[altitude];
-                TEMP_GEOS[idx] = geo;
+                cPoints[idx] = point;
+                altitudes[idx] = altitudeCache[altitude];
+                markers[idx] = geo;
                 idx++;
             }
         }
         if (idx === 0) {
             return [];
         }
         const map = this.getMap();
-        const pts = map._pointsToContainerPoints(TEMP_POINTS, glZoom, TEMP_ALTITUDES);
+        const pts = map._pointsToContainerPoints(cPoints, glZoom, altitudes);
         const containerExtent = map.getContainerExtent();
         const { xmax, ymax, xmin, ymin } = containerExtent;
-        const symbolkeyMap = {};
-        for (let i = 0, len = TEMP_GEOS.length; i < len; i++) {
-            const geo = TEMP_GEOS[i];
+        const extentCache = {};
+        for (let i = 0, len = markers.length; i < len; i++) {
+            const geo = markers[i];
             geo._cPoint = pts[i];
             const { x, y } = pts[i];
             //Is the point in view
@@ -293,7 +292,7 @@ class VectorLayerRenderer extends OverlayLayerCanvasRenderer {
                 let fixedExtent;
                 if (symbolkey) {
                     //相同的symbol 不要重复计算
-                    fixedExtent = symbolkeyMap[symbolkey] = (symbolkeyMap[symbolkey] || geo._painter.getFixedExtent());
+                    fixedExtent = extentCache[symbolkey] = (extentCache[symbolkey] || geo._painter.getFixedExtent());
                 } else {
                     fixedExtent = geo._painter.getFixedExtent();
                 }