@antv/l7-layers 2.16.1 → 2.16.2

package/es/plugins/LayerModelPlugin.js

@@ -1,9 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-
 var _dec, _class;
-
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { IDebugLog, ILayerStage } from '@antv/l7-core';
 import { injectable } from 'inversify';
@@ -12,38 +10,31 @@ import TileLayer from "../tile/tileLayer/BaseLayer";
 /**
  * Layer Model 初始化，更新，销毁
  */
-
 var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
   function LayerModelPlugin() {
     _classCallCheck(this, LayerModelPlugin);
   }
-
   _createClass(LayerModelPlugin, [{
     key: "build",
     value: function () {
       var _build = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(layer) {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                // 更新Model 配置项
-                layer.prepareBuildModel(); // 初始化 Model
-
-                _context.next = 3;
-                return layer.buildModels();
-
-              case 3:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              // 更新Model 配置项 style options
+              layer.prepareBuildModel();
+              // 初始化 Model
+              _context.next = 3;
+              return layer.buildModels();
+            case 3:
+            case "end":
+              return _context.stop();
           }
         }, _callee);
       }));
-
       function build(_x) {
         return _build.apply(this, arguments);
       }
-
       return build;
     }()
   }, {
@@ -51,27 +42,21 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
     value: function () {
       var _initLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(layer) {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return this.build(layer);
-
-              case 2:
-                layer.styleNeedUpdate = false;
-
-              case 3:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return this.build(layer);
+            case 2:
+              layer.styleNeedUpdate = false;
+            case 3:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
-
       function initLayerModel(_x2) {
         return _initLayerModel.apply(this, arguments);
       }
-
       return initLayerModel;
     }()
   }, {
@@ -79,106 +64,96 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
     value: function () {
       var _prepareLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(layer) {
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                _context3.next = 2;
-                return this.build(layer);
-
-              case 2:
-              case "end":
-                return _context3.stop();
-            }
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.next = 2;
+              return this.build(layer);
+            case 2:
+              layer.styleNeedUpdate = false;
+            case 3:
+            case "end":
+              return _context3.stop();
           }
         }, _callee3, this);
       }));
-
       function prepareLayerModel(_x3) {
         return _prepareLayerModel.apply(this, arguments);
       }
-
       return prepareLayerModel;
     }()
   }, {
     key: "apply",
     value: function apply(layer) {
       var _this = this;
-
       layer.hooks.init.tapPromise('LayerModelPlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              if (!layer.getSource().isTile) {
+                _context4.next = 4;
+                break;
+              }
+              layer.prepareBuildModel();
+              layer.tileLayer = new TileLayer(layer);
+              return _context4.abrupt("return");
+            case 4:
+              layer.log(IDebugLog.BuildModelStart, ILayerStage.INIT);
+              _context4.next = 7;
+              return _this.initLayerModel(layer);
+            case 7:
+              layer.log(IDebugLog.BuildModelEnd, ILayerStage.INIT);
+            case 8:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      })));
+      layer.hooks.beforeRenderData.tapPromise('LayerModelPlugin', /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(flag) {
+          return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+            while (1) switch (_context5.prev = _context5.next) {
               case 0:
+                if (flag) {
+                  _context5.next = 2;
+                  break;
+                }
+                return _context5.abrupt("return", false);
+              case 2:
                 if (!layer.getSource().isTile) {
-                  _context4.next = 4;
+                  _context5.next = 5;
                   break;
                 }
-
-                layer.prepareBuildModel();
                 layer.tileLayer = new TileLayer(layer);
-                return _context4.abrupt("return");
-
-              case 4:
-                layer.log(IDebugLog.BuildModelStart, ILayerStage.INIT);
-                _context4.next = 7;
-                return _this.initLayerModel(layer);
-
-              case 7:
-                layer.log(IDebugLog.BuildModelEnd, ILayerStage.INIT);
-
+                return _context5.abrupt("return", false);
+              case 5:
+                layer.log(IDebugLog.BuildModelStart, ILayerStage.UPDATE);
+                _context5.next = 8;
+                return _this.prepareLayerModel(layer);
               case 8:
+                layer.log(IDebugLog.BuildModelEnd, ILayerStage.UPDATE);
+                return _context5.abrupt("return", true);
+              case 10:
               case "end":
-                return _context4.stop();
-            }
-          }
-        }, _callee4);
-      })));
-      layer.hooks.beforeRenderData.tapPromise('LayerModelPlugin', /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(flag) {
-          return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-            while (1) {
-              switch (_context5.prev = _context5.next) {
-                case 0:
-                  if (flag) {
-                    _context5.next = 2;
-                    break;
-                  }
-
-                  return _context5.abrupt("return", false);
-
-                case 2:
-                  if (!layer.getSource().isTile) {
-                    _context5.next = 5;
-                    break;
-                  }
-
-                  layer.tileLayer = new TileLayer(layer);
-                  return _context5.abrupt("return", false);
-
-                case 5:
-                  layer.log(IDebugLog.BuildModelStart, ILayerStage.UPDATE);
-                  _context5.next = 8;
-                  return _this.prepareLayerModel(layer);
-
-                case 8:
-                  layer.log(IDebugLog.BuildModelEnd, ILayerStage.UPDATE);
-                  return _context5.abrupt("return", true);
-
-                case 10:
-                case "end":
-                  return _context5.stop();
-              }
+                return _context5.stop();
             }
           }, _callee5);
         }));
-
         return function (_x4) {
           return _ref2.apply(this, arguments);
         };
       }());
+      layer.hooks.beforeRender.tap('LayerModelPlugin', function () {
+        // 判断数据映射是否需要更新
+        if (layer.styleNeedUpdate) {
+          _this.prepareLayerModel(layer).then(function () {
+            layer.styleNeedUpdate = false;
+            layer.renderLayers();
+          });
+        }
+        layer.styleNeedUpdate = false;
+      });
     }
   }]);
-
   return LayerModelPlugin;
 }()) || _class);
 export { LayerModelPlugin as default };

package/es/plugins/LayerStylePlugin.js

@@ -1,35 +1,29 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-
 var _dec, _class;
-
 import { injectable } from 'inversify';
 import 'reflect-metadata';
 /**
  * 更新图层样式，初始图层相关配置
  */
-
 var LayerStylePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
   function LayerStylePlugin() {
     _classCallCheck(this, LayerStylePlugin);
   }
-
   _createClass(LayerStylePlugin, [{
     key: "apply",
     value: function apply(layer) {
       layer.hooks.afterInit.tap('LayerStylePlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
-            autoFit = _layer$getLayerConfig.autoFit,
-            fitBoundsOptions = _layer$getLayerConfig.fitBoundsOptions; // mask 初始化
-
-
+          autoFit = _layer$getLayerConfig.autoFit,
+          fitBoundsOptions = _layer$getLayerConfig.fitBoundsOptions;
+        // mask 初始化
         if (autoFit) {
           layer.fitBounds(fitBoundsOptions);
         }
       });
     }
   }]);
-
   return LayerStylePlugin;
 }()) || _class);
 export { LayerStylePlugin as default };

package/es/plugins/LightingPlugin.js

@@ -2,9 +2,7 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-
 var _dec, _class;
-
 var _excluded = ["type"];
 import { injectable } from 'inversify';
 import 'reflect-metadata';
@@ -51,46 +49,43 @@ export function generateLightingUniforms(lights) {
     u_SpotLights: new Array(3).fill(_objectSpread({}, DEFAULT_SPOT_LIGHT)),
     u_NumOfSpotLights: 0
   };
-
   if (!lights || !lights.length) {
     lights = [DEFAULT_LIGHT];
   }
-
   lights.forEach(function (_ref) {
     var _ref$type = _ref.type,
-        type = _ref$type === void 0 ? 'directional' : _ref$type,
-        rest = _objectWithoutProperties(_ref, _excluded);
-
+      type = _ref$type === void 0 ? 'directional' : _ref$type,
+      rest = _objectWithoutProperties(_ref, _excluded);
     var lightsUniformName = lightTypeUniformMap[type].lights;
-    var lightsNumUniformName = lightTypeUniformMap[type].num; // @ts-ignore
-
-    var num = lightsMap[lightsNumUniformName]; // @ts-ignore
-
-    lightsMap[lightsUniformName][num] = _objectSpread(_objectSpread({}, lightsMap[lightsUniformName][num]), rest); // @ts-ignore
+    var lightsNumUniformName = lightTypeUniformMap[type].num;
 
+    // @ts-ignore
+    var num = lightsMap[lightsNumUniformName];
+    // @ts-ignore
+    lightsMap[lightsUniformName][num] = _objectSpread(_objectSpread({}, lightsMap[lightsUniformName][num]), rest);
+    // @ts-ignore
     lightsMap[lightsNumUniformName]++;
   });
   return lightsMap;
 }
+
 /**
  * 光照 & Shadow
  */
-
 var LightingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
   function LightingPlugin() {
     _classCallCheck(this, LightingPlugin);
   }
-
   _createClass(LightingPlugin, [{
     key: "apply",
     value: function apply(layer) {
       layer.hooks.beforeRender.tap('LightingPlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
-            enableLighting = _layer$getLayerConfig.enableLighting;
-
+          enableLighting = _layer$getLayerConfig.enableLighting;
         if (enableLighting) {
           layer.models.forEach(function (model) {
-            return (// @ts-ignore
+            return (
+              // @ts-ignore
               model.addUniforms(_objectSpread({}, generateLightingUniforms()))
             );
           });
@@ -98,7 +93,6 @@ var LightingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (
       });
     }
   }]);
-
   return LightingPlugin;
 }()) || _class);
 export { LightingPlugin as default };

package/es/plugins/MultiPassRendererPlugin.js

@@ -1,11 +1,10 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-
 var _dec, _class;
-
 import { injectable } from 'inversify';
 import 'reflect-metadata';
 import { createMultiPassRenderer } from "../utils/multiPassRender";
+
 /**
  * 自定义渲染管线：
  * ClearPass -> PixelPickingPass(可选) -> RenderPass/TAAPass -> PostProcessing -> CopyPass
@@ -19,29 +18,27 @@ import { createMultiPassRenderer } from "../utils/multiPassRender";
  *   ],
  * })
  */
-
 var MultiPassRendererPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
   function MultiPassRendererPlugin() {
     _classCallCheck(this, MultiPassRendererPlugin);
   }
-
   _createClass(MultiPassRendererPlugin, [{
     key: "apply",
     value: function apply(layer, _ref) {
       var _this = this;
-
       var rendererService = _ref.rendererService,
-          postProcessingPassFactory = _ref.postProcessingPassFactory,
-          normalPassFactory = _ref.normalPassFactory;
+        postProcessingPassFactory = _ref.postProcessingPassFactory,
+        normalPassFactory = _ref.normalPassFactory;
       layer.hooks.init.tapPromise('MultiPassRendererPlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
-            enableMultiPassRenderer = _layer$getLayerConfig.enableMultiPassRenderer,
-            _layer$getLayerConfig2 = _layer$getLayerConfig.passes,
-            passes = _layer$getLayerConfig2 === void 0 ? [] : _layer$getLayerConfig2; // SceneConfig 的 enableMultiPassRenderer 配置项可以统一关闭
-
+          enableMultiPassRenderer = _layer$getLayerConfig.enableMultiPassRenderer,
+          _layer$getLayerConfig2 = _layer$getLayerConfig.passes,
+          passes = _layer$getLayerConfig2 === void 0 ? [] : _layer$getLayerConfig2;
 
-        _this.enabled = !!enableMultiPassRenderer && layer.getLayerConfig().enableMultiPassRenderer !== false; // 根据 LayerConfig passes 配置项初始化
+        // SceneConfig 的 enableMultiPassRenderer 配置项可以统一关闭
+        _this.enabled = !!enableMultiPassRenderer && layer.getLayerConfig().enableMultiPassRenderer !== false;
 
+        // 根据 LayerConfig passes 配置项初始化
         if (_this.enabled) {
           layer.multiPassRenderer = createMultiPassRenderer(layer, passes, postProcessingPassFactory, normalPassFactory);
           layer.multiPassRenderer.setRenderFlag(true);
@@ -51,15 +48,13 @@ var MultiPassRendererPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/f
         if (_this.enabled) {
           // 渲染前根据 viewport 调整 FBO size
           var _rendererService$getV = rendererService.getViewportSize(),
-              width = _rendererService$getV.width,
-              height = _rendererService$getV.height;
-
+            width = _rendererService$getV.width,
+            height = _rendererService$getV.height;
           layer.multiPassRenderer.resize(width, height);
         }
       });
     }
   }]);
-
   return MultiPassRendererPlugin;
 }()) || _class);
 export { MultiPassRendererPlugin as default };

package/es/plugins/PixelPickingPlugin.js

@@ -1,8 +1,6 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-
 var _dec, _class;
-
 import { AttributeType, gl } from '@antv/l7-core';
 import { decodePickingColor, encodePickingColor, rgb2arr } from '@antv/l7-utils';
 import { injectable } from 'inversify';
@@ -16,7 +14,6 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
   function PixelPickingPlugin() {
     _classCallCheck(this, PixelPickingPlugin);
   }
-
   _createClass(PixelPickingPlugin, [{
     key: "apply",
     value: function apply(layer, _ref) {
@@ -24,8 +21,7 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
       // TODO: 由于 Shader 目前无法根据是否开启拾取进行内容修改，因此即使不开启也需要生成 a_PickingColor
       layer.hooks.init.tapPromise('PixelPickingPlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
-            enablePicking = _layer$getLayerConfig.enablePicking;
-
+          enablePicking = _layer$getLayerConfig.enablePicking;
         styleAttributeService.registerStyleAttribute({
           name: 'pickingColor',
           type: AttributeType.Attribute,
@@ -44,12 +40,11 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
             }
           }
         });
-      }); // 必须要与 PixelPickingPass 结合使用，因此必须开启 multiPassRenderer
-
+      });
+      // 必须要与 PixelPickingPass 结合使用，因此必须开启 multiPassRenderer
       layer.hooks.beforePickingEncode.tap('PixelPickingPlugin', function () {
         var _layer$getLayerConfig2 = layer.getLayerConfig(),
-            enablePicking = _layer$getLayerConfig2.enablePicking;
-
+          enablePicking = _layer$getLayerConfig2.enablePicking;
         if (enablePicking && layer.isVisible()) {
           layer.models.forEach(function (model) {
             return model.addUniforms({
@@ -60,9 +55,8 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
       });
       layer.hooks.afterPickingEncode.tap('PixelPickingPlugin', function () {
         var _layer$getLayerConfig3 = layer.getLayerConfig(),
-            enablePicking = _layer$getLayerConfig3.enablePicking; // 区分选中高亮 和滑过高亮
-
-
+          enablePicking = _layer$getLayerConfig3.enablePicking;
+        // 区分选中高亮 和滑过高亮
         if (enablePicking && layer.isVisible()) {
           layer.models.forEach(function (model) {
             return model.addUniforms({
@@ -73,10 +67,9 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
       });
       layer.hooks.beforeHighlight.tap('PixelPickingPlugin', function (pickedColor) {
         var _layer$getLayerConfig4 = layer.getLayerConfig(),
-            highlightColor = _layer$getLayerConfig4.highlightColor,
-            _layer$getLayerConfig5 = _layer$getLayerConfig4.activeMix,
-            activeMix = _layer$getLayerConfig5 === void 0 ? 0 : _layer$getLayerConfig5;
-
+          highlightColor = _layer$getLayerConfig4.highlightColor,
+          _layer$getLayerConfig5 = _layer$getLayerConfig4.activeMix,
+          activeMix = _layer$getLayerConfig5 === void 0 ? 0 : _layer$getLayerConfig5;
         var highlightColorInArray = typeof highlightColor === 'string' ? rgb2arr(highlightColor) : highlightColor || [1, 0, 0, 1];
         layer.updateLayerConfig({
           pickedFeatureID: decodePickingColor(new Uint8Array(pickedColor))
@@ -94,10 +87,9 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
       });
       layer.hooks.beforeSelect.tap('PixelPickingPlugin', function (pickedColor) {
         var _layer$getLayerConfig6 = layer.getLayerConfig(),
-            selectColor = _layer$getLayerConfig6.selectColor,
-            _layer$getLayerConfig7 = _layer$getLayerConfig6.selectMix,
-            selectMix = _layer$getLayerConfig7 === void 0 ? 0 : _layer$getLayerConfig7;
-
+          selectColor = _layer$getLayerConfig6.selectColor,
+          _layer$getLayerConfig7 = _layer$getLayerConfig6.selectMix,
+          selectMix = _layer$getLayerConfig7 === void 0 ? 0 : _layer$getLayerConfig7;
         var highlightColorInArray = typeof selectColor === 'string' ? rgb2arr(selectColor) : selectColor || [1, 0, 0, 1];
         layer.updateLayerConfig({
           pickedFeatureID: decodePickingColor(new Uint8Array(pickedColor))
@@ -120,7 +112,6 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
       });
     }
   }]);
-
   return PixelPickingPlugin;
 }()) || _class);
 export { PixelPickingPlugin as default };

package/es/plugins/RegisterStyleAttributePlugin.js

@@ -1,33 +1,28 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-
 var _dec, _class;
-
 import { AttributeType, gl } from '@antv/l7-core';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
 import { isTileGroup } from "../tile/utils";
+
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
  */
-
 var RegisterStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
   function RegisterStyleAttributePlugin() {
     _classCallCheck(this, RegisterStyleAttributePlugin);
   }
-
   _createClass(RegisterStyleAttributePlugin, [{
     key: "apply",
     value: function apply(layer, _ref) {
       var _this = this;
-
       var styleAttributeService = _ref.styleAttributeService;
       layer.hooks.init.tapPromise('RegisterStyleAttributePlugin', function () {
         // 过滤 tileGroup layer （瓦片图层不需要注册）
         if (isTileGroup(layer)) {
           return;
         }
-
         _this.registerBuiltinAttributes(styleAttributeService, layer);
       });
     }
@@ -38,11 +33,10 @@ var RegisterStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE
       if (layer.type === 'MaskLayer') {
         this.registerPositionAttribute(styleAttributeService);
         return;
-      } // Tip: normal render layer
-
-
-      this.registerPositionAttribute(styleAttributeService); // this.registerFilterAttribute(styleAttributeService);//数据层数据过滤
-
+      }
+      // Tip: normal render layer
+      this.registerPositionAttribute(styleAttributeService);
+      // this.registerFilterAttribute(styleAttributeService);//数据层数据过滤
       this.registerColorAttribute(styleAttributeService);
       this.registerVertexIdAttribute(styleAttributeService);
     }
@@ -132,7 +126,6 @@ var RegisterStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE
       });
     }
   }]);
-
   return RegisterStyleAttributePlugin;
 }()) || _class);
 export { RegisterStyleAttributePlugin as default };