@antv/l7-layers 2.10.1 → 2.10.2

package/lib/tile/tileLayer/BaseLayer.js

@@ -0,0 +1,373 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+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 _TileLayerService = require("../service/TileLayerService");
+
+var _TilePickService = require("../service/TilePickService");
+
+var _lodash = require("lodash");
+
+var _tileFactory = require("../tileFactory");
+
+var _constants = require("../style/constants");
+
+var BaseTileLayer = /*#__PURE__*/function () {
+  // 瓦片数据管理器
+  function BaseTileLayer(parent) {
+    (0, _classCallCheck2.default)(this, BaseTileLayer);
+    (0, _defineProperty2.default)(this, "initedTileset", false);
+    (0, _defineProperty2.default)(this, "viewchange", (0, _lodash.debounce)(this.mapchange, 24));
+    this.parent = parent;
+    var container = this.parent.getContainer();
+    this.rendererService = container.get(_l7Core.TYPES.IRendererService);
+    this.layerService = container.get(_l7Core.TYPES.ILayerService);
+    this.mapService = container.get(_l7Core.TYPES.IMapService);
+    this.pickingService = container.get(_l7Core.TYPES.IPickingService); // 初始化瓦片管理服务
+
+    this.tileLayerService = new _TileLayerService.TileLayerService({
+      rendererService: this.rendererService,
+      layerService: this.layerService,
+      parent: parent
+    }); // 初始化拾取服务
+
+    this.tilePickService = new _TilePickService.TilePickService({
+      tileLayerService: this.tileLayerService,
+      layerService: this.layerService
+    }); // 重置
+
+    this.parent.setLayerPickService(this.tilePickService);
+    this.proxy(parent);
+    this.initTileSetManager();
+  }
+
+  (0, _createClass2.default)(BaseTileLayer, [{
+    key: "initTileSetManager",
+    value: function initTileSetManager() {
+      var _this$tilesetManager;
+
+      var source = this.parent.getSource();
+      this.tilesetManager = source.tileset;
+
+      if (!this.initedTileset) {
+        this.bindTilesetEvent();
+        this.initedTileset = true;
+      }
+
+      var _this$getCurrentView = this.getCurrentView(),
+          latLonBounds = _this$getCurrentView.latLonBounds,
+          zoom = _this$getCurrentView.zoom;
+
+      (_this$tilesetManager = this.tilesetManager) === null || _this$tilesetManager === void 0 ? void 0 : _this$tilesetManager.update(zoom, latLonBounds);
+    }
+  }, {
+    key: "mapchange",
+    value: function mapchange() {
+      var _this$tilesetManager2;
+
+      var _this$getCurrentView2 = this.getCurrentView(),
+          latLonBounds = _this$getCurrentView2.latLonBounds,
+          zoom = _this$getCurrentView2.zoom;
+
+      if (this.mapService.version === 'GAODE1.x') {
+        var _this$parent$getLayer = this.parent.getLayerConfig(),
+            visible = _this$parent$getLayer.visible;
+
+        if (zoom < 3 && visible) {
+          this.parent.updateLayerConfig({
+            visible: false
+          });
+          this.layerService.reRender();
+        } else if (zoom >= 3 && !visible) {
+          this.parent.updateLayerConfig({
+            visible: true
+          });
+          this.layerService.reRender();
+        }
+      }
+
+      if (this.lastViewStates && this.lastViewStates.zoom === zoom && this.lastViewStates.latLonBounds.toString() === latLonBounds.toString()) {
+        return;
+      }
+
+      this.lastViewStates = {
+        zoom: zoom,
+        latLonBounds: latLonBounds
+      };
+      (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 ? void 0 : _this$tilesetManager2.throttleUpdate(zoom, latLonBounds);
+    }
+  }, {
+    key: "getCurrentView",
+    value: function getCurrentView() {
+      var bounds = this.mapService.getBounds();
+      var latLonBounds = [bounds[0][0], bounds[0][1], bounds[1][0], bounds[1][1]];
+      var zoom = this.mapService.getZoom();
+      return {
+        latLonBounds: latLonBounds,
+        zoom: zoom
+      };
+    }
+  }, {
+    key: "bindTilesetEvent",
+    value: function bindTilesetEvent() {
+      var _this = this;
+
+      // 瓦片数据加载成功
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      this.tilesetManager.on('tile-loaded', function (tile) {// 将事件抛出，图层上可以监听使用
+      }); // 瓦片数据从缓存删除或被执行重新加载
+
+      this.tilesetManager.on('tile-unload', function (tile) {
+        // 将事件抛出，图层上可以监听使用
+        _this.tileUnLoad(tile);
+      }); // 瓦片数据加载失败
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
+      this.tilesetManager.on('tile-error', function (error, tile) {
+        // 将事件抛出，图层上可以监听使用
+        _this.tileError(error);
+      }); // 瓦片显隐状态更新
+
+      this.tilesetManager.on('tile-update', function () {
+        _this.tileUpdate();
+      }); // 地图视野发生改变
+
+      this.mapService.on('zoomend', function () {
+        return _this.mapchange();
+      });
+      this.mapService.on('moveend', function () {
+        return _this.viewchange();
+      });
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      this.tileLayerService.render();
+    }
+  }, {
+    key: "getLayers",
+    value: function getLayers() {
+      return this.tileLayerService.getLayers();
+    }
+  }, {
+    key: "getTiles",
+    value: function getTiles() {
+      return this.tileLayerService.getTiles();
+    } //  防抖操作
+
+  }, {
+    key: "tileLoaded",
+    value: // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    function tileLoaded(tile) {//
+    }
+  }, {
+    key: "tileError",
+    value: function tileError(error) {
+      console.warn('error:', error);
+    }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      var _this$tilesetManager3;
+
+      (_this$tilesetManager3 = this.tilesetManager) === null || _this$tilesetManager3 === void 0 ? void 0 : _this$tilesetManager3.destroy();
+      this.tileLayerService.destroy();
+    }
+  }, {
+    key: "tileUnLoad",
+    value: function tileUnLoad(tile) {
+      this.tileLayerService.removeTile(tile.key);
+    }
+  }, {
+    key: "tileUpdate",
+    value: function () {
+      var _tileUpdate = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var _this2 = this;
+
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                if (this.tilesetManager) {
+                  _context2.next = 2;
+                  break;
+                }
+
+                return _context2.abrupt("return");
+
+              case 2:
+                _context2.next = 4;
+                return Promise.all(this.tilesetManager.tiles.filter(function (tile) {
+                  return tile.isLoaded;
+                }) // 过滤未加载完成的
+                .filter(function (tile) {
+                  return tile.isVisibleChange;
+                }) // 过滤未发生变化的
+                .filter(function (tile) {
+                  return _this2.isTileReady(tile);
+                }) // 过滤未发生变化的
+                .map( /*#__PURE__*/function () {
+                  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(tile) {
+                    var tileInstance, tileLayer;
+                    return _regenerator.default.wrap(function _callee$(_context) {
+                      while (1) {
+                        switch (_context.prev = _context.next) {
+                          case 0:
+                            if (_this2.tileLayerService.hasTile(tile.key)) {
+                              _context.next = 11;
+                              break;
+                            }
+
+                            tileInstance = (0, _tileFactory.getTileFactory)(_this2.parent);
+                            tileLayer = new tileInstance(tile, _this2.parent);
+                            _context.next = 5;
+                            return tileLayer.initTileLayer();
+
+                          case 5:
+                            _this2.tilePickService.setPickState();
+
+                            if (tileLayer.getLayers().length !== 0) {
+                              _this2.tileLayerService.addTile(tileLayer);
+
+                              _this2.layerService.reRender();
+                            }
+
+                            _this2.tileLayerService.addTile(tileLayer);
+
+                            _this2.layerService.reRender();
+
+                            _context.next = 14;
+                            break;
+
+                          case 11:
+                            _this2.tileLayerService.updateTileVisible(tile);
+
+                            _this2.tilePickService.setPickState();
+
+                            _this2.layerService.reRender();
+
+                          case 14:
+                          case "end":
+                            return _context.stop();
+                        }
+                      }
+                    }, _callee);
+                  }));
+
+                  return function (_x) {
+                    return _ref.apply(this, arguments);
+                  };
+                }()));
+
+              case 4:
+                if (this.tilesetManager.isLoaded) {
+                  // 将事件抛出，图层上可以使用瓦片
+                  this.parent.emit('tiles-loaded', this.tilesetManager.currentTiles);
+                }
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function tileUpdate() {
+        return _tileUpdate.apply(this, arguments);
+      }
+
+      return tileUpdate;
+    }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
+  }, {
+    key: "isTileReady",
+    value: function isTileReady(tile) {
+      // if (tile.data?.layers && this.sourceLayer) {
+      //   // vector
+      //   const vectorTileLayer = tile.data.layers[this.sourceLayer];
+      //   const features = vectorTileLayer?.features;
+      //   if (!(Array.isArray(features) && features.length > 0)) {
+      //     return false;
+      //   }
+      // }
+      return true;
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
+  }, {
+    key: "setPickState",
+    value: function setPickState(layers) {}
+  }, {
+    key: "pickRender",
+    value: function pickRender(target) {
+      this.tilePickService.pickRender(target);
+    }
+  }, {
+    key: "selectFeature",
+    value: function selectFeature(pickedColors) {
+      this.tilePickService.selectFeature(pickedColors);
+    }
+  }, {
+    key: "highlightPickedFeature",
+    value: function highlightPickedFeature(pickedColors) {
+      this.tilePickService.highlightPickedFeature(pickedColors);
+    }
+    /**
+     * 实现 TileLayer 对子图层方法的代理
+     * @param parent 
+     */
+
+  }, {
+    key: "proxy",
+    value: function proxy(parent) {
+      var _this3 = this;
+
+      _constants.ProxyFuncs.forEach(function (func) {
+        // @ts-ignore
+        var oldStyleFunc = parent[func].bind(parent); // @ts-ignore
+
+        parent[func] = function () {
+          for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+            args[_key] = arguments[_key];
+          }
+
+          oldStyleFunc.apply(void 0, args);
+
+          _this3.getLayers().map(function (child) {
+            // @ts-ignore
+            child[func].apply(child, args);
+          }); // Tip: 目前在更新 RasterData 的 colorTexture 的时候需要额外优化
+
+
+          if (func === 'style') {
+            _this3.getTiles().forEach(function (tile) {
+              return tile.styleUpdate.apply(tile, args);
+            });
+          }
+
+          return parent;
+        };
+      });
+    }
+  }]);
+  return BaseTileLayer;
+}();
+
+exports.default = BaseTileLayer;

package/lib/tile/utils.js

@@ -4,24 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getContainerSize = getContainerSize;
-exports.getLayerShape = getLayerShape;
-exports.getMaskValue = getMaskValue;
-exports.isTileChildLoaded = isTileChildLoaded;
 exports.isTileGroup = isTileGroup;
-exports.isTileLoaded = isTileLoaded;
-exports.isTileParentLoaded = isTileParentLoaded;
-exports.isVectorTile = isVectorTile;
-exports.registerLayers = registerLayers;
-exports.tileAllLoad = tileAllLoad;
 exports.tileVectorParser = void 0;
-exports.updateTileVisible = updateTileVisible;
-
-var _l7Core = require("@antv/l7-core");
 
 var _l7Utils = require("@antv/l7-utils");
 
-var _utils = require("./style/utils");
-
 var tileVectorParser = ['mvt', 'geojsonvt', 'testTile'];
 /**
  * 判断当前图层是否是瓦片图层
@@ -36,70 +23,6 @@ function isTileGroup(layer) {
   return tileVectorParser.includes(source.parser.type);
 }
 
-function isVectorTile(parserType) {
-  return tileVectorParser.indexOf(parserType) >= 0;
-}
-
-function registerLayers(parentLayer, layers) {
-  layers.map(function (layer) {
-    var container = (0, _l7Core.createLayerContainer)(parentLayer.sceneContainer);
-    layer.setContainer(container, parentLayer.sceneContainer);
-    layer.init();
-  });
-}
-
-function getLayerShape(layerType, layer) {
-  var _layerShape$scale;
-
-  var layerShape = layer.getAttribute('shape');
-
-  if (layerShape && (_layerShape$scale = layerShape.scale) !== null && _layerShape$scale !== void 0 && _layerShape$scale.field) {
-    var _layerShape$scale2;
-
-    if (((_layerShape$scale2 = layerShape.scale) === null || _layerShape$scale2 === void 0 ? void 0 : _layerShape$scale2.values) === 'text') {
-      return [layerShape.scale.field, layerShape.scale.values];
-    }
-
-    return layerShape.scale.field;
-  }
-
-  switch (layerType) {
-    case 'PolygonLayer':
-      return 'fill';
-
-    case 'LineLayer':
-      return 'tileline';
-
-    case 'PointLayer':
-      return 'circle';
-
-    case 'RasterLayer':
-      return 'image';
-
-    default:
-      return '';
-  }
-}
-
-function getMaskValue(layerType, mask) {
-  switch (layerType) {
-    case 'PolygonLayer':
-      return true;
-
-    case 'LineLayer':
-      return true;
-
-    case 'PointLayer':
-      return false;
-
-    case 'RasterLayer':
-      return mask;
-
-    default:
-      return mask;
-  }
-}
-
 function getContainerSize(container) {
   if (container.getContext) {
     return {
@@ -109,73 +32,4 @@ function getContainerSize(container) {
   } else {
     return container.getBoundingClientRect();
   }
-}
-
-function isTileLoaded(tile) {
-  return tile.layerIDList.length === tile.loadedLayers;
-}
-
-function isTileChildLoaded(tile) {
-  var children = tile.children;
-  return children.filter(function (child) {
-    return isTileLoaded(child);
-  }).length === children.length;
-}
-
-function isTileParentLoaded(tile) {
-  var parent = tile.parent;
-
-  if (!parent) {
-    return true;
-  } else {
-    return isTileLoaded(parent);
-  }
-}
-
-function tileAllLoad(tile, callback) {
-  var timer = window.setInterval(function () {
-    var tileLoaded = isTileLoaded(tile);
-    var tileChildLoaded = isTileChildLoaded(tile);
-    var tileParentLoaded = isTileParentLoaded(tile);
-
-    if (tileLoaded && tileChildLoaded && tileParentLoaded) {
-      callback();
-      window.clearInterval(timer);
-    }
-  }, 36);
-}
-
-function dispatchTileVisibleChange(tile, callback) {
-  if (tile.isVisible) {
-    callback();
-  } else {
-    tileAllLoad(tile, function () {
-      callback();
-    });
-  }
-}
-
-function updateImmediately(layers) {
-  var immediately = true;
-  layers.map(function (layer) {
-    if (layer.type !== 'PointLayer') {
-      immediately = false;
-    }
-  });
-  return immediately;
-}
-
-function updateTileVisible(tile, layers, layerService) {
-  if (layers.length === 0) return;
-
-  if (updateImmediately(layers)) {
-    (0, _utils.updateLayersConfig)(layers, 'visible', tile.isVisible);
-    layerService.reRender();
-    return;
-  }
-
-  dispatchTileVisibleChange(tile, function () {
-    (0, _utils.updateLayersConfig)(layers, 'visible', tile.isVisible);
-    layerService.reRender();
-  });
 }

package/lib/utils/dataMappingStyle.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.handleStyleColor = handleStyleColor;
-exports.handleStyleDataMapping = handleStyleDataMapping;
-exports.handleStyleFloat = handleStyleFloat;
+exports.colorStyleMapping = colorStyleMapping;
+exports.floatStyleMapping = floatStyleMapping;
+exports.styleDataMapping = styleDataMapping;
 
 var _lodash = require("lodash");
 
@@ -25,43 +25,45 @@ function registerStyleAttribute(fieldName, layer, field, values, updateOptions)
  */
 
 
-function handleStyleDataMapping(configToUpdate, layer) {
+function styleDataMapping(configToUpdate, layer) {
   // 瓦片图层不需要进行样式数据映射
-  if (layer.tileLayer || layer.isTileLayer) return;
+  if (layer.tileLayer || layer.isTileLayer) {
+    return;
+  }
 
   if (configToUpdate.opacity) {
     // 处理 style 中 opacity 属性的数据映射
-    handleStyleFloat('opacity', layer, configToUpdate.opacity);
+    floatStyleMapping('opacity', layer, configToUpdate.opacity);
   }
 
   if (configToUpdate.strokeWidth) {
     // 处理 style 中 strokeWidth 属性的数据映射
-    handleStyleFloat('strokeWidth', layer, configToUpdate.strokeWidth);
+    floatStyleMapping('strokeWidth', layer, configToUpdate.strokeWidth);
   }
 
   if (configToUpdate.strokeOpacity) {
     // 处理 style 中 strokeOpacity 属性的数据映射
-    handleStyleFloat('strokeOpacity', layer, configToUpdate.strokeOpacity);
+    floatStyleMapping('strokeOpacity', layer, configToUpdate.strokeOpacity);
   }
 
   if (configToUpdate.stroke) {
     // 处理 style 中 stroke (strokeColor) 属性的数据映射
-    handleStyleColor('stroke', layer, configToUpdate.stroke);
+    colorStyleMapping('stroke', layer, configToUpdate.stroke);
   }
 
   if (configToUpdate.offsets) {
     // 处理 style 中 offsets 属性的数据映射
-    handleStyleOffsets('offsets', layer, configToUpdate.offsets);
+    offsetStyleMapping('offsets', layer, configToUpdate.offsets);
   }
 
   if (configToUpdate.textOffset) {
     // 处理 style 中 textOffset 属性的数据映射
-    handleStyleOffsets('textOffset', layer, configToUpdate.textOffset);
+    offsetStyleMapping('textOffset', layer, configToUpdate.textOffset);
   }
 
   if (configToUpdate.thetaOffset) {
     // 处理 style 中 thetaOffset 属性的数据映射
-    handleStyleFloat('thetaOffset', layer, configToUpdate.thetaOffset);
+    floatStyleMapping('thetaOffset', layer, configToUpdate.thetaOffset);
   }
 }
 /**
@@ -69,15 +71,14 @@ function handleStyleDataMapping(configToUpdate, layer) {
  */
 
 
-function handleStyleFloat(fieldName, layer, styleFloat) {
+function floatStyleMapping(fieldName, layer, styleFloat) {
   if ((0, _lodash.isString)(styleFloat)) {
     // 如果传入的 styleFloat 是 string 类型，那么就认为其对应的是传入数据的字段
     registerStyleAttribute(fieldName, layer, styleFloat, function (value) {
       return value;
     });
-  } else if ((0, _lodash.isNumber)(styleFloat)) {
-    // 传入 number、默认值处理
-    registerStyleAttribute(fieldName, layer, [styleFloat], undefined);
+  } else if ((0, _lodash.isNumber)(styleFloat)) {// 传入 number、默认值处理
+    // registerStyleAttribute(fieldName, layer, [styleFloat], undefined);
   } else if (Array.isArray(styleFloat) && styleFloat.length === 2) {
     // 传入的 styleFloat 是长度为 2 的数组
     if ((0, _lodash.isString)(styleFloat[0]) && (0, _lodash.isFunction)(styleFloat[1])) {
@@ -103,7 +104,7 @@ function handleStyleFloat(fieldName, layer, styleFloat) {
  */
 
 
-function handleStyleOffsets(fieldName, layer, styleOffsets) {
+function offsetStyleMapping(fieldName, layer, styleOffsets) {
   if ((0, _lodash.isString)(styleOffsets)) {
     // 如果传入的 styleOffsets 是 string 类型，那么就认为其对应的是传入数据的字段
     registerStyleAttribute(fieldName, layer, styleOffsets, function (value) {
@@ -128,10 +129,9 @@ function handleStyleOffsets(fieldName, layer, styleOffsets) {
  */
 
 
-function handleStyleColor(fieldName, layer, styleColor) {
-  if ((0, _lodash.isString)(styleColor)) {
-    // 如果传入的 styleColor 是 string 类型，那么就认为其是颜色值
-    registerStyleAttribute(fieldName, layer, styleColor, undefined);
+function colorStyleMapping(fieldName, layer, styleColor) {
+  if ((0, _lodash.isString)(styleColor)) {// 如果传入的 styleColor 是 string 类型，那么就认为其是颜色值
+    // registerStyleAttribute(fieldName, layer, styleColor, undefined);
   } else if (Array.isArray(styleColor) && styleColor.length === 2) {
     // 传入的 styleColor 是长度为 2 的数组
     if ((0, _lodash.isString)(styleColor[0]) && (0, _lodash.isFunction)(styleColor[1])) {

package/lib/utils/layerData.js

@@ -103,7 +103,7 @@ function unProjectCoordinates(coordinates, mapService) {
   }
 }
 
-function applyAttributeMapping(attribute, record, minimumColor) {
+function applyAttributeMapping(attribute, record) {
   var _attribute$scale;
 
   if (!attribute.scale) {
@@ -123,15 +123,10 @@ function applyAttributeMapping(attribute, record, minimumColor) {
     }
   });
   var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
-
-  if (attribute.name === 'color' && !(0, _l7Utils.isColor)(mappingResult[0])) {
-    return [minimumColor];
-  }
-
   return mappingResult;
 }
 
-function mapping(attributes, data, fontService, mapService, minimumColor, layer) {
+function mapping(attributes, data, fontService, mapService, layer) {
   var _ref2 = layer === null || layer === void 0 ? void 0 : layer.getLayerConfig(),
       _ref2$arrow = _ref2.arrow,
       arrow = _ref2$arrow === void 0 ? {
@@ -146,7 +141,7 @@ function mapping(attributes, data, fontService, mapService, minimumColor, layer)
     attributes.filter(function (attribute) {
       return attribute.scale !== undefined;
     }).forEach(function (attribute) {
-      var values = applyAttributeMapping(attribute, record, minimumColor);
+      var values = applyAttributeMapping(attribute, record);
       attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
 
       if (attribute.name === 'color') {
@@ -181,11 +176,10 @@ function mapping(attributes, data, fontService, mapService, minimumColor, layer)
 
 function calculateData(layer, fontService, mapService, styleAttributeService, data, options) {
   var source = new _l7Source.default(data, options);
-  var bottomColor = layer.getBottomColor();
   var attributes = styleAttributeService.getLayerStyleAttributes() || [];
   var dataArray = source.data.dataArray;
   var filterData = dataArray;
-  var mappedEncodeData = mapping(attributes, filterData, fontService, mapService, bottomColor, layer);
+  var mappedEncodeData = mapping(attributes, filterData, fontService, mapService, layer);
   source.destroy();
   return mappedEncodeData;
 }