@antv/l7-layers 2.16.1 → 2.16.2

package/es/plugins/DataMappingPlugin.js

@@ -6,9 +6,7 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _applyDecoratedDescriptor from "@babel/runtime/helpers/esm/applyDecoratedDescriptor";
 import _initializerWarningHelper from "@babel/runtime/helpers/esm/initializerWarningHelper";
-
 var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
-
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { IDebugLog, ILayerStage, TYPES } from '@antv/l7-core';
 import { Version } from '@antv/l7-maps';
@@ -19,35 +17,27 @@ import 'reflect-metadata';
 var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService), _dec3 = inject(TYPES.IFontService), _dec(_class = (_class2 = /*#__PURE__*/function () {
   function DataMappingPlugin() {
     _classCallCheck(this, DataMappingPlugin);
-
     _initializerDefineProperty(this, "mapService", _descriptor, this);
-
     _initializerDefineProperty(this, "fontService", _descriptor2, this);
   }
-
   _createClass(DataMappingPlugin, [{
     key: "apply",
     value: function apply(layer, _ref) {
       var _this = this;
-
       var styleAttributeService = _ref.styleAttributeService;
       layer.hooks.init.tapPromise('DataMappingPlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                layer.log(IDebugLog.MappingStart, ILayerStage.INIT); // 初始化重新生成 map
-
-                _this.generateMaping(layer, {
-                  styleAttributeService: styleAttributeService
-                });
-
-                layer.log(IDebugLog.MappingEnd, ILayerStage.INIT);
-
-              case 3:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              layer.log(IDebugLog.MappingStart, ILayerStage.INIT);
+              // 初始化重新生成 map
+              _this.generateMaping(layer, {
+                styleAttributeService: styleAttributeService
+              });
+              layer.log(IDebugLog.MappingEnd, ILayerStage.INIT);
+            case 3:
+            case "end":
+              return _context.stop();
           }
         }, _callee);
       })));
@@ -55,104 +45,95 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
         var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(flag) {
           var mappingResult;
           return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-            while (1) {
-              switch (_context2.prev = _context2.next) {
-                case 0:
-                  if (flag) {
-                    _context2.next = 2;
-                    break;
-                  }
-
-                  return _context2.abrupt("return", flag);
-
-                case 2:
-                  layer.dataState.dataMappingNeedUpdate = false;
-                  layer.log(IDebugLog.MappingStart, ILayerStage.UPDATE);
-                  mappingResult = _this.generateMaping(layer, {
-                    styleAttributeService: styleAttributeService
-                  });
-                  layer.log(IDebugLog.MappingEnd, ILayerStage.UPDATE);
-                  return _context2.abrupt("return", mappingResult);
-
-                case 7:
-                case "end":
-                  return _context2.stop();
-              }
+            while (1) switch (_context2.prev = _context2.next) {
+              case 0:
+                if (flag) {
+                  _context2.next = 2;
+                  break;
+                }
+                return _context2.abrupt("return", flag);
+              case 2:
+                layer.dataState.dataMappingNeedUpdate = false;
+                layer.log(IDebugLog.MappingStart, ILayerStage.UPDATE);
+                mappingResult = _this.generateMaping(layer, {
+                  styleAttributeService: styleAttributeService
+                });
+                layer.log(IDebugLog.MappingEnd, ILayerStage.UPDATE);
+                return _context2.abrupt("return", mappingResult);
+              case 7:
+              case "end":
+                return _context2.stop();
             }
           }, _callee2);
         }));
-
         return function (_x) {
           return _ref3.apply(this, arguments);
         };
-      }()); // remapping before render
+      }());
 
+      // remapping before render
       layer.hooks.beforeRender.tap('DataMappingPlugin', function () {
         var source = layer.getSource();
-
         if (layer.layerModelNeedUpdate || !source || !source.inited) {
           return;
         }
-
         var attributes = styleAttributeService.getLayerStyleAttributes() || [];
         var filter = styleAttributeService.getLayerStyleAttribute('filter');
-        var dataArray = source.data.dataArray; // TODO 数据为空的情况
-
+        var dataArray = source.data.dataArray;
+        // TODO 数据为空的情况
         if (Array.isArray(dataArray) && dataArray.length === 0) {
           return;
         }
-
         var attributesToRemapping = attributes.filter(function (attribute) {
           return attribute.needRemapping;
         } // 如果filter变化
         );
-        var filterData = dataArray; // 数据过滤完 再执行数据映射
 
+        var filterData = dataArray;
+        // 数据过滤完 再执行数据映射
         if (filter !== null && filter !== void 0 && filter.needRemapping && filter !== null && filter !== void 0 && filter.scale) {
           filterData = dataArray.filter(function (record) {
             return _this.applyAttributeMapping(filter, record)[0];
           });
         }
-
         if (attributesToRemapping.length) {
           // 过滤数据
-          var encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData());
+          var encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData() // TODO 优化
+          );
 
           layer.setEncodedData(encodeData);
-        } // 处理文本更新，更新文字形状
-        // layer.emit('remapping', null);
+        }
 
+        // 处理文本更新，更新文字形状
+        // layer.emit('remapping', null);
       });
     }
   }, {
     key: "generateMaping",
     value: function generateMaping(layer, _ref4) {
       var _this2 = this;
-
       var styleAttributeService = _ref4.styleAttributeService;
       var attributes = styleAttributeService.getLayerStyleAttributes() || [];
       var filter = styleAttributeService.getLayerStyleAttribute('filter');
       var dataArray = layer.getSource().data.dataArray;
-      var filterData = dataArray; // 数据过滤完 再执行数据映射
-
+      var filterData = dataArray;
+      // 数据过滤完 再执行数据映射
       if (filter !== null && filter !== void 0 && filter.scale) {
         filterData = dataArray.filter(function (record) {
           return _this2.applyAttributeMapping(filter, record)[0];
         });
-      } // Tip: layer 对数据做处理
+      }
+      // Tip: layer 对数据做处理
       // 数据处理 在数据进行 mapping 生成 encodeData 之前对数据进行处理
       // 在各个 layer 中继承
 
-
-      filterData = layer.processData(filterData);
+      filterData = layer.processData(filterData); // 目前只有简单线需要处理
       var encodeData = this.mapping(layer, attributes, filterData, undefined);
       layer.setEncodedData(encodeData);
-
       if (dataArray.length === 0 && layer.encodeDataLength === 0) {
         return false;
-      } // 对外暴露事件
-
-
+      }
+      // 对外暴露事件
       layer.emit('dataUpdate', null);
       return true;
     }
@@ -160,13 +141,11 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     key: "mapping",
     value: function mapping(layer, attributes, data, predata) {
       var _this3 = this;
-
       var _ref5 = layer.getLayerConfig(),
-          _ref5$arrow = _ref5.arrow,
-          arrow = _ref5$arrow === void 0 ? {
-        enable: false
-      } : _ref5$arrow;
-
+        _ref5$arrow = _ref5.arrow,
+        arrow = _ref5$arrow === void 0 ? {
+          enable: false
+        } : _ref5$arrow;
       var usedAttributes = attributes.filter(function (attribute) {
         return attribute.scale !== undefined;
       }).filter(function (attribute) {
@@ -174,52 +153,47 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
       });
       var mappedData = data.map(function (record, i) {
         var preRecord = predata ? predata[i] : {};
-
         var encodeRecord = _objectSpread({
           id: record._id,
           coordinates: record.coordinates
         }, preRecord);
-
         usedAttributes.forEach(function (attribute) {
-          var values = _this3.applyAttributeMapping(attribute, record); // TODO: 支持每个属性配置 postprocess
-
-
-          if (attribute.name === 'color') {
+          var values = _this3.applyAttributeMapping(attribute, record);
+          // TODO: 支持每个属性配置 postprocess}
+          if (attribute.name === 'color' || attribute.name === 'stroke') {
             values = values.map(function (c) {
               return rgb2arr(c);
             });
-          } // @ts-ignore
-
-
-          encodeRecord[attribute.name] = Array.isArray(values) && values.length === 1 ? values[0] : values; // 增加对 layer/text/iconfont unicode 映射的解析
+          }
+          // @ts-ignore
+          encodeRecord[attribute.name] = Array.isArray(values) && values.length === 1 ? values[0] : values;
 
+          // 增加对 layer/text/iconfont unicode 映射的解析
           if (attribute.name === 'shape') {
             encodeRecord.shape = _this3.fontService.getIconFontKey(encodeRecord[attribute.name]);
           }
         });
-
-        if (arrow.enable && (encodeRecord.shape === 'line' || encodeRecord.shape === 'halfLine')) {
+        if (arrow.enable && encodeRecord.shape === 'line') {
           // 只有在线图层且支持配置箭头的时候进行插入顶点的处理
-          var coords = encodeRecord.coordinates; // @ts-ignore
-
+          var coords = encodeRecord.coordinates;
+          // @ts-ignore
           if (layer.arrowInsertCount < layer.encodeDataLength) {
             // Tip: arrowInsert 的判断用于确保每一条线数据 arrow 的属性点只会被植入一次
             var arrowPoint = _this3.getArrowPoints(coords[0], coords[1]);
-
-            encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint); // @ts-ignore
-
+            encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint);
+            // @ts-ignore
             layer.arrowInsertCount++;
           }
         }
-
         return encodeRecord;
       });
       attributes.forEach(function (attribute) {
         attribute.needRemapping = false;
-      }); // 调整数据兼容 Amap2.0
-
-      this.adjustData2Amap2Coordinates(mappedData, layer); // 调整数据兼容 SimpleCoordinates
+      });
+      // 调整数据兼容 Amap2.0
+      this.adjustData2Amap2Coordinates(mappedData, layer);
 
+      // 调整数据兼容 SimpleCoordinates
       this.adjustData2SimpleCoordinates(mappedData);
       return mappedData;
     }
@@ -227,48 +201,29 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     key: "adjustData2Amap2Coordinates",
     value: function adjustData2Amap2Coordinates(mappedData, layer) {
       var _this4 = this;
-
       // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
       if (mappedData.length > 0 && this.mapService.version === Version['GAODE2.x']) {
         var layerCenter = layer.coordCenter || layer.getSource().center;
-
-        if (typeof mappedData[0].coordinates[0] === 'number') {
-          // 单个的点数据
+        // 单个的点数据
+        // @ts-ignore
+        mappedData
+        // TODO: 避免经纬度被重复计算导致坐标位置偏移
+        .filter(function (d) {
+          return !d.originCoordinates;
+        }).map(function (d) {
+          d.version = Version['GAODE2.x'];
           // @ts-ignore
-          mappedData // TODO: 避免经纬度被重复计算导致坐标位置偏移
-          .filter(function (d) {
-            return !d.originCoordinates;
-          }).map(function (d) {
-            d.version = Version['GAODE2.x']; // @ts-ignore
-
-            d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
-            // @ts-ignore
-            // d.coordinates = this.mapService.lngLatToCoord(d.coordinates);
-
-            d.coordinates = _this4.mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
-          });
-        } else {
-          // 连续的线、面数据
-          mappedData // TODO: 避免经纬度被重复计算导致坐标位置偏移
-          .filter(function (d) {
-            return !d.originCoordinates;
-          }).map(function (d) {
-            d.version = Version['GAODE2.x']; // @ts-ignore
-
-            d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
-            // @ts-ignore
-            // d.coordinates = this.mapService.lngLatToCoords(d.coordinates);
-
-            d.coordinates = _this4.mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
-          });
-        }
+          d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
+          // @ts-ignore
+          // d.coordinates = this.mapService.lngLatToCoord(d.coordinates);
+          d.coordinates = _this4.mapService.coordToAMap2RelativeCoordinates(d.coordinates, layerCenter);
+        });
       }
     }
   }, {
     key: "adjustData2SimpleCoordinates",
     value: function adjustData2SimpleCoordinates(mappedData) {
       var _this5 = this;
-
       if (mappedData.length > 0 && this.mapService.version === Version.SIMPLE) {
         mappedData.map(function (d) {
           if (!d.simpleCoordinate) {
@@ -282,11 +237,9 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     key: "unProjectCoordinates",
     value: function unProjectCoordinates(coordinates) {
       var _this6 = this;
-
       if (typeof coordinates[0] === 'number') {
         return this.mapService.simpleMapCoord.unproject(coordinates);
       }
-
       if (coordinates[0] && coordinates[0][0] instanceof Array) {
         // @ts-ignore
         var coords = [];
@@ -295,20 +248,20 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
           var c1 = [];
           coord.map(function (co) {
             c1.push(_this6.mapService.simpleMapCoord.unproject(co));
-          }); // @ts-ignore
-
+          });
+          // @ts-ignore
           coords.push(c1);
-        }); // @ts-ignore
-
+        });
+        // @ts-ignore
         return coords;
       } else {
         // @ts-ignore
-        var _coords = []; // @ts-ignore
-
+        var _coords = [];
+        // @ts-ignore
         coordinates.map(function (coord) {
           _coords.push(_this6.mapService.simpleMapCoord.unproject(coord));
-        }); // @ts-ignore
-
+        });
+        // @ts-ignore
         return _coords;
       }
     }
@@ -316,25 +269,22 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     key: "applyAttributeMapping",
     value: function applyAttributeMapping(attribute, record) {
       var _attribute$scale;
-
       if (!attribute.scale) {
         return [];
       }
-
       var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
       var params = [];
       scalers.forEach(function (_ref6) {
         var _attribute$scale2;
-
         var field = _ref6.field;
-
         if (record.hasOwnProperty(field) || ((_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.type) === 'variable') {
           // TODO:多字段，常量
           params.push(record[field]);
         }
       });
       var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
-      return mappingResult; // return attribute.mapping ? attribute.mapping(params) : [];
+      return mappingResult;
+      // return attribute.mapping ? attribute.mapping(params) : [];
     }
   }, {
     key: "getArrowPoints",
@@ -345,7 +295,6 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
       return arrowPoint;
     }
   }]);
-
   return DataMappingPlugin;
 }(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "mapService", [_dec2], {
   configurable: true,

package/es/plugins/DataSourcePlugin.js

@@ -1,9 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-
 var _dec, _class;
-
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { IDebugLog, ILayerStage, TYPES } from '@antv/l7-core';
 import Source from '@antv/l7-source';
@@ -13,79 +11,64 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
   function DataSourcePlugin() {
     _classCallCheck(this, DataSourcePlugin);
   }
-
   _createClass(DataSourcePlugin, [{
     key: "apply",
     value: function apply(layer) {
       var _this = this;
-
       this.mapService = layer.getContainer().get(TYPES.IMapService);
       layer.hooks.init.tapPromise('DataSourcePlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var source, _ref2, data, options;
-
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                layer.log(IDebugLog.SourceInitStart, ILayerStage.INIT);
-                source = layer.getSource();
-
-                if (!source) {
-                  // Tip: 用户没有传入 source 的时候使用图层的默认数据
-                  _ref2 = layer.sourceOption || layer.defaultSourceConfig, data = _ref2.data, options = _ref2.options;
-                  source = new Source(data, options);
-                  layer.setSource(source);
-                }
-
-                if (!source.inited) {
-                  _context.next = 8;
-                  break;
-                }
-
-                _this.updateClusterData(layer);
-
-                layer.log(IDebugLog.SourceInitEnd, ILayerStage.INIT);
-                _context.next = 10;
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              layer.log(IDebugLog.SourceInitStart, ILayerStage.INIT);
+              source = layer.getSource();
+              if (!source) {
+                // Tip: 用户没有传入 source 的时候使用图层的默认数据
+                _ref2 = layer.sourceOption || layer.defaultSourceConfig, data = _ref2.data, options = _ref2.options;
+                source = new Source(data, options);
+                layer.setSource(source);
+              }
+              if (!source.inited) {
+                _context.next = 8;
                 break;
-
-              case 8:
-                _context.next = 10;
-                return new Promise(function (resolve) {
-                  source.on('update', function (e) {
-                    if (e.type === 'inited') {
-                      _this.updateClusterData(layer);
-
-                      layer.log(IDebugLog.SourceInitEnd, ILayerStage.INIT);
-                    }
-
-                    resolve(null);
-                  });
+              }
+              _this.updateClusterData(layer);
+              layer.log(IDebugLog.SourceInitEnd, ILayerStage.INIT);
+              _context.next = 10;
+              break;
+            case 8:
+              _context.next = 10;
+              return new Promise(function (resolve) {
+                source.on('update', function (e) {
+                  if (e.type === 'inited') {
+                    _this.updateClusterData(layer);
+                    layer.log(IDebugLog.SourceInitEnd, ILayerStage.INIT);
+                  }
+                  resolve(null);
                 });
-
-              case 10:
-              case "end":
-                return _context.stop();
-            }
+              });
+            case 10:
+            case "end":
+              return _context.stop();
           }
         }, _callee);
-      }))); // 检测数据是否需要更新
+      })));
 
+      // 检测数据是否需要更新
       layer.hooks.beforeRenderData.tapPromise('DataSourcePlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var neeUpdateCluster, dataSourceNeedUpdate, needScale;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                neeUpdateCluster = _this.updateClusterData(layer);
-                dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
-                layer.dataState.dataSourceNeedUpdate = false;
-                needScale = neeUpdateCluster || dataSourceNeedUpdate;
-                return _context2.abrupt("return", needScale);
-
-              case 5:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              neeUpdateCluster = _this.updateClusterData(layer);
+              dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
+              layer.dataState.dataSourceNeedUpdate = false;
+              needScale = neeUpdateCluster || dataSourceNeedUpdate;
+              return _context2.abrupt("return", needScale);
+            case 5:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2);
       })));
@@ -97,33 +80,27 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
       if (layer.isTileLayer || layer.tileLayer || !layer.getSource()) {
         return false;
       }
-
       var source = layer.getSource();
       var cluster = source.cluster;
       var _source$clusterOption = source.clusterOptions.zoom,
-          zoom = _source$clusterOption === void 0 ? 0 : _source$clusterOption;
+        zoom = _source$clusterOption === void 0 ? 0 : _source$clusterOption;
       var newZoom = this.mapService.getZoom() - 1;
       var dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
-
       if (cluster && dataSourceNeedUpdate) {
         // 数据发生更新
         source.updateClusterData(Math.floor(newZoom));
-      } // 如果 dataSource 有更新，跳过 zoom 的判断，直接更新一次
-
-
+      }
+      // 如果 dataSource 有更新，跳过 zoom 的判断，直接更新一次
       if (cluster && Math.abs(layer.clusterZoom - newZoom) >= 1) {
         if (zoom !== Math.floor(newZoom)) {
           source.updateClusterData(Math.floor(newZoom));
         }
-
         layer.clusterZoom = newZoom;
         return true;
       }
-
       return false;
     }
   }]);
-
   return DataSourcePlugin;
 }()) || _class);
 export { DataSourcePlugin as default };