@antv/l7-layers 2.13.1 → 2.13.3

package/es/core/BaseLayer.js

@@ -590,12 +590,19 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "scale",
     value: function scale(field, cfg) {
+      var preOption = _objectSpread({}, this.scaleOptions);
+
       if (isObject(field)) {
         this.scaleOptions = _objectSpread(_objectSpread({}, this.scaleOptions), field);
       } else {
         this.scaleOptions[field] = cfg;
       }
 
+      if (this.styleAttributeService && !isEqual(preOption, this.scaleOptions)) {
+        var scaleOptions = isObject(field) ? field : _defineProperty({}, field, cfg);
+        this.styleAttributeService.updateScaleAttribute(scaleOptions);
+      }
+
       return this;
     }
     /**
@@ -1062,8 +1069,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       } // this.layerSource.inited 为 true update 事件不会再触发
 
 
-      this.layerSource.on('update', function (_ref3) {
-        var type = _ref3.type;
+      this.layerSource.on('update', function (_ref4) {
+        var type = _ref4.type;
 
         if (_this8.coordCenter === undefined) {
           var _this8$mapService;
@@ -1193,9 +1200,9 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     }
   }, {
     key: "pick",
-    value: function pick(_ref7) {
-      var x = _ref7.x,
-          y = _ref7.y;
+    value: function pick(_ref8) {
+      var x = _ref8.x,
+          y = _ref8.y;
       this.interactionService.triggerHover({
         x: x,
         y: y
@@ -1228,9 +1235,9 @@ 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 (_ref8) {
-                      var attributes = _ref8.attributes,
-                          elements = _ref8.elements;
+                    _this10.styleAttributeService.createAttributesAndIndicesAscy(_this10.encodedData, segmentNumber, workerOptions).then(function (_ref9) {
+                      var attributes = _ref9.attributes,
+                          elements = _ref9.elements;
                       var m = createModel(_objectSpread({
                         attributes: attributes,
                         uniforms: uniforms,

package/es/tile/service/TilePickService.d.ts

@@ -21,6 +21,6 @@ export declare class TilePickService implements ITilePickService {
     private color2PickId;
     private pickId2Color;
     /** 从瓦片中根据数据 */
-    getFeatureById(pickedFeatureIdx: number): never[] | null;
+    getFeatureById(pickedFeatureIdx: number): any[];
     pickRasterLayer(layer: ILayer, target: IInteractionTarget, parent?: ILayer): boolean;
 }

package/es/tile/service/TilePickService.js

@@ -148,18 +148,13 @@ export var TilePickService = /*#__PURE__*/function () {
       }); // 提取当前可见瓦片中匹配 ID 的 feature 列表
 
       var features = [];
-      tiles.map(function (tile) {
+      tiles.forEach(function (tile) {
         features.push.apply(features, _toConsumableArray(tile.getFeatureById(pickedFeatureIdx)));
-      });
-
-      if (features.length <= 0) {
-        return null;
-      } // 将 feature 列表合并后返回
+      }); // 将 feature 列表合并后返回
       // 统一返回成 polygon 的格式 点、线、面可以通用
       // const data = this.tileSourceService.getCombineFeature(features);
 
-
-      return [];
+      return features;
     } // Tip: for interface define
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
 

package/es/tile/tileFactory/VectorTile.js

@@ -163,7 +163,8 @@ var VectorTile = /*#__PURE__*/function (_Tile) {
           minZoom: this.z - 1
         });
       }
-    }
+    } // 获取瓦片数据
+
   }, {
     key: "getFeatures",
     value: function getFeatures(sourceLayer) {
@@ -185,9 +186,10 @@ var VectorTile = /*#__PURE__*/function (_Tile) {
         return [];
       }
 
-      return layer.getSource().data.dataArray.filter(function (d) {
+      var res = layer.getSource().data.dataArray.filter(function (d) {
         return d._id === id;
       });
+      return res;
     }
   }]);
 

package/lib/core/BaseLayer.js

@@ -591,12 +591,19 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "scale",
     value: function scale(field, cfg) {
+      var preOption = (0, _objectSpread2.default)({}, this.scaleOptions);
+
       if ((0, _lodash.isObject)(field)) {
         this.scaleOptions = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, this.scaleOptions), field);
       } else {
         this.scaleOptions[field] = cfg;
       }
 
+      if (this.styleAttributeService && !(0, _lodash.isEqual)(preOption, this.scaleOptions)) {
+        var scaleOptions = (0, _lodash.isObject)(field) ? field : (0, _defineProperty2.default)({}, field, cfg);
+        this.styleAttributeService.updateScaleAttribute(scaleOptions);
+      }
+
       return this;
     }
     /**
@@ -1063,8 +1070,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       } // this.layerSource.inited 为 true update 事件不会再触发
 
 
-      this.layerSource.on('update', function (_ref3) {
-        var type = _ref3.type;
+      this.layerSource.on('update', function (_ref4) {
+        var type = _ref4.type;
 
         if (_this8.coordCenter === undefined) {
           var _this8$mapService;
@@ -1194,9 +1201,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     }
   }, {
     key: "pick",
-    value: function pick(_ref7) {
-      var x = _ref7.x,
-          y = _ref7.y;
+    value: function pick(_ref8) {
+      var x = _ref8.x,
+          y = _ref8.y;
       this.interactionService.triggerHover({
         x: x,
         y: y
@@ -1229,9 +1236,9 @@ 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 (_ref8) {
-                      var attributes = _ref8.attributes,
-                          elements = _ref8.elements;
+                    _this10.styleAttributeService.createAttributesAndIndicesAscy(_this10.encodedData, segmentNumber, workerOptions).then(function (_ref9) {
+                      var attributes = _ref9.attributes,
+                          elements = _ref9.elements;
                       var m = createModel((0, _objectSpread2.default)({
                         attributes: attributes,
                         uniforms: uniforms,

package/lib/tile/service/TilePickService.js

@@ -163,18 +163,13 @@ var TilePickService = /*#__PURE__*/function () {
       }); // 提取当前可见瓦片中匹配 ID 的 feature 列表
 
       var features = [];
-      tiles.map(function (tile) {
+      tiles.forEach(function (tile) {
         features.push.apply(features, (0, _toConsumableArray2.default)(tile.getFeatureById(pickedFeatureIdx)));
-      });
-
-      if (features.length <= 0) {
-        return null;
-      } // 将 feature 列表合并后返回
+      }); // 将 feature 列表合并后返回
       // 统一返回成 polygon 的格式 点、线、面可以通用
       // const data = this.tileSourceService.getCombineFeature(features);
 
-
-      return [];
+      return features;
     } // Tip: for interface define
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
 

package/lib/tile/tileFactory/VectorTile.js

@@ -180,7 +180,8 @@ var VectorTile = /*#__PURE__*/function (_Tile) {
           minZoom: this.z - 1
         });
       }
-    }
+    } // 获取瓦片数据
+
   }, {
     key: "getFeatures",
     value: function getFeatures(sourceLayer) {
@@ -202,9 +203,10 @@ var VectorTile = /*#__PURE__*/function (_Tile) {
         return [];
       }
 
-      return layer.getSource().data.dataArray.filter(function (d) {
+      var res = layer.getSource().data.dataArray.filter(function (d) {
         return d._id === id;
       });
+      return res;
     }
   }]);
   return VectorTile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.13.1",
+  "version": "2.13.3",
   "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.13.1",
-    "@antv/l7-maps": "2.13.1",
-    "@antv/l7-source": "2.13.1",
-    "@antv/l7-utils": "2.13.1",
+    "@antv/l7-core": "2.13.3",
+    "@antv/l7-maps": "2.13.3",
+    "@antv/l7-source": "2.13.3",
+    "@antv/l7-utils": "2.13.3",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "6a7cbf5974ee1b3f38f926b3eaac97a144013ef2",
+  "gitHead": "c737d472363367279bc2fba8c14646a3d4af7bb7",
   "publishConfig": {
     "access": "public"
   }