@antv/l7-layers 2.10.3 → 2.10.4

package/es/tile/interaction/TilePickService.js

@@ -0,0 +1,129 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+import { EventEmitter } from 'eventemitter3';
+export var TilePickService = /*#__PURE__*/function (_EventEmitter) {
+  _inherits(TilePickService, _EventEmitter);
+
+  var _super = _createSuper(TilePickService);
+
+  function TilePickService(parent, rendererService, pickingService, children, tileRenderService) {
+    var _this;
+
+    _classCallCheck(this, TilePickService);
+
+    _this = _super.call(this);
+
+    _defineProperty(_assertThisInitialized(_this), "isLastPicked", false);
+
+    _this.parent = parent;
+    _this.rendererService = rendererService;
+    _this.pickingService = pickingService;
+    _this.children = children;
+    _this.tileRenderService = tileRenderService;
+    return _this;
+  }
+
+  _createClass(TilePickService, [{
+    key: "pick",
+    value: function pick(layers, target) {
+      var _this2 = this;
+
+      // Tip: 在进行拾取渲染的时候也需要先渲染一遍父组件然后再渲染子组件
+      //  如需要在 栅格瓦片存在 Mask 的时候发生的拾取，那么就需要先渲染父组件（渲染父组件的帧缓冲）
+      this.tileRenderService.renderMask(this.parent);
+      var isPicked = layers.filter(function (layer) {
+        return _this2.parent.needPick(target.type) && layer.inited && layer.isVisible();
+      }).some(function (layer) {
+        layer.hooks.beforePickingEncode.call();
+
+        if (layer.masks.length > 0) {
+          // 清除上一次的模版缓存
+          _this2.rendererService.clear({
+            stencil: 0,
+            depth: 1,
+            framebuffer: null
+          });
+
+          layer.masks.map(function (m) {
+            m.hooks.beforeRender.call();
+            m.render();
+            m.hooks.afterRender.call();
+          });
+        }
+
+        layer.renderModels(true);
+        layer.hooks.afterPickingEncode.call();
+
+        var layerPicked = _this2.pickingService.pickFromPickingFBO(layer, target); // RasterLayer 不参与拾取后的 shader 计算
+
+
+        if (layerPicked && _this2.parent.type !== 'RasterLayer') {
+          _this2.emit('pick', {
+            type: target.type,
+            pickedColors: _this2.pickingService.pickedColors,
+            layer: layer
+          });
+
+          _this2.pickingService.pickedTileLayers = [_this2.parent];
+        }
+
+        return layerPicked;
+      });
+
+      if (this.parent.type !== 'RasterLayer' && !isPicked && this.isLastPicked && target.type !== 'click') {
+        // 只有上一次有被高亮选中，本次未选中的时候才需要清除选中状态
+        this.pickingService.pickedTileLayers = [];
+        this.emit('unpick', {});
+        this.beforeHighlight([0, 0, 0]);
+      }
+
+      this.isLastPicked = isPicked;
+      return isPicked;
+    }
+  }, {
+    key: "clearPick",
+    value: function clearPick() {
+      this.children.filter(function (child) {
+        return child.inited && child.isVisible();
+      }).map(function (layer) {
+        layer.hooks.beforeSelect.call([0, 0, 0]);
+      });
+      this.pickingService.pickedTileLayers = [];
+    }
+  }, {
+    key: "beforeHighlight",
+    value: function beforeHighlight(pickedColors) {
+      this.children.filter(function (child) {
+        return child.inited && child.isVisible();
+      }).map(function (child) {
+        child.hooks.beforeHighlight.call(pickedColors);
+      });
+    }
+  }, {
+    key: "beforeSelect",
+    value: function beforeSelect(pickedColors) {
+      this.children.filter(function (child) {
+        return child.inited && child.isVisible();
+      }).map(function (layer) {
+        layer.hooks.beforeSelect.call(pickedColors);
+      });
+    }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      this.removeAllListeners();
+    }
+  }]);
+
+  return TilePickService;
+}(EventEmitter);

package/es/tile/interaction/getRasterData.d.ts

@@ -1,4 +1,4 @@
 import { IMapService, IRendererService } from '@antv/l7-core';
-import { SourceTile } from '@antv/l7-utils';
-export declare function readRasterValue(tile: SourceTile, mapService: IMapService, x: number, y: number): any;
+import { Tile } from '@antv/l7-utils';
+export declare function readRasterValue(tile: Tile, mapService: IMapService, x: number, y: number): any;
 export declare function readPixel(x: number, y: number, rendererService: IRendererService): false | Uint8Array;

package/es/tile/interaction/utils.js

@@ -27,7 +27,7 @@ export function setSelect(layers, pickedColors, renderList) {
   }); // unselect normal layer
 
   renderList.filter(function (layer) {
-    return layer.inited && layer.isVisible() && layer.needPick('click');
+    return layer.inited && !layer.isVector && layer.isVisible() && layer.needPick('click');
   }).filter(function (layer) {
     return layer.getCurrentSelectedId() !== null;
   }).map(function (layer) {
@@ -39,8 +39,9 @@ export function setSelect(layers, pickedColors, renderList) {
 export function setHighlight(layers, pickedColors) {
   var pickId = decodePickingColor(pickedColors);
   layers.filter(function (layer) {
-    return layer.inited && layer.isVisible();
-  }) // @ts-ignore
+    return layer.inited && layer.isVisible() && layer.isVector;
+  }) // Tip: 使用 vectorLayer 上的 pickID 优化高亮操作（过滤重复操作）
+  // @ts-ignore
   .filter(function (layer) {
     return layer.getPickID() !== pickId;
   }).map(function (layer) {
@@ -52,6 +53,13 @@ export function setHighlight(layers, pickedColors) {
 export function setPickState(layers, pickColors) {
   if (pickColors.select) {
     layers.map(function (layer) {
+      // if(layer.modelLoaded) {
+      //   selectFeature(layer, this.pickColors.select);
+      // } else {
+      //   layer.once('modelLoaded', () => {
+      //     selectFeature(layer, this.pickColors.select);
+      //   })
+      // }
       selectFeature(layer, pickColors.select);
     });
   }

package/es/tile/interface.d.ts

@@ -1,5 +1,5 @@
 import { ILayer, IMapService, IRendererService, ISource, ISubLayerInitOptions } from '@antv/l7-core';
-import { SourceTile } from '@antv/l7-utils';
+import { Tile } from '@antv/l7-utils';
 export declare type Timeout = any;
 export declare type CacheEvent = 'click' | 'mousemove' | 'mouseup' | 'mousedown' | 'contextmenu';
 export interface ITileFactoryOptions {
@@ -12,17 +12,16 @@ export interface ITileStyles {
 }
 export interface ILayerTileConfig {
     L7Layer?: any;
-    tile: SourceTile;
+    tile: Tile;
     initOptions: ISubLayerInitOptions;
     vectorTileLayer?: any;
     source: ISource;
     needListen?: boolean;
 }
 export interface ITileFactory {
-    loaded: boolean;
-    layers: ILayer[];
-    createTile(tile: SourceTile, initOptions: ISubLayerInitOptions): {
+    createTile(tile: Tile, initOptions: ISubLayerInitOptions): {
         layers: ILayer[];
+        layerIDList: string[];
     };
     createLayer(option: ILayerTileConfig): ILayer;
     updateStyle(styles: ITileStyles): string;

package/es/tile/manager/base.d.ts

@@ -1,35 +1,30 @@
-import { ILayer, IRendererService, IMapService, ISubLayerInitOptions, ILayerService } from '@antv/l7-core';
-import { SourceTile } from '@antv/l7-utils';
+import { ILayer, IRendererService, IMapService, ISubLayerInitOptions } from '@antv/l7-core';
+import { Tile } from '@antv/l7-utils';
+import { ITileFactory } from '../tileFactory';
 export declare class Base {
     sourceLayer: string;
     parent: ILayer;
     children: ILayer[];
     mapService: IMapService;
     rendererService: IRendererService;
-    protected tileFactory: any;
+    protected tileFactory: ITileFactory;
     protected initOptions: ISubLayerInitOptions;
     private tileCache;
-    private tileLayerCache;
-    private initTileLayers;
-    render(): void;
-    hasTile(tile: SourceTile): boolean;
-    addTile(tile: SourceTile): Promise<any>;
-    removeTile(tile: SourceTile): void;
+    hasTile(tile: Tile): boolean;
+    addTile(tile: Tile): {
+        layers: ILayer[];
+        layerIDList: string[];
+    };
+    removeTile(tile: Tile): void;
     addChild(layer: ILayer): void;
     addChildren(layers: ILayer[]): void;
-    removeLayers(layers?: ILayer[], refresh?: boolean): void;
+    removeChildren(layerIDList: string[], refresh?: boolean): void;
     removeChild(layer: ILayer): void;
-    getLayers(tile: SourceTile): ILayer[];
+    getChildren(layerIDList: string[]): ILayer[];
     getChild(layerID: string): ILayer;
     clearChild(): void;
     hasChild(layer: ILayer): boolean;
     initTileFactory(): void;
     getSourceLayer(parentParserType: string, sourceLayer: string | undefined): string | undefined;
-    updateTileVisible(tile: SourceTile, layerService: ILayerService): void;
-    listenLoad(tile: SourceTile, callback: () => void): void;
-    isTileLoaded(tile: SourceTile): boolean;
-    isTileChildLoaded(tile: SourceTile): boolean;
-    isTileParentLoaded(tile: SourceTile): boolean;
-    isTileAllLoad(tile: SourceTile): boolean;
     destroy(): void;
 }

package/es/tile/manager/base.js

@@ -1,143 +1,55 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 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 _regeneratorRuntime from "@babel/runtime/regenerator";
-import { createLayerContainer } from '@antv/l7-core';
-import { updateLayersConfig } from "../style/utils";
+import { getTileFactory } from "../tileFactory";
+import { registerLayers } from "../utils";
 export var Base = /*#__PURE__*/function () {
   function Base() {
     _classCallCheck(this, Base);
 
     _defineProperty(this, "tileCache", new Map());
-
-    _defineProperty(this, "tileLayerCache", new Map());
   }
 
   _createClass(Base, [{
-    key: "initTileLayers",
-    value: function () {
-      var _initTileLayers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(layers, tile) {
-        var _this = this;
-
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                return _context2.abrupt("return", Promise.all(layers.map( /*#__PURE__*/function () {
-                  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(layer) {
-                    var container;
-                    return _regeneratorRuntime.wrap(function _callee$(_context) {
-                      while (1) {
-                        switch (_context.prev = _context.next) {
-                          case 0:
-                            container = createLayerContainer(_this.parent.sceneContainer);
-                            layer.setContainer(container, _this.parent.sceneContainer);
-                            _context.next = 4;
-                            return layer.init();
-
-                          case 4:
-                            _this.addChild(layer);
-
-                            tile.layerLoad();
-
-                            _this.render();
-
-                          case 7:
-                          case "end":
-                            return _context.stop();
-                        }
-                      }
-                    }, _callee);
-                  }));
-
-                  return function (_x3) {
-                    return _ref.apply(this, arguments);
-                  };
-                }())));
-
-              case 1:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2);
-      }));
-
-      function initTileLayers(_x, _x2) {
-        return _initTileLayers.apply(this, arguments);
-      }
-
-      return initTileLayers;
-    }()
-  }, {
-    key: "render",
-    value: function render() {
-      this.parent.renderLayers();
-    }
-  }, {
     key: "hasTile",
     value: function hasTile(tile) {
-      return this.tileCache.has(tile.key);
-    } // 添加图层
-
+      return !!this.tileCache.has(tile.key);
+    }
   }, {
     key: "addTile",
-    value: function () {
-      var _addTile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(tile) {
-        var layerCollections;
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                if (!this.hasTile(tile)) {
-                  _context3.next = 2;
-                  break;
-                }
+    value: function addTile(tile) {
+      var _tile$layerIDList;
 
-                return _context3.abrupt("return", {
-                  layers: []
-                });
+      // oldTile 存在的时候暂时直接结束
+      // TODO：合并不存在的时候
+      if (this.hasTile(tile)) return {
+        layers: [],
+        layerIDList: []
+      }; // 存储当前 tile
 
-              case 2:
-                // 存储当前 tile
-                this.tileCache.set(tile.key, tile); // 创建 tile 对应的 layers
+      this.tileCache.set(tile.key, tile); // 创建 tile 对应的 layers
 
-                layerCollections = this.tileFactory.createTile(tile, this.initOptions); // // 初始化图层
+      var layerCollections = this.tileFactory.createTile(tile, this.initOptions); // regist layer 将创建出来的 layer 进行注册初始化操作
 
-                _context3.next = 6;
-                return this.initTileLayers(layerCollections.layers, tile);
+      registerLayers(this.parent, layerCollections.layers);
 
-              case 6:
-                this.tileLayerCache.set(tile.key, layerCollections.layers); // const visible =  tile.parent ? tile.parent.children.every(t=>this.tileLayerCache.has(t.key)) : true
-                // tile.parent?.children.forEach((t)=>{
-                //   updateLayersConfig(this.getLayers(t),'visible',visible)
-                // })
+      (_tile$layerIDList = tile.layerIDList).push.apply(_tile$layerIDList, _toConsumableArray(layerCollections.layerIDList)); // add layer into layerGroup
 
-                return _context3.abrupt("return", layerCollections);
-
-              case 8:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3, this);
-      }));
-
-      function addTile(_x4) {
-        return _addTile.apply(this, arguments);
-      }
 
-      return addTile;
-    }()
+      this.addChildren(layerCollections.layers);
+      layerCollections.layers.map(function (layer) {
+        layer.once('modelLoaded', function () {
+          tile.layerLoad();
+        });
+      });
+      return layerCollections;
+    }
   }, {
     key: "removeTile",
     value: function removeTile(tile) {
       this.tileCache.delete(tile.key);
-      var layers = this.tileLayerCache.get(tile.key);
-      this.tileLayerCache.delete(tile.key);
-      this.removeLayers(layers, false);
+      this.removeChildren(tile.layerIDList, false);
     }
   }, {
     key: "addChild",
@@ -152,16 +64,18 @@ export var Base = /*#__PURE__*/function () {
       (_this$children = this.children).push.apply(_this$children, _toConsumableArray(layers));
     }
   }, {
-    key: "removeLayers",
-    value: function removeLayers() {
-      var layers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    key: "removeChildren",
+    value: function removeChildren(layerIDList) {
       var refresh = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      this.children = this.children.filter(function (child) {
-        return !layers.includes(child);
+      var remveLayerList = [];
+      var cacheLayerList = [];
+      this.children.filter(function (child) {
+        layerIDList.includes(child.id) ? remveLayerList.push(child) : cacheLayerList.push(child);
       });
-      layers.map(function (layer) {
+      remveLayerList.map(function (layer) {
         return layer.destroy(refresh);
       });
+      this.children = cacheLayerList;
     }
   }, {
     key: "removeChild",
@@ -175,10 +89,11 @@ export var Base = /*#__PURE__*/function () {
       layer.destroy();
     }
   }, {
-    key: "getLayers",
-    value: function getLayers(tile) {
-      if (!tile) return [];
-      return this.tileLayerCache.get(tile.key) || [];
+    key: "getChildren",
+    value: function getChildren(layerIDList) {
+      return this.children.filter(function (child) {
+        return layerIDList.includes(child.id);
+      });
     }
   }, {
     key: "getChild",
@@ -202,11 +117,14 @@ export var Base = /*#__PURE__*/function () {
     }
   }, {
     key: "initTileFactory",
-    value: function initTileFactory() {// this.tileFactory = new TileFactory({
-      //   parent: this.parent,
-      //   mapService: this.mapService,
-      //   rendererService: this.rendererService,
-      // });
+    value: function initTileFactory() {
+      var source = this.parent.getSource();
+      var TileFactory = getTileFactory(this.parent.type, source.parser);
+      this.tileFactory = new TileFactory({
+        parent: this.parent,
+        mapService: this.mapService,
+        rendererService: this.rendererService
+      });
     }
   }, {
     key: "getSourceLayer",
@@ -219,92 +137,9 @@ export var Base = /*#__PURE__*/function () {
         return sourceLayer;
       }
     }
-  }, {
-    key: "updateTileVisible",
-    value: function updateTileVisible(tile, layerService) {
-      var layers = this.getLayers(tile);
-      if (layers.length === 0) return;
-
-      if (tile.isVisible) {
-        // 如果可见直接进行渲染，父级发
-        updateLayersConfig(layers, 'visible', tile.isVisible);
-      } else {
-        // 如果不可见，放大，等到子瓦片渲染完成，缩小：父级渲染成功
-        // console.log('updateTileVisible',`${tile.x}_${tile.y}_${tile.z}`,tile.isVisible)
-        // console.log(tile);
-        // console.log(`子瓦片${tile.x}/${tile.y}/${tile.z}`,tile.children.length)
-        // tile.children.forEach((t)=>{
-        //   console.log(`${t.x}/${t.y}/${t.z}`)
-        // })
-        updateLayersConfig(layers, 'visible', tile.isVisible);
-      } // this.listenLoad(tile, () => {
-      //   this.isTileAllLoad(tile) && updateLayersConfig(layers, 'visible', tile.isVisible);
-      // })
-
-    }
-  }, {
-    key: "listenLoad",
-    value: function listenLoad(tile, callback) {
-      var _tile$parent;
-
-      tile.once('layerLoaded', function () {
-        callback();
-      });
-      tile.children.map(function (childTile) {
-        childTile.once('layerLoaded', function () {
-          callback();
-        });
-      });
-      (_tile$parent = tile.parent) === null || _tile$parent === void 0 ? void 0 : _tile$parent.once('layerLoaded', function () {
-        callback();
-      });
-    }
-  }, {
-    key: "isTileLoaded",
-    value: function isTileLoaded(tile) {
-      if (tile.isLoad) return true;
-      var isLoad = this.getLayers(tile).length === tile.loadedLayers;
-      tile.isLoad = isLoad;
-      return isLoad;
-    }
-  }, {
-    key: "isTileChildLoaded",
-    value: function isTileChildLoaded(tile) {
-      var _this2 = this;
-
-      if (tile.isChildLoad) return true;
-      var children = tile.children;
-      var isLoad = children.filter(function (child) {
-        return _this2.isTileLoaded(child);
-      }).length === children.length;
-      tile.isChildLoad = isLoad;
-      return isLoad;
-    }
-  }, {
-    key: "isTileParentLoaded",
-    value: function isTileParentLoaded(tile) {
-      var parent = tile.parent;
-
-      if (!parent) {
-        return true;
-      } else {
-        return this.isTileLoaded(parent);
-      }
-    }
-  }, {
-    key: "isTileAllLoad",
-    value: function isTileAllLoad(tile) {
-      var tileLoaded = this.isTileLoaded(tile);
-      var tileChildLoaded = this.isTileChildLoaded(tile);
-      var tileParentLoaded = this.isTileParentLoaded(tile);
-      return tileLoaded && tileChildLoaded && tileParentLoaded;
-    }
   }, {
     key: "destroy",
-    value: function destroy() {
-      this.tileCache.clear();
-      this.tileLayerCache.clear();
-    }
+    value: function destroy() {}
   }]);
 
   return Base;

package/es/tile/manager/layerManager.d.ts

@@ -0,0 +1,19 @@
+import { IInteractionTarget, ILayer, IMapService, IPickingService, IRendererService, ITileLayerManager, ITilePickService, ITileRenderService, ITransform } from '@antv/l7-core';
+import { Base } from './base';
+import { ITileStyleService } from '../style/TileStyleService';
+export declare class TileLayerManager extends Base implements ITileLayerManager {
+    tilePickService: ITilePickService;
+    tileStyleService: ITileStyleService;
+    tileRenderService: ITileRenderService;
+    private transforms;
+    constructor(parent: ILayer, mapService: IMapService, rendererService: IRendererService, pickingService: IPickingService, transforms: ITransform[]);
+    render(): void;
+    pickLayers(target: IInteractionTarget): boolean;
+    private setSubLayerInitOption;
+    private getInitOptionValue;
+    private setInitOptionValue;
+    private setConfigListener;
+    private updateAttribute;
+    private updateStyle;
+    destroy(): void;
+}