@antv/l7-layers 2.10.3 → 2.10.4

package/lib/plugins/DataMappingPlugin.js

@@ -7,12 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -52,73 +48,59 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
       var _this = this;
 
       var styleAttributeService = _ref.styleAttributeService;
-      layer.hooks.init.tapPromise('DataMappingPlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        return _regenerator.default.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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(flag) {
-          return _regenerator.default.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 source = layer.getSource();
+        var _layer$getLayerConfig = layer.getLayerConfig(),
+            usage = _layer$getLayerConfig.usage;
 
-        if (layer.layerModelNeedUpdate || !source || !source.inited) {
+        if (usage === 'basemap') {
           return;
         }
 
-        var attributes = styleAttributeService.getLayerStyleAttributes() || [];
-        var filter = styleAttributeService.getLayerStyleAttribute('filter');
-        var dataArray = source.data.dataArray; // TODO 数据为空的情况
+        var source = layer.getSource();
 
-        if (Array.isArray(dataArray) && dataArray.length === 0) {
+        if (layer.layerModelNeedUpdate || !source || !source.inited) {
           return;
         }
 
+        var bottomColor = layer.getBottomColor();
+        var attributes = styleAttributeService.getLayerStyleAttributes() || [];
+        var filter = styleAttributeService.getLayerStyleAttribute('filter');
+        var dataArray = source.data.dataArray;
         var attributesToRemapping = attributes.filter(function (attribute) {
           return attribute.needRemapping;
         } // 如果filter变化
@@ -127,33 +109,35 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
         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);
-          } // 处理文本更新，更新文字形状
-          // layer.emit('remapping', null);
+          } // 处理文本更新
+
 
+          layer.emit('remapping', null);
         }
       });
     }
   }, {
     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;
@@ -161,29 +145,30 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
       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;
@@ -195,7 +180,7 @@ 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, minimumColor);
 
           attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
 
@@ -235,10 +220,55 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
       this.adjustData2SimpleCoordinates(mappedData);
       return mappedData;
     }
+  }, {
+    key: "mapLayerMapping",
+    value: function mapLayerMapping(layer, attributes, data, predata) {
+      var _this4 = this;
+
+      var usedAttributes = attributes.filter(function (attribute) {
+        return attribute.scale !== undefined;
+      });
+      var mappedData = data.map(function (record, i) {
+        var preRecord = predata ? predata[i] : {};
+        var encodeRecord = (0, _objectSpread2.default)({
+          id: record._id,
+          coordinates: record.coordinates
+        }, preRecord);
+        usedAttributes.forEach(function (attribute) {
+          var _layer$shapeOption;
+
+          if (attribute.name === 'shape' && // @ts-ignore
+          ((_layer$shapeOption = layer.shapeOption) === null || _layer$shapeOption === void 0 ? void 0 : _layer$shapeOption.field) === 'simple') {
+            encodeRecord[attribute.name] = 'simple';
+            attribute.needRemapping = false;
+          } else {
+            var values = _this4.applyMapLayerAttributeMapping(attribute, record);
+
+            attribute.needRemapping = false; // @ts-ignore
+
+            encodeRecord[attribute.name] = Array.isArray(values) && values.length === 1 ? values[0] : values; // 增加对 layer/text/iconfont unicode 映射的解析
+
+            if (attribute.name === 'shape') {
+              encodeRecord.shape = _this4.fontService.getIconFontKey(encodeRecord[attribute.name]);
+            }
+          }
+        });
+
+        if (encodeRecord.size === undefined) {
+          // in case not set size
+          encodeRecord.size = 1;
+        }
+
+        return encodeRecord;
+      }); // 调整数据兼容 Amap2.0
+
+      this.adjustData2Amap2Coordinates(mappedData, layer);
+      return mappedData;
+    }
   }, {
     key: "adjustData2Amap2Coordinates",
     value: function adjustData2Amap2Coordinates(mappedData, layer) {
-      var _this4 = this;
+      var _this5 = this;
 
       // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
       if (mappedData.length > 0 && this.mapService.version === _l7Maps.Version['GAODE2.x']) {
@@ -257,7 +287,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
             // @ts-ignore
             // d.coordinates = this.mapService.lngLatToCoord(d.coordinates);
 
-            d.coordinates = _this4.mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
+            d.coordinates = _this5.mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
           });
         } else {
           // 连续的线、面数据
@@ -271,7 +301,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
             // @ts-ignore
             // d.coordinates = this.mapService.lngLatToCoords(d.coordinates);
 
-            d.coordinates = _this4.mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
+            d.coordinates = _this5.mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
           });
         }
       }
@@ -279,12 +309,12 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
   }, {
     key: "adjustData2SimpleCoordinates",
     value: function adjustData2SimpleCoordinates(mappedData) {
-      var _this5 = this;
+      var _this6 = this;
 
       if (mappedData.length > 0 && this.mapService.version === _l7Maps.Version.SIMPLE) {
         mappedData.map(function (d) {
           if (!d.simpleCoordinate) {
-            d.coordinates = _this5.unProjectCoordinates(d.coordinates);
+            d.coordinates = _this6.unProjectCoordinates(d.coordinates);
             d.simpleCoordinate = true;
           }
         });
@@ -293,7 +323,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
   }, {
     key: "unProjectCoordinates",
     value: function unProjectCoordinates(coordinates) {
-      var _this6 = this;
+      var _this7 = this;
 
       if (typeof coordinates[0] === 'number') {
         return this.mapService.simpleMapCoord.unproject(coordinates);
@@ -306,7 +336,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
           // @ts-ignore
           var c1 = [];
           coord.map(function (co) {
-            c1.push(_this6.mapService.simpleMapCoord.unproject(co));
+            c1.push(_this7.mapService.simpleMapCoord.unproject(co));
           }); // @ts-ignore
 
           coords.push(c1);
@@ -318,7 +348,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
         var _coords = []; // @ts-ignore
 
         coordinates.map(function (coord) {
-          _coords.push(_this6.mapService.simpleMapCoord.unproject(coord));
+          _coords.push(_this7.mapService.simpleMapCoord.unproject(coord));
         }); // @ts-ignore
 
         return _coords;
@@ -326,7 +356,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
     }
   }, {
     key: "applyAttributeMapping",
-    value: function applyAttributeMapping(attribute, record) {
+    value: function applyAttributeMapping(attribute, record, minimumColor) {
       var _attribute$scale;
 
       if (!attribute.scale) {
@@ -335,10 +365,10 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
       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:多字段，常量
@@ -346,8 +376,36 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
         }
       });
       var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
+
+      if (attribute.name === 'color' && !(0, _l7Utils.isColor)(mappingResult[0])) {
+        return [minimumColor];
+      }
+
       return mappingResult; // return attribute.mapping ? attribute.mapping(params) : [];
     }
+  }, {
+    key: "applyMapLayerAttributeMapping",
+    value: function applyMapLayerAttributeMapping(attribute, record) {
+      var _attribute$scale3;
+
+      if (!attribute.scale) {
+        return [];
+      }
+
+      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 (_ref5) {
+        var _attribute$scale4;
+
+        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]);
+        }
+      });
+      var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
+      return mappingResult;
+    }
   }, {
     key: "getArrowPoints",
     value: function getArrowPoints(p1, p2) {

package/lib/plugins/DataSourcePlugin.js

@@ -7,10 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -36,83 +32,41 @@ var DataSourcePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
       var _this = this;
 
       this.mapService = layer.getContainer().get(_l7Core.TYPES.IMapService);
-      layer.hooks.init.tapPromise('DataSourcePlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var source, _ref2, data, options;
-
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                source = layer.getSource();
-
-                if (!source) {
-                  // Tip: 用户没有传入 source 的时候使用图层的默认数据
-                  _ref2 = layer.sourceOption || layer.defaultSourceConfig, data = _ref2.data, options = _ref2.options;
-                  source = new _l7Source.default(data, options);
-                  layer.setSource(source); // await new Promise((resolve) => {
-                  //   source.on('update', (e) => {
-                  //     if (e.type === 'inited') {
-                  //       layer.initSource(source);
-                  //     }
-                  //     resolve(null);
-                  //   });
-                  // });
-                }
-
-                if (!source.inited) {
-                  _context.next = 6;
-                  break;
-                }
-
-                _this.updateClusterData(layer);
-
-                _context.next = 8;
-                break;
-
-              case 6:
-                _context.next = 8;
-                return new Promise(function (resolve) {
-                  source.on('update', function (e) {
-                    if (e.type === 'inited') {
-                      _this.updateClusterData(layer);
-                    }
-
-                    resolve(null);
-                  });
-                });
-
-              case 8:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }))); // 检测数据是否需要更新
-
-      layer.hooks.beforeRenderData.tapPromise('DataSourcePlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var neeUpdateCluster, dataSourceNeedUpdate;
-        return _regenerator.default.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 _l7Source.default(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;
       }