@antv/l7-layers 2.21.0 → 2.21.2

package/lib/plugins/DataSourcePlugin.js

@@ -5,105 +5,79 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _l7Core = require("@antv/l7-core");
 var _l7Source = _interopRequireDefault(require("@antv/l7-source"));
-var DataSourcePlugin = exports.default = /*#__PURE__*/function () {
-  function DataSourcePlugin() {
-    (0, _classCallCheck2.default)(this, DataSourcePlugin);
+class DataSourcePlugin {
+  constructor() {
+    (0, _defineProperty2.default)(this, "mapService", void 0);
   }
-  (0, _createClass2.default)(DataSourcePlugin, [{
-    key: "apply",
-    value: function apply(layer) {
-      var _this = this;
-      this.mapService = layer.getContainer().mapService;
-      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:
-              layer.log(_l7Core.IDebugLog.SourceInitStart, _l7Core.ILayerStage.INIT);
-              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);
-              }
-              if (!source.inited) {
-                _context.next = 8;
-                break;
-              }
+  apply(layer) {
+    var _this = this;
+    this.mapService = layer.getContainer().mapService;
+    layer.hooks.init.tapPromise('DataSourcePlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)(function* () {
+      layer.log(_l7Core.IDebugLog.SourceInitStart, _l7Core.ILayerStage.INIT);
+      let source = layer.getSource();
+      if (!source) {
+        // Tip: 用户没有传入 source 的时候使用图层的默认数据
+        const {
+          data,
+          options
+        } = layer.sourceOption || layer.defaultSourceConfig;
+        source = new _l7Source.default(data, options);
+        layer.setSource(source);
+      }
+      if (source.inited) {
+        _this.updateClusterData(layer);
+        layer.log(_l7Core.IDebugLog.SourceInitEnd, _l7Core.ILayerStage.INIT);
+      } else {
+        yield new Promise(resolve => {
+          source.on('update', e => {
+            if (e.type === 'inited') {
               _this.updateClusterData(layer);
               layer.log(_l7Core.IDebugLog.SourceInitEnd, _l7Core.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(_l7Core.IDebugLog.SourceInitEnd, _l7Core.ILayerStage.INIT);
-                  }
-                  resolve(null);
-                });
-              });
-            case 10:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      })));
+            }
+            resolve(null);
+          });
+        });
+      }
+    }));
 
-      // 检测数据是否需要更新
-      layer.hooks.beforeRenderData.tapPromise('DataSourcePlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var neeUpdateCluster, dataSourceNeedUpdate, needScale;
-        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;
-              needScale = neeUpdateCluster || dataSourceNeedUpdate;
-              return _context2.abrupt("return", needScale);
-            case 5:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      })));
+    // 检测数据是否需要更新
+    layer.hooks.beforeRenderData.tapPromise('DataSourcePlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)(function* () {
+      const neeUpdateCluster = _this.updateClusterData(layer);
+      const dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
+      layer.dataState.dataSourceNeedUpdate = false;
+      const needScale = neeUpdateCluster || dataSourceNeedUpdate;
+      return needScale;
+    }));
+  }
+  updateClusterData(layer) {
+    // Tip: 矢量瓦片不需要进行聚合操作
+    if (layer.isTileLayer || layer.tileLayer || !layer.getSource()) {
+      return false;
     }
-  }, {
-    key: "updateClusterData",
-    value: function updateClusterData(layer) {
-      // Tip: 矢量瓦片不需要进行聚合操作
-      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;
-      var newZoom = this.mapService.getZoom() - 1;
-      var dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
-      if (cluster && dataSourceNeedUpdate) {
-        // 数据发生更新
+    const source = layer.getSource();
+    const cluster = source.cluster;
+    const {
+      zoom = 0
+    } = source.clusterOptions;
+    const newZoom = this.mapService.getZoom() - 1;
+    const dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
+    if (cluster && dataSourceNeedUpdate) {
+      // 数据发生更新
+      source.updateClusterData(Math.floor(newZoom));
+    }
+    // 如果 dataSource 有更新，跳过 zoom 的判断，直接更新一次
+    if (cluster && Math.abs(layer.clusterZoom - newZoom) >= 1) {
+      if (zoom !== Math.floor(newZoom)) {
         source.updateClusterData(Math.floor(newZoom));
       }
-      // 如果 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;
+      layer.clusterZoom = newZoom;
+      return true;
     }
-  }]);
-  return DataSourcePlugin;
-}();
+    return false;
+  }
+}
+exports.default = DataSourcePlugin;

package/lib/plugins/FeatureScalePlugin.d.ts

@@ -0,0 +1,20 @@
+import type { ILayer, ILayerPlugin, L7Container } from '@antv/l7-core';
+/**
+ * 根据 Source 原始数据为指定字段创建 Scale，保存在 StyleAttribute 上，供下游插件使用
+ */
+export default class FeatureScalePlugin implements ILayerPlugin {
+    private scaleOptions;
+    apply(layer: ILayer, { styleAttributeService }: L7Container): void;
+    private isNumber;
+    private caculateScalesForAttributes;
+    /**
+     * @example
+     * 'w*h' => ['w', 'h']
+     * 'w' => ['w']
+     */
+    private parseFields;
+    private createScale;
+    private getDefaultType;
+    private createScaleConfig;
+    private createDefaultScale;
+}