@antv/l7-layers 2.10.1 → 2.10.2

package/es/raster/models/index.js

@@ -1,10 +1,8 @@
-import RasterTileModel from "../../tile/models/tileModel";
 import RasterModel from "./raster";
 import RasterRgbModel from "./rasterRgb";
 var RasterModels = {
   raster: RasterModel,
   rasterRgb: RasterRgbModel,
-  raster3d: RasterModel,
-  rasterTile: RasterTileModel
+  raster3d: RasterModel
 };
 export default RasterModels;

package/es/raster/models/raster.d.ts

@@ -14,8 +14,8 @@ export default class RasterModel extends BaseModel {
         u_colorTexture: ITexture2D;
     };
     private getRasterData;
-    initModels(callbackModel: (models: IModel[]) => void): Promise<void>;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
     private updateColorTexture;

package/es/raster/models/raster.js

@@ -117,8 +117,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "initModels",
     value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(callbackModel) {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, rampColorsData, rampColors, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, imageData;
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, rampColorsData, rampColors, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, imageData, model;
 
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
@@ -151,7 +151,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   height: imageData.height,
                   flipY: false
                 });
-                this.layer.buildLayerModel({
+                _context2.next = 15;
+                return this.layer.buildLayerModel({
                   moduleName: 'rasterImageData',
                   vertexShader: rasterVert,
                   fragmentShader: rasterFrag,
@@ -161,14 +162,13 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                     enable: false
                   },
                   stencil: getMask(mask, maskInside)
-                }).then(function (model) {
-                  callbackModel([model]);
-                }).catch(function (err) {
-                  console.warn(err);
-                  callbackModel([]);
                 });
 
-              case 14:
+              case 15:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 17:
               case "end":
                 return _context2.stop();
             }
@@ -176,7 +176,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         }, _callee2, this);
       }));
 
-      function initModels(_x2) {
+      function initModels() {
         return _initModels.apply(this, arguments);
       }
 
@@ -184,9 +184,32 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     }()
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
+                return this.initModels();
+
+              case 2:
+                return _context3.abrupt("return", _context3.sent);
+
+              case 3:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {

package/es/raster/models/rasterRgb.d.ts

@@ -13,8 +13,8 @@ export default class RasterModel extends BaseModel {
         u_channelBMax: number;
     };
     private getRasterData;
-    initModels(callbackModel: (models: IModel[]) => void): Promise<void>;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
 }

package/es/raster/models/rasterRgb.js

@@ -125,8 +125,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "initModels",
     value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(callbackModel) {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height;
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
 
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
@@ -152,7 +152,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   format: gl.RGB,
                   type: gl.FLOAT
                 });
-                this.layer.buildLayerModel({
+                _context2.next = 13;
+                return this.layer.buildLayerModel({
                   moduleName: 'rasterImageDataRGBA',
                   vertexShader: rasterVert,
                   fragmentShader: rasterFrag,
@@ -162,14 +163,13 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                     enable: false
                   },
                   stencil: getMask(mask, maskInside)
-                }).then(function (model) {
-                  callbackModel([model]);
-                }).catch(function (err) {
-                  console.warn(err);
-                  callbackModel([]);
                 });
 
-              case 12:
+              case 13:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 15:
               case "end":
                 return _context2.stop();
             }
@@ -177,7 +177,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         }, _callee2, this);
       }));
 
-      function initModels(_x2) {
+      function initModels() {
         return _initModels.apply(this, arguments);
       }
 
@@ -185,9 +185,32 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     }()
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
+                return this.initModels();
+
+              case 2:
+                return _context3.abrupt("return", _context3.sent);
+
+              case 3:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {

package/es/raster/models/rasterTile.d.ts

@@ -11,8 +11,8 @@ export default class RasterModel extends BaseModel {
         u_noDataValue: number;
         u_colorTexture: ITexture2D;
     };
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
 }

package/es/raster/models/rasterTile.js

@@ -1,8 +1,10 @@
+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";
 
 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); }; }
 
@@ -66,44 +68,83 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "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([]);
-      });
-    }
+    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;
+    }()
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
-    }
+    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;
+    }()
   }, {
     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(): void;
+    buildModels(): Promise<void>;
     renderModels(): this;
     private buildRasterModel;
 }

package/es/raster/raster.js

@@ -1,5 +1,6 @@
 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";
@@ -7,6 +8,7 @@ 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";
 
 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); }; }
 
@@ -51,30 +53,48 @@ var RasterLayer = /*#__PURE__*/function (_BaseLayer) {
     }
   }, {
     key: "buildModels",
-    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
-      });
+    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);
+      }));
 
-      var _this$getLayerConfig = this.getLayerConfig(),
-          rampColors = _this$getLayerConfig.rampColors;
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
 
-      var imageData = generateColorRamp(rampColors);
-      this.colorTexture = createTexture2D({
-        data: imageData.data,
-        width: imageData.width,
-        height: imageData.height,
-        flipY: false
-      });
-      this.models = [this.buildRasterModel()];
-    }
+      return buildModels;
+    }()
   }, {
     key: "renderModels",
     value: function renderModels() {

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

@@ -1,4 +1,4 @@
 import { IMapService, IRendererService } from '@antv/l7-core';
-import { Tile } from '@antv/l7-utils';
-export declare function readRasterValue(tile: Tile, mapService: IMapService, x: number, y: number): any;
+import { SourceTile } from '@antv/l7-utils';
+export declare function readRasterValue(tile: SourceTile, 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.isVector && layer.isVisible() && layer.needPick('click');
+    return layer.inited && layer.isVisible() && layer.needPick('click');
   }).filter(function (layer) {
     return layer.getCurrentSelectedId() !== null;
   }).map(function (layer) {
@@ -39,9 +39,8 @@ export function setSelect(layers, pickedColors, renderList) {
 export function setHighlight(layers, pickedColors) {
   var pickId = decodePickingColor(pickedColors);
   layers.filter(function (layer) {
-    return layer.inited && layer.isVisible() && layer.isVector;
-  }) // Tip: 使用 vectorLayer 上的 pickID 优化高亮操作（过滤重复操作）
-  // @ts-ignore
+    return layer.inited && layer.isVisible();
+  }) // @ts-ignore
   .filter(function (layer) {
     return layer.getPickID() !== pickId;
   }).map(function (layer) {
@@ -53,13 +52,6 @@ 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 { Tile } from '@antv/l7-utils';
+import { SourceTile } from '@antv/l7-utils';
 export declare type Timeout = any;
 export declare type CacheEvent = 'click' | 'mousemove' | 'mouseup' | 'mousedown' | 'contextmenu';
 export interface ITileFactoryOptions {
@@ -12,16 +12,17 @@ export interface ITileStyles {
 }
 export interface ILayerTileConfig {
     L7Layer?: any;
-    tile: Tile;
+    tile: SourceTile;
     initOptions: ISubLayerInitOptions;
     vectorTileLayer?: any;
     source: ISource;
     needListen?: boolean;
 }
 export interface ITileFactory {
-    createTile(tile: Tile, initOptions: ISubLayerInitOptions): {
+    loaded: boolean;
+    layers: ILayer[];
+    createTile(tile: SourceTile, initOptions: ISubLayerInitOptions): {
         layers: ILayer[];
-        layerIDList: string[];
     };
     createLayer(option: ILayerTileConfig): ILayer;
     updateStyle(styles: ITileStyles): string;

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

@@ -1,30 +1,35 @@
-import { ILayer, IRendererService, IMapService, ISubLayerInitOptions } from '@antv/l7-core';
-import { Tile } from '@antv/l7-utils';
-import { ITileFactory } from '../tileFactory';
+import { ILayer, IRendererService, IMapService, ISubLayerInitOptions, ILayerService } from '@antv/l7-core';
+import { SourceTile } from '@antv/l7-utils';
 export declare class Base {
     sourceLayer: string;
     parent: ILayer;
     children: ILayer[];
     mapService: IMapService;
     rendererService: IRendererService;
-    protected tileFactory: ITileFactory;
+    protected tileFactory: any;
     protected initOptions: ISubLayerInitOptions;
     private tileCache;
-    hasTile(tile: Tile): boolean;
-    addTile(tile: Tile): {
-        layers: ILayer[];
-        layerIDList: string[];
-    };
-    removeTile(tile: Tile): void;
+    private tileLayerCache;
+    private initTileLayers;
+    render(): void;
+    hasTile(tile: SourceTile): boolean;
+    addTile(tile: SourceTile): Promise<any>;
+    removeTile(tile: SourceTile): void;
     addChild(layer: ILayer): void;
     addChildren(layers: ILayer[]): void;
-    removeChildren(layerIDList: string[], refresh?: boolean): void;
+    removeLayers(layers?: ILayer[], refresh?: boolean): void;
     removeChild(layer: ILayer): void;
-    getChildren(layerIDList: string[]): ILayer[];
+    getLayers(tile: SourceTile): 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;
 }