@antv/l7-layers 2.19.9 → 2.19.11

package/lib/line/shaders/line_arc_frag.glsl

@@ -1,8 +1,6 @@
 
 #define Animate 0.0
 #define LineTexture 1.0
-
-uniform float u_opacity;
 uniform float u_textureBlend;
 uniform float u_blur : 0.9;
 uniform float u_line_type: 0.0;
@@ -28,7 +26,6 @@ void main() {
   float animateSpeed = 0.0; // 运动速度
   gl_FragColor = v_color;
   
-  gl_FragColor.a *= u_opacity;
 
   if(u_animate.x == Animate && u_line_texture != LineTexture) {
       animateSpeed = u_time / u_animate.y;
@@ -71,7 +68,7 @@ void main() {
       pattern.a = 0.0;
       gl_FragColor = filterColor(gl_FragColor + pattern);
     } else { // replace
-        pattern.a *= u_opacity;
+        pattern.a *= v_color.a;
         if(gl_FragColor.a <= 0.0) {
           pattern.a = 0.0;
         }

package/lib/line/shaders/line_arc_great_circle_frag.glsl

@@ -3,7 +3,6 @@
 #define Animate 0.0
 #define LineTexture 1.0
 
-uniform float u_opacity;
 uniform float u_textureBlend;
 uniform float u_blur : 0.9;
 uniform float u_line_type: 0.0;
@@ -32,20 +31,20 @@ varying vec4 v_line_data;
 #pragma include "projection"
 
 void main() {
-  float opacity = u_opacity;
+
   float animateSpeed = 0.0;
   float d_segmentIndex = v_line_data.g;
   
   // 设置弧线的底色
   if(u_linearColor == 1.0) { // 使用渐变颜色
     gl_FragColor = mix(u_sourceColor, u_targetColor, d_segmentIndex/segmentNumber);
+     gl_FragColor.a *= v_color.a;
   } else { // 使用 color 方法传入的颜色
      gl_FragColor = v_color;
   }
 
   // float blur = 1.- smoothstep(u_blur, 1., length(v_normal.xy));
   // float blur = smoothstep(1.0, u_blur, length(v_normal.xy));
-  gl_FragColor.a *= opacity;
   if(u_line_type == LineTypeDash) {
     float dashLength = mod(v_distance_ratio, v_dash_array.x + v_dash_array.y + v_dash_array.z + v_dash_array.w);
     if(dashLength < v_dash_array.x || (dashLength > (v_dash_array.x + v_dash_array.y) && dashLength <  v_dash_array.x + v_dash_array.y + v_dash_array.z)) {
@@ -73,7 +72,7 @@ void main() {
     float u = fract(arcRadio * count - animateSpeed * count);
     // float u = fract(arcRadio * count - animateSpeed);
     if(u_animate.x == Animate) {
-      u = gl_FragColor.a/opacity;
+      u = gl_FragColor.a/v_color.a;
     }
 
     float v = v_line_data.a; // 线图层贴图部分的 v 坐标值
@@ -86,7 +85,7 @@ void main() {
       pattern.a = 0.0;
       gl_FragColor = filterColor(gl_FragColor + pattern);
     } else { // replace
-        pattern.a *= opacity;
+        pattern.a *= v_color.a;
         if(gl_FragColor.a <= 0.0) {
           pattern.a = 0.0;
         }

package/lib/line/shaders/line_arc_great_circle_vert.glsl

@@ -119,9 +119,8 @@ vec2 interpolate (vec2 source, vec2 target, float angularDist, float t) {
 }
 
 void main() {
-  
-
   v_color = a_Color;
+  v_color.a = v_color.a * opacity;
   vec2 source = radians(a_Instance.rg);
   vec2 target = radians(a_Instance.ba);
   float angularDist = getAngularDist(source, target);

package/lib/line/shaders/line_arc_vert.glsl

@@ -13,7 +13,6 @@ varying vec4 v_color;
 
 uniform float u_lineDir: 1.0;
 
-uniform float u_thetaOffset: 0.314;
 uniform float u_icon_step: 100;
 uniform float u_line_texture: 0.0;
 attribute vec2 a_iconMapUV;
@@ -21,8 +20,6 @@ varying vec2 v_iconMapUV;
 varying vec4 v_lineData;
 varying vec2 v_distance_ratio;
 
-uniform float u_opacity: 1.0;
-
 
 #pragma include "projection"
 #pragma include "project"
@@ -80,6 +77,7 @@ vec2 getNormal(vec2 line_clipspace, float offset_direction) {
 
 void main() {
   v_color = a_Color;
+  v_color.a = v_color.a * opacity;
 
   vec2 source = a_Instance.rg;  // 起始点
   vec2 target =  a_Instance.ba; // 终点
@@ -99,8 +97,8 @@ void main() {
 
  v_lineData.b = d_distance_ratio;
 
-  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, u_thetaOffset), 0.0, 1.0));
-  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, u_thetaOffset), 0.0, 1.0));
+  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, thetaOffset), 0.0, 1.0));
+  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, thetaOffset), 0.0, 1.0));
 
   
   vec2 offset = project_pixel(getExtrusionOffset((next.xy - curr.xy) * indexDir, a_Position.y));

package/lib/line/shaders/line_frag.glsl

@@ -3,11 +3,11 @@
 #define LineTexture 1.0
 uniform float u_textureBlend;
 
-uniform float u_borderWidth: 0.0;
+uniform float u_strokeWidth: 0.0;
 
 uniform vec3 u_blur;
-uniform vec4 u_borderColor;
 varying vec4 v_color;
+varying vec4 v_stroke;
 
 // line texture
 uniform float u_line_texture;
@@ -59,20 +59,20 @@ void main() {
   } 
 
   float v = v_texture_data.a;
-  float borderWidth = min(0.5, u_borderWidth);
+  float strokeWidth = min(0.5, u_strokeWidth);
   // 绘制 border
-  if(borderWidth > 0.01) {
-    float borderOuterWidth = borderWidth / 2.0;
+  if(strokeWidth > 0.01) {
+    float borderOuterWidth = strokeWidth / 2.0;
 
 
-    if(v >= 1.0 - borderWidth || v <= borderWidth) {
-      if(v > borderWidth) { // 外侧
-        float linear = smoothstep(0.0, 1.0, (v - (1.0 - borderWidth))/borderWidth);
+    if(v >= 1.0 - strokeWidth || v <= strokeWidth) {
+      if(v > strokeWidth) { // 外侧
+        float linear = smoothstep(0.0, 1.0, (v - (1.0 - strokeWidth))/strokeWidth);
         //  float linear = step(0.0, (v - (1.0 - borderWidth))/borderWidth);
-        gl_FragColor.rgb = mix(gl_FragColor.rgb, u_borderColor.rgb, linear);
-      } else if(v <= borderWidth) {
-        float linear = smoothstep(0.0, 1.0, v/borderWidth);
-        gl_FragColor.rgb = mix(u_borderColor.rgb, gl_FragColor.rgb, linear);
+        gl_FragColor.rgb = mix(gl_FragColor.rgb, v_stroke.rgb, linear);
+      } else if(v <= strokeWidth) {
+        float linear = smoothstep(0.0, 1.0, v/strokeWidth);
+        gl_FragColor.rgb = mix(v_stroke.rgb, gl_FragColor.rgb, linear);
       }
     }
 

package/lib/line/shaders/line_vert.glsl

@@ -26,6 +26,7 @@ uniform float u_raisingHeight: 0.0;
 #pragma include "picking"
 
 varying vec4 v_color;
+varying vec4 v_stroke;
 
 // texV 线图层 - 贴图部分的 v 坐标（线的宽度方向）
 varying vec2 v_iconMapUV;
@@ -95,6 +96,7 @@ void main() {
 
   v_color = a_Color;
   v_color.a *= opacity;
+  v_stroke = stroke;
 
   vec3 size = a_Miter * setPickingSize(a_Size.x) * reverse_offset_normal(a_Normal);
   

package/lib/line/shaders/linear/arc_linear_vert.glsl

@@ -10,9 +10,7 @@ varying vec4 v_color;
 varying float v_segmentIndex;
 
 uniform float u_lineDir: 1.0;
-uniform float u_opacity: 1.0;
 
-uniform float u_thetaOffset: 0.314;
 uniform vec4 u_sourceColor;
 uniform vec4 u_targetColor;
 
@@ -81,8 +79,8 @@ void main() {
   float indexDir = mix(-1.0, 1.0, step(segmentIndex, 0.0));
   float nextSegmentRatio = getSegmentRatio(segmentIndex + indexDir);
   float d_distance_ratio;
-  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, u_thetaOffset), 0.0, 1.0));
-  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, u_thetaOffset), 0.0, 1.0));
+  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, thetaOffset), 0.0, 1.0));
+  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, thetaOffset), 0.0, 1.0));
   // v_normal = getNormal((next.xy - curr.xy) * indexDir, a_Position.y);
   //unProjCustomCoord
   
@@ -92,7 +90,7 @@ void main() {
   float d_segmentIndex = a_Position.x + 1.0; // 当前顶点在弧线中所处的分段位置
 
   v_color = mix(u_sourceColor, u_targetColor, d_segmentIndex/segmentNumber);
-  v_color.a *= u_opacity;
+  v_color.a *= opacity;
 
   gl_Position = project_common_position_to_clipspace_v2(vec4(curr.xy + offset, 0, 1.0));
 

package/lib/line/shaders/linear/line_linear_frag.glsl

@@ -4,7 +4,6 @@ uniform float u_linearDir: 1.0;
 uniform float u_linearColor: 0;
 uniform vec4 u_sourceColor;
 uniform vec4 u_targetColor;
-uniform float u_opacity: 1.0;
 
 #pragma include "picking"
 

package/lib/line/shaders/linearLine/line_linear_vert.glsl

@@ -14,7 +14,6 @@ uniform mat4 u_ModelMatrix;
 uniform float u_heightfixed: 0.0;
 uniform float u_vertexScale: 1.0;
 uniform float u_raisingHeight: 0.0;
-uniform float u_opacity : 1.0;
 uniform sampler2D u_texture;
 uniform float u_linearDir: 1.0;
 varying vec4 v_Color;
@@ -46,7 +45,7 @@ void main() {
 
   v_Color = texture2D(u_texture, vec2(linearRadio, 0.5));
 
-  v_Color.a *= u_opacity; // 全局透明度
+  v_Color.a *= opacity; // 全局透明度
 
 
 

package/lib/line/shaders/simple/simpleline_linear_frag.glsl

@@ -1,8 +1,8 @@
 uniform vec4 u_sourceColor;
 uniform vec4 u_targetColor;
 varying float v_distanceScale;
-uniform float u_opacity: 1.0;
+varying vec4 v_color;
 void main() {
   gl_FragColor = mix(u_sourceColor, u_targetColor, v_distanceScale);
-  gl_FragColor.a *= u_opacity; // 全局透明度
+  gl_FragColor.a *= v_color.a; // 全局透明度
 }

package/lib/line/shaders/simple/simpleline_vert.glsl

@@ -8,7 +8,6 @@ attribute float a_Distance;
 uniform mat4 u_ModelMatrix;
 
 
-uniform float u_opacity: 1.0;
 uniform float u_vertexScale: 1.0;
 uniform vec4 u_sourceColor;
 uniform vec4 u_targetColor;
@@ -24,7 +23,7 @@ void main() {
 
   v_color = a_Color; 
   v_distanceScale = a_Distance / a_Total_Distance;
-  v_color = vec4(a_Color.xyz, a_Color.w * u_opacity); 
+  v_color.a = v_color.a * opacity;
   vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
 
   float h = float(a_Position.z) * u_vertexScale; // 线顶点的高度 - 兼容不存在第三个数值的情况

package/lib/plugins/DataMappingPlugin.js

@@ -15,7 +15,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime/helpers/applyDecoratedDescriptor"));
 var _initializerWarningHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerWarningHelper"));
 var _l7Core = require("@antv/l7-core");
-var _l7Maps = require("@antv/l7-maps");
 var _l7Utils = require("@antv/l7-utils");
 var _inversify = require("inversify");
 require("reflect-metadata");
@@ -148,11 +147,6 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
     key: "mapping",
     value: function mapping(layer, attributes, data, predata) {
       var _this3 = this;
-      var _ref5 = layer.getLayerConfig(),
-        _ref5$arrow = _ref5.arrow,
-        arrow = _ref5$arrow === void 0 ? {
-          enable: false
-        } : _ref5$arrow;
       var usedAttributes = attributes.filter(function (attribute) {
         return attribute.scale !== undefined;
       }).filter(function (attribute) {
@@ -180,18 +174,6 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
             encodeRecord.shape = _this3.fontService.getIconFontKey(encodeRecord[attribute.name]);
           }
         });
-        if (arrow.enable && encodeRecord.shape === 'line') {
-          // 只有在线图层且支持配置箭头的时候进行插入顶点的处理
-          var coords = encodeRecord.coordinates;
-          // @ts-ignore
-          if (layer.arrowInsertCount < layer.encodeDataLength) {
-            // Tip: arrowInsert 的判断用于确保每一条线数据 arrow 的属性点只会被植入一次
-            var arrowPoint = _this3.getArrowPoints(coords[0], coords[1]);
-            encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint);
-            // @ts-ignore
-            layer.arrowInsertCount++;
-          }
-        }
         return encodeRecord;
       });
       attributes.forEach(function (attribute) {
@@ -209,7 +191,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
     value: function adjustData2Amap2Coordinates(mappedData, layer) {
       var _this4 = this;
       // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
-      if (mappedData.length > 0 && this.mapService.version === _l7Maps.Version['GAODE2.x']) {
+      if (mappedData.length > 0 && this.mapService.version === 'GAODE2.x') {
         var layerCenter = layer.coordCenter || layer.getSource().center;
         // 单个的点数据
         // @ts-ignore
@@ -218,7 +200,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
         .filter(function (d) {
           return !d.originCoordinates;
         }).map(function (d) {
-          d.version = _l7Maps.Version['GAODE2.x'];
+          d.version = 'GAODE2.x';
           // @ts-ignore
           d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
           // @ts-ignore
@@ -231,7 +213,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
     key: "adjustData2SimpleCoordinates",
     value: function adjustData2SimpleCoordinates(mappedData) {
       var _this5 = this;
-      if (mappedData.length > 0 && this.mapService.version === _l7Maps.Version.SIMPLE) {
+      if (mappedData.length > 0 && this.mapService.version === 'SIMPLE') {
         mappedData.map(function (d) {
           if (!d.simpleCoordinate) {
             d.coordinates = _this5.unProjectCoordinates(d.coordinates);
@@ -281,9 +263,9 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
       }
       var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
       var params = [];
-      scalers.forEach(function (_ref6) {
+      scalers.forEach(function (_ref5) {
         var _attribute$scale2;
-        var field = _ref6.field;
+        var field = _ref5.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]);

package/lib/polygon/models/ocean.js

@@ -14,7 +14,6 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _l7Core = require("@antv/l7-core");
-var _l7Maps = require("@antv/l7-maps");
 var _l7Utils = require("@antv/l7-utils");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
@@ -143,7 +142,7 @@ var OceanModel = /*#__PURE__*/function (_BaseModel) {
           },
           size: 2,
           update: function update(feature, featureIdx, vertex, attributeIdx) {
-            var v = feature.version === _l7Maps.Version['GAODE2.x'] ? feature.originCoordinates[0][attributeIdx] : vertex;
+            var v = feature.version === 'GAODE2.x' ? feature.originCoordinates[0][attributeIdx] : vertex;
             var _v = (0, _slicedToArray2.default)(v, 2),
               lng = _v[0],
               lat = _v[1];

package/lib/polygon/models/water.js

@@ -14,7 +14,6 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _l7Core = require("@antv/l7-core");
-var _l7Maps = require("@antv/l7-maps");
 var _l7Utils = require("@antv/l7-utils");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
@@ -136,7 +135,7 @@ var WaterModel = /*#__PURE__*/function (_BaseModel) {
           },
           size: 2,
           update: function update(feature, featureIdx, vertex, attributeIdx) {
-            var v = feature.version === _l7Maps.Version['GAODE2.x'] ? feature.originCoordinates[0][attributeIdx] : vertex;
+            var v = feature.version === 'GAODE2.x' ? feature.originCoordinates[0][attributeIdx] : vertex;
             var _v = (0, _slicedToArray2.default)(v, 2),
               lng = _v[0],
               lat = _v[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.19.9",
+  "version": "2.19.11",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,10 +27,10 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.9",
-    "@antv/l7-core": "2.19.9",
-    "@antv/l7-maps": "2.19.9",
-    "@antv/l7-source": "2.19.9",
-    "@antv/l7-utils": "2.19.9",
+    "@antv/l7-core": "2.19.11",
+    "@antv/l7-maps": "2.19.11",
+    "@antv/l7-source": "2.19.11",
+    "@antv/l7-utils": "2.19.11",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -52,7 +52,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.19.9",
+    "@antv/l7-test-utils": "2.19.11",
     "@types/d3-array": "^2.0.0",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "52744e944c7c136f2fcc4d369661040223100c0c",
+  "gitHead": "a16cafc9907fb3a118ee97df82832c88e114446d",
   "publishConfig": {
     "access": "public"
   }

package/es/utils/layerData.d.ts

@@ -1,2 +0,0 @@
-import { IEncodeFeature, IFontService, ILayer, IMapService, ISourceCFG, IStyleAttributeService } from '@antv/l7-core';
-export declare function calculateData(layer: ILayer, fontService: IFontService, mapService: IMapService, styleAttributeService: IStyleAttributeService, data: any, options: ISourceCFG | undefined): IEncodeFeature[];

package/es/utils/layerData.js

@@ -1,159 +0,0 @@
-import { Version } from '@antv/l7-maps';
-import Source from '@antv/l7-source';
-import { lodashUtil, normalize, rgb2arr } from '@antv/l7-utils';
-var cloneDeep = lodashUtil.cloneDeep;
-function getArrowPoints(p1, p2) {
-  var dir = [p2[0] - p1[0], p2[1] - p1[1]];
-  var normalizeDir = normalize(dir);
-  var arrowPoint = [p1[0] + normalizeDir[0] * 0.0001, p1[1] + normalizeDir[1] * 0.0001];
-  return arrowPoint;
-}
-function adjustData2Amap2Coordinates(mappedData, mapService, layer) {
-  // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
-  if (mappedData.length > 0 && mapService.version === Version['GAODE2.x']) {
-    var layerCenter = layer.coordCenter;
-    if (typeof mappedData[0].coordinates[0] === 'number') {
-      // 单个的点数据
-      // @ts-ignore
-      mappedData
-      // 避免经纬度被重复计算导致坐标位置偏移
-      .filter(function (d) {
-        return !d.originCoordinates;
-      }).map(function (d) {
-        d.version = Version['GAODE2.x'];
-        // @ts-ignore
-        d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
-        // @ts-ignore
-        // d.coordinates = mapService.lngLatToCoord(d.coordinates);
-        d.coordinates = mapService.coordToAMap2RelativeCoordinates(d.coordinates, layerCenter);
-      });
-    } else {
-      // 连续的线、面数据
-      // @ts-ignore
-      mappedData
-      // 避免经纬度被重复计算导致坐标位置偏移
-      .filter(function (d) {
-        return !d.originCoordinates;
-      }).map(function (d) {
-        d.version = Version['GAODE2.x'];
-        // @ts-ignore
-        d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
-        // @ts-ignore
-        // d.coordinates = mapService.lngLatToCoords(d.coordinates);
-        d.coordinates = mapService.coordToAMap2RelativeCoordinates(d.coordinates, layerCenter);
-      });
-    }
-  }
-}
-function adjustData2SimpleCoordinates(mappedData, mapService) {
-  if (mappedData.length > 0 && mapService.version === Version.SIMPLE) {
-    mappedData.map(function (d) {
-      if (!d.simpleCoordinate) {
-        d.coordinates = unProjectCoordinates(d.coordinates, mapService);
-        d.simpleCoordinate = true;
-      }
-    });
-  }
-}
-function unProjectCoordinates(coordinates, mapService) {
-  if (typeof coordinates[0] === 'number') {
-    return mapService.simpleMapCoord.unproject(coordinates);
-  }
-  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 {
-    // @ts-ignore
-    var _coords = [];
-    // @ts-ignore
-    coordinates.map(function (coord) {
-      _coords.push(mapService.simpleMapCoord.unproject(coord));
-    });
-    // @ts-ignore
-    return _coords;
-  }
-}
-function applyAttributeMapping(attribute, record) {
-  var _attribute$scale;
-  if (!attribute.scale) {
-    return [];
-  }
-  var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
-  var params = [];
-  scalers.forEach(function (_ref) {
-    var _attribute$scale2;
-    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]);
-    }
-  });
-  var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
-  return mappingResult;
-}
-function mapping(attributes, data, fontService, mapService, layer) {
-  var _ref2 = layer === null || layer === void 0 ? void 0 : layer.getLayerConfig(),
-    _ref2$arrow = _ref2.arrow,
-    arrow = _ref2$arrow === void 0 ? {
-      enable: false
-    } : _ref2$arrow;
-  var mappedData = data.map(function (record) {
-    var encodeRecord = {
-      id: record._id,
-      coordinates: record.coordinates
-    };
-    attributes.filter(function (attribute) {
-      return attribute.scale !== undefined;
-    }).forEach(function (attribute) {
-      var values = applyAttributeMapping(attribute, record);
-      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;
-
-      // 增加对 layer/text/iconfont unicode 映射的解析
-      if (attribute.name === 'shape') {
-        encodeRecord.shape = fontService.getIconFontKey(encodeRecord[attribute.name]);
-      }
-    });
-    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;
-  });
-  // 调整数据兼容 Amap2.0
-  adjustData2Amap2Coordinates(mappedData, mapService, layer);
-
-  // 调整数据兼容 SimpleCoordinates
-  adjustData2SimpleCoordinates(mappedData, mapService);
-  return mappedData;
-}
-export function calculateData(layer, fontService, mapService, styleAttributeService, data, options) {
-  var source = new Source(data, options);
-  var attributes = styleAttributeService.getLayerStyleAttributes() || [];
-  var dataArray = source.data.dataArray;
-  var filterData = dataArray;
-  var mappedEncodeData = mapping(attributes, filterData, fontService, mapService, layer);
-  source.destroy();
-  return mappedEncodeData;
-}