@antv/l7-layers 2.16.0 → 2.16.2

package/lib/core/BaseLayer.js

@@ -26,13 +26,12 @@ var _l7Utils = require("@antv/l7-utils");
 var _eventemitter = require("eventemitter3");
 var _lodash = require("lodash");
 var _blend = require("../utils/blend");
-var _dataMappingStyle = require("../utils/dataMappingStyle");
 var _layerData = require("../utils/layerData");
 var _multiPassRender = require("../utils/multiPassRender");
 var _LayerPickService = _interopRequireDefault(require("./LayerPickService"));
 var _TextureService = _interopRequireDefault(require("./TextureService"));
 var _excluded = ["passes"],
-  _excluded2 = ["moduleName", "vertexShader", "fragmentShader", "triangulation", "segmentNumber", "workerEnabled", "workerOptions"];
+  _excluded2 = ["moduleName", "vertexShader", "fragmentShader", "inject", "triangulation", "segmentNumber"];
 var _dec, _class, _descriptor;
 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); }
@@ -113,6 +112,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       enable: false
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "currentPickId", null);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "encodeStyleAttribute", {});
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableEncodeStyles", []);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "pendingStyleAttributes", []);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "scaleOptions", {});
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "animateStatus", false);
@@ -132,7 +133,6 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     _this.name = config.name || _this.id;
     _this.zIndex = config.zIndex || 0;
     _this.rawConfig = config;
-    // this.parent = this;
     return _this;
   }
   (0, _createClass2.default)(BaseLayer, [{
@@ -205,7 +205,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       } else {
         var sceneId = this.container.get(_l7Core.TYPES.SceneID);
         // @ts-ignore
-        (0, _dataMappingStyle.styleDataMapping)(configToUpdate, this); // 处理 style 中进行数据映射的属性字段
+        // styleDataMapping(configToUpdate, this); // 处理 style 中进行数据映射的属性字段
         this.configService.setLayerConfig(sceneId, this.id, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.configService.getLayerConfig(this.id)), this.needUpdateConfig), configToUpdate));
         this.needUpdateConfig = {};
       }
@@ -428,7 +428,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "prepareBuildModel",
     value: function prepareBuildModel() {
-      this.updateLayerConfig((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.getDefaultConfig()), this.rawConfig), this.needUpdateConfig));
+      if (Object.keys(this.needUpdateConfig || {}).length !== 0) {
+        this.updateLayerConfig({});
+      }
 
       // 启动动画
       var _this$getLayerConfig2 = this.getLayerConfig(),
@@ -565,21 +567,32 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           }
         });
       }
-      this.rawConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.rawConfig), rest);
-      if (this.container) {
-        this.updateLayerConfig(this.rawConfig);
-        this.styleNeedUpdate = true;
-      }
-      // TODO style model 更新
-      // @ts-ignore
-      // if (lastConfig && lastConfig.mask === true && options.mask === false) {
-      //   this.clearModels();
-      //   this.layerModel.buildModels((models) => {
-      //     this.models = models;
-      //   });
-      // }
+      this.encodeStyle(rest);
+      this.updateLayerConfig(rest);
       return this;
     }
+
+    // 参与数据映射的字段 encodeing
+  }, {
+    key: "encodeStyle",
+    value: function encodeStyle(options) {
+      var _this6 = this;
+      Object.keys(options).forEach(function (key) {
+        if (
+        // 需要数据映射
+        _this6.enableEncodeStyles.includes(key) && (0, _lodash.isPlainObject)(options[key]) && (options[key].field || options[key].values) && !(0, _lodash.isEqual)(_this6.encodeStyleAttribute[key], options[key]) // 防止计算属性重复计算
+        ) {
+          _this6.encodeStyleAttribute[key] = options[key];
+          _this6.updateStyleAttribute(key, options[key].field, options[key].values);
+          _this6.styleNeedUpdate = true;
+        } else {
+          // 不需要数据映射
+          if (_this6.encodeStyleAttribute[key]) {
+            delete _this6.encodeStyleAttribute[key]; // 删除已经存在的属性
+          }
+        }
+      });
+    }
   }, {
     key: "scale",
     value: function scale(field, cfg) {
@@ -689,7 +702,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "setActive",
     value: function setActive(id, options) {
-      var _this6 = this;
+      var _this7 = this;
       if ((0, _lodash.isObject)(id)) {
         var _id$x = id.x,
           x = _id$x === void 0 ? 0 : _id$x,
@@ -713,7 +726,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         // @ts-ignore
         .then(function () {
           setTimeout(function () {
-            _this6.reRender();
+            _this7.reRender();
           }, 1);
         });
       }
@@ -740,7 +753,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "setSelect",
     value: function setSelect(id, options) {
-      var _this7 = this;
+      var _this8 = this;
       if ((0, _lodash.isObject)(id)) {
         var _id$x2 = id.x,
           x = _id$x2 === void 0 ? 0 : _id$x2,
@@ -764,7 +777,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         // @ts-ignore
         .then(function () {
           setTimeout(function () {
-            _this7.reRender();
+            _this8.reRender();
           }, 1);
         });
       }
@@ -1015,7 +1028,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "setSource",
     value: function setSource(source) {
-      var _this8 = this;
+      var _this9 = this;
       // 解除原 sources 事件
       if (this.layerSource) {
         this.layerSource.off('update', this.sourceEvent);
@@ -1034,22 +1047,22 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       // this.layerSource.inited 为 true update 事件不会再触发
       this.layerSource.on('update', function (_ref4) {
         var type = _ref4.type;
-        if (_this8.coordCenter === undefined) {
-          var _this8$mapService;
-          var layerCenter = _this8.layerSource.center;
-          _this8.coordCenter = layerCenter;
-          if ((_this8$mapService = _this8.mapService) !== null && _this8$mapService !== void 0 && _this8$mapService.setCoordCenter) {
-            _this8.mapService.setCoordCenter(layerCenter);
+        if (_this9.coordCenter === undefined) {
+          var _this9$mapService;
+          var layerCenter = _this9.layerSource.center;
+          _this9.coordCenter = layerCenter;
+          if ((_this9$mapService = _this9.mapService) !== null && _this9$mapService !== void 0 && _this9$mapService.setCoordCenter) {
+            _this9.mapService.setCoordCenter(layerCenter);
           }
         }
         if (type === 'update') {
-          if (_this8.tileLayer) {
+          if (_this9.tileLayer) {
             // 瓦片图层独立更新
-            _this8.tileLayer.reload();
+            _this9.tileLayer.reload();
             return;
           }
           // source 初始化不需要处理
-          _this8.sourceEvent();
+          _this9.sourceEvent();
         }
       });
     }
@@ -1147,56 +1160,38 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     key: "buildLayerModel",
     value: function () {
       var _buildLayerModel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(options) {
-        var _this9 = this;
-        var moduleName, vertexShader, fragmentShader, triangulation, segmentNumber, _options$workerEnable, workerEnabled, workerOptions, rest, _this$shaderModuleSer, vs, fs, uniforms, createModel;
+        var _this10 = this;
+        var moduleName, vertexShader, fragmentShader, inject, triangulation, segmentNumber, rest, _this$shaderModuleSer, vs, fs, uniforms, createModel;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              moduleName = options.moduleName, vertexShader = options.vertexShader, fragmentShader = options.fragmentShader, triangulation = options.triangulation, segmentNumber = options.segmentNumber, _options$workerEnable = options.workerEnabled, workerEnabled = _options$workerEnable === void 0 ? false : _options$workerEnable, workerOptions = options.workerOptions, rest = (0, _objectWithoutProperties2.default)(options, _excluded2);
+              moduleName = options.moduleName, vertexShader = options.vertexShader, fragmentShader = options.fragmentShader, inject = options.inject, triangulation = options.triangulation, segmentNumber = options.segmentNumber, rest = (0, _objectWithoutProperties2.default)(options, _excluded2);
               this.shaderModuleService.registerModule(moduleName, {
                 vs: vertexShader,
-                fs: fragmentShader
+                fs: fragmentShader,
+                inject: inject
               });
               _this$shaderModuleSer = this.shaderModuleService.getModule(moduleName), vs = _this$shaderModuleSer.vs, fs = _this$shaderModuleSer.fs, uniforms = _this$shaderModuleSer.uniforms;
               createModel = this.rendererService.createModel;
-              return _context3.abrupt("return", new Promise(function (resolve, reject) {
-                // filter supported worker & worker enabled layer
-                if (workerOptions && workerOptions.modelType in _l7Utils.WorkerSourceMap && workerEnabled) {
-                  _this9.styleAttributeService.createAttributesAndIndicesAscy(_this9.encodedData, segmentNumber, workerOptions).then(function (_ref9) {
-                    var attributes = _ref9.attributes,
-                      elements = _ref9.elements;
-                    var m = createModel((0, _objectSpread2.default)({
-                      attributes: attributes,
-                      uniforms: uniforms,
-                      fs: fs,
-                      vs: vs,
-                      elements: elements,
-                      blend: _blend.BlendTypes[_l7Core.BlendType.normal]
-                    }, rest));
-                    resolve(m);
-                  }).catch(function (err) {
-                    return reject(err);
-                  });
-                } else {
-                  // console.log(this.encodedData)
-                  var _this9$styleAttribute = _this9.styleAttributeService.createAttributesAndIndices(_this9.encodedData, triangulation, segmentNumber),
-                    attributes = _this9$styleAttribute.attributes,
-                    elements = _this9$styleAttribute.elements,
-                    count = _this9$styleAttribute.count;
-                  var modelOptions = (0, _objectSpread2.default)({
-                    attributes: attributes,
-                    uniforms: uniforms,
-                    fs: fs,
-                    vs: vs,
-                    elements: elements,
-                    blend: _blend.BlendTypes[_l7Core.BlendType.normal]
-                  }, rest);
-                  if (count) {
-                    modelOptions.count = count;
-                  }
-                  var m = createModel(modelOptions);
-                  resolve(m);
+              return _context3.abrupt("return", new Promise(function (resolve) {
+                // console.log(this.encodedData)
+                var _this10$styleAttribut = _this10.styleAttributeService.createAttributesAndIndices(_this10.encodedData, triangulation, segmentNumber),
+                  attributes = _this10$styleAttribut.attributes,
+                  elements = _this10$styleAttribut.elements,
+                  count = _this10$styleAttribut.count;
+                var modelOptions = (0, _objectSpread2.default)({
+                  attributes: attributes,
+                  uniforms: uniforms,
+                  fs: fs,
+                  vs: vs,
+                  elements: elements,
+                  blend: _blend.BlendTypes[_l7Core.BlendType.normal]
+                }, rest);
+                if (count) {
+                  modelOptions.count = count;
                 }
+                var m = createModel(modelOptions);
+                resolve(m);
               }));
             case 5:
             case "end":
@@ -1326,7 +1321,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "renderModels",
     value: function renderModels() {
-      var _this10 = this;
+      var _this11 = this;
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       // TODO: this.getEncodedData().length > 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
       if (this.encodeDataLength <= 0 && !this.forceRender) {
@@ -1337,9 +1332,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.hooks.beforeRender.call();
       this.models.forEach(function (model) {
         model.draw({
-          uniforms: _this10.layerModel.getUninforms(),
-          blend: _this10.layerModel.getBlend(),
-          stencil: _this10.layerModel.getStencil(options)
+          uniforms: _this11.layerModel.getUninforms(),
+          blend: _this11.layerModel.getBlend(),
+          stencil: _this11.layerModel.getStencil(options)
         }, (options === null || options === void 0 ? void 0 : options.ispick) || false);
       });
       this.hooks.afterRender.call();
@@ -1355,10 +1350,11 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         field: field,
         values: values
       })) {
+        // 检测是否发生更新
         return false;
       }
 
-      // 存储 Attribute
+      // 存储 Attribute 瓦片图层使用
       if (['color', 'size', 'texture', 'rotate', 'filter', 'label', 'shape'].indexOf(type) !== -1) {
         this.configService.setAttributeConfig(this.id, (0, _defineProperty2.default)({}, type, {
           field: field,