@antv/l7-layers 2.9.27-alpha.2 → 2.9.27-alpha.3

package/lib/line/shaders/{wall_frag.glsl → wall/wall_frag.glsl}

@@ -1,36 +1,32 @@
 #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;
+uniform float u_opacity : 1.0;
+uniform float u_textureBlend;
+uniform float u_iconStepCount;
+uniform float u_time;
+uniform vec4 u_aimate: [ 1., 2., 1.0, 0.2 ]; // 控制运动
 
-#pragma include "picking"
+varying vec2 v_iconMapUV;
+varying float v_blur;
+varying float v_radio;
+varying vec4 v_color;
+varying vec4 v_dataset;
 
-uniform float u_time;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ]; // 控制运动
+#pragma include "picking"
 
-varying mat4 styleMappingMat;
-// [animate, duration, interval, trailLength],
 void main() {
-  float opacity = styleMappingMat[0][0];
+  float opacity = u_opacity;
   float animateSpeed = 0.0; // 运动速度
-  float d_distance_ratio = styleMappingMat[3].r; // 当前点位距离占线总长的比例
-  float v = styleMappingMat[3].a;
+  float d_distance_ratio = v_dataset.r; // 当前点位距离占线总长的比例
+  float v = v_dataset.a;
 
   if(u_linearColor == 1.0) { // 使用渐变颜色
     gl_FragColor = mix(u_sourceColor, u_targetColor, v);
@@ -48,10 +44,10 @@ void main() {
   }
 
   if(u_line_texture == LineTexture) { // while load texture
-    float aDistance = styleMappingMat[3].g;      // 当前顶点的距离
-    float d_texPixelLen = styleMappingMat[3].b;  // 贴图的像素长度，根据地图层级缩放
+    float aDistance = v_dataset.g;      // 当前顶点的距离
+    float d_texPixelLen = v_dataset.b;  // 贴图的像素长度，根据地图层级缩放
     float u = fract(mod(aDistance, d_texPixelLen)/d_texPixelLen - animateSpeed);
-    float v = styleMappingMat[3].a;  // 线图层贴图部分的 v 坐标值
+    float v = v_dataset.a;  // 线图层贴图部分的 v 坐标值
 
     // 计算纹理间隔 start
     float flag = 0.0;

package/lib/line/shaders/wall/wall_vert.glsl

@@ -0,0 +1,77 @@
+#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: [ 1., 2., 1.0, 0.2 ];
+uniform float u_icon_step: 100;
+uniform float u_heightfixed;
+uniform float u_linearColor: 0;
+
+#pragma include "projection"
+#pragma include "light"
+#pragma include "picking"
+
+// texV 线图层 - 贴图部分的 v 坐标（线的宽度方向）
+varying vec2 v_iconMapUV;
+varying vec4 v_color;
+varying float v_blur;
+varying float v_radio;
+varying vec4 v_dataset;
+
+void main() {
+
+
+  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;
+  // 设置数据集的参数
+  v_dataset[0] = d_distance_ratio; // 当前点位距离占线总长的比例
+  v_dataset[1] = a_Distance;       // 当前顶点的距离
+  v_dataset[2] = d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
+  v_dataset[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);
+
+  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/lib/mask/index.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -25,6 +27,14 @@ var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 
 var _models = _interopRequireDefault(require("./models"));
 
+var _l7Core = require("@antv/l7-core");
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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; }
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
 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; } }
@@ -49,25 +59,92 @@ var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
   }
 
   (0, _createClass2.default)(MaskLayer, [{
+    key: "init",
+    value: function init() {
+      var _this2 = this;
+
+      // 设置配置项
+      var sceneId = this.container.get(_l7Core.TYPES.SceneID);
+      this.configService.setLayerConfig(sceneId, this.id, this.rawConfig);
+      this.layerType = this.rawConfig.layerType;
+      this.rendererService = this.container.get(_l7Core.TYPES.IRendererService);
+      this.layerService = this.container.get(_l7Core.TYPES.ILayerService);
+      this.mapService = this.container.get(_l7Core.TYPES.IMapService);
+      this.cameraService = this.container.get(_l7Core.TYPES.ICameraService);
+      this.coordinateService = this.container.get(_l7Core.TYPES.ICoordinateSystemService);
+      this.shaderModuleService = this.container.get(_l7Core.TYPES.IShaderModuleService);
+      this.postProcessingPassFactory = this.container.get(_l7Core.TYPES.IFactoryPostProcessingPass);
+      this.normalPassFactory = this.container.get(_l7Core.TYPES.IFactoryNormalPass); // 图层容器服务
+
+      this.styleAttributeService = this.container.get(_l7Core.TYPES.IStyleAttributeService); // 完成样式服务注册完成前添加的属性
+
+      this.pendingStyleAttributes.forEach(function (_ref) {
+        var attributeName = _ref.attributeName,
+            attributeField = _ref.attributeField,
+            attributeValues = _ref.attributeValues,
+            updateOptions = _ref.updateOptions;
+
+        _this2.styleAttributeService.updateStyleAttribute(attributeName, {
+          // @ts-ignore
+          scale: (0, _objectSpread2.default)({
+            field: attributeField
+          }, _this2.splitValuesAndCallbackInAttribute( // @ts-ignore
+          attributeValues, // @ts-ignore
+          _this2.getLayerConfig()[attributeName]))
+        }, // @ts-ignore
+        updateOptions);
+      });
+      this.pendingStyleAttributes = []; // 获取插件集
+
+      this.plugins = this.container.getAll(_l7Core.TYPES.ILayerPlugin); // 完成插件注册，传入场景和图层容器内的服务
+
+      var _iterator = _createForOfIteratorHelper(this.plugins),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var plugin = _step.value;
+          plugin.apply(this, {
+            rendererService: this.rendererService,
+            mapService: this.mapService,
+            styleAttributeService: this.styleAttributeService,
+            normalPassFactory: this.normalPassFactory,
+            postProcessingPassFactory: this.postProcessingPassFactory
+          });
+        } // 触发 init 生命周期插件
+
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+
+      this.hooks.init.call();
+      this.hooks.afterInit.call();
+      return this;
+    }
+  }, {
     key: "buildModels",
     value: function buildModels() {
-      var _this2 = this;
+      var _this3 = this;
 
       var shape = this.getModelType();
       this.layerModel = new _models.default[shape](this);
       this.layerModel.initModels(function (models) {
-        _this2.models = models;
+        _this3.models = models;
 
-        _this2.renderLayers();
+        _this3.emit('modelLoaded', null);
       });
     }
   }, {
     key: "rebuildModels",
     value: function rebuildModels() {
-      var _this3 = this;
+      var _this4 = this;
 
       this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
+        _this4.models = models;
+
+        _this4.emit('modelLoaded', null);
       });
     }
   }, {

package/lib/mask/models/fill.js

@@ -23,6 +23,8 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _l7Core = require("@antv/l7-core");
 
+var _l7Utils = require("@antv/l7-utils");
+
 var _lodash = require("lodash");
 
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
@@ -33,11 +35,11 @@ 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; } }
 
-/* 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 '../../shader/minify_frag.glsl' */
+var mask_frag = "uniform float u_opacity : 1.0;\nuniform vec4 u_color;\n\nvoid main() {\n  gl_FragColor = u_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 mask_vert = "attribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\n#pragma include \"projection\"\n\nvoid main() {\n  vec4 project_pos = project_position(vec4(a_Position, 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 = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(MaskModel, _BaseModel);
@@ -54,10 +56,13 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
           _ref$opacity = _ref.opacity,
-          opacity = _ref$opacity === void 0 ? 0 : _ref$opacity;
+          opacity = _ref$opacity === void 0 ? 0 : _ref$opacity,
+          _ref$color = _ref.color,
+          color = _ref$color === void 0 ? '#000' : _ref$color;
 
       return {
-        u_opacity: (0, _lodash.isNumber)(opacity) ? opacity : 0.0
+        u_opacity: (0, _lodash.isNumber)(opacity) ? opacity : 0.0,
+        u_color: (0, _l7Utils.rgb2arr)(color)
       };
     }
   }, {
@@ -95,7 +100,8 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
                       zfail: _l7Core.gl.REPLACE,
                       zpass: _l7Core.gl.REPLACE
                     }
-                  }
+                  },
+                  pick: false
                 }).then(function (model) {
                   callbackModel([model]);
                 }).catch(function (err) {
@@ -120,10 +126,8 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$dataTexture;
-
-      (_this$dataTexture = this.dataTexture) === null || _this$dataTexture === void 0 ? void 0 : _this$dataTexture.destroy();
-      this.layerService.clear();
+      var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+      refresh && this.layerService.clear();
     }
   }, {
     key: "registerBuiltinAttributes",

package/lib/mask/shaders/mask_vert.glsl

@@ -1,17 +1,11 @@
-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));

package/lib/plugins/DataMappingPlugin.js

@@ -33,14 +33,13 @@ var _lodash = require("lodash");
 
 require("reflect-metadata");
 
-var _dec, _dec2, _dec3, _dec4, _class, _class2, _descriptor, _descriptor2, _descriptor3;
+var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
 
-var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPES.IGlobalConfigService), _dec3 = (0, _inversify.inject)(_l7Core.TYPES.IMapService), _dec4 = (0, _inversify.inject)(_l7Core.TYPES.IFontService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPES.IMapService), _dec3 = (0, _inversify.inject)(_l7Core.TYPES.IFontService), _dec(_class = (_class2 = /*#__PURE__*/function () {
   function DataMappingPlugin() {
     (0, _classCallCheck2.default)(this, DataMappingPlugin);
-    (0, _initializerDefineProperty2.default)(this, "configService", _descriptor, this);
-    (0, _initializerDefineProperty2.default)(this, "mapService", _descriptor2, this);
-    (0, _initializerDefineProperty2.default)(this, "fontService", _descriptor3, this);
+    (0, _initializerDefineProperty2.default)(this, "mapService", _descriptor, this);
+    (0, _initializerDefineProperty2.default)(this, "fontService", _descriptor2, this);
   }
 
   (0, _createClass2.default)(DataMappingPlugin, [{
@@ -63,8 +62,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
               styleAttributeService: styleAttributeService
             });
           });
-        } // this.generateMaping(layer, { styleAttributeService });
-
+        }
       });
       layer.hooks.beforeRenderData.tap('DataMappingPlugin', function () {
         layer.dataState.dataMappingNeedUpdate = false;
@@ -80,8 +78,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
               styleAttributeService: styleAttributeService
             });
           });
-        } // this.generateMaping(layer, { styleAttributeService });
-
+        }
 
         return true;
       }); // remapping before render
@@ -112,10 +109,14 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
         if (attributesToRemapping.length) {
           // 过滤数据
           if (filter !== null && filter !== void 0 && filter.needRemapping) {
-            layer.setEncodedData(_this.mapping(layer, attributes, filterData, undefined, bottomColor));
+            var encodeData = _this.mapping(layer, attributes, filterData, undefined, bottomColor);
+
+            layer.setEncodedData(encodeData);
             filter.needRemapping = false;
           } else {
-            layer.setEncodedData(_this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData(), bottomColor));
+            var _encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData(), bottomColor);
+
+            layer.setEncodedData(_encodeData);
           } // 处理文本更新
 
 
@@ -141,18 +142,11 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
         });
       }
 
-      layer.setEncodedData(this.mapping(layer, attributes, filterData, undefined, bottomColor)); // 对外暴露事件
+      var encodeData = this.mapping(layer, attributes, filterData, undefined, bottomColor);
+      layer.setEncodedData(encodeData); // 对外暴露事件
 
       layer.emit('dataUpdate', null);
     }
-  }, {
-    key: "getArrowPoints",
-    value: function getArrowPoints(p1, p2) {
-      var dir = [p2[0] - p1[0], p2[1] - p1[1]];
-      var normalizeDir = (0, _l7Utils.normalize)(dir);
-      var arrowPoint = [p1[0] + normalizeDir[0] * 0.0001, p1[1] + normalizeDir[1] * 0.0001];
-      return arrowPoint;
-    }
   }, {
     key: "mapping",
     value: function mapping(layer, attributes, data, predata, minimumColor) {
@@ -162,25 +156,28 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
           _ref3$arrow = _ref3.arrow,
           arrow = _ref3$arrow === void 0 ? {
         enable: false
-      } : _ref3$arrow;
+      } : _ref3$arrow,
+          usage = _ref3.usage;
+
+      if (usage === 'basemap') {
+        return this.mapLayerMapping(layer, attributes, data, predata);
+      }
 
+      var usedAttributes = attributes.filter(function (attribute) {
+        return attribute.scale !== undefined;
+      });
       var mappedData = data.map(function (record, i) {
         var preRecord = predata ? predata[i] : {};
         var encodeRecord = (0, _objectSpread2.default)({
           id: record._id,
           coordinates: record.coordinates
         }, preRecord);
-        attributes.filter(function (attribute) {
-          return attribute.scale !== undefined;
-        }).forEach(function (attribute) {
-          // console.log('record', record)
-          var values = _this3.applyAttributeMapping(attribute, record, minimumColor); // console.log('values', values)
-
+        usedAttributes.forEach(function (attribute) {
+          var values = _this3.applyAttributeMapping(attribute, record, minimumColor);
 
           attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
 
           if (attribute.name === 'color') {
-            // console.log('attribute', attribute)
             values = values.map(function (c) {
               return (0, _l7Utils.rgb2arr)(c);
             });
@@ -196,26 +193,75 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
         if (arrow.enable && (encodeRecord.shape === 'line' || encodeRecord.shape === 'halfLine')) {
           // 只有在线图层且支持配置箭头的时候进行插入顶点的处理
-          var coords = encodeRecord.coordinates;
+          var coords = encodeRecord.coordinates; // @ts-ignore
 
-          var arrowPoint = _this3.getArrowPoints(coords[0], coords[1]);
+          if (layer.arrowInsertCount < layer.encodeDataLength) {
+            // Tip: arrowInsert 的判断用于确保每一条线数据 arrow 的属性点只会被植入一次
+            var arrowPoint = _this3.getArrowPoints(coords[0], coords[1]);
 
-          encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint);
+            encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint); // @ts-ignore
+
+            layer.arrowInsertCount++;
+          }
         }
 
         return encodeRecord;
-      }); // console.log('mappedData', mappedData)
-      // 调整数据兼容 Amap2.0
+      }); // 调整数据兼容 Amap2.0
 
       this.adjustData2Amap2Coordinates(mappedData, layer); // 调整数据兼容 SimpleCoordinates
 
       this.adjustData2SimpleCoordinates(mappedData);
       return mappedData;
     }
+  }, {
+    key: "mapLayerMapping",
+    value: function mapLayerMapping(layer, attributes, data, predata) {
+      var _this4 = this;
+
+      var usedAttributes = attributes.filter(function (attribute) {
+        return attribute.scale !== undefined;
+      });
+      var mappedData = data.map(function (record, i) {
+        var preRecord = predata ? predata[i] : {};
+        var encodeRecord = (0, _objectSpread2.default)({
+          id: record._id,
+          coordinates: record.coordinates
+        }, preRecord);
+        usedAttributes.forEach(function (attribute) {
+          var _layer$shapeOption;
+
+          if (attribute.name === 'shape' && // @ts-ignore
+          ((_layer$shapeOption = layer.shapeOption) === null || _layer$shapeOption === void 0 ? void 0 : _layer$shapeOption.field) === 'simple') {
+            encodeRecord[attribute.name] = 'simple';
+            attribute.needRemapping = false;
+          } else {
+            var values = _this4.applyMapLayerAttributeMapping(attribute, record);
+
+            attribute.needRemapping = false; // @ts-ignore
+
+            encodeRecord[attribute.name] = Array.isArray(values) && values.length === 1 ? values[0] : values; // 增加对 layer/text/iconfont unicode 映射的解析
+
+            if (attribute.name === 'shape') {
+              encodeRecord.shape = _this4.fontService.getIconFontKey(encodeRecord[attribute.name]);
+            }
+          }
+        });
+
+        if (encodeRecord.size === undefined) {
+          // in case not set size
+          encodeRecord.size = 1;
+        }
+
+        return encodeRecord;
+      }); // 调整数据兼容 Amap2.0
+
+      this.adjustData2Amap2Coordinates(mappedData, layer);
+      return mappedData;
+    }
   }, {
     key: "adjustData2Amap2Coordinates",
     value: function adjustData2Amap2Coordinates(mappedData, layer) {
-      var _this4 = this;
+      var _this5 = this;
 
       // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
       if (mappedData.length > 0 && this.mapService.version === _l7Maps.Version['GAODE2.x']) {
@@ -234,7 +280,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
             // @ts-ignore
             // d.coordinates = this.mapService.lngLatToCoord(d.coordinates);
 
-            d.coordinates = _this4.mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
+            d.coordinates = _this5.mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
           });
         } else {
           // 连续的线、面数据
@@ -249,35 +295,35 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
             // @ts-ignore
             // d.coordinates = this.mapService.lngLatToCoords(d.coordinates);
 
-            d.coordinates = _this4.mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
+            d.coordinates = _this5.mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
           });
         }
       }
     }
-  }, {
-    key: "getLayerCenter",
-    value: function getLayerCenter(layer) {
-      var source = layer.getSource();
-      return source.center;
-    }
   }, {
     key: "adjustData2SimpleCoordinates",
     value: function adjustData2SimpleCoordinates(mappedData) {
-      var _this5 = this;
+      var _this6 = this;
 
       if (mappedData.length > 0 && this.mapService.version === _l7Maps.Version.SIMPLE) {
         mappedData.map(function (d) {
           if (!d.simpleCoordinate) {
-            d.coordinates = _this5.unProjectCoordinates(d.coordinates);
+            d.coordinates = _this6.unProjectCoordinates(d.coordinates);
             d.simpleCoordinate = true;
           }
         });
       }
     }
+  }, {
+    key: "getLayerCenter",
+    value: function getLayerCenter(layer) {
+      var source = layer.getSource();
+      return source.center;
+    }
   }, {
     key: "unProjectCoordinates",
     value: function unProjectCoordinates(coordinates) {
-      var _this6 = this;
+      var _this7 = this;
 
       if (typeof coordinates[0] === 'number') {
         return this.mapService.simpleMapCoord.unproject(coordinates);
@@ -290,7 +336,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
           // @ts-ignore
           var c1 = [];
           coord.map(function (co) {
-            c1.push(_this6.mapService.simpleMapCoord.unproject(co));
+            c1.push(_this7.mapService.simpleMapCoord.unproject(co));
           }); // @ts-ignore
 
           coords.push(c1);
@@ -302,7 +348,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
         var _coords = []; // @ts-ignore
 
         coordinates.map(function (coord) {
-          _coords.push(_this6.mapService.simpleMapCoord.unproject(coord));
+          _coords.push(_this7.mapService.simpleMapCoord.unproject(coord));
         }); // @ts-ignore
 
         return _coords;
@@ -328,9 +374,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
           // TODO:多字段，常量
           params.push(record[field]);
         }
-      }); // console.log('params', params)
-      // console.log('attribute', attribute)
-
+      });
       var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
 
       if (attribute.name === 'color' && !(0, _l7Utils.isColor)(mappingResult[0])) {
@@ -339,19 +383,45 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
       return mappingResult; // return attribute.mapping ? attribute.mapping(params) : [];
     }
+  }, {
+    key: "applyMapLayerAttributeMapping",
+    value: function applyMapLayerAttributeMapping(attribute, record) {
+      var _attribute$scale3;
+
+      if (!attribute.scale) {
+        return [];
+      }
+
+      var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale3 = attribute.scale) === null || _attribute$scale3 === void 0 ? void 0 : _attribute$scale3.scalers) || [];
+      var params = [];
+      scalers.forEach(function (_ref5) {
+        var _attribute$scale4;
+
+        var field = _ref5.field;
+
+        if (record.hasOwnProperty(field) || ((_attribute$scale4 = attribute.scale) === null || _attribute$scale4 === void 0 ? void 0 : _attribute$scale4.type) === 'variable') {
+          params.push(record[field]);
+        }
+      });
+      var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
+      return mappingResult;
+    }
+  }, {
+    key: "getArrowPoints",
+    value: function getArrowPoints(p1, p2) {
+      var dir = [p2[0] - p1[0], p2[1] - p1[1]];
+      var normalizeDir = (0, _l7Utils.normalize)(dir);
+      var arrowPoint = [p1[0] + normalizeDir[0] * 0.0001, p1[1] + normalizeDir[1] * 0.0001];
+      return arrowPoint;
+    }
   }]);
   return DataMappingPlugin;
-}(), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "configService", [_dec2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "mapService", [_dec3], {
+}(), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "mapService", [_dec2], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "fontService", [_dec4], {
+}), _descriptor2 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "fontService", [_dec3], {
   configurable: true,
   enumerable: true,
   writable: true,