@antv/l7-layers 2.14.4 → 2.14.6

package/es/core/BaseLayer.d.ts

@@ -188,9 +188,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     clearModels(): void;
     isDirty(): boolean;
     setSource(source: Source): void;
-    initSource(source: Source): void;
     getSource(): Source;
-    private addSourceEvent;
     getScaleOptions(): IScaleOptions;
     encodeDataLength: number;
     setEncodedData(encodedData: IEncodeFeature[]): void;

package/es/core/BaseLayer.js

@@ -1156,44 +1156,22 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         }
 
         if (type === 'update') {
-          // source 初始化不需要处理
+          if (_this8.tileLayer) {
+            // 瓦片图层独立更新
+            _this8.tileLayer.reload();
+
+            return;
+          } // source 初始化不需要处理
+
+
           _this8.sourceEvent();
         }
       });
-    } // layer 初始化source
-
-  }, {
-    key: "initSource",
-    value: function initSource(source) {
-      this.layerSource = source;
-      this.clusterZoom = 0;
-      this.addSourceEvent();
     }
   }, {
     key: "getSource",
     value: function getSource() {
       return this.layerSource;
-    } // 注册source 更新事件
-
-  }, {
-    key: "addSourceEvent",
-    value: function addSourceEvent() {
-      var _this9 = this;
-
-      this.layerSource.on('update', function () {
-        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);
-          }
-        }
-
-        _this9.sourceEvent();
-      });
     }
   }, {
     key: "getScaleOptions",
@@ -1289,7 +1267,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "buildLayerModel",
     value: function () {
       var _buildLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(options) {
-        var _this10 = this;
+        var _this9 = this;
 
         var moduleName, vertexShader, fragmentShader, triangulation, segmentNumber, _options$workerEnable, workerEnabled, workerOptions, rest, _this$shaderModuleSer, vs, fs, uniforms, createModel;
 
@@ -1307,7 +1285,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
                 return _context3.abrupt("return", new Promise(function (resolve, reject) {
                   // filter supported worker & worker enabled layer
                   if (workerOptions && workerOptions.modelType in WorkerSourceMap && workerEnabled) {
-                    _this10.styleAttributeService.createAttributesAndIndicesAscy(_this10.encodedData, segmentNumber, workerOptions).then(function (_ref9) {
+                    _this9.styleAttributeService.createAttributesAndIndicesAscy(_this9.encodedData, segmentNumber, workerOptions).then(function (_ref9) {
                       var attributes = _ref9.attributes,
                           elements = _ref9.elements;
                       var m = createModel(_objectSpread({
@@ -1323,10 +1301,10 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
                       return reject(err);
                     });
                   } else {
-                    var _this10$styleAttribut = _this10.styleAttributeService.createAttributesAndIndices(_this10.encodedData, triangulation, segmentNumber),
-                        attributes = _this10$styleAttribut.attributes,
-                        elements = _this10$styleAttribut.elements,
-                        count = _this10$styleAttribut.count;
+                    var _this9$styleAttribute = _this9.styleAttributeService.createAttributesAndIndices(_this9.encodedData, triangulation, segmentNumber),
+                        attributes = _this9$styleAttribute.attributes,
+                        elements = _this9$styleAttribute.elements,
+                        count = _this9$styleAttribute.count;
 
                     var modelOptions = _objectSpread({
                       attributes: attributes,
@@ -1497,7 +1475,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "renderModels",
     value: function renderModels() {
-      var _this11 = this;
+      var _this10 = this;
 
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
@@ -1509,9 +1487,9 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       this.hooks.beforeRender.call();
       this.models.forEach(function (model) {
         model.draw({
-          uniforms: _this11.layerModel.getUninforms(),
-          blend: _this11.layerModel.getBlend(),
-          stencil: _this11.layerModel.getStencil(options)
+          uniforms: _this10.layerModel.getUninforms(),
+          blend: _this10.layerModel.getBlend(),
+          stencil: _this10.layerModel.getStencil(options)
         }, (options === null || options === void 0 ? void 0 : options.ispick) || false);
       });
       this.hooks.afterRender.call();

package/es/tile/tileLayer/BaseLayer.d.ts

@@ -32,6 +32,7 @@ export default class BaseTileLayer {
     tileLoaded(tile: SourceTile): void;
     tileError(error: Error): void;
     destroy(): void;
+    reload(): void;
     tileUnLoad(tile: SourceTile): void;
     tileUpdate(): Promise<void>;
     setPickState(layers: ILayer[]): void;

package/es/tile/tileLayer/BaseLayer.js

@@ -180,6 +180,21 @@ var BaseTileLayer = /*#__PURE__*/function () {
       this.mapService.off('moveend', this.viewchange);
       (_this$tilesetManager3 = this.tilesetManager) === null || _this$tilesetManager3 === void 0 ? void 0 : _this$tilesetManager3.destroy();
       this.tileLayerService.destroy();
+    } // 重新加载
+
+  }, {
+    key: "reload",
+    value: function reload() {
+      var _this$tilesetManager4;
+
+      // 瓦片重新加载
+      this.tilesetManager.clear();
+
+      var _this$getCurrentView3 = this.getCurrentView(),
+          latLonBounds = _this$getCurrentView3.latLonBounds,
+          zoom = _this$getCurrentView3.zoom;
+
+      (_this$tilesetManager4 = this.tilesetManager) === null || _this$tilesetManager4 === void 0 ? void 0 : _this$tilesetManager4.update(zoom, latLonBounds);
     }
   }, {
     key: "tileUnLoad",

package/lib/core/BaseLayer.js

@@ -1157,44 +1157,22 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         }
 
         if (type === 'update') {
-          // source 初始化不需要处理
+          if (_this8.tileLayer) {
+            // 瓦片图层独立更新
+            _this8.tileLayer.reload();
+
+            return;
+          } // source 初始化不需要处理
+
+
           _this8.sourceEvent();
         }
       });
-    } // layer 初始化source
-
-  }, {
-    key: "initSource",
-    value: function initSource(source) {
-      this.layerSource = source;
-      this.clusterZoom = 0;
-      this.addSourceEvent();
     }
   }, {
     key: "getSource",
     value: function getSource() {
       return this.layerSource;
-    } // 注册source 更新事件
-
-  }, {
-    key: "addSourceEvent",
-    value: function addSourceEvent() {
-      var _this9 = this;
-
-      this.layerSource.on('update', function () {
-        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);
-          }
-        }
-
-        _this9.sourceEvent();
-      });
     }
   }, {
     key: "getScaleOptions",
@@ -1290,7 +1268,7 @@ 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 _this10 = this;
+        var _this9 = this;
 
         var moduleName, vertexShader, fragmentShader, triangulation, segmentNumber, _options$workerEnable, workerEnabled, workerOptions, rest, _this$shaderModuleSer, vs, fs, uniforms, createModel;
 
@@ -1308,7 +1286,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
                 return _context3.abrupt("return", new Promise(function (resolve, reject) {
                   // filter supported worker & worker enabled layer
                   if (workerOptions && workerOptions.modelType in _l7Utils.WorkerSourceMap && workerEnabled) {
-                    _this10.styleAttributeService.createAttributesAndIndicesAscy(_this10.encodedData, segmentNumber, workerOptions).then(function (_ref9) {
+                    _this9.styleAttributeService.createAttributesAndIndicesAscy(_this9.encodedData, segmentNumber, workerOptions).then(function (_ref9) {
                       var attributes = _ref9.attributes,
                           elements = _ref9.elements;
                       var m = createModel((0, _objectSpread2.default)({
@@ -1324,10 +1302,10 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
                       return reject(err);
                     });
                   } else {
-                    var _this10$styleAttribut = _this10.styleAttributeService.createAttributesAndIndices(_this10.encodedData, triangulation, segmentNumber),
-                        attributes = _this10$styleAttribut.attributes,
-                        elements = _this10$styleAttribut.elements,
-                        count = _this10$styleAttribut.count;
+                    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,
@@ -1498,7 +1476,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "renderModels",
     value: function renderModels() {
-      var _this11 = this;
+      var _this10 = this;
 
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
@@ -1510,9 +1488,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.hooks.beforeRender.call();
       this.models.forEach(function (model) {
         model.draw({
-          uniforms: _this11.layerModel.getUninforms(),
-          blend: _this11.layerModel.getBlend(),
-          stencil: _this11.layerModel.getStencil(options)
+          uniforms: _this10.layerModel.getUninforms(),
+          blend: _this10.layerModel.getBlend(),
+          stencil: _this10.layerModel.getStencil(options)
         }, (options === null || options === void 0 ? void 0 : options.ispick) || false);
       });
       this.hooks.afterRender.call();

package/lib/tile/tileLayer/BaseLayer.js

@@ -195,6 +195,21 @@ var BaseTileLayer = /*#__PURE__*/function () {
       this.mapService.off('moveend', this.viewchange);
       (_this$tilesetManager3 = this.tilesetManager) === null || _this$tilesetManager3 === void 0 ? void 0 : _this$tilesetManager3.destroy();
       this.tileLayerService.destroy();
+    } // 重新加载
+
+  }, {
+    key: "reload",
+    value: function reload() {
+      var _this$tilesetManager4;
+
+      // 瓦片重新加载
+      this.tilesetManager.clear();
+
+      var _this$getCurrentView3 = this.getCurrentView(),
+          latLonBounds = _this$getCurrentView3.latLonBounds,
+          zoom = _this$getCurrentView3.zoom;
+
+      (_this$tilesetManager4 = this.tilesetManager) === null || _this$tilesetManager4 === void 0 ? void 0 : _this$tilesetManager4.update(zoom, latLonBounds);
     }
   }, {
     key: "tileUnLoad",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.14.4",
+  "version": "2.14.6",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,10 +27,10 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.9",
-    "@antv/l7-core": "2.14.4",
-    "@antv/l7-maps": "2.14.4",
-    "@antv/l7-source": "2.14.4",
-    "@antv/l7-utils": "2.14.4",
+    "@antv/l7-core": "2.14.6",
+    "@antv/l7-maps": "2.14.6",
+    "@antv/l7-source": "2.14.6",
+    "@antv/l7-utils": "2.14.6",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -53,7 +53,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.14.4",
+    "@antv/l7-test-utils": "2.14.6",
     "@types/d3-array": "^2.0.0",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
@@ -62,7 +62,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "0d01c2e1daea1b571b4e467186c9fee754b98429",
+  "gitHead": "5f8823a2b58da0d8bed10a23e21fc903458c1f77",
   "publishConfig": {
     "access": "public"
   }