@antv/l7-layers 2.10.2 → 2.10.4

package/es/raster/models/rasterTile.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 _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 
 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); }; }
 
@@ -68,83 +66,44 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, parserDataItem, model;
-
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-                source = this.layer.getSource();
-                createTexture2D = this.rendererService.createTexture2D;
-                parserDataItem = source.data.dataArray[0];
-                this.texture = createTexture2D({
-                  data: parserDataItem.data,
-                  width: parserDataItem.width,
-                  height: parserDataItem.height,
-                  format: gl.LUMINANCE,
-                  type: gl.FLOAT
-                });
-                _context.next = 7;
-                return this.layer.buildLayerModel({
-                  moduleName: 'rasterTileImageData',
-                  vertexShader: rasterVert,
-                  fragmentShader: rasterFrag,
-                  triangulation: RasterImageTriangulation,
-                  depth: {
-                    enable: false
-                  },
-                  stencil: getMask(mask, maskInside)
-                });
-
-              case 7:
-                model = _context.sent;
-                return _context.abrupt("return", [model]);
-
-              case 9:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-
-      return initModels;
-    }()
+    value: function initModels(callbackModel) {
+      var _ref2 = this.layer.getLayerConfig(),
+          _ref2$mask = _ref2.mask,
+          mask = _ref2$mask === void 0 ? false : _ref2$mask,
+          _ref2$maskInside = _ref2.maskInside,
+          maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
+
+      var source = this.layer.getSource();
+      var createTexture2D = this.rendererService.createTexture2D;
+      var parserDataItem = source.data.dataArray[0];
+      this.texture = createTexture2D({
+        data: parserDataItem.data,
+        width: parserDataItem.width,
+        height: parserDataItem.height,
+        format: gl.LUMINANCE,
+        type: gl.FLOAT
+      });
+      this.layer.buildLayerModel({
+        moduleName: 'rasterTileImageData',
+        vertexShader: rasterVert,
+        fragmentShader: rasterFrag,
+        triangulation: RasterImageTriangulation,
+        depth: {
+          enable: false
+        },
+        stencil: getMask(mask, maskInside)
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return this.initModels();
-
-              case 2:
-                return _context2.abrupt("return", _context2.sent);
-
-              case 3:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }()
+    value: function buildModels(callbackModel) {
+      this.initModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {

package/es/raster/raster.d.ts

@@ -14,7 +14,7 @@ export default class RasterLayer extends BaseLayer<IRasterLayerStyleOptions> {
     protected rasterTexture: ITexture2D;
     protected colorTexture: ITexture2D;
     getAnimateUniforms(): IModelUniform;
-    buildModels(): Promise<void>;
+    buildModels(): void;
     renderModels(): this;
     private buildRasterModel;
 }

package/es/raster/raster.js

@@ -1,14 +1,12 @@
-import _objectSpread from "@babel/runtime/helpers/objectSpread2";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+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); }; }
 
@@ -53,48 +51,30 @@ var RasterLayer = /*#__PURE__*/function (_BaseLayer) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var parserDataItem, createTexture2D, _this$getLayerConfig, rampColors, imageData;
-
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                parserDataItem = this.getSource().data.dataArray[0];
-                createTexture2D = this.rendererService.createTexture2D;
-                this.rasterTexture = createTexture2D({
-                  data: parserDataItem.data,
-                  width: parserDataItem.width,
-                  height: parserDataItem.height,
-                  format: gl.LUMINANCE,
-                  type: gl.FLOAT,
-                  aniso: 4
-                });
-                _this$getLayerConfig = this.getLayerConfig(), rampColors = _this$getLayerConfig.rampColors;
-                imageData = generateColorRamp(rampColors);
-                this.colorTexture = createTexture2D({
-                  data: imageData.data,
-                  width: imageData.width,
-                  height: imageData.height,
-                  flipY: false
-                });
-                this.models = [this.buildRasterModel()];
-
-              case 7:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
+    value: function buildModels() {
+      var parserDataItem = this.getSource().data.dataArray[0];
+      var createTexture2D = this.rendererService.createTexture2D;
+      this.rasterTexture = createTexture2D({
+        data: parserDataItem.data,
+        width: parserDataItem.width,
+        height: parserDataItem.height,
+        format: gl.LUMINANCE,
+        type: gl.FLOAT,
+        aniso: 4
+      });
 
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
+      var _this$getLayerConfig = this.getLayerConfig(),
+          rampColors = _this$getLayerConfig.rampColors;
 
-      return buildModels;
-    }()
+      var imageData = generateColorRamp(rampColors);
+      this.colorTexture = createTexture2D({
+        data: imageData.data,
+        width: imageData.width,
+        height: imageData.height,
+        flipY: false
+      });
+      this.models = [this.buildRasterModel()];
+    }
   }, {
     key: "renderModels",
     value: function renderModels() {

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

@@ -0,0 +1,16 @@
+import { ILayer, IPickingService, IRendererService, IInteractionTarget, ITileRenderService } from '@antv/l7-core';
+import { EventEmitter } from 'eventemitter3';
+export declare class TilePickService extends EventEmitter {
+    isLastPicked: boolean;
+    private rendererService;
+    private pickingService;
+    private children;
+    private parent;
+    private tileRenderService;
+    constructor(parent: ILayer, rendererService: IRendererService, pickingService: IPickingService, children: ILayer[], tileRenderService: ITileRenderService);
+    pick(layers: ILayer[], target: IInteractionTarget): boolean;
+    clearPick(): void;
+    beforeHighlight(pickedColors: any): void;
+    beforeSelect(pickedColors: any): void;
+    destroy(): void;
+}

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/getRasterData.js

@@ -1,4 +1,4 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { DOM } from '@antv/l7-utils';
 export function readRasterValue(tile, mapService, x, y) {
   var _tile$bboxPolygon, _tile$data, _tile$data2, _tile$data3;

package/es/tile/interaction/utils.js

@@ -1,4 +1,4 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { decodePickingColor } from '@antv/l7-utils';
 export function clearPickState(layers) {
   layers.filter(function (layer) {
@@ -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;
 }