@antv/l7-layers 2.10.6 → 2.10.9

package/es/canvas/models/canvas.d.ts

@@ -9,10 +9,10 @@ export default class CanvaModel extends BaseModel {
     unBindListener: () => void;
     bindListener: () => void;
     clearModels(): void;
-    initModels(): never[];
+    initModels(): Promise<never[]>;
     initCanvas(): void;
     clearCanvas: () => void;
     renderCanvas: () => void;
-    buildModels(): never[];
+    buildModels(): Promise<never[]>;
     protected registerBuiltinAttributes(): void;
 }

package/es/canvas/models/canvas.js

@@ -1,3 +1,4 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
@@ -6,6 +7,7 @@ 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";
+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); }; }
 
@@ -148,18 +150,36 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels() {
-      var _ref3 = this.layer.getLayerConfig(),
-          _ref3$update = _ref3.update,
-          update = _ref3$update === void 0 ? CanvasUpdateType.ALWAYS : _ref3$update;
-
-      this.updateMode = update;
-      this.initCanvas();
-      this.renderCanvas();
-      this.bindListener();
-      this.mapService.getContainer();
-      return [];
-    }
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var _ref3, _ref3$update, update;
+
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _ref3 = this.layer.getLayerConfig(), _ref3$update = _ref3.update, update = _ref3$update === void 0 ? CanvasUpdateType.ALWAYS : _ref3$update;
+                this.updateMode = update;
+                this.initCanvas();
+                this.renderCanvas();
+                this.bindListener();
+                this.mapService.getContainer();
+                return _context.abrupt("return", []);
+
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "initCanvas",
     value: function initCanvas() {
@@ -196,9 +216,28 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function buildModels() {
-      return this.initModels();
-    }
+    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:
+                return _context2.abrupt("return", this.initModels());
+
+              case 1:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/canvas/models/index.d.ts

@@ -1,4 +1,4 @@
-export declare type CanvasModelType = 'canvas';
+export type CanvasModelType = 'canvas';
 declare const CanvasModels: {
     [key in CanvasModelType]: any;
 };

package/es/citybuliding/building.d.ts

@@ -1,8 +1,7 @@
 import BaseLayer from '../core/BaseLayer';
 export default class CityBuildingLayer extends BaseLayer {
     type: string;
-    buildModels(): void;
-    rebuildModels(): void;
+    buildModels(): Promise<void>;
     setLight(t: number): void;
-    protected getModelType(): string;
+    getModelType(): string;
 }

package/es/citybuliding/building.js

@@ -1,3 +1,4 @@
+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 _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
@@ -5,6 +6,7 @@ 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";
+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); }; }
 
@@ -36,23 +38,30 @@ var CityBuildingLayer = /*#__PURE__*/function (_BaseLayer) {
 
   _createClass(CityBuildingLayer, [{
     key: "buildModels",
-    value: function buildModels() {
-      var _this2 = this;
-
-      this.layerModel = new CityBuildModel(this);
-      this.layerModel.initModels(function (models) {
-        _this2.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this3 = this;
-
-      this.layerModel.buildModels(function (models) {
-        _this3.dispatchModelLoad(models);
-      });
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                this.layerModel = new CityBuildModel(this);
+                _context.next = 3;
+                return this.initLayerModels();
+
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "setLight",
     value: function setLight(t) {

package/es/citybuliding/models/build.d.ts

@@ -16,7 +16,7 @@ export default class CityBuildModel extends BaseModel {
         u_time: number;
     };
     calCityGeo(): void;
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;
 }

package/es/citybuliding/models/build.js

@@ -1,9 +1,11 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 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";
+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); }; }
 
@@ -94,33 +96,76 @@ var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.calCityGeo();
-      this.startModelAnimate();
-      this.buildModels(callbackModel);
-    }
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                this.calCityGeo();
+                this.startModelAnimate();
+                _context.next = 4;
+                return this.buildModels();
+
+              case 4:
+                return _context.abrupt("return", _context.sent);
+
+              case 5:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.layer.buildLayerModel({
-        moduleName: 'cityBuilding',
-        vertexShader: buildVert,
-        fragmentShader: buildFrag,
-        triangulation: PolygonExtrudeTriangulation,
-        depth: {
-          enable: true
-        },
-        cull: {
-          enable: true,
-          face: gl.BACK
-        }
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var model;
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return this.layer.buildLayerModel({
+                  moduleName: 'cityBuilding',
+                  vertexShader: buildVert,
+                  fragmentShader: buildFrag,
+                  triangulation: PolygonExtrudeTriangulation,
+                  depth: {
+                    enable: true
+                  },
+                  cull: {
+                    enable: true,
+                    face: gl.BACK
+                  }
+                });
+
+              case 2:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 4:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/core/BaseLayer.d.ts

@@ -1,11 +1,12 @@
-import { SyncBailHook, SyncHook, SyncWaterfallHook } from '@antv/async-hook';
-import { BlendType, IActiveOption, IAnimateOption, IAttributeAndElements, ICameraService, ICoordinateSystemService, IDataState, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, IInteractionService, ILayer, ILayerConfig, ILayerModel, ILayerModelInitializationOptions, ILayerPlugin, ILayerService, ILegend, IMapService, IModel, IModelInitializationOptions, IMultiPassRenderer, IPass, IPickingService, IPostProcessingPass, IRendererService, IScale, IScaleOptions, IShaderModuleService, ISourceCFG, IStyleAttributeService, IStyleAttributeUpdateOptions, LayerEventType, LegendItems, StyleAttributeField, StyleAttributeOption, Triangulation } from '@antv/l7-core';
+import { AsyncSeriesBailHook, AsyncWaterfallHook, SyncBailHook, SyncHook } from '@antv/async-hook';
+import { BlendType, IActiveOption, IAnimateOption, IAttributeAndElements, ICameraService, ICoordinateSystemService, IDataState, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, IInteractionService, ILayer, ILayerAttributesOption, ILayerConfig, ILayerModel, ILayerModelInitializationOptions, ILayerPickService, ILayerPlugin, ILayerService, ILegend, IMapService, IModel, IModelInitializationOptions, IMultiPassRenderer, IParseDataItem, IPass, IPickingService, IPostProcessingPass, IRendererService, IScale, IScaleOptions, IShaderModuleService, ISourceCFG, IStyleAttributeService, IStyleAttributeUpdateOptions, ITextureService, LayerEventType, LegendItems, StyleAttributeField, StyleAttributeOption, Triangulation } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { EventEmitter } from 'eventemitter3';
 import { Container } from 'inversify';
 export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter<LayerEventType> implements ILayer {
     id: string;
     name: string;
+    parent: ILayer;
     coordCenter: number[];
     type: string;
     visible: boolean;
@@ -22,16 +23,18 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     clusterZoom: number;
     layerType?: string | undefined;
     triangulation?: Triangulation | undefined;
+    layerPickService: ILayerPickService;
+    textureService: ITextureService;
     defaultSourceConfig: {
         data: any[];
         options: ISourceCFG | undefined;
     };
     dataState: IDataState;
     hooks: {
-        init: SyncBailHook;
+        init: AsyncSeriesBailHook;
         afterInit: SyncBailHook;
         beforeRender: SyncBailHook;
-        beforeRenderData: SyncWaterfallHook;
+        beforeRenderData: AsyncWaterfallHook;
         afterRender: SyncHook;
         beforePickingEncode: SyncHook;
         afterPickingEncode: SyncHook;
@@ -43,9 +46,9 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
         afterDestroy: SyncHook;
     };
     models: IModel[];
-    modelLoaded: boolean;
     multiPassRenderer: IMultiPassRenderer;
     plugins: ILayerPlugin[];
+    startInit: boolean;
     sourceOption: {
         data: any;
         options?: ISourceCFG;
@@ -59,7 +62,6 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     tileLayer: any | undefined;
     layerChildren: ILayer[];
     masks: ILayer[];
-    isVector: boolean;
     protected readonly configService: IGlobalConfigService;
     protected shaderModuleService: IShaderModuleService;
     protected cameraService: ICameraService;
@@ -71,10 +73,10 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     protected layerService: ILayerService;
     protected interactionService: IInteractionService;
     protected mapService: IMapService;
-    protected styleAttributeService: IStyleAttributeService;
+    styleAttributeService: IStyleAttributeService;
     protected layerSource: Source;
-    protected postProcessingPassFactory: (name: string) => IPostProcessingPass<unknown>;
-    protected normalPassFactory: (name: string) => IPass<unknown>;
+    postProcessingPassFactory: (name: string) => IPostProcessingPass<unknown>;
+    normalPassFactory: (name: string) => IPass<unknown>;
     protected animateOptions: IAnimateOption;
     /**
      * 图层容器
@@ -97,13 +99,12 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     private scaleOptions;
     private animateStartTime;
     private animateStatus;
-    private bottomColor;
     private isDestroyed;
     constructor(config?: Partial<ILayerConfig & ChildLayerStyleOptions>);
     addMaskLayer(maskLayer: ILayer): void;
     removeMaskLayer(maskLayer: ILayer): void;
     getAttribute(name: string): import("@antv/l7-core").IStyleAttribute | undefined;
-    getLayerConfig(): Partial<ILayerConfig & import("@antv/l7-core").ISceneConfig & ChildLayerStyleOptions>;
+    getLayerConfig<T = any>(): Partial<ILayerConfig & import("@antv/l7-core").ISceneConfig & ChildLayerStyleOptions & T>;
     updateLayerConfig(configToUpdate: Partial<ILayerConfig | ChildLayerStyleOptions>): void;
     /**
      * 注入图层容器，父容器为场景容器
@@ -113,12 +114,11 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
      */
     setContainer(container: Container, sceneContainer: Container): void;
     getContainer(): Container;
-    setBottomColor(color: string): void;
-    getBottomColor(): string;
     addPlugin(plugin: ILayerPlugin): ILayer;
-    init(): this;
+    init(): Promise<void>;
     updateModelData(data: IAttributeAndElements): void;
     createModelData(data: any, option?: ISourceCFG): any;
+    setLayerPickService(layerPickService: ILayerPickService): void;
     calculateEncodeData(data: any, option?: ISourceCFG): IEncodeFeature[] | null;
     /**
      * Model初始化前需要更新Model样式
@@ -182,7 +182,9 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     clearModels(): void;
     isDirty(): boolean;
     setSource(source: Source): void;
+    initSource(source: Source): void;
     getSource(): Source;
+    private addSourceEvent;
     getScaleOptions(): IScaleOptions;
     encodeDataLength: number;
     setEncodedData(encodedData: IEncodeFeature[]): void;
@@ -202,21 +204,23 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     stopAnimate(): void;
     getLayerAnimateTime(): number;
     needPick(type: string): boolean;
-    buildModels(): void;
-    rebuildModels(): void;
+    buildModels(): Promise<void>;
+    rebuildModels(): Promise<void>;
     renderMulPass(multiPassRenderer: IMultiPassRenderer): Promise<void>;
     renderModels(isPicking?: boolean): this;
     updateStyleAttribute(type: string, field: StyleAttributeField, values?: StyleAttributeOption, updateOptions?: Partial<IStyleAttributeUpdateOptions>): void;
+    getLayerAttributeConfig(): Partial<ILayerAttributesOption>;
     getShaderPickStat(): boolean;
     /**
      * 继承空方法
      * @param time
      */
     setEarthTime(time: number): void;
-    protected getModelType(): unknown;
+    processData(filterData: IParseDataItem[]): IParseDataItem[];
+    getModelType(): string;
     protected getDefaultConfig(): {};
     protected sourceEvent: () => void;
-    protected dispatchModelLoad(models: IModel[]): void;
+    protected initLayerModels(): Promise<void>;
     protected reRender(): void;
     protected splitValuesAndCallbackInAttribute(valuesOrCallback?: unknown[], defaultValues?: unknown[]): {
         values: unknown[] | undefined;