@antv/l7-layers 2.10.2 → 2.10.4

package/es/plugins/DataMappingPlugin.js

@@ -1,18 +1,16 @@
-import _objectSpread from "@babel/runtime/helpers/objectSpread2";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _initializerDefineProperty from "@babel/runtime/helpers/initializerDefineProperty";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _applyDecoratedDescriptor from "@babel/runtime/helpers/applyDecoratedDescriptor";
-import _initializerWarningHelper from "@babel/runtime/helpers/initializerWarningHelper";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _initializerDefineProperty from "@babel/runtime/helpers/esm/initializerDefineProperty";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+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 { TYPES } from '@antv/l7-core';
 import { Version } from '@antv/l7-maps';
-import { normalize, rgb2arr } from '@antv/l7-utils';
+import { isColor, normalize, rgb2arr } from '@antv/l7-utils';
 import { inject, injectable } from 'inversify';
 import { cloneDeep } from 'lodash';
 import 'reflect-metadata';
@@ -31,57 +29,40 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
       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:
-                // 初始化重新生成 map
-                _this.generateMaping(layer, {
-                  styleAttributeService: styleAttributeService
-                });
-
-              case 1:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      })));
-      layer.hooks.beforeRenderData.tapPromise('DataMappingPlugin', /*#__PURE__*/function () {
-        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(flag) {
-          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;
-
-                  _this.generateMaping(layer, {
-                    styleAttributeService: styleAttributeService
-                  });
-
-                  return _context2.abrupt("return", true);
-
-                case 5:
-                case "end":
-                  return _context2.stop();
-              }
-            }
-          }, _callee2);
-        }));
+      layer.hooks.init.tap('DataMappingPlugin', function () {
+        // 初始化重新生成 map
+        var source = layer.getSource();
 
-        return function (_x) {
-          return _ref3.apply(this, arguments);
-        };
-      }()); // remapping before render
+        if (source.inited) {
+          _this.generateMaping(layer, {
+            styleAttributeService: styleAttributeService
+          });
+        } else {
+          source.once('update', function () {
+            _this.generateMaping(layer, {
+              styleAttributeService: styleAttributeService
+            });
+          });
+        }
+      });
+      layer.hooks.beforeRenderData.tap('DataMappingPlugin', function () {
+        layer.dataState.dataMappingNeedUpdate = false;
+        var source = layer.getSource();
+
+        if (source.inited) {
+          _this.generateMaping(layer, {
+            styleAttributeService: styleAttributeService
+          });
+        } else {
+          source.once('update', function () {
+            _this.generateMaping(layer, {
+              styleAttributeService: styleAttributeService
+            });
+          });
+        }
+
+        return true;
+      }); // remapping before render
 
       layer.hooks.beforeRender.tap('DataMappingPlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
@@ -97,6 +78,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
           return;
         }
 
+        var bottomColor = layer.getBottomColor();
         var attributes = styleAttributeService.getLayerStyleAttributes() || [];
         var filter = styleAttributeService.getLayerStyleAttribute('filter');
         var dataArray = source.data.dataArray;
@@ -108,19 +90,19 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
         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];
+            return _this.applyAttributeMapping(filter, record, bottomColor)[0];
           });
         }
 
         if (attributesToRemapping.length) {
           // 过滤数据
           if (filter !== null && filter !== void 0 && filter.needRemapping) {
-            var encodeData = _this.mapping(layer, attributes, filterData, undefined);
+            var encodeData = _this.mapping(layer, attributes, filterData, undefined, bottomColor);
 
             layer.setEncodedData(encodeData);
             filter.needRemapping = false;
           } else {
-            var _encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData());
+            var _encodeData = _this.mapping(layer, attributesToRemapping, filterData, layer.getEncodedData(), bottomColor);
 
             layer.setEncodedData(_encodeData);
           } // 处理文本更新
@@ -132,10 +114,11 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     }
   }, {
     key: "generateMaping",
-    value: function generateMaping(layer, _ref4) {
+    value: function generateMaping(layer, _ref2) {
       var _this2 = this;
 
-      var styleAttributeService = _ref4.styleAttributeService;
+      var styleAttributeService = _ref2.styleAttributeService;
+      var bottomColor = layer.getBottomColor();
       var attributes = styleAttributeService.getLayerStyleAttributes() || [];
       var filter = styleAttributeService.getLayerStyleAttribute('filter');
       var dataArray = layer.getSource().data.dataArray;
@@ -143,29 +126,30 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
       if (filter !== null && filter !== void 0 && filter.scale) {
         filterData = dataArray.filter(function (record) {
-          return _this2.applyAttributeMapping(filter, record)[0];
+          return _this2.applyAttributeMapping(filter, record, bottomColor)[0];
         });
-      } // Tip: layer 对数据做处理
-      // 数据处理 在数据进行 mapping 生成 encodeData 之前对数据进行处理
-      // 在各个 layer 中继承
-
+      }
 
-      filterData = layer.processData(filterData);
-      var encodeData = this.mapping(layer, attributes, filterData, undefined);
+      var encodeData = this.mapping(layer, attributes, filterData, undefined, bottomColor);
       layer.setEncodedData(encodeData); // 对外暴露事件
 
       layer.emit('dataUpdate', null);
     }
   }, {
     key: "mapping",
-    value: function mapping(layer, attributes, data, predata) {
+    value: function mapping(layer, attributes, data, predata, minimumColor) {
       var _this3 = this;
 
-      var _ref5 = layer.getLayerConfig(),
-          _ref5$arrow = _ref5.arrow,
-          arrow = _ref5$arrow === void 0 ? {
+      var _ref3 = layer.getLayerConfig(),
+          _ref3$arrow = _ref3.arrow,
+          arrow = _ref3$arrow === void 0 ? {
         enable: false
-      } : _ref5$arrow;
+      } : _ref3$arrow,
+          usage = _ref3.usage;
+
+      if (usage === 'basemap') {
+        return this.mapLayerMapping(layer, attributes, data, predata);
+      }
 
       var usedAttributes = attributes.filter(function (attribute) {
         return attribute.scale !== undefined;
@@ -179,7 +163,7 @@ 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, minimumColor);
 
           attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
 
@@ -357,7 +341,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     }
   }, {
     key: "applyAttributeMapping",
-    value: function applyAttributeMapping(attribute, record) {
+    value: function applyAttributeMapping(attribute, record, minimumColor) {
       var _attribute$scale;
 
       if (!attribute.scale) {
@@ -366,10 +350,10 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
       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) {
+      scalers.forEach(function (_ref4) {
         var _attribute$scale2;
 
-        var field = _ref6.field;
+        var field = _ref4.field;
 
         if (record.hasOwnProperty(field) || ((_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.type) === 'variable') {
           // TODO:多字段，常量
@@ -377,6 +361,11 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
         }
       });
       var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
+
+      if (attribute.name === 'color' && !isColor(mappingResult[0])) {
+        return [minimumColor];
+      }
+
       return mappingResult; // return attribute.mapping ? attribute.mapping(params) : [];
     }
   }, {
@@ -390,10 +379,10 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
       var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale3 = attribute.scale) === null || _attribute$scale3 === void 0 ? void 0 : _attribute$scale3.scalers) || [];
       var params = [];
-      scalers.forEach(function (_ref7) {
+      scalers.forEach(function (_ref5) {
         var _attribute$scale4;
 
-        var field = _ref7.field;
+        var field = _ref5.field;
 
         if (record.hasOwnProperty(field) || ((_attribute$scale4 = attribute.scale) === null || _attribute$scale4 === void 0 ? void 0 : _attribute$scale4.type) === 'variable') {
           params.push(record[field]);

package/es/plugins/DataSourcePlugin.js

@@ -1,10 +1,8 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
+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 { TYPES } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { injectable } from 'inversify';
@@ -20,75 +18,41 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
       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:
-                source = layer.getSource();
-
-                if (source) {
-                  _context.next = 6;
-                  break;
-                }
-
-                // Tip: 用户没有传入 source 的时候使用图层的默认数据
-                _ref2 = layer.sourceOption || layer.defaultSourceConfig, data = _ref2.data, options = _ref2.options;
-                source = new Source(data, options);
-                _context.next = 6;
-                return new Promise(function (resolve) {
-                  source.on('update', function (e) {
-                    if (e.type === 'inited') {
-                      layer.initSource(source);
-                    }
-
-                    resolve(null);
-                  });
-                });
-
-              case 6:
-                if (source.inited) {
-                  _this.updateClusterData(layer);
-                } else {
-                  source.once('update', function () {
-                    _this.updateClusterData(layer);
-                  });
-                }
-
-              case 7:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }))); // 检测数据是否需要更新
-
-      layer.hooks.beforeRenderData.tapPromise('DataSourcePlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var neeUpdateCluster, dataSourceNeedUpdate;
-        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;
-                return _context2.abrupt("return", neeUpdateCluster || dataSourceNeedUpdate);
-
-              case 4:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2);
-      })));
+      layer.hooks.init.tap('DataSourcePlugin', function () {
+        var source = layer.getSource();
+
+        if (!source) {
+          // Tip: 用户没有传入 source 的时候使用图层的默认数据
+          var _ref = layer.sourceOption || layer.defaultSourceConfig,
+              data = _ref.data,
+              options = _ref.options;
+
+          source = new Source(data, options);
+          layer.setSource(source);
+        }
+
+        if (source.inited) {
+          _this.updateClusterData(layer);
+        } else {
+          source.once('update', function () {
+            _this.updateClusterData(layer);
+          });
+        }
+      }); // 检测数据是否需要更新
+
+      layer.hooks.beforeRenderData.tap('DataSourcePlugin', function () {
+        var neeUpdateCluster = _this.updateClusterData(layer);
+
+        var dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
+        layer.dataState.dataSourceNeedUpdate = false;
+        return neeUpdateCluster || dataSourceNeedUpdate;
+      });
     }
   }, {
     key: "updateClusterData",
     value: function updateClusterData(layer) {
       // Tip: 矢量瓦片不需要进行聚合操作
-      if (layer.isTileLayer || layer.tileLayer || !layer.getSource()) {
+      if (layer.isTileLayer || layer.tileLayer) {
         return false;
       }
 

package/es/plugins/FeatureScalePlugin.js

@@ -1,12 +1,10 @@
-import _objectSpread from "@babel/runtime/helpers/objectSpread2";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 
 var _scaleMap, _dec, _class;
 
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { ScaleTypes, StyleScaleType } from '@antv/l7-core';
 import { extent } from 'd3-array';
 import * as d3interpolate from 'd3-interpolate';
@@ -46,80 +44,39 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
       var _this = this;
 
       var styleAttributeService = _ref.styleAttributeService;
-      layer.hooks.init.tapPromise('FeatureScalePlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _layer$getSource;
-
-        var attributes, dataArray;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _this.scaleOptions = layer.getScaleOptions();
-                attributes = styleAttributeService.getLayerStyleAttributes();
-                dataArray = (_layer$getSource = layer.getSource()) === null || _layer$getSource === void 0 ? void 0 : _layer$getSource.data.dataArray;
-
-                if (!(Array.isArray(dataArray) && dataArray.length === 0)) {
-                  _context.next = 7;
-                  break;
-                }
-
-                return _context.abrupt("return");
+      layer.hooks.init.tap('FeatureScalePlugin', function () {
+        _this.scaleOptions = layer.getScaleOptions();
+        var attributes = styleAttributeService.getLayerStyleAttributes();
 
-              case 7:
-                _this.caculateScalesForAttributes(attributes || [], dataArray);
+        _this.getSourceData(layer, function (_ref2) {
+          var dataArray = _ref2.dataArray;
 
-              case 8:
-              case "end":
-                return _context.stop();
-            }
+          if (Array.isArray(dataArray) && dataArray.length === 0) {
+            return;
+          } else {
+            _this.caculateScalesForAttributes(attributes || [], dataArray);
           }
-        }, _callee);
-      }))); // 检测数据是否需要更新
-
-      layer.hooks.beforeRenderData.tapPromise('FeatureScalePlugin', /*#__PURE__*/function () {
-        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(flag) {
-          var attributes, dataArray;
-          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:
-                  _this.scaleOptions = layer.getScaleOptions();
-                  attributes = styleAttributeService.getLayerStyleAttributes();
-                  dataArray = layer.getSource().data.dataArray;
+        });
+      }); // 检测数据是否需要更新
 
-                  if (!(Array.isArray(dataArray) && dataArray.length === 0)) {
-                    _context2.next = 7;
-                    break;
-                  }
+      layer.hooks.beforeRenderData.tap('FeatureScalePlugin', function () {
+        _this.scaleOptions = layer.getScaleOptions();
+        var attributes = styleAttributeService.getLayerStyleAttributes();
 
-                  return _context2.abrupt("return");
+        _this.getSourceData(layer, function (_ref3) {
+          var dataArray = _ref3.dataArray;
 
-                case 7:
-                  _this.caculateScalesForAttributes(attributes || [], dataArray);
+          if (Array.isArray(dataArray) && dataArray.length === 0) {
+            return;
+          }
 
-                  layer.layerModelNeedUpdate = true;
-                  return _context2.abrupt("return", true);
+          _this.caculateScalesForAttributes(attributes || [], dataArray);
 
-                case 10:
-                case "end":
-                  return _context2.stop();
-              }
-            }
-          }, _callee2);
-        }));
+          layer.layerModelNeedUpdate = true;
+        });
 
-        return function (_x) {
-          return _ref3.apply(this, arguments);
-        };
-      }());
+        return true;
+      });
       layer.hooks.beforeRender.tap('FeatureScalePlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
             usage = _layer$getLayerConfig.usage;
@@ -130,20 +87,23 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
 
         _this.scaleOptions = layer.getScaleOptions();
         var attributes = styleAttributeService.getLayerStyleAttributes();
-        var dataArray = layer.getSource().data.dataArray;
-
-        if (Array.isArray(dataArray) && dataArray.length === 0) {
-          return;
-        }
 
         if (attributes) {
-          var attributesToRescale = attributes.filter(function (attribute) {
-            return attribute.needRescale;
-          });
+          _this.getSourceData(layer, function (_ref4) {
+            var dataArray = _ref4.dataArray;
 
-          if (attributesToRescale.length) {
-            _this.caculateScalesForAttributes(attributesToRescale, dataArray);
-          }
+            if (dataArray.length === 0) {
+              return;
+            }
+
+            var attributesToRescale = attributes.filter(function (attribute) {
+              return attribute.needRescale;
+            });
+
+            if (attributesToRescale.length) {
+              _this.caculateScalesForAttributes(attributesToRescale, dataArray);
+            }
+          });
         }
       });
     }
@@ -347,12 +307,12 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
 
   }, {
     key: "createDefaultScale",
-    value: function createDefaultScale(_ref4) {
-      var type = _ref4.type,
-          domain = _ref4.domain,
-          unknown = _ref4.unknown,
-          clamp = _ref4.clamp,
-          nice = _ref4.nice;
+    value: function createDefaultScale(_ref5) {
+      var type = _ref5.type,
+          domain = _ref5.domain,
+          unknown = _ref5.unknown,
+          clamp = _ref5.clamp,
+          nice = _ref5.nice;
       // @ts-ignore
       var scale = scaleMap[type]();
 

package/es/plugins/LayerAnimateStylePlugin.js

@@ -1,6 +1,6 @@
-import _objectSpread from "@babel/runtime/helpers/objectSpread2";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
 
 var _dec, _class;
 

package/es/plugins/LayerModelPlugin.d.ts

@@ -4,7 +4,7 @@ import 'reflect-metadata';
  * Layer Model 初始化，更新，销毁
  */
 export default class LayerModelPlugin implements ILayerPlugin {
-    initLayerModel(layer: ILayer): Promise<void>;
-    prepareLayerModel(layer: ILayer): Promise<void>;
+    initLayerModel(layer: ILayer): void;
+    prepareLayerModel(layer: ILayer): void;
     apply(layer: ILayer): void;
 }