@antv/l7-layers 2.9.20 → 2.9.22

package/es/line/shaders/wall_frag.glsl

@@ -0,0 +1,93 @@
+#define Animate 0.0
+#define LineTexture 1.0
+
+uniform float u_opacity : 1.0;
+uniform float u_textureBlend;
+uniform float u_iconStepCount;
+
+varying vec4 v_color;
+
+// line texture
+uniform float u_line_texture;
+uniform sampler2D u_texture;
+uniform vec2 u_textSize;
+
+varying vec2 v_iconMapUV;
+varying float v_blur;
+
+uniform float u_linearColor: 0;
+uniform vec4 u_sourceColor;
+uniform vec4 u_targetColor;
+
+#pragma include "picking"
+
+uniform float u_time;
+uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ]; // 控制运动
+
+varying mat4 styleMappingMat;
+// [animate, duration, interval, trailLength],
+void main() {
+  float opacity = styleMappingMat[0][0];
+  float animateSpeed = 0.0; // 运动速度
+  float d_distance_ratio = styleMappingMat[3].r; // 当前点位距离占线总长的比例
+  float v = styleMappingMat[3].a;
+
+  if(u_linearColor == 1.0) { // 使用渐变颜色
+    gl_FragColor = mix(u_sourceColor, u_targetColor, v);
+  } else { // 使用 color 方法传入的颜色
+     gl_FragColor = v_color;
+  }
+
+  gl_FragColor.a *= opacity; // 全局透明度
+  if(u_aimate.x == Animate) {
+      animateSpeed = u_time / u_aimate.y;
+       float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_aimate.z)* (1.0/ u_aimate.z) + animateSpeed);
+      alpha = (alpha + u_aimate.w -1.0) / u_aimate.w;
+      alpha = smoothstep(0., 1., alpha);
+      gl_FragColor.a *= alpha;
+  }
+
+  if(u_line_texture == LineTexture) { // while load texture
+    float aDistance = styleMappingMat[3].g;      // 当前顶点的距离
+    float d_texPixelLen = styleMappingMat[3].b;  // 贴图的像素长度，根据地图层级缩放
+    float u = fract(mod(aDistance, d_texPixelLen)/d_texPixelLen - animateSpeed);
+    float v = styleMappingMat[3].a;  // 线图层贴图部分的 v 坐标值
+
+    // 计算纹理间隔 start
+    float flag = 0.0;
+    if(u > 1.0/u_iconStepCount) {
+      flag = 1.0;
+    }
+    u = fract(u*u_iconStepCount);
+    // 计算纹理间隔 end
+
+    vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;
+    vec4 pattern = texture2D(u_texture, uv);
+
+    // Tip: 判断纹理间隔
+    if(flag > 0.0) {
+      pattern = vec4(0.0);
+    }
+
+    if(u_textureBlend == 0.0) { // normal
+      pattern.a = 0.0;
+      gl_FragColor = filterColor(gl_FragColor + pattern);
+    } else { // replace
+        pattern.a *= opacity;
+        if(gl_FragColor.a <= 0.0) {
+          pattern.a = 0.0;
+        }
+        gl_FragColor = filterColor(pattern);
+    }
+  }
+  
+
+  // blur - AA
+  if(v < v_blur) {
+    gl_FragColor.a = mix(0.0, gl_FragColor.a, v/v_blur);
+  } else if(v > 1.0 - v_blur) {
+    gl_FragColor.a = mix(gl_FragColor.a, 0.0, (v - (1.0 - v_blur))/v_blur);
+  }
+
+  gl_FragColor = filterColor(gl_FragColor);
+}

package/es/line/shaders/wall_vert.glsl

@@ -0,0 +1,111 @@
+#define Animate 0.0
+
+attribute float a_Miter;
+attribute vec4 a_Color;
+attribute vec2 a_Size;
+attribute vec3 a_Normal;
+attribute vec3 a_Position;
+attribute vec2 a_iconMapUV;
+
+attribute float a_Total_Distance;
+attribute float a_Distance;
+
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
+uniform float u_icon_step: 100;
+uniform float u_heightfixed;
+
+#pragma include "projection"
+#pragma include "light"
+#pragma include "picking"
+
+varying vec4 v_color;
+varying float v_blur;
+
+// texV 线图层 - 贴图部分的 v 坐标（线的宽度方向）
+varying vec2 v_iconMapUV;
+
+uniform float u_linearColor: 0;
+
+uniform float u_opacity: 1.0;
+varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
+
+#pragma include "styleMapping"
+#pragma include "light"
+#pragma include "styleMappingCalOpacity"
+
+void main() {
+  // cal style mapping - 数据纹理映射部分的计算
+  styleMappingMat = mat4(
+    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty
+    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA
+    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]
+    0.0, 0.0, 0.0, 0.0  // distance_ratio/distance/pixelLen/texV
+  );
+
+  float rowCount = u_cellTypeLayout[0][0];    // 当前的数据纹理有几行
+  float columnCount = u_cellTypeLayout[0][1]; // 当看到数据纹理有几列
+  float columnWidth = 1.0/columnCount;  // 列宽
+  float rowHeight = 1.0/rowCount;       // 行高
+  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets
+  float id = a_vertexId; // 第n个顶点
+  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // 起始点在第几行
+  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // 起始点在第几列
+  
+  // cell 固定顺序 opacity -> strokeOpacity -> strokeWidth -> stroke ... 
+  // 按顺序从 cell 中取值、若没有则自动往下取值
+  float textureOffset = 0.0; // 在 cell 中取值的偏移量
+
+  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
+  styleMappingMat[0][0] = opacityAndOffset.r;
+  textureOffset = opacityAndOffset.g;
+  // cal style mapping - 数据纹理映射部分的计算
+
+  float d_distance_ratio; // 当前点位距离占线总长的比例
+  float d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
+
+  v_iconMapUV = a_iconMapUV;
+  if(u_heightfixed < 1.0) {     // 高度随 zoom 调整
+    d_texPixelLen = project_pixel(u_icon_step);
+  } else {
+    d_texPixelLen = u_icon_step;
+  }
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+    d_texPixelLen *= 10.0;
+  }
+
+  if(u_aimate.x == Animate || u_linearColor == 1.0) {
+      d_distance_ratio = a_Distance / a_Total_Distance;
+  }
+
+  float miter = (a_Miter + 1.0)/2.0;
+  // 设置数据集的参数
+  styleMappingMat[3][0] = d_distance_ratio; // 当前点位距离占线总长的比例
+  styleMappingMat[3][1] = a_Distance;       // 当前顶点的距离
+  styleMappingMat[3][2] = d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
+  styleMappingMat[3][3] = miter;          // 线图层贴图部分的 v 坐标值 0 - 1
+
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
+
+  float originSize = a_Size.x;  // 固定高度
+  if(u_heightfixed < 1.0) {     // 高度随 zoom 调整
+    originSize = project_float_pixel(a_Size.x);
+  }
+
+  float wallHeight = originSize * miter;
+  float lightWeight = calc_lighting(vec4(project_pos.xy, wallHeight, 1.0));
+
+  v_blur = min(project_float_pixel(2.0) / originSize, 0.05);
+
+  v_color = vec4(a_Color.rgb * lightWeight, a_Color.w);
+  // v_color = a_Color;
+
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    gl_Position = u_Mvp * (vec4(project_pos.xy, wallHeight, 1.0));
+  } else {
+    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, wallHeight, 1.0));
+  }
+
+  setPickingColor(a_PickingColor);
+}

package/es/mask/index.js

@@ -10,10 +10,10 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-import BaseLayer from '../core/BaseLayer';
-import MaskModels from './models';
+import BaseLayer from "../core/BaseLayer";
+import MaskModels from "./models";
 
-var MaskLayer = function (_BaseLayer) {
+var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(MaskLayer, _BaseLayer);
 
   var _super = _createSuper(MaskLayer);
@@ -79,5 +79,4 @@ var MaskLayer = function (_BaseLayer) {
   return MaskLayer;
 }(BaseLayer);
 
-export { MaskLayer as default };
-//# sourceMappingURL=index.js.map
+export { MaskLayer as default };

package/es/mask/models/fill.js

@@ -4,7 +4,6 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _isNumber from "lodash/isNumber";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -12,12 +11,17 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 import { gl } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-import { polygonTriangulation } from '../../core/triangulation';
+import { isNumber } from 'lodash';
+import BaseModel from "../../core/BaseModel";
+import { polygonTriangulation } from "../../core/triangulation";
+
+/* babel-plugin-inline-import '../shaders/mask_frag.glsl' */
 var mask_frag = "uniform float u_opacity;\nvarying vec4 v_Color;\n\nvoid main() {\n  gl_FragColor = v_Color;\n  gl_FragColor.a *= u_opacity;\n}\n";
+
+/* babel-plugin-inline-import '../shaders/mask_vert.glsl' */
 var mask_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec4 v_Color;\n\n#pragma include \"projection\"\n\nvoid main() {\n\n  v_Color = a_Color;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n}\n\n";
 
-var MaskModel = function (_BaseModel) {
+var MaskModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(MaskModel, _BaseModel);
 
   var _super = _createSuper(MaskModel);
@@ -36,7 +40,7 @@ var MaskModel = function (_BaseModel) {
           opacity = _ref$opacity === void 0 ? 0 : _ref$opacity;
 
       return {
-        u_opacity: _isNumber(opacity) ? opacity : 0.0
+        u_opacity: isNumber(opacity) ? opacity : 0.0
       };
     }
   }, {
@@ -47,7 +51,7 @@ var MaskModel = function (_BaseModel) {
   }, {
     key: "buildModels",
     value: function () {
-      var _buildModels = _asyncToGenerator(_regeneratorRuntime.mark(function _callee(callbackModel) {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(callbackModel) {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -114,5 +118,4 @@ var MaskModel = function (_BaseModel) {
   return MaskModel;
 }(BaseModel);
 
-export { MaskModel as default };
-//# sourceMappingURL=fill.js.map
+export { MaskModel as default };

package/es/mask/models/index.js

@@ -1,6 +1,5 @@
-import FillModel from './fill';
+import FillModel from "./fill";
 var MaskModels = {
   fill: FillModel
 };
-export default MaskModels;
-//# sourceMappingURL=index.js.map
+export default MaskModels;

package/es/mask/shaders/mask_frag.glsl

@@ -0,0 +1,7 @@
+uniform float u_opacity;
+varying vec4 v_Color;
+
+void main() {
+  gl_FragColor = v_Color;
+  gl_FragColor.a *= u_opacity;
+}

package/es/mask/shaders/mask_vert.glsl

@@ -0,0 +1,22 @@
+attribute vec4 a_Color;
+attribute vec3 a_Position;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+
+varying vec4 v_Color;
+
+#pragma include "projection"
+
+void main() {
+
+  v_Color = a_Color;
+  vec4 project_pos = project_position(vec4(a_Position, 1.0));
+  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
+
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));
+  } else {
+    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
+  }
+}
+

package/es/plugins/DataMappingPlugin.js

@@ -1,23 +1,20 @@
+import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import _initializerDefineProperty from "@babel/runtime/helpers/initializerDefineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _applyDecoratedDescriptor from "@babel/runtime/helpers/applyDecoratedDescriptor";
 import _initializerWarningHelper from "@babel/runtime/helpers/initializerWarningHelper";
-import _cloneDeep from "lodash/cloneDeep";
 
 var _dec, _dec2, _dec3, _dec4, _class, _class2, _descriptor, _descriptor2, _descriptor3;
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 import { TYPES } from '@antv/l7-core';
 import { Version } from '@antv/l7-maps';
 import { isColor, normalize, rgb2arr } from '@antv/l7-utils';
 import { inject, injectable } from 'inversify';
+import { cloneDeep } from 'lodash';
 import 'reflect-metadata';
-var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfigService), _dec3 = inject(TYPES.IMapService), _dec4 = inject(TYPES.IFontService), _dec(_class = (_class2 = function () {
+var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfigService), _dec3 = inject(TYPES.IMapService), _dec4 = inject(TYPES.IFontService), _dec(_class = (_class2 = /*#__PURE__*/function () {
   function DataMappingPlugin() {
     _classCallCheck(this, DataMappingPlugin);
 
@@ -35,6 +32,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
 
       var styleAttributeService = _ref.styleAttributeService;
       layer.hooks.init.tap('DataMappingPlugin', function () {
+        // 初始化重新生成 map
         var source = layer.getSource();
 
         if (source.inited) {
@@ -47,7 +45,8 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
               styleAttributeService: styleAttributeService
             });
           });
-        }
+        } // this.generateMaping(layer, { styleAttributeService });
+
       });
       layer.hooks.beforeRenderData.tap('DataMappingPlugin', function () {
         layer.dataState.dataMappingNeedUpdate = false;
@@ -63,10 +62,12 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
               styleAttributeService: styleAttributeService
             });
           });
-        }
+        } // this.generateMaping(layer, { styleAttributeService });
+
 
         return true;
-      });
+      }); // remapping before render
+
       layer.hooks.beforeRender.tap('DataMappingPlugin', function () {
         var source = layer.getSource();
 
@@ -80,8 +81,9 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
         var dataArray = source.data.dataArray;
         var attributesToRemapping = attributes.filter(function (attribute) {
           return attribute.needRemapping;
-        });
-        var filterData = dataArray;
+        } // 如果filter变化
+        );
+        var filterData = dataArray; // 数据过滤完 再执行数据映射
 
         if (filter !== null && filter !== void 0 && filter.needRemapping && filter !== null && filter !== void 0 && filter.scale) {
           filterData = dataArray.filter(function (record) {
@@ -90,12 +92,14 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
         }
 
         if (attributesToRemapping.length) {
+          // 过滤数据
           if (filter !== null && filter !== void 0 && filter.needRemapping) {
             layer.setEncodedData(_this.mapping(layer, attributes, filterData, undefined, bottomColor));
             filter.needRemapping = false;
           } else {
             layer.setEncodedData(_this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData(), bottomColor));
-          }
+          } // 处理文本更新
+
 
           layer.emit('remapping', null);
         }
@@ -111,7 +115,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
       var attributes = styleAttributeService.getLayerStyleAttributes() || [];
       var filter = styleAttributeService.getLayerStyleAttribute('filter');
       var dataArray = layer.getSource().data.dataArray;
-      var filterData = dataArray;
+      var filterData = dataArray; // 数据过滤完 再执行数据映射
 
       if (filter !== null && filter !== void 0 && filter.scale) {
         filterData = dataArray.filter(function (record) {
@@ -119,7 +123,8 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
         });
       }
 
-      layer.setEncodedData(this.mapping(layer, attributes, filterData, undefined, bottomColor));
+      layer.setEncodedData(this.mapping(layer, attributes, filterData, undefined, bottomColor)); // 对外暴露事件
+
       layer.emit('dataUpdate', null);
     }
   }, {
@@ -152,17 +157,21 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
         attributes.filter(function (attribute) {
           return attribute.scale !== undefined;
         }).forEach(function (attribute) {
-          var values = _this3.applyAttributeMapping(attribute, record, minimumColor);
+          // console.log('record', record)
+          var values = _this3.applyAttributeMapping(attribute, record, minimumColor); // console.log('values', values)
 
-          attribute.needRemapping = false;
+
+          attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
 
           if (attribute.name === 'color') {
+            // console.log('attribute', attribute)
             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 = _this3.fontService.getIconFontKey(encodeRecord[attribute.name]);
@@ -170,6 +179,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
         });
 
         if (arrow.enable && (encodeRecord.shape === 'line' || encodeRecord.shape === 'halfLine')) {
+          // 只有在线图层且支持配置箭头的时候进行插入顶点的处理
           var coords = encodeRecord.coordinates;
 
           var arrowPoint = _this3.getArrowPoints(coords[0], coords[1]);
@@ -178,8 +188,11 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
         }
 
         return encodeRecord;
-      });
-      this.adjustData2Amap2Coordinates(mappedData, layer);
+      }); // console.log('mappedData', mappedData)
+      // 调整数据兼容 Amap2.0
+
+      this.adjustData2Amap2Coordinates(mappedData, layer); // 调整数据兼容 SimpleCoordinates
+
       this.adjustData2SimpleCoordinates(mappedData);
       return mappedData;
     }
@@ -188,23 +201,38 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
     value: function adjustData2Amap2Coordinates(mappedData, layer) {
       var _this4 = this;
 
+      // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
       if (mappedData.length > 0 && this.mapService.version === Version['GAODE2.x']) {
         var layerCenter = this.getLayerCenter(layer);
 
         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);
+
             d.coordinates = _this4.mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
           });
         } 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);
+
             d.coordinates = _this4.mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
           });
         }
@@ -240,20 +268,27 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
       }
 
       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(_this6.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(_this6.mapService.simpleMapCoord.unproject(coord));
-        });
+        }); // @ts-ignore
+
         return _coords;
       }
     }
@@ -274,16 +309,19 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
         var field = _ref4.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]);
         }
-      });
+      }); // console.log('params', params)
+      // console.log('attribute', attribute)
+
       var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
 
       if (attribute.name === 'color' && !isColor(mappingResult[0])) {
         return [minimumColor];
       }
 
-      return mappingResult;
+      return mappingResult; // return attribute.mapping ? attribute.mapping(params) : [];
     }
   }]);
 
@@ -304,5 +342,4 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
   writable: true,
   initializer: null
 })), _class2)) || _class);
-export { DataMappingPlugin as default };
-//# sourceMappingURL=DataMappingPlugin.js.map
+export { DataMappingPlugin as default };

package/es/plugins/DataSourcePlugin.js

@@ -1,6 +1,5 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
 var _dec, _class;
 
@@ -8,11 +7,9 @@ import { TYPES } from '@antv/l7-core';
 import Source, { DEFAULT_DATA, DEFAULT_PARSER, DEFAULT_SOURCE } from '@antv/l7-source';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
-var DataSourcePlugin = (_dec = injectable(), _dec(_class = function () {
+var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
   function DataSourcePlugin() {
     _classCallCheck(this, DataSourcePlugin);
-
-    _defineProperty(this, "mapService", void 0);
   }
 
   _createClass(DataSourcePlugin, [{
@@ -25,6 +22,7 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = function () {
         var source = layer.getSource();
 
         if (!source) {
+          // TODO: 允许用户不使用 layer 的 source 方法，在这里传入一个默认的替换的默认数据
           var defaultSourceConfig = DEFAULT_SOURCE[layer.type] || {
             data: DEFAULT_DATA,
             options: DEFAULT_PARSER
@@ -42,10 +40,13 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = function () {
           _this.updateClusterData(layer);
         } else {
           source.once('sourceUpdate', function () {
-            _this.updateClusterData(layer);
+            _this.updateClusterData(layer); // TODO: layer.hooks.init.call();
+
           });
-        }
-      });
+        } // this.updateClusterData(layer);
+
+      }); // 检测数据是否需要更新
+
       layer.hooks.beforeRenderData.tap('DataSourcePlugin', function () {
         var neeUpdateCluster = _this.updateClusterData(layer);
 
@@ -65,8 +66,10 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = function () {
       var dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
 
       if (cluster && dataSourceNeedUpdate) {
+        // 数据发生更新
         source.updateClusterData(Math.floor(newZoom));
-      }
+      } // 如果 dataSource 有更新，跳过 zoom 的判断，直接更新一次
+
 
       if (cluster && Math.abs(layer.clusterZoom - newZoom) >= 1) {
         if (zoom !== Math.floor(newZoom)) {
@@ -83,5 +86,4 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = function () {
 
   return DataSourcePlugin;
 }()) || _class);
-export { DataSourcePlugin as default };
-//# sourceMappingURL=DataSourcePlugin.js.map
+export { DataSourcePlugin as default };