@antv/l7-layers 2.12.0 → 2.12.2

package/es/core/BaseLayer.js

@@ -39,7 +39,6 @@ import { BlendTypes } from "../utils/blend";
 import { styleDataMapping } from "../utils/dataMappingStyle";
 import { calculateData } from "../utils/layerData";
 import { createMultiPassRenderer, normalizePasses } from "../utils/multiPassRender";
-import { updateShape } from "../utils/updateShape";
 import LayerPickService from "./LayerPickService";
 import TextureService from "./TextureService";
 /**
@@ -471,24 +470,18 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "filter",
     value: function filter(field, values, updateOptions) {
       this.updateStyleAttribute('filter', field, values, updateOptions);
+      this.dataState.dataSourceNeedUpdate = true;
       return this;
     }
   }, {
     key: "shape",
     value: function shape(field, values, updateOptions) {
-      var _this$styleAttributeS, _this$styleAttributeS2, _this$styleAttributeS3;
-
-      var lastShape = (_this$styleAttributeS = this.styleAttributeService) === null || _this$styleAttributeS === void 0 ? void 0 : (_this$styleAttributeS2 = _this$styleAttributeS.getLayerStyleAttribute('shape')) === null || _this$styleAttributeS2 === void 0 ? void 0 : (_this$styleAttributeS3 = _this$styleAttributeS2.scale) === null || _this$styleAttributeS3 === void 0 ? void 0 : _this$styleAttributeS3.field;
-      var currentShape = field;
       this.shapeOption = {
         field: field,
         values: values
       };
-      this.updateStyleAttribute('shape', field, values, updateOptions); // Tip: 根据 shape 判断是否需要更新 model
-
-      if (!this.tileLayer) {
-        updateShape(this, lastShape, currentShape);
-      }
+      this.updateStyleAttribute('shape', field, values, updateOptions);
+      this.dataState.dataSourceNeedUpdate = true; // 通过数据更新驱动shape 更新
 
       return this;
     }
@@ -1294,8 +1287,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function createAttributes(options) {
       var triangulation = options.triangulation; // @ts-ignore
 
-      var _this$styleAttributeS4 = this.styleAttributeService.createAttributes(this.encodedData, triangulation),
-          attributes = _this$styleAttributeS4.attributes;
+      var _this$styleAttributeS = this.styleAttributeService.createAttributes(this.encodedData, triangulation),
+          attributes = _this$styleAttributeS.attributes;
 
       return attributes;
     }

package/es/plugins/DataMappingPlugin.js

@@ -112,19 +112,12 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
         if (attributesToRemapping.length) {
           // 过滤数据
-          if (filter !== null && filter !== void 0 && filter.needRemapping) {
-            var encodeData = _this.mapping(layer, attributes, filterData, undefined);
+          var encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData());
 
-            layer.setEncodedData(encodeData);
-            filter.needRemapping = false;
-          } else {
-            var _encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData());
+          layer.setEncodedData(encodeData);
+        } // 处理文本更新，更新文字形状
+        // layer.emit('remapping', null);
 
-            layer.setEncodedData(_encodeData);
-          } // 处理文本更新，更新文字形状
-          // layer.emit('remapping', null);
-
-        }
       });
     }
   }, {
@@ -166,6 +159,8 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
       var usedAttributes = attributes.filter(function (attribute) {
         return attribute.scale !== undefined;
+      }).filter(function (attribute) {
+        return attribute.name !== 'filter';
       });
       var mappedData = data.map(function (record, i) {
         var preRecord = predata ? predata[i] : {};
@@ -176,9 +171,8 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
         }, preRecord);
 
         usedAttributes.forEach(function (attribute) {
-          var values = _this3.applyAttributeMapping(attribute, record);
+          var values = _this3.applyAttributeMapping(attribute, record); // TODO: 支持每个属性配置 postprocess
 
-          attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
 
           if (attribute.name === 'color') {
             values = values.map(function (c) {
@@ -209,6 +203,9 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
         }
 
         return encodeRecord;
+      });
+      attributes.forEach(function (attribute) {
+        attribute.needRemapping = false;
       }); // 调整数据兼容 Amap2.0
 
       this.adjustData2Amap2Coordinates(mappedData, layer); // 调整数据兼容 SimpleCoordinates

package/es/plugins/RegisterStyleAttributePlugin.js

@@ -41,8 +41,8 @@ var RegisterStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE
       } // Tip: normal render layer
 
 
-      this.registerPositionAttribute(styleAttributeService);
-      this.registerFilterAttribute(styleAttributeService);
+      this.registerPositionAttribute(styleAttributeService); // this.registerFilterAttribute(styleAttributeService);//数据层数据过滤
+
       this.registerColorAttribute(styleAttributeService);
       this.registerVertexIdAttribute(styleAttributeService);
     }

package/es/tile/tileFactory/Tile.d.ts

@@ -76,6 +76,7 @@ export default abstract class Tile implements ITile {
         map?: import("@antv/l7-core").IMapWrapper | undefined;
         logoPosition?: import("@antv/l7-core").PositionName | undefined;
         logoVisible?: boolean | undefined;
+        isMini?: boolean | undefined;
         animate?: boolean | undefined;
         pickBufferScale?: number | undefined;
         stencil?: boolean | undefined;

package/lib/core/BaseLayer.js

@@ -55,8 +55,6 @@ var _layerData = require("../utils/layerData");
 
 var _multiPassRender = require("../utils/multiPassRender");
 
-var _updateShape = require("../utils/updateShape");
-
 var _LayerPickService = _interopRequireDefault(require("./LayerPickService"));
 
 var _TextureService = _interopRequireDefault(require("./TextureService"));
@@ -474,24 +472,18 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     key: "filter",
     value: function filter(field, values, updateOptions) {
       this.updateStyleAttribute('filter', field, values, updateOptions);
+      this.dataState.dataSourceNeedUpdate = true;
       return this;
     }
   }, {
     key: "shape",
     value: function shape(field, values, updateOptions) {
-      var _this$styleAttributeS, _this$styleAttributeS2, _this$styleAttributeS3;
-
-      var lastShape = (_this$styleAttributeS = this.styleAttributeService) === null || _this$styleAttributeS === void 0 ? void 0 : (_this$styleAttributeS2 = _this$styleAttributeS.getLayerStyleAttribute('shape')) === null || _this$styleAttributeS2 === void 0 ? void 0 : (_this$styleAttributeS3 = _this$styleAttributeS2.scale) === null || _this$styleAttributeS3 === void 0 ? void 0 : _this$styleAttributeS3.field;
-      var currentShape = field;
       this.shapeOption = {
         field: field,
         values: values
       };
-      this.updateStyleAttribute('shape', field, values, updateOptions); // Tip: 根据 shape 判断是否需要更新 model
-
-      if (!this.tileLayer) {
-        (0, _updateShape.updateShape)(this, lastShape, currentShape);
-      }
+      this.updateStyleAttribute('shape', field, values, updateOptions);
+      this.dataState.dataSourceNeedUpdate = true; // 通过数据更新驱动shape 更新
 
       return this;
     }
@@ -1296,8 +1288,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     value: function createAttributes(options) {
       var triangulation = options.triangulation; // @ts-ignore
 
-      var _this$styleAttributeS4 = this.styleAttributeService.createAttributes(this.encodedData, triangulation),
-          attributes = _this$styleAttributeS4.attributes;
+      var _this$styleAttributeS = this.styleAttributeService.createAttributes(this.encodedData, triangulation),
+          attributes = _this$styleAttributeS.attributes;
 
       return attributes;
     }

package/lib/plugins/DataMappingPlugin.js

@@ -133,19 +133,12 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
         if (attributesToRemapping.length) {
           // 过滤数据
-          if (filter !== null && filter !== void 0 && filter.needRemapping) {
-            var encodeData = _this.mapping(layer, attributes, filterData, undefined);
+          var encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData());
 
-            layer.setEncodedData(encodeData);
-            filter.needRemapping = false;
-          } else {
-            var _encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData());
+          layer.setEncodedData(encodeData);
+        } // 处理文本更新，更新文字形状
+        // layer.emit('remapping', null);
 
-            layer.setEncodedData(_encodeData);
-          } // 处理文本更新，更新文字形状
-          // layer.emit('remapping', null);
-
-        }
       });
     }
   }, {
@@ -187,6 +180,8 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
       var usedAttributes = attributes.filter(function (attribute) {
         return attribute.scale !== undefined;
+      }).filter(function (attribute) {
+        return attribute.name !== 'filter';
       });
       var mappedData = data.map(function (record, i) {
         var preRecord = predata ? predata[i] : {};
@@ -195,9 +190,8 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
           coordinates: record.coordinates
         }, preRecord);
         usedAttributes.forEach(function (attribute) {
-          var values = _this3.applyAttributeMapping(attribute, record);
+          var values = _this3.applyAttributeMapping(attribute, record); // TODO: 支持每个属性配置 postprocess
 
-          attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
 
           if (attribute.name === 'color') {
             values = values.map(function (c) {
@@ -228,6 +222,9 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
         }
 
         return encodeRecord;
+      });
+      attributes.forEach(function (attribute) {
+        attribute.needRemapping = false;
       }); // 调整数据兼容 Amap2.0
 
       this.adjustData2Amap2Coordinates(mappedData, layer); // 调整数据兼容 SimpleCoordinates

package/lib/plugins/RegisterStyleAttributePlugin.js

@@ -55,8 +55,8 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
       } // Tip: normal render layer
 
 
-      this.registerPositionAttribute(styleAttributeService);
-      this.registerFilterAttribute(styleAttributeService);
+      this.registerPositionAttribute(styleAttributeService); // this.registerFilterAttribute(styleAttributeService);//数据层数据过滤
+
       this.registerColorAttribute(styleAttributeService);
       this.registerVertexIdAttribute(styleAttributeService);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.12.0",
+  "version": "2.12.2",
   "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.12.0",
-    "@antv/l7-maps": "2.12.0",
-    "@antv/l7-source": "2.12.0",
-    "@antv/l7-utils": "2.12.0",
+    "@antv/l7-core": "2.12.2",
+    "@antv/l7-maps": "2.12.2",
+    "@antv/l7-source": "2.12.2",
+    "@antv/l7-utils": "2.12.2",
     "@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": "2c0d52810384b8ccfd6b62884c569cad2a5fb116",
+  "gitHead": "1aa51493b0899f6b28f0477dcd6c56db19ce0669",
   "publishConfig": {
     "access": "public"
   }

package/es/utils/updateShape.d.ts

@@ -1,2 +0,0 @@
-import { ILayer, StyleAttributeField } from '@antv/l7-core';
-export declare function updateShape(layer: ILayer, lastShape: StyleAttributeField | undefined, currentShape: StyleAttributeField | undefined): void;

package/es/utils/updateShape.js

@@ -1,20 +0,0 @@
-// shapeUpdateList 存储一系列的 shape 类型
-// 当这一系列的 shape 相互切换的时候需要重构 layer 的 model (顶点数据集)
-var shapeUpdateList = [// PointLayer
-['circle', 'cylinder'], ['square', 'cylinder'], ['triangle', 'cylinder'], ['pentagon', 'cylinder'], ['hexagon', 'cylinder'], ['octogon', 'cylinder'], ['hexagram', 'cylinder'], ['rhombus', 'cylinder'], ['vesica', 'cylinder']];
-export function updateShape(layer, lastShape, currentShape) {
-  if (typeof lastShape === 'string' && typeof currentShape === 'string' && lastShape !== currentShape) {
-    if (layer.type === 'PointLayer') {
-      layer.dataState.dataSourceNeedUpdate = true;
-      return;
-    }
-
-    shapeUpdateList.map(function (shapes) {
-      if (shapes.includes(lastShape) && shapes.includes(currentShape)) {
-        // dataSourceNeedUpdate 借用数据更新时更新 layer model 的工作流
-        layer.dataState.dataSourceNeedUpdate = true;
-        return;
-      }
-    });
-  }
-}

package/lib/utils/updateShape.js

@@ -1,27 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.updateShape = updateShape;
-// shapeUpdateList 存储一系列的 shape 类型
-// 当这一系列的 shape 相互切换的时候需要重构 layer 的 model (顶点数据集)
-var shapeUpdateList = [// PointLayer
-['circle', 'cylinder'], ['square', 'cylinder'], ['triangle', 'cylinder'], ['pentagon', 'cylinder'], ['hexagon', 'cylinder'], ['octogon', 'cylinder'], ['hexagram', 'cylinder'], ['rhombus', 'cylinder'], ['vesica', 'cylinder']];
-
-function updateShape(layer, lastShape, currentShape) {
-  if (typeof lastShape === 'string' && typeof currentShape === 'string' && lastShape !== currentShape) {
-    if (layer.type === 'PointLayer') {
-      layer.dataState.dataSourceNeedUpdate = true;
-      return;
-    }
-
-    shapeUpdateList.map(function (shapes) {
-      if (shapes.includes(lastShape) && shapes.includes(currentShape)) {
-        // dataSourceNeedUpdate 借用数据更新时更新 layer model 的工作流
-        layer.dataState.dataSourceNeedUpdate = true;
-        return;
-      }
-    });
-  }
-}