@antv/l7-layers 2.9.19 → 2.9.22-alpha.0

package/es/utils/extrude_polyline.js

@@ -47,24 +47,12 @@ function getArrayUnique(matrix) {
   return matrix;
 }
 
-var ExtrudePolyline = function () {
+var ExtrudePolyline = /*#__PURE__*/function () {
   function ExtrudePolyline() {
     var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
     _classCallCheck(this, ExtrudePolyline);
 
-    _defineProperty(this, "complex", void 0);
-
-    _defineProperty(this, "join", void 0);
-
-    _defineProperty(this, "cap", void 0);
-
-    _defineProperty(this, "miterLimit", void 0);
-
-    _defineProperty(this, "thickness", void 0);
-
-    _defineProperty(this, "normal", void 0);
-
     _defineProperty(this, "lastFlip", -1);
 
     _defineProperty(this, "miter", vec2.fromValues(0, 0));
@@ -92,8 +80,8 @@ var ExtrudePolyline = function () {
   }
 
   _createClass(ExtrudePolyline, [{
-    key: "extrude_gaode2",
-    value: function extrude_gaode2(points, originPoints) {
+    key: "simpleExtrude",
+    value: function simpleExtrude(points) {
       var complex = this.complex;
 
       if (points.length <= 1) {
@@ -107,24 +95,115 @@ var ExtrudePolyline = function () {
       var total = points.length;
       var count = complex.startIndex;
 
+      for (var i = 1; i < total; i++) {
+        var last = points[i - 1];
+        var cur = points[i];
+        var next = i < points.length - 1 ? points[i + 1] : null;
+        var amt = this.simpleSegment(complex, count, last, cur, next);
+        count += amt;
+      }
+
+      if (this.dash) {
+        for (var _i = 0; _i < complex.positions.length / 6; _i++) {
+          complex.positions[_i * 6 + 5] = this.totalDistance;
+        }
+      }
+
+      complex.startIndex = complex.positions.length / 6;
+      return complex;
+    }
+  }, {
+    key: "simpleExtrude_gaode2",
+    value: function simpleExtrude_gaode2(points, originPoints) {
+      var complex = this.complex;
+
+      if (points.length <= 1) {
+        return complex;
+      }
+
+      this.lastFlip = -1;
+      this.started = false;
+      this.normal = null;
+      this.totalDistance = 0; // 去除数组里重复的点
+      // points = getArrayUnique(points);
+
+      var total = points.length;
+      var count = complex.startIndex;
+
       for (var i = 1; i < total; i++) {
         var _originPoints$, _originPoints$i$, _originPoints$2;
 
         var last = points[i - 1];
-        last.push((_originPoints$ = originPoints[i - 1][2]) !== null && _originPoints$ !== void 0 ? _originPoints$ : 0);
+        last.push((_originPoints$ = originPoints[i - 1][2]) !== null && _originPoints$ !== void 0 ? _originPoints$ : 0); // @ts-ignore
+
         var originLast = originPoints[i - 1];
         var cur = points[i];
-        cur.push((_originPoints$i$ = originPoints[i][2]) !== null && _originPoints$i$ !== void 0 ? _originPoints$i$ : 0);
+        cur.push((_originPoints$i$ = originPoints[i][2]) !== null && _originPoints$i$ !== void 0 ? _originPoints$i$ : 0); // @ts-ignore
+
         var originCur = originPoints[i];
         var next = i < points.length - 1 ? [].concat(_toConsumableArray(points[i + 1]), [(_originPoints$2 = originPoints[i + 1][2]) !== null && _originPoints$2 !== void 0 ? _originPoints$2 : 0]) : null;
         var originNext = i < originPoints.length - 1 ? originPoints[i + 1] : null;
-        var amt = this.segment_gaode2(complex, count, last, cur, next, originLast, originCur, originNext);
+        var amt = this.simpleSegment(complex, count, // @ts-ignore
+        last, // @ts-ignore
+        cur, // @ts-ignore
+        next, // @ts-ignore
+        originLast, originCur, // @ts-ignore
+        originNext);
         count += amt;
       }
 
       if (this.dash) {
-        for (var _i = 0; _i < complex.positions.length / 6; _i++) {
-          complex.positions[_i * 6 + 5] = this.totalDistance;
+        for (var _i2 = 0; _i2 < complex.positions.length / 6; _i2++) {
+          complex.positions[_i2 * 6 + 5] = this.totalDistance;
+        }
+      }
+
+      complex.startIndex = complex.positions.length / 6;
+      return complex;
+    }
+  }, {
+    key: "extrude_gaode2",
+    value: function extrude_gaode2(points, originPoints) {
+      var complex = this.complex;
+
+      if (points.length <= 1) {
+        return complex;
+      }
+
+      this.lastFlip = -1;
+      this.started = false;
+      this.normal = null;
+      this.totalDistance = 0; // 去除数组里重复的点
+      // points = getArrayUnique(points);
+
+      var total = points.length;
+      var count = complex.startIndex;
+
+      for (var i = 1; i < total; i++) {
+        var _originPoints$3, _originPoints$i$2, _originPoints$4;
+
+        var last = points[i - 1];
+        last.push((_originPoints$3 = originPoints[i - 1][2]) !== null && _originPoints$3 !== void 0 ? _originPoints$3 : 0); // @ts-ignore
+
+        var originLast = originPoints[i - 1];
+        var cur = points[i];
+        cur.push((_originPoints$i$2 = originPoints[i][2]) !== null && _originPoints$i$2 !== void 0 ? _originPoints$i$2 : 0); // @ts-ignore
+
+        var originCur = originPoints[i];
+        var next = i < points.length - 1 ? [].concat(_toConsumableArray(points[i + 1]), [(_originPoints$4 = originPoints[i + 1][2]) !== null && _originPoints$4 !== void 0 ? _originPoints$4 : 0]) : null;
+        var originNext = i < originPoints.length - 1 ? originPoints[i + 1] : null;
+        var amt = this.segment_gaode2(complex, count, // @ts-ignore
+        last, // @ts-ignore
+        cur, // @ts-ignore
+        next, // @ts-ignore
+        originLast, originCur, // @ts-ignore
+        originNext);
+        count += amt;
+      }
+
+      if (this.dash) {
+        for (var _i3 = 0; _i3 < complex.positions.length / 6; _i3++) {
+          complex.positions[_i3 * 6 + 5] = this.totalDistance;
         }
       }
 
@@ -143,7 +222,9 @@ var ExtrudePolyline = function () {
       this.lastFlip = -1;
       this.started = false;
       this.normal = null;
-      this.totalDistance = 0;
+      this.totalDistance = 0; // 去除数组里重复的点
+      // points = getArrayUnique(points);
+
       var total = points.length;
       var count = complex.startIndex;
 
@@ -156,14 +237,78 @@ var ExtrudePolyline = function () {
       }
 
       if (this.dash) {
-        for (var _i2 = 0; _i2 < complex.positions.length / 6; _i2++) {
-          complex.positions[_i2 * 6 + 5] = this.totalDistance;
+        for (var _i4 = 0; _i4 < complex.positions.length / 6; _i4++) {
+          complex.positions[_i4 * 6 + 5] = this.totalDistance;
         }
       }
 
       complex.startIndex = complex.positions.length / 6;
       return complex;
     }
+  }, {
+    key: "simpleSegment",
+    value: function simpleSegment(complex, index, last, cur, next) {
+      var count = 0;
+      var indices = complex.indices;
+      var positions = complex.positions;
+      var normals = complex.normals;
+      var flatCur = aProjectFlat([cur[0], cur[1]]);
+      var flatLast = aProjectFlat([last[0], last[1]]); // @ts-ignore
+
+      direction(lineA, flatCur, flatLast);
+      var segmentDistance = 0;
+
+      if (this.dash) {
+        // @ts-ignore
+        segmentDistance = this.lineSegmentDistance(flatCur, flatLast);
+        this.totalDistance += segmentDistance;
+      }
+
+      if (!this.normal) {
+        this.normal = vec2.create();
+        computeNormal(this.normal, lineA);
+      }
+
+      if (!this.started) {
+        this.started = true;
+        this.extrusions(positions, normals, last, this.normal, this.thickness, this.totalDistance - segmentDistance);
+      }
+
+      indices.push(index + 0, index + 1, index + 2);
+
+      if (!next) {
+        computeNormal(this.normal, lineA);
+        this.extrusions(positions, normals, cur, this.normal, this.thickness, this.totalDistance);
+        indices.push.apply(indices, _toConsumableArray(this.lastFlip === 1 ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3]));
+        count += 2;
+      } else {
+        var flatNext = aProjectFlat([next[0], next[1]]);
+
+        if (isPointEqual(flatCur, flatNext)) {
+          vec2.add(flatNext, flatCur, vec2.normalize(flatNext, vec2.subtract(flatNext, flatCur, flatLast)));
+        }
+
+        direction(lineB, flatNext, flatCur); // stores tangent & miter
+
+        var _computeMiter = computeMiter(tangent, vec2.create(), lineA, lineB, this.thickness),
+            _computeMiter2 = _slicedToArray(_computeMiter, 2),
+            miterLen = _computeMiter2[0],
+            miter = _computeMiter2[1]; // normal(tmp, lineA)
+        // get orientation
+
+
+        var flip = vec2.dot(tangent, this.normal) < 0 ? -1 : 1;
+        this.extrusions(positions, normals, cur, miter, miterLen, this.totalDistance);
+        indices.push.apply(indices, _toConsumableArray(this.lastFlip === 1 ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3]));
+        flip = -1; // the miter is now the normal for our next join
+
+        vec2.copy(this.normal, miter);
+        count += 2;
+        this.lastFlip = flip;
+      }
+
+      return count;
+    }
   }, {
     key: "segment_gaode2",
     value: function segment_gaode2(complex, index, last, cur, next, originLast, originCur, originNext) {
@@ -174,11 +319,13 @@ var ExtrudePolyline = function () {
       var capSquare = this.cap === 'square';
       var joinBevel = this.join === 'bevel';
       var flatCur = aProjectFlat([originCur[0], originCur[1]]);
-      var flatLast = aProjectFlat([originLast[0], originLast[1]]);
+      var flatLast = aProjectFlat([originLast[0], originLast[1]]); // @ts-ignore
+
       direction(lineA, cur, last);
       var segmentDistance = 0;
 
       if (this.dash) {
+        // @ts-ignore
         segmentDistance = this.lineSegmentDistance(flatCur, flatLast);
         this.totalDistance += segmentDistance;
       }
@@ -189,9 +336,10 @@ var ExtrudePolyline = function () {
       }
 
       if (!this.started) {
-        this.started = true;
+        this.started = true; // if the end cap is type square, we can just push the verts out a bit
 
         if (capSquare) {
+          // vec2.scaleAndAdd(capEnd, last, lineA, -this.thickness);
           var out1 = vec2.create();
           var out2 = vec2.create();
           vec2.add(out1, this.normal, lineA);
@@ -234,16 +382,24 @@ var ExtrudePolyline = function () {
         indices.push.apply(indices, _toConsumableArray(this.lastFlip === 1 ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3]));
         count += 2;
       } else {
+        // @ts-ignore
         if (isPointEqual(cur, next)) {
-          vec2.add(next, cur, vec2.normalize(next, vec2.subtract(next, cur, last)));
-        }
+          vec2.add( // @ts-ignore
+          next, // @ts-ignore
+          cur, vec2.normalize( // @ts-ignore
+          next, // @ts-ignore
+          vec2.subtract(next, cur, last)));
+        } // @ts-ignore
 
-        direction(lineB, next, cur);
 
-        var _computeMiter = computeMiter(tangent, vec2.create(), lineA, lineB, this.thickness),
-            _computeMiter2 = _slicedToArray(_computeMiter, 2),
-            miterLen = _computeMiter2[0],
-            miter = _computeMiter2[1];
+        direction(lineB, next, cur); // stores tangent & miter
+
+        var _computeMiter3 = computeMiter(tangent, vec2.create(), lineA, lineB, this.thickness),
+            _computeMiter4 = _slicedToArray(_computeMiter3, 2),
+            miterLen = _computeMiter4[0],
+            miter = _computeMiter4[1]; // normal(tmp, lineA)
+        // get orientation
+
 
         var flip = vec2.dot(tangent, this.normal) < 0 ? -1 : 1;
         var bevel = joinBevel;
@@ -264,10 +420,12 @@ var ExtrudePolyline = function () {
           positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, this.thickness * flip, cur[2] | 0);
           this.complex.indexes.push(this.currentIndex);
           this.currentIndex++;
-          indices.push.apply(indices, _toConsumableArray(this.lastFlip !== -flip ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3]));
+          indices.push.apply(indices, _toConsumableArray(this.lastFlip !== -flip ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3])); // now add the bevel triangle
+
           indices.push(index + 2, index + 3, index + 4);
           computeNormal(tmp, lineB);
-          vec2.copy(this.normal, tmp);
+          vec2.copy(this.normal, tmp); // store normal for next round
+
           normals.push(this.normal[0], this.normal[1], 0);
           positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, -this.thickness * flip, cur[2] | 0);
           this.complex.indexes.push(this.currentIndex);
@@ -276,7 +434,8 @@ var ExtrudePolyline = function () {
         } else {
           this.extrusions(positions, normals, cur, miter, miterLen, this.totalDistance);
           indices.push.apply(indices, _toConsumableArray(this.lastFlip === 1 ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3]));
-          flip = -1;
+          flip = -1; // the miter is now the normal for our next join
+
           vec2.copy(this.normal, miter);
           count += 2;
         }
@@ -296,11 +455,13 @@ var ExtrudePolyline = function () {
       var capSquare = this.cap === 'square';
       var joinBevel = this.join === 'bevel';
       var flatCur = aProjectFlat([cur[0], cur[1]]);
-      var flatLast = aProjectFlat([last[0], last[1]]);
+      var flatLast = aProjectFlat([last[0], last[1]]); // @ts-ignore
+
       direction(lineA, flatCur, flatLast);
       var segmentDistance = 0;
 
       if (this.dash) {
+        // @ts-ignore
         segmentDistance = this.lineSegmentDistance(flatCur, flatLast);
         this.totalDistance += segmentDistance;
       }
@@ -311,9 +472,10 @@ var ExtrudePolyline = function () {
       }
 
       if (!this.started) {
-        this.started = true;
+        this.started = true; // if the end cap is type square, we can just push the verts out a bit
 
         if (capSquare) {
+          // vec2.scaleAndAdd(capEnd, last, lineA, -this.thickness);
           var out1 = vec2.create();
           var out2 = vec2.create();
           vec2.add(out1, this.normal, lineA);
@@ -324,7 +486,8 @@ var ExtrudePolyline = function () {
           this.complex.indexes.push(this.currentIndex);
           positions.push(last[0], last[1], last[2] | 0, this.totalDistance - segmentDistance, this.thickness, last[2] | 0);
           this.complex.indexes.push(this.currentIndex);
-          this.currentIndex++;
+          this.currentIndex++; // this.extrusions(positions, normals, last, out, this.thickness);
+          // last = capEnd;
         } else {
           this.extrusions(positions, normals, last, this.normal, this.thickness, this.totalDistance - segmentDistance);
         }
@@ -336,12 +499,15 @@ var ExtrudePolyline = function () {
         computeNormal(this.normal, lineA);
 
         if (capSquare) {
+          // vec2.scaleAndAdd(capEnd, cur, lineA, this.thickness);
+          // cur = capEnd;
           var _out3 = vec2.create();
 
           var _out4 = vec2.create();
 
           vec2.sub(_out4, lineA, this.normal);
-          vec2.add(_out3, lineA, this.normal);
+          vec2.add(_out3, lineA, this.normal); // this.extrusions(positions, normals, cur, out, this.thickness);
+
           normals.push(_out4[0], _out4[1], 0);
           normals.push(_out3[0], _out3[1], 0);
           positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, this.thickness, cur[2] | 0);
@@ -351,7 +517,8 @@ var ExtrudePolyline = function () {
           this.currentIndex++;
         } else {
           this.extrusions(positions, normals, cur, this.normal, this.thickness, this.totalDistance);
-        }
+        } // this.extrusions(positions, normals, cur, this.normal, this.thickness);
+
 
         indices.push.apply(indices, _toConsumableArray(this.lastFlip === 1 ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3]));
         count += 2;
@@ -362,12 +529,14 @@ var ExtrudePolyline = function () {
           vec2.add(flatNext, flatCur, vec2.normalize(flatNext, vec2.subtract(flatNext, flatCur, flatLast)));
         }
 
-        direction(lineB, flatNext, flatCur);
+        direction(lineB, flatNext, flatCur); // stores tangent & miter
+
+        var _computeMiter5 = computeMiter(tangent, vec2.create(), lineA, lineB, this.thickness),
+            _computeMiter6 = _slicedToArray(_computeMiter5, 2),
+            miterLen = _computeMiter6[0],
+            miter = _computeMiter6[1]; // normal(tmp, lineA)
+        // get orientation
 
-        var _computeMiter3 = computeMiter(tangent, vec2.create(), lineA, lineB, this.thickness),
-            _computeMiter4 = _slicedToArray(_computeMiter3, 2),
-            miterLen = _computeMiter4[0],
-            miter = _computeMiter4[1];
 
         var flip = vec2.dot(tangent, this.normal) < 0 ? -1 : 1;
         var bevel = joinBevel;
@@ -388,10 +557,12 @@ var ExtrudePolyline = function () {
           positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, this.thickness * flip, cur[2] | 0);
           this.complex.indexes.push(this.currentIndex);
           this.currentIndex++;
-          indices.push.apply(indices, _toConsumableArray(this.lastFlip !== -flip ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3]));
+          indices.push.apply(indices, _toConsumableArray(this.lastFlip !== -flip ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3])); // now add the bevel triangle
+
           indices.push(index + 2, index + 3, index + 4);
           computeNormal(tmp, lineB);
-          vec2.copy(this.normal, tmp);
+          vec2.copy(this.normal, tmp); // store normal for next round
+
           normals.push(this.normal[0], this.normal[1], 0);
           positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, -this.thickness * flip, cur[2] | 0);
           this.complex.indexes.push(this.currentIndex);
@@ -400,7 +571,8 @@ var ExtrudePolyline = function () {
         } else {
           this.extrusions(positions, normals, cur, miter, miterLen, this.totalDistance);
           indices.push.apply(indices, _toConsumableArray(this.lastFlip === 1 ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3]));
-          flip = -1;
+          flip = -1; // the miter is now the normal for our next join
+
           vec2.copy(this.normal, miter);
           count += 2;
         }
@@ -412,7 +584,10 @@ var ExtrudePolyline = function () {
     }
   }, {
     key: "extrusions",
-    value: function extrusions(positions, normals, point, normal, thickness, distanceRadio) {
+    value: function extrusions(positions, normals, point, // 顶点
+    normal, // 法向量
+    thickness, // 高度
+    distanceRadio) {
       normals.push(normal[0], normal[1], 0);
       normals.push(normal[0], normal[1], 0);
       positions.push(point[0], point[1], point[2] | 0, distanceRadio, -thickness, point[2] | 0);
@@ -433,5 +608,4 @@ var ExtrudePolyline = function () {
   return ExtrudePolyline;
 }();
 
-export { ExtrudePolyline as default };
-//# sourceMappingURL=extrude_polyline.js.map
+export { ExtrudePolyline as default };

package/es/utils/grid-index.js

@@ -8,30 +8,16 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-var GridIndex = function () {
+/**
+ * 网格索引，相比 @mapbox/grid-index，在简单计算碰撞检测结果时效率更高
+ * @see https://zhuanlan.zhihu.com/p/74373214
+ */
+var GridIndex = /*#__PURE__*/function () {
   function GridIndex(width, height, cellSize) {
     _classCallCheck(this, GridIndex);
 
     _defineProperty(this, "boxCells", []);
 
-    _defineProperty(this, "xCellCount", void 0);
-
-    _defineProperty(this, "yCellCount", void 0);
-
-    _defineProperty(this, "boxKeys", void 0);
-
-    _defineProperty(this, "bboxes", void 0);
-
-    _defineProperty(this, "width", void 0);
-
-    _defineProperty(this, "height", void 0);
-
-    _defineProperty(this, "xScale", void 0);
-
-    _defineProperty(this, "yScale", void 0);
-
-    _defineProperty(this, "boxUid", void 0);
-
     var boxCells = this.boxCells;
     this.xCellCount = Math.ceil(width / cellSize);
     this.yCellCount = Math.ceil(height / cellSize);
@@ -84,6 +70,7 @@ var GridIndex = function () {
       var result = [];
 
       if (x1 <= 0 && y1 <= 0 && this.width <= x2 && this.height <= y2) {
+        // 这一步是高效的关键，后续精确碰撞检测结果在计算文本可见性时并不需要
         if (hitTest) {
           return true;
         }
@@ -189,5 +176,4 @@ var GridIndex = function () {
   return GridIndex;
 }();
 
-export default GridIndex;
-//# sourceMappingURL=grid-index.js.map
+export default GridIndex;

package/es/utils/layerData.js

@@ -12,21 +12,34 @@ function getArrowPoints(p1, p2) {
 function adjustData2Amap2Coordinates(mappedData, mapService) {
   var _this = this;
 
+  // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
   if (mappedData.length > 0 && mapService.version === Version['GAODE2.x']) {
     if (typeof mappedData[0].coordinates[0] === 'number') {
-      mappedData.filter(function (d) {
+      // 单个的点数据
+      // @ts-ignore
+      mappedData // TODO: 避免经纬度被重复计算导致坐标位置偏移
+      .filter(function (d) {
         return !d.originCoordinates;
       }).map(function (d) {
-        d.version = Version['GAODE2.x'];
-        d.originCoordinates = cloneDeep(d.coordinates);
+        d.version = Version['GAODE2.x']; // @ts-ignore
+
+        d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
+        // @ts-ignore
+
         d.coordinates = _this.mapService.lngLatToCoord(d.coordinates);
       });
     } else {
-      mappedData.filter(function (d) {
+      // 连续的线、面数据
+      // @ts-ignore
+      mappedData // TODO: 避免经纬度被重复计算导致坐标位置偏移
+      .filter(function (d) {
         return !d.originCoordinates;
       }).map(function (d) {
-        d.version = Version['GAODE2.x'];
-        d.originCoordinates = cloneDeep(d.coordinates);
+        d.version = Version['GAODE2.x']; // @ts-ignore
+
+        d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
+        // @ts-ignore
+
         d.coordinates = _this.mapService.lngLatToCoords(d.coordinates);
       });
     }
@@ -50,20 +63,27 @@ function unProjectCoordinates(coordinates, mapService) {
   }
 
   if (coordinates[0] && coordinates[0][0] instanceof Array) {
+    // @ts-ignore
     var coords = [];
     coordinates.map(function (coord) {
+      // @ts-ignore
       var c1 = [];
       coord.map(function (co) {
         c1.push(mapService.simpleMapCoord.unproject(co));
-      });
+      }); // @ts-ignore
+
       coords.push(c1);
-    });
+    }); // @ts-ignore
+
     return coords;
   } else {
-    var _coords = [];
+    // @ts-ignore
+    var _coords = []; // @ts-ignore
+
     coordinates.map(function (coord) {
       _coords.push(mapService.simpleMapCoord.unproject(coord));
-    });
+    }); // @ts-ignore
+
     return _coords;
   }
 }
@@ -83,6 +103,7 @@ function applyAttributeMapping(attribute, record, minimumColor) {
     var field = _ref.field;
 
     if (record.hasOwnProperty(field) || ((_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.type) === 'variable') {
+      // TODO:多字段，常量
       params.push(record[field]);
     }
   });
@@ -111,15 +132,16 @@ function mapping(attributes, data, fontService, mapService, minimumColor, layer)
       return attribute.scale !== undefined;
     }).forEach(function (attribute) {
       var values = applyAttributeMapping(attribute, record, minimumColor);
-      attribute.needRemapping = false;
+      attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
 
       if (attribute.name === 'color') {
         values = values.map(function (c) {
           return rgb2arr(c);
         });
-      }
+      } // @ts-ignore
+
 
-      encodeRecord[attribute.name] = Array.isArray(values) && values.length === 1 ? values[0] : values;
+      encodeRecord[attribute.name] = Array.isArray(values) && values.length === 1 ? values[0] : values; // 增加对 layer/text/iconfont unicode 映射的解析
 
       if (attribute.name === 'shape') {
         encodeRecord.shape = fontService.getIconFontKey(encodeRecord[attribute.name]);
@@ -127,14 +149,17 @@ function mapping(attributes, data, fontService, mapService, minimumColor, layer)
     });
 
     if (encodeRecord.shape === 'line' && arrow.enable) {
+      // 只有在线图层且支持配置箭头的时候进行插入顶点的处理
       var coords = encodeRecord.coordinates;
       var arrowPoint = getArrowPoints(coords[0], coords[1]);
       encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint);
     }
 
     return encodeRecord;
-  });
-  adjustData2Amap2Coordinates(mappedData, mapService);
+  }); // 调整数据兼容 Amap2.0
+
+  adjustData2Amap2Coordinates(mappedData, mapService); // 调整数据兼容 SimpleCoordinates
+
   adjustData2SimpleCoordinates(mappedData, mapService);
   return mappedData;
 }
@@ -148,5 +173,4 @@ export function calculateData(layer, fontService, mapService, styleAttributeServ
   var mappedEncodeData = mapping(attributes, filterData, fontService, mapService, bottomColor, layer);
   source.destroy();
   return mappedEncodeData;
-}
-//# sourceMappingURL=layerData.js.map
+}

package/es/utils/multiPassRender.js

@@ -1,4 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+
+/**
+ * 'blurH' -> ['blurH', {}]
+ */
 export function normalizePasses(passes) {
   return passes.map(function (pass) {
     if (typeof pass === 'string') {
@@ -8,18 +12,30 @@ export function normalizePasses(passes) {
     return pass;
   });
 }
+/**
+ * 默认添加 ClearPass、RenderPass
+ * 以及 PostProcessing 中的最后一个 CopyPass
+ */
+
 export function createMultiPassRenderer(layer, passes, postProcessingPassFactory, normalPassFactory) {
   var multiPassRenderer = layer.multiPassRenderer;
 
   var _layer$getLayerConfig = layer.getLayerConfig(),
       enablePicking = _layer$getLayerConfig.enablePicking,
-      enableTAA = _layer$getLayerConfig.enableTAA;
+      enableTAA = _layer$getLayerConfig.enableTAA; // picking pass if enabled
+  // if (enablePicking) {
+  //   multiPassRenderer.add(normalPassFactory('pixelPicking'));
+  // }
+  // use TAA pass if enabled instead of render pass
+
 
   if (enableTAA) {
     multiPassRenderer.add(normalPassFactory('taa'));
   } else {
+    // render all layers in this pass
     multiPassRenderer.add(normalPassFactory('render'));
-  }
+  } // post processing
+
 
   normalizePasses(passes).forEach(function (pass) {
     var _pass = _slicedToArray(pass, 2),
@@ -27,8 +43,8 @@ export function createMultiPassRenderer(layer, passes, postProcessingPassFactory
         initializationOptions = _pass[1];
 
     multiPassRenderer.add(postProcessingPassFactory(passName), initializationOptions);
-  });
+  }); // 末尾为固定的 CopyPass
+
   multiPassRenderer.add(postProcessingPassFactory('copy'));
   return multiPassRenderer;
-}
-//# sourceMappingURL=multiPassRender.js.map
+}