@antv/l7-layers 2.19.10 → 2.20.0

package/lib/line/shaders/dash/arc_dash_vert.glsl

@@ -13,9 +13,6 @@ uniform vec4 u_dash_array: [10.0, 5., 0, 0];
 uniform float u_lineDir: 1.0;
 varying vec4 v_dash_array;
 varying float v_distance_ratio;
-
-uniform float u_thetaOffset: 0.314;
-
 #pragma include "projection"
 #pragma include "project"
 #pragma include "picking"
@@ -92,8 +89,8 @@ void main() {
 
   v_distance_ratio = segmentIndex / segmentNumber;
 
-  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/flow/flow_line_vert.glsl

@@ -8,29 +8,59 @@ uniform mat4 u_ModelMatrix;
 
 
 #pragma include "projection"
+#pragma include "project"
 #pragma include "picking"
 varying vec4 v_color;
 uniform float u_gap_width: 1.0;
 uniform float u_stroke_width: 1.0;
 uniform float u_stroke_opacity: 1.0;
 
+vec2 project_pixel_offset(vec2 offsets) {
+
+   vec2 data = project_pixel(offsets);
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
+    return data;
+  }
+
+  return vec2(data.x, -data.y);;
+}
+
+vec2 line_dir(vec2 target, vec2 source) {
+
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
+     return normalize(target - source);
+  }
+  return normalize(ProjectFlat(target) - ProjectFlat(source));
+}
+
+float flag_gap() {
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
+     return 1.;
+  }
+  return -1.;
+
+}
+
 
 void main() {
 
 // 透明度计算
   vec2 source = a_Instance.rg;  // 起始点
   vec2 target =  a_Instance.ba; // 终点
-  vec2 flowlineDir = normalize(target - source);
-  vec2 perpendicularDir = vec2(-flowlineDir.y, flowlineDir.x);
+  vec2 flowlineDir = line_dir(target,source);
+  vec2 perpendicularDir = vec2(flowlineDir.y, flowlineDir.x); // mapbox || 高德
 
 
   vec2 position = mix(source, target, a_Position.x);
   
   float lengthCommon = length(project_position(vec4(target,0,1)) - project_position(vec4(source,0,1)));  //    
-  vec2 offsetDistances = a_Size.x * project_pixel(a_Position.yz);
+  vec2 offsetDistances = a_Size.x * project_pixel_offset(vec2(a_Position.y, a_Position.z)); // Mapbox || 高德
   vec2 limitedOffsetDistances = clamp(   
    offsetDistances,
-   project_pixel(-lengthCommon*.8), project_pixel(lengthCommon*.8)
+   project_pixel(-lengthCommon*.2), project_pixel(lengthCommon*.2)
   );
 
 
@@ -42,9 +72,9 @@ void main() {
     a_Position.x
   );
 
-  vec2 normalsCommon =  u_stroke_width * project_pixel(a_Normal.xy);
+  vec2 normalsCommon =  u_stroke_width * project_pixel_offset(vec2(a_Normal.x, a_Normal.y)); // mapbox || 高德
 
-  float gapCommon =  project_pixel(u_gap_width);
+  float gapCommon = flag_gap() * project_pixel(u_gap_width);
   vec3 offsetCommon = vec3(
     flowlineDir * (limitedOffsetDistances[1] + normalsCommon.y + endpointOffset * 1.05) -
     perpendicularDir * (limitedOffsetDistances[0] + gapCommon + normalsCommon.x),

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

@@ -11,7 +11,6 @@ varying float v_segmentIndex;
 
 uniform float u_lineDir: 1.0;
 
-uniform float u_thetaOffset: 0.314;
 uniform vec4 u_sourceColor;
 uniform vec4 u_targetColor;
 
@@ -80,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
   

package/lib/mask/index.js

@@ -18,7 +18,7 @@ var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 var _models = _interopRequireDefault(require("./models"));
 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; } }
-var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
+var MaskLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
   (0, _inherits2.default)(MaskLayer, _BaseLayer);
   var _super = _createSuper(MaskLayer);
   function MaskLayer() {
@@ -61,5 +61,4 @@ var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
     }
   }]);
   return MaskLayer;
-}(_BaseLayer2.default);
-exports.default = MaskLayer;
+}(_BaseLayer2.default);

package/lib/mask/models/fill.js

@@ -22,7 +22,7 @@ var mask_frag = "uniform float u_opacity : 1.0;\nuniform vec4 u_color;\n\nvoid m
 /* babel-plugin-inline-import '../shaders/mask_vert.glsl' */
 var mask_vert = "attribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\n\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 isNumber = _l7Utils.lodashUtil.isNumber;
-var MaskModel = /*#__PURE__*/function (_BaseModel) {
+var MaskModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(MaskModel, _BaseModel);
   var _super = _createSuper(MaskModel);
   function MaskModel() {
@@ -109,5 +109,4 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return MaskModel;
-}(_BaseModel2.default);
-exports.default = MaskModel;
+}(_BaseModel2.default);

package/lib/mask/models/index.js

@@ -9,5 +9,4 @@ var _fill = _interopRequireDefault(require("./fill"));
 var MaskModels = {
   fill: _fill.default
 };
-var _default = MaskModels;
-exports.default = _default;
+var _default = exports.default = MaskModels;

package/lib/plugins/DataMappingPlugin.js

@@ -20,7 +20,7 @@ var _inversify = require("inversify");
 require("reflect-metadata");
 var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
 var cloneDeep = _l7Utils.lodashUtil.cloneDeep;
-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 () {
+var DataMappingPlugin = exports.default = (_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, "mapService", _descriptor, this);
@@ -147,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) {
@@ -179,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) {
@@ -278,11 +261,11 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
       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 scalers = (attribute === null || attribute === 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]);
@@ -312,5 +295,4 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
   enumerable: true,
   writable: true,
   initializer: null
-})), _class2)) || _class);
-exports.default = DataMappingPlugin;
+})), _class2)) || _class);

package/lib/plugins/DataSourcePlugin.js

@@ -14,7 +14,7 @@ var _l7Source = _interopRequireDefault(require("@antv/l7-source"));
 var _inversify = require("inversify");
 require("reflect-metadata");
 var _dec, _class;
-var DataSourcePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var DataSourcePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function DataSourcePlugin() {
     (0, _classCallCheck2.default)(this, DataSourcePlugin);
   }
@@ -109,5 +109,4 @@ var DataSourcePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
     }
   }]);
   return DataSourcePlugin;
-}()) || _class);
-exports.default = DataSourcePlugin;
+}()) || _class);

package/lib/plugins/FeatureScalePlugin.js

@@ -21,8 +21,8 @@ var _inversify = require("inversify");
 require("reflect-metadata");
 var _identityScale = _interopRequireDefault(require("../utils/identityScale"));
 var _scaleMap, _dec, _class;
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var isNil = _l7Utils.lodashUtil.isNil,
   isString = _l7Utils.lodashUtil.isString,
   uniq = _l7Utils.lodashUtil.uniq;
@@ -31,7 +31,7 @@ var scaleMap = (_scaleMap = {}, (0, _defineProperty2.default)(_scaleMap, _l7Core
 /**
  * 根据 Source 原始数据为指定字段创建 Scale，保存在 StyleAttribute 上，供下游插件使用
  */
-var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var FeatureScalePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function FeatureScalePlugin() {
     (0, _classCallCheck2.default)(this, FeatureScalePlugin);
     (0, _defineProperty2.default)(this, "scaleOptions", {});
@@ -335,5 +335,4 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
     }
   }]);
   return FeatureScalePlugin;
-}()) || _class);
-exports.default = FeatureScalePlugin;
+}()) || _class);

package/lib/plugins/LayerAnimateStylePlugin.js

@@ -11,7 +11,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _inversify = require("inversify");
 require("reflect-metadata");
 var _dec, _class;
-var LayerAnimateStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LayerAnimateStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function LayerAnimateStylePlugin() {
     (0, _classCallCheck2.default)(this, LayerAnimateStylePlugin);
   }
@@ -30,5 +30,4 @@ var LayerAnimateStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class
     }
   }]);
   return LayerAnimateStylePlugin;
-}()) || _class);
-exports.default = LayerAnimateStylePlugin;
+}()) || _class);

package/lib/plugins/LayerMaskPlugin.js

@@ -14,7 +14,7 @@ var _dec, _class;
 /**
  * 更新图层样式，初始图层相关配置
  */
-var LayerStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LayerStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function LayerStylePlugin() {
     (0, _classCallCheck2.default)(this, LayerStylePlugin);
   }
@@ -37,5 +37,4 @@ var LayerStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
     }
   }]);
   return LayerStylePlugin;
-}()) || _class);
-exports.default = LayerStylePlugin;
+}()) || _class);

package/lib/plugins/LayerModelPlugin.js

@@ -17,7 +17,7 @@ var _dec, _class;
 /**
  * Layer Model 初始化，更新，销毁
  */
-var LayerModelPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LayerModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function LayerModelPlugin() {
     (0, _classCallCheck2.default)(this, LayerModelPlugin);
   }
@@ -152,5 +152,4 @@ var LayerModelPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
     }
   }]);
   return LayerModelPlugin;
-}()) || _class);
-exports.default = LayerModelPlugin;
+}()) || _class);

package/lib/plugins/LayerStylePlugin.js

@@ -13,7 +13,7 @@ var _dec, _class;
 /**
  * 更新图层样式，初始图层相关配置
  */
-var LayerStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LayerStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function LayerStylePlugin() {
     (0, _classCallCheck2.default)(this, LayerStylePlugin);
   }
@@ -33,5 +33,4 @@ var LayerStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
     }
   }]);
   return LayerStylePlugin;
-}()) || _class);
-exports.default = LayerStylePlugin;
+}()) || _class);

package/lib/plugins/LightingPlugin.js

@@ -80,7 +80,7 @@ function generateLightingUniforms(lights) {
 /**
  * 光照 & Shadow
  */
-var LightingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LightingPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function LightingPlugin() {
     (0, _classCallCheck2.default)(this, LightingPlugin);
   }
@@ -102,5 +102,4 @@ var LightingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PU
     }
   }]);
   return LightingPlugin;
-}()) || _class);
-exports.default = LightingPlugin;
+}()) || _class);

package/lib/plugins/MultiPassRendererPlugin.js

@@ -24,7 +24,7 @@ var _dec, _class;
  *   ],
  * })
  */
-var MultiPassRendererPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var MultiPassRendererPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function MultiPassRendererPlugin() {
     (0, _classCallCheck2.default)(this, MultiPassRendererPlugin);
   }
@@ -62,5 +62,4 @@ var MultiPassRendererPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class
     }
   }]);
   return MultiPassRendererPlugin;
-}()) || _class);
-exports.default = MultiPassRendererPlugin;
+}()) || _class);

package/lib/plugins/PixelPickingPlugin.js

@@ -7,24 +7,81 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _inversify = require("inversify");
 require("reflect-metadata");
+var _CommonStyleAttribute = require("../core/CommonStyleAttribute");
 var _dec, _class;
 var PickingStage = {
   NONE: 0.0,
   ENCODE: 1.0,
   HIGHLIGHT: 2.0
 };
-var PixelPickingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var PixelPickingPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function PixelPickingPlugin() {
     (0, _classCallCheck2.default)(this, PixelPickingPlugin);
+    (0, _defineProperty2.default)(this, "PickOption", {
+      u_HighlightColor: [1, 0, 0, 1],
+      u_SelectColor: [1, 0, 0, 1],
+      u_PickingColor: [0, 0, 0],
+      u_PickingStage: 0,
+      u_CurrentSelectedId: [0, 0, 0],
+      u_PickingThreshold: 10,
+      u_PickingBuffer: 0,
+      // TODO: 更新机制
+      u_shaderPick: 0,
+      u_EnableSelect: 0,
+      u_activeMix: 0
+    });
   }
   (0, _createClass2.default)(PixelPickingPlugin, [{
+    key: "pickOption2Array",
+    value: function pickOption2Array() {
+      return Object.values(this.PickOption).flat();
+    }
+  }, {
+    key: "updatePickOption",
+    value: function updatePickOption(option, rendererService) {
+      var _this = this;
+      Object.keys(option).forEach(function (key) {
+        _this.PickOption[key] = option[key];
+      });
+      rendererService.uniformBuffers[1].subData({
+        offset: 0,
+        data: new Uint8Array(new Float32Array(this.pickOption2Array()))
+      });
+    }
+  }, {
     key: "apply",
     value: function apply(layer, _ref) {
-      var styleAttributeService = _ref.styleAttributeService;
+      var _this2 = this;
+      var rendererService = _ref.rendererService,
+        styleAttributeService = _ref.styleAttributeService;
+      if (!rendererService.uniformBuffers[1]) {
+        // Create a Uniform Buffer Object(UBO).
+        var uniformBuffer = rendererService.createBuffer({
+          // vec4 u_HighlightColor;
+          // vec4 u_SelectColor;
+          // vec3 u_PickingColor;
+          // float u_PickingStage;
+          // vec3 u_CurrentSelectedId;
+          // float u_PickingThreshold;
+          // float u_PickingBuffer;
+          // float u_shaderPick;
+          // float u_EnableSelect;
+          // float u_activeMix;
+          data: new Float32Array(this.pickOption2Array().length),
+          isUBO: true
+        });
+        rendererService.uniformBuffers[1] = uniformBuffer;
+        this.updatePickOption({}, rendererService);
+      }
+      // u_PickingBuffer: layer.getLayerConfig().pickingBuffer || 0,
+      // // Tip: 当前地图是否在拖动
+      // u_shaderPick: Number(layer.getShaderPickStat()),
+
       // TODO: 由于 Shader 目前无法根据是否开启拾取进行内容修改，因此即使不开启也需要生成 a_PickingColor
       layer.hooks.init.tapPromise('PixelPickingPlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
@@ -34,6 +91,7 @@ var PixelPickingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
           type: _l7Core.AttributeType.Attribute,
           descriptor: {
             name: 'a_PickingColor',
+            shaderLocation: _CommonStyleAttribute.ShaderLocation.PICKING_COLOR,
             buffer: {
               data: [],
               type: _l7Core.gl.FLOAT
@@ -53,6 +111,9 @@ var PixelPickingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
         var _layer$getLayerConfig2 = layer.getLayerConfig(),
           enablePicking = _layer$getLayerConfig2.enablePicking;
         if (enablePicking && layer.isVisible()) {
+          _this2.updatePickOption({
+            u_PickingStage: PickingStage.ENCODE
+          }, rendererService);
           layer.models.forEach(function (model) {
             return model.addUniforms({
               u_PickingStage: PickingStage.ENCODE
@@ -65,6 +126,9 @@ var PixelPickingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
           enablePicking = _layer$getLayerConfig3.enablePicking;
         // 区分选中高亮 和滑过高亮
         if (enablePicking && layer.isVisible()) {
+          _this2.updatePickOption({
+            u_PickingStage: PickingStage.HIGHLIGHT
+          }, rendererService);
           layer.models.forEach(function (model) {
             return model.addUniforms({
               u_PickingStage: PickingStage.HIGHLIGHT
@@ -81,15 +145,17 @@ var PixelPickingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
         layer.updateLayerConfig({
           pickedFeatureID: (0, _l7Utils.decodePickingColor)(new Uint8Array(pickedColor))
         });
+        var option = {
+          u_PickingStage: PickingStage.HIGHLIGHT,
+          u_PickingColor: pickedColor,
+          u_HighlightColor: highlightColorInArray.map(function (c) {
+            return c * 255;
+          }),
+          u_activeMix: activeMix
+        };
+        _this2.updatePickOption(option, rendererService);
         layer.models.forEach(function (model) {
-          return model.addUniforms({
-            u_PickingStage: PickingStage.HIGHLIGHT,
-            u_PickingColor: pickedColor,
-            u_HighlightColor: highlightColorInArray.map(function (c) {
-              return c * 255;
-            }),
-            u_activeMix: activeMix
-          });
+          return model.addUniforms(option);
         });
       });
       layer.hooks.beforeSelect.tap('PixelPickingPlugin', function (pickedColor) {
@@ -101,24 +167,26 @@ var PixelPickingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
         layer.updateLayerConfig({
           pickedFeatureID: (0, _l7Utils.decodePickingColor)(new Uint8Array(pickedColor))
         });
+        var option = {
+          u_PickingStage: PickingStage.HIGHLIGHT,
+          u_PickingColor: pickedColor,
+          u_HighlightColor: highlightColorInArray.map(function (c) {
+            return c * 255;
+          }),
+          u_activeMix: selectMix,
+          u_CurrentSelectedId: pickedColor,
+          u_SelectColor: highlightColorInArray.map(function (c) {
+            return c * 255;
+          }),
+          u_EnableSelect: 1
+        };
+        console.log(option);
+        _this2.updatePickOption(option, rendererService);
         layer.models.forEach(function (model) {
-          return model.addUniforms({
-            u_PickingStage: PickingStage.HIGHLIGHT,
-            u_PickingColor: pickedColor,
-            u_HighlightColor: highlightColorInArray.map(function (c) {
-              return c * 255;
-            }),
-            u_activeMix: selectMix,
-            u_CurrentSelectedId: pickedColor,
-            u_SelectColor: highlightColorInArray.map(function (c) {
-              return c * 255;
-            }),
-            u_EnableSelect: 1
-          });
+          return model.addUniforms(option);
         });
       });
     }
   }]);
   return PixelPickingPlugin;
-}()) || _class);
-exports.default = PixelPickingPlugin;
+}()) || _class);

package/lib/plugins/RegisterStyleAttributePlugin.js

@@ -10,12 +10,13 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _l7Core = require("@antv/l7-core");
 var _inversify = require("inversify");
 require("reflect-metadata");
+var _CommonStyleAttribute = require("../core/CommonStyleAttribute");
 var _utils = require("../tile/utils/utils");
 var _dec, _class;
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
  */
-var RegisterStyleAttributePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var RegisterStyleAttributePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function RegisterStyleAttributePlugin() {
     (0, _classCallCheck2.default)(this, RegisterStyleAttributePlugin);
   }
@@ -54,6 +55,7 @@ var RegisterStyleAttributePlugin = (_dec = (0, _inversify.injectable)(), _dec(_c
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Position',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.POSITION,
           buffer: {
             data: [],
             type: _l7Core.gl.FLOAT
@@ -65,28 +67,6 @@ var RegisterStyleAttributePlugin = (_dec = (0, _inversify.injectable)(), _dec(_c
         }
       });
     }
-  }, {
-    key: "registerFilterAttribute",
-    value: function registerFilterAttribute(styleAttributeService) {
-      styleAttributeService.registerStyleAttribute({
-        name: 'filter',
-        type: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          name: 'filter',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: _l7Core.gl.DYNAMIC_DRAW,
-            data: [],
-            type: _l7Core.gl.FLOAT
-          },
-          size: 1,
-          update: function update(feature) {
-            var filter = feature.filter;
-            return filter ? [1] : [0];
-          }
-        }
-      });
-    }
   }, {
     key: "registerColorAttribute",
     value: function registerColorAttribute(styleAttributeService) {
@@ -95,6 +75,7 @@ var RegisterStyleAttributePlugin = (_dec = (0, _inversify.injectable)(), _dec(_c
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Color',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.COLOR,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -118,6 +99,7 @@ var RegisterStyleAttributePlugin = (_dec = (0, _inversify.injectable)(), _dec(_c
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_vertexId',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.VERTEX_ID,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -133,5 +115,4 @@ var RegisterStyleAttributePlugin = (_dec = (0, _inversify.injectable)(), _dec(_c
     }
   }]);
   return RegisterStyleAttributePlugin;
-}()) || _class);
-exports.default = RegisterStyleAttributePlugin;
+}()) || _class);