@antv/l7-layers 2.9.17-alpha.0 → 2.9.17

package/lib/core/BaseLayer.js

@@ -60,7 +60,7 @@ var _multiPassRender = require("../utils/multiPassRender");
 var _updateShape = require("../utils/updateShape");
 
 var _excluded = ["passes"],
-    _excluded2 = ["moduleName", "vertexShader", "fragmentShader", "triangulation", "segmentNumber", "workerEnabled", "workerOptions"];
+    _excluded2 = ["moduleName", "vertexShader", "fragmentShader", "triangulation", "segmentNumber"];
 
 var _dec, _class, _descriptor;
 
@@ -172,10 +172,12 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "sourceEvent", function () {
       _this.dataState.dataSourceNeedUpdate = true;
 
-      var layerConfig = _this.getLayerConfig();
+      var _this$getLayerConfig = _this.getLayerConfig(),
+          autoFit = _this$getLayerConfig.autoFit,
+          fitBoundsOptions = _this$getLayerConfig.fitBoundsOptions;
 
-      if (layerConfig && layerConfig.autoFit) {
-        _this.fitBounds(layerConfig.fitBoundsOptions);
+      if (autoFit) {
+        _this.fitBounds(fitBoundsOptions);
       }
 
       _this.reRender();
@@ -275,9 +277,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.pickingService = this.container.get(_l7Core.TYPES.IPickingService);
       this.mapService = this.container.get(_l7Core.TYPES.IMapService);
 
-      var _this$getLayerConfig = this.getLayerConfig(),
-          enableMultiPassRenderer = _this$getLayerConfig.enableMultiPassRenderer,
-          passes = _this$getLayerConfig.passes;
+      var _this$getLayerConfig2 = this.getLayerConfig(),
+          enableMultiPassRenderer = _this$getLayerConfig2.enableMultiPassRenderer,
+          passes = _this$getLayerConfig2.passes;
 
       if (enableMultiPassRenderer && passes !== null && passes !== void 0 && passes.length && passes.length > 0) {
         this.mapService.on('mapAfterFrameChange', function () {
@@ -386,8 +388,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.inited = true;
       this.updateLayerConfig(_objectSpread(_objectSpread({}, this.getDefaultConfig()), this.rawConfig));
 
-      var _this$getLayerConfig2 = this.getLayerConfig(),
-          animateOption = _this$getLayerConfig2.animateOption;
+      var _this$getLayerConfig3 = this.getLayerConfig(),
+          animateOption = _this$getLayerConfig3.animateOption;
 
       if (animateOption !== null && animateOption !== void 0 && animateOption.enable) {
         this.layerService.startAnimate();
@@ -537,9 +539,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       if (lastConfig && lastConfig.mask === true && options.mask === false) {
         this.clearModels();
-        this.layerModel.buildModels(function (models) {
-          _this5.models = models;
-        });
+        this.models = this.layerModel.buildModels();
       }
 
       return this;
@@ -570,7 +570,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         return this;
       }
 
-      if (this.getEncodedData() && this.getEncodedData().length !== 0) {
+      if (this.getEncodedData().length !== 0) {
         this.renderModels();
       }
 
@@ -584,7 +584,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                if (!(this.getEncodedData() && this.getEncodedData().length !== 0)) {
+                if (!(this.getEncodedData().length !== 0)) {
                   _context.next = 7;
                   break;
                 }
@@ -795,12 +795,12 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     value: function isVisible() {
       var zoom = this.mapService.getZoom();
 
-      var _this$getLayerConfig3 = this.getLayerConfig(),
-          visible = _this$getLayerConfig3.visible,
-          _this$getLayerConfig4 = _this$getLayerConfig3.minZoom,
-          minZoom = _this$getLayerConfig4 === void 0 ? -Infinity : _this$getLayerConfig4,
-          _this$getLayerConfig5 = _this$getLayerConfig3.maxZoom,
-          maxZoom = _this$getLayerConfig5 === void 0 ? Infinity : _this$getLayerConfig5;
+      var _this$getLayerConfig4 = this.getLayerConfig(),
+          visible = _this$getLayerConfig4.visible,
+          _this$getLayerConfig5 = _this$getLayerConfig4.minZoom,
+          minZoom = _this$getLayerConfig5 === void 0 ? -Infinity : _this$getLayerConfig5,
+          _this$getLayerConfig6 = _this$getLayerConfig4.maxZoom,
+          maxZoom = _this$getLayerConfig6 === void 0 ? Infinity : _this$getLayerConfig6;
 
       return !!visible && zoom >= minZoom && zoom <= maxZoom;
     }
@@ -818,9 +818,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       }
 
       if (enableMultiPass) {
-        var _this$getLayerConfig6 = this.getLayerConfig(),
-            _this$getLayerConfig7 = _this$getLayerConfig6.passes,
-            passes = _this$getLayerConfig7 === void 0 ? [] : _this$getLayerConfig7;
+        var _this$getLayerConfig7 = this.getLayerConfig(),
+            _this$getLayerConfig8 = _this$getLayerConfig7.passes,
+            passes = _this$getLayerConfig8 === void 0 ? [] : _this$getLayerConfig8;
 
         this.multiPassRenderer = (0, _multiPassRender.createMultiPassRenderer)(this, passes, this.postProcessingPassFactory, this.normalPassFactory);
         this.multiPassRenderer.setRenderFlag(true);
@@ -845,16 +845,16 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "getMinZoom",
     value: function getMinZoom() {
-      var _this$getLayerConfig8 = this.getLayerConfig(),
-          minZoom = _this$getLayerConfig8.minZoom;
+      var _this$getLayerConfig9 = this.getLayerConfig(),
+          minZoom = _this$getLayerConfig9.minZoom;
 
       return minZoom;
     }
   }, {
     key: "getMaxZoom",
     value: function getMaxZoom() {
-      var _this$getLayerConfig9 = this.getLayerConfig(),
-          maxZoom = _this$getLayerConfig9.maxZoom;
+      var _this$getLayerConfig10 = this.getLayerConfig(),
+          maxZoom = _this$getLayerConfig10.maxZoom;
 
       return maxZoom;
     }
@@ -923,7 +923,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       });
       this.masks = [];
       this.hooks.beforeDestroy.call();
-      this.layerSource.off('sourceUpdate', this.sourceEvent);
+      this.layerSource.off('update', this.sourceEvent);
       this.multiPassRenderer.destroy();
       this.styleAttributeService.clearAllAttributes();
       this.hooks.afterDestroy.call();
@@ -949,12 +949,10 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$layerModel2;
-
       this.models.forEach(function (model) {
         return model.destroy();
       });
-      (_this$layerModel2 = this.layerModel) === null || _this$layerModel2 === void 0 ? void 0 : _this$layerModel2.clearModels();
+      this.layerModel.clearModels();
       this.models = [];
     }
   }, {
@@ -967,10 +965,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "setSource",
     value: function setSource(source) {
-      var _this8 = this;
-
       if (this.layerSource) {
-        this.layerSource.off('sourceUpdate', this.sourceEvent);
+        this.layerSource.off('update', this.sourceEvent);
       }
 
       this.layerSource = source;
@@ -981,13 +977,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         this.layerSource.updateClusterData(zoom);
       }
 
-      if (this.layerSource.inited) {
-        this.sourceEvent();
-      }
-
-      this.layerSource.on('sourceUpdate', function () {
-        _this8.sourceEvent();
-      });
+      this.layerSource.on('update', this.sourceEvent);
     }
   }, {
     key: "getSource",
@@ -1070,16 +1060,11 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "buildLayerModel",
     value: function buildLayerModel(options) {
-      var _this9 = this;
-
       var 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);
       this.shaderModuleService.registerModule(moduleName, {
         vs: vertexShader,
@@ -1092,47 +1077,27 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           uniforms = _this$shaderModuleSer.uniforms;
 
       var createModel = this.rendererService.createModel;
-      return new Promise(function (resolve, reject) {
-        if (workerOptions && workerOptions.modelType in _l7Utils.WorkerSourceMap && workerEnabled) {
-          _this9.styleAttributeService.createAttributesAndIndicesAscy(_this9.encodedData, segmentNumber, workerOptions).then(function (_ref6) {
-            var attributes = _ref6.attributes,
-                elements = _ref6.elements;
-            var m = createModel(_objectSpread({
-              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 {
-          var _this9$styleAttribute = _this9.styleAttributeService.createAttributesAndIndices(_this9.encodedData, triangulation, segmentNumber),
-              attributes = _this9$styleAttribute.attributes,
-              elements = _this9$styleAttribute.elements;
-
-          var m = createModel(_objectSpread({
-            attributes: attributes,
-            uniforms: uniforms,
-            fs: fs,
-            vs: vs,
-            elements: elements,
-            blend: _blend.BlendTypes[_l7Core.BlendType.normal]
-          }, rest));
-          resolve(m);
-        }
-      });
+
+      var _this$styleAttributeS4 = this.styleAttributeService.createAttributesAndIndices(this.encodedData, triangulation, segmentNumber),
+          attributes = _this$styleAttributeS4.attributes,
+          elements = _this$styleAttributeS4.elements;
+
+      return createModel(_objectSpread({
+        attributes: attributes,
+        uniforms: uniforms,
+        fs: fs,
+        vs: vs,
+        elements: elements,
+        blend: _blend.BlendTypes[_l7Core.BlendType.normal]
+      }, rest));
     }
   }, {
     key: "createAttrubutes",
     value: function createAttrubutes(options) {
       var triangulation = options.triangulation;
 
-      var _this$styleAttributeS4 = this.styleAttributeService.createAttributes(this.encodedData, triangulation),
-          attributes = _this$styleAttributeS4.attributes;
+      var _this$styleAttributeS5 = this.styleAttributeService.createAttributes(this.encodedData, triangulation),
+          attributes = _this$styleAttributeS5.attributes;
 
       return attributes;
     }
@@ -1167,11 +1132,11 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "needPick",
     value: function needPick(type) {
-      var _this$getLayerConfig10 = this.getLayerConfig(),
-          _this$getLayerConfig11 = _this$getLayerConfig10.enableHighlight,
-          enableHighlight = _this$getLayerConfig11 === void 0 ? true : _this$getLayerConfig11,
-          _this$getLayerConfig12 = _this$getLayerConfig10.enableSelect,
-          enableSelect = _this$getLayerConfig12 === void 0 ? true : _this$getLayerConfig12;
+      var _this$getLayerConfig11 = this.getLayerConfig(),
+          _this$getLayerConfig12 = _this$getLayerConfig11.enableHighlight,
+          enableHighlight = _this$getLayerConfig12 === void 0 ? true : _this$getLayerConfig12,
+          _this$getLayerConfig13 = _this$getLayerConfig11.enableSelect,
+          enableSelect = _this$getLayerConfig13 === void 0 ? true : _this$getLayerConfig13;
 
       var isPick = this.eventNames().indexOf(type) !== -1 || this.eventNames().indexOf('un' + type) !== -1;
 
@@ -1223,17 +1188,13 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "renderModels",
     value: function renderModels(isPicking) {
-      var _this10 = this;
+      var _this8 = this;
 
-      if (this.getEncodedData() && this.getEncodedData().length > 0) {
+      if (this.getEncodedData().length > 0) {
         if (this.layerModelNeedUpdate && this.layerModel) {
-          this.layerModel.buildModels(function (models) {
-            _this10.models = models;
-
-            _this10.hooks.beforeRender.call();
-
-            _this10.layerModelNeedUpdate = false;
-          });
+          this.models = this.layerModel.buildModels();
+          this.hooks.beforeRender.call();
+          this.layerModelNeedUpdate = false;
         }
 
         if (this.layerModel.renderUpdate) {
@@ -1242,7 +1203,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
         this.models.forEach(function (model) {
           model.draw({
-            uniforms: _this10.layerModel.getUninforms()
+            uniforms: _this8.layerModel.getUninforms()
           }, isPicking);
         });
       }