@antv/l7-scene 2.20.20 → 2.21.0

package/es/index.d.ts

@@ -1,6 +1,5 @@
-import type { Bounds, ICameraOptions, IControl, IDebugService, IIconFontGlyph, IImage, ILayer, ILngLat, IMapService, IMarker, IMarkerLayer, IPoint, IPopup, IPostProcessingPass, ISceneConfig, IStatusOptions, Point } from '@antv/l7-core';
+import type { Bounds, ICameraOptions, IControl, IDebugService, IIconFontGlyph, IImage, ILayer, ILngLat, IMapService, IMarker, IMarkerLayer, IPoint, IPopup, IPostProcessingPass, ISceneConfig, IStatusOptions, Point, L7Container } from '@antv/l7-core';
 import type { IProtocolHandler } from '@antv/l7-utils';
-import type { Container } from 'inversify';
 import type ILayerManager from './ILayerManager';
 import type IMapController from './IMapController';
 import type IPostProcessingPassPluggable from './IPostProcessingPassPluggable';
@@ -32,7 +31,7 @@ declare class Scene implements IPostProcessingPassPluggable, IMapController, ILa
     constructor(config: ISceneConfig);
     get map(): unknown;
     get loaded(): boolean;
-    getServiceContainer(): Container;
+    getServiceContainer(): L7Container;
     getSize(): [number, number];
     getMinZoom(): number;
     getMaxZoom(): number;
@@ -50,6 +49,7 @@ declare class Scene implements IPostProcessingPassPluggable, IMapController, ILa
     registerRenderService(render: any): void;
     setBgColor(color: string): void;
     addLayer(layer: ILayer): void;
+    preAddLayer(layer: ILayer): void;
     initMask(layer: ILayer): ILayer | undefined;
     addMask(mask: ILayer, layerId: string): void;
     getPickedLayer(): number;
@@ -114,7 +114,7 @@ declare class Scene implements IPostProcessingPassPluggable, IMapController, ILa
     containerToLngLat(pixel: Point): ILngLat;
     lngLatToContainer(lnglat: Point): IPoint;
     destroy(): void;
-    registerPostProcessingPass(constructor: new (...args: any[]) => IPostProcessingPass<unknown>, name: string): void;
+    registerPostProcessingPass(constructor: new (...args: any[]) => IPostProcessingPass<unknown>): void;
     enableShaderPick(): void;
     diasbleShaderPick(): void;
     enableBoxSelect(once?: boolean): void;
@@ -127,5 +127,6 @@ declare class Scene implements IPostProcessingPassPluggable, IMapController, ILa
     getPointSizeRange(): Float32Array;
     private initComponent;
     private initControl;
+    private initTileLayer;
 }
 export { Scene };

package/es/index.js

@@ -5,11 +5,12 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { Logo } from '@antv/l7-component';
-import { createLayerContainer, createSceneContainer, SceneEventList, TYPES } from '@antv/l7-core';
-import { MaskLayer } from '@antv/l7-layers';
+import { SceneEventList, createLayerContainer, createSceneContainer } from '@antv/l7-core';
+import { MaskLayer, TileLayer } from '@antv/l7-layers';
 import { DeviceRendererService, ReglRendererService } from '@antv/l7-renderer';
 import { DOM, SceneConifg } from '@antv/l7-utils';
 import BoxSelect, { BoxSelectEventList } from "./boxSelect";
+
 /**
  * 暴露 Scene API
  *
@@ -35,21 +36,24 @@ var Scene = /*#__PURE__*/function () {
     this.container = sceneContainer;
     // 绑定地图服务
     map.setContainer(sceneContainer, id, canvas);
-    // 绑定渲染引擎服务
-    sceneContainer.bind(TYPES.IRendererService).to(renderer === 'regl' ? ReglRendererService : DeviceRendererService).inSingletonScope();
+    if (renderer === 'regl') {
+      sceneContainer.rendererService = new ReglRendererService();
+    } else {
+      sceneContainer.rendererService = new DeviceRendererService();
+    }
 
     // 依赖注入
-    this.sceneService = sceneContainer.get(TYPES.ISceneService);
-    this.mapService = sceneContainer.get(TYPES.IMapService);
-    this.iconService = sceneContainer.get(TYPES.IIconService);
-    this.fontService = sceneContainer.get(TYPES.IFontService);
-    this.controlService = sceneContainer.get(TYPES.IControlService);
-    this.layerService = sceneContainer.get(TYPES.ILayerService);
-    this.debugService = sceneContainer.get(TYPES.IDebugService);
+    this.sceneService = sceneContainer.sceneService;
+    this.mapService = sceneContainer.mapService;
+    this.iconService = sceneContainer.iconService;
+    this.fontService = sceneContainer.fontService;
+    this.controlService = sceneContainer.controlService;
+    this.layerService = sceneContainer.layerService;
+    this.debugService = sceneContainer.debugService;
     this.debugService.setEnable(config.debug);
-    this.markerService = sceneContainer.get(TYPES.IMarkerService);
-    this.interactionService = sceneContainer.get(TYPES.IInteractionService);
-    this.popupService = sceneContainer.get(TYPES.IPopupService);
+    this.markerService = sceneContainer.markerService;
+    this.interactionService = sceneContainer.interactionService;
+    this.popupService = sceneContainer.popupService;
     this.boxSelect = new BoxSelect(this, {});
     this.initComponent(id);
 
@@ -176,29 +180,46 @@ var Scene = /*#__PURE__*/function () {
     value: function setBgColor(color) {
       this.mapService.setBgColor(color);
     }
-
-    // layer 管理
   }, {
     key: "addLayer",
     value: function addLayer(layer) {
       var _this2 = this;
+      if (this.loaded) {
+        this.preAddLayer(layer);
+      } else {
+        console.log('layer not loaded');
+        this.once('loaded', function () {
+          console.log('layer loaded');
+          _this2.preAddLayer(layer);
+        });
+      }
+    }
+
+    // layer 管理
+  }, {
+    key: "preAddLayer",
+    value: function preAddLayer(layer) {
+      var _this3 = this;
       // 为当前图层创建一个容器
       // TODO: 初始化的时候设置 容器
       var layerContainer = createLayerContainer(this.container);
-      layer.setContainer(layerContainer, this.container);
+      layer.setContainer(layerContainer);
       this.sceneService.addLayer(layer);
 
       // mask 在 scene loaded 之后执行
       if (layer.inited) {
+        this.initTileLayer(layer);
         var maskInstance = this.initMask(layer);
         this.addMask(maskInstance, layer.id);
       } else {
         layer.on('inited', function () {
-          var maskInstance = _this2.initMask(layer); // 初始化 mask
-          _this2.addMask(maskInstance, layer.id);
+          _this3.initTileLayer(layer);
+          var maskInstance = _this3.initMask(layer); // 初始化 mask
+          _this3.addMask(maskInstance, layer.id);
         });
       }
     }
+    // 兼容历史接口
   }, {
     key: "initMask",
     value: function initMask(layer) {
@@ -227,7 +248,7 @@ var Scene = /*#__PURE__*/function () {
       var parent = this.getLayer(layerId);
       if (parent) {
         var layerContainer = createLayerContainer(this.container);
-        mask.setContainer(layerContainer, this.container);
+        mask.setContainer(layerContainer);
         parent.addMaskLayer(mask);
         this.sceneService.addMask(mask);
       } else {
@@ -319,12 +340,12 @@ var Scene = /*#__PURE__*/function () {
   }, {
     key: "addIconFonts",
     value: function addIconFonts(options) {
-      var _this3 = this;
+      var _this4 = this;
       options.forEach(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
           name = _ref2[0],
           fontUnicode = _ref2[1];
-        _this3.fontService.addIconFont(name, fontUnicode);
+        _this4.fontService.addIconFont(name, fontUnicode);
       });
     }
     /**
@@ -335,9 +356,9 @@ var Scene = /*#__PURE__*/function () {
   }, {
     key: "addFontFace",
     value: function addFontFace(fontFamily, fontPath) {
-      var _this4 = this;
+      var _this5 = this;
       this.fontService.once('fontloaded', function (e) {
-        _this4.emit('fontloaded', e);
+        _this5.emit('fontloaded', e);
       });
       this.fontService.addFontFace(fontFamily, fontPath);
     }
@@ -601,8 +622,8 @@ var Scene = /*#__PURE__*/function () {
     }
   }, {
     key: "registerPostProcessingPass",
-    value: function registerPostProcessingPass(constructor, name) {
-      this.container.bind(TYPES.IPostProcessingPass).to(constructor).whenTargetNamed(name);
+    value: function registerPostProcessingPass(constructor) {
+      this.container.postProcessingPass.name = new constructor();
     }
 
     // 控制 shader pick 计算
@@ -619,12 +640,12 @@ var Scene = /*#__PURE__*/function () {
   }, {
     key: "enableBoxSelect",
     value: function enableBoxSelect() {
-      var _this5 = this;
+      var _this6 = this;
       var once = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
       this.boxSelect.enable();
       if (once) {
         this.boxSelect.once('selectend', function () {
-          _this5.disableBoxSelect();
+          _this6.disableBoxSelect();
         });
       }
     }
@@ -678,6 +699,14 @@ var Scene = /*#__PURE__*/function () {
         }));
       }
     }
+  }, {
+    key: "initTileLayer",
+    value: function initTileLayer(layer) {
+      if (layer.getSource().isTile) {
+        layer.tileLayer = new TileLayer(layer);
+        // Todo 支持瓦片更新
+      }
+    }
   }], [{
     key: "addProtocol",
     value: function addProtocol(protocol, handler) {

package/lib/index.js

@@ -44,26 +44,22 @@ var Scene = class {
     const sceneContainer = (0, import_l7_core.createSceneContainer)();
     this.container = sceneContainer;
     map.setContainer(sceneContainer, id, canvas);
-    sceneContainer.bind(import_l7_core.TYPES.IRendererService).to(renderer === "regl" ? import_l7_renderer.ReglRendererService : import_l7_renderer.DeviceRendererService).inSingletonScope();
-    this.sceneService = sceneContainer.get(import_l7_core.TYPES.ISceneService);
-    this.mapService = sceneContainer.get(
-      import_l7_core.TYPES.IMapService
-    );
-    this.iconService = sceneContainer.get(import_l7_core.TYPES.IIconService);
-    this.fontService = sceneContainer.get(import_l7_core.TYPES.IFontService);
-    this.controlService = sceneContainer.get(
-      import_l7_core.TYPES.IControlService
-    );
-    this.layerService = sceneContainer.get(import_l7_core.TYPES.ILayerService);
-    this.debugService = sceneContainer.get(import_l7_core.TYPES.IDebugService);
+    if (renderer === "regl") {
+      sceneContainer.rendererService = new import_l7_renderer.ReglRendererService();
+    } else {
+      sceneContainer.rendererService = new import_l7_renderer.DeviceRendererService();
+    }
+    this.sceneService = sceneContainer.sceneService;
+    this.mapService = sceneContainer.mapService;
+    this.iconService = sceneContainer.iconService;
+    this.fontService = sceneContainer.fontService;
+    this.controlService = sceneContainer.controlService;
+    this.layerService = sceneContainer.layerService;
+    this.debugService = sceneContainer.debugService;
     this.debugService.setEnable(config.debug);
-    this.markerService = sceneContainer.get(
-      import_l7_core.TYPES.IMarkerService
-    );
-    this.interactionService = sceneContainer.get(
-      import_l7_core.TYPES.IInteractionService
-    );
-    this.popupService = sceneContainer.get(import_l7_core.TYPES.IPopupService);
+    this.markerService = sceneContainer.markerService;
+    this.interactionService = sceneContainer.interactionService;
+    this.popupService = sceneContainer.popupService;
     this.boxSelect = new import_boxSelect.default(this, {});
     this.initComponent(id);
     this.sceneService.init(config);
@@ -126,21 +122,35 @@ var Scene = class {
   setBgColor(color) {
     this.mapService.setBgColor(color);
   }
-  // layer 管理
   addLayer(layer) {
+    if (this.loaded) {
+      this.preAddLayer(layer);
+    } else {
+      console.log("layer not loaded");
+      this.once("loaded", () => {
+        console.log("layer loaded");
+        this.preAddLayer(layer);
+      });
+    }
+  }
+  // layer 管理
+  preAddLayer(layer) {
     const layerContainer = (0, import_l7_core.createLayerContainer)(this.container);
-    layer.setContainer(layerContainer, this.container);
+    layer.setContainer(layerContainer);
     this.sceneService.addLayer(layer);
     if (layer.inited) {
+      this.initTileLayer(layer);
       const maskInstance = this.initMask(layer);
       this.addMask(maskInstance, layer.id);
     } else {
       layer.on("inited", () => {
+        this.initTileLayer(layer);
         const maskInstance = this.initMask(layer);
         this.addMask(maskInstance, layer.id);
       });
     }
   }
+  // 兼容历史接口
   initMask(layer) {
     const {
       mask,
@@ -164,7 +174,7 @@ var Scene = class {
     const parent = this.getLayer(layerId);
     if (parent) {
       const layerContainer = (0, import_l7_core.createLayerContainer)(this.container);
-      mask.setContainer(layerContainer, this.container);
+      mask.setContainer(layerContainer);
       parent.addMaskLayer(mask);
       this.sceneService.addMask(mask);
     } else {
@@ -377,8 +387,8 @@ var Scene = class {
   destroy() {
     this.sceneService.destroy();
   }
-  registerPostProcessingPass(constructor, name) {
-    this.container.bind(import_l7_core.TYPES.IPostProcessingPass).to(constructor).whenTargetNamed(name);
+  registerPostProcessingPass(constructor) {
+    this.container.postProcessingPass.name = new constructor();
   }
   // 控制 shader pick 计算
   enableShaderPick() {
@@ -434,6 +444,11 @@ var Scene = class {
       this.addControl(new import_l7_component.Logo({ position: logoPosition }));
     }
   }
+  initTileLayer(layer) {
+    if (layer.getSource().isTile) {
+      layer.tileLayer = new import_l7_layers.TileLayer(layer);
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

@@ -1,45 +1,43 @@
 {
   "name": "@antv/l7-scene",
-  "version": "2.20.20",
+  "version": "2.21.0",
   "description": "",
+  "license": "ISC",
+  "author": "xiaoiver",
+  "sideEffects": false,
   "main": "lib/index.js",
   "module": "es/index.js",
   "types": "es/index.d.ts",
-  "sideEffects": false,
   "files": [
     "lib",
     "es",
     "README.md"
   ],
   "scripts": {
-    "tsc": "tsc --project tsconfig.build.json",
-    "clean": "rimraf dist; rimraf es; rimraf lib;",
     "build": "father build",
     "build:cjs": "BABEL_ENV=cjs babel src --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments",
     "build:esm": "BABEL_ENV=esm babel src --root-mode upward --out-dir es --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments",
-    "watch": "BABEL_ENV=cjs babel src --watch --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments",
-    "sync": "tnpm sync"
+    "clean": "rimraf dist; rimraf es; rimraf lib;",
+    "sync": "tnpm sync",
+    "tsc": "tsc --project tsconfig.build.json",
+    "watch": "BABEL_ENV=cjs babel src --watch --root-mode upward --out-dir lib --source-maps --extensions .ts,.tsx --delete-dir-on-start --no-comments"
   },
-  "author": "xiaoiver",
-  "license": "ISC",
   "dependencies": {
-    "@antv/l7-component": "2.20.20",
-    "@antv/l7-core": "2.20.20",
-    "@antv/l7-layers": "2.20.20",
-    "@antv/l7-maps": "2.20.20",
-    "@antv/l7-renderer": "2.20.20",
-    "@antv/l7-utils": "2.20.20",
+    "@antv/l7-component": "2.21.0",
+    "@antv/l7-core": "2.21.0",
+    "@antv/l7-layers": "2.21.0",
+    "@antv/l7-maps": "2.21.0",
+    "@antv/l7-renderer": "2.21.0",
+    "@antv/l7-utils": "2.21.0",
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.7",
-    "inversify": "^5.0.1",
-    "mapbox-gl": "^1.2.1",
-    "reflect-metadata": "^0.1.13"
+    "mapbox-gl": "^1.2.1"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.20.20"
+    "@antv/l7-test-utils": "2.21.0"
   },
-  "gitHead": "1966dbadf9efee8d69d22beb4d89947c158da634",
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "gitHead": "7fa1b00b5262c98bb4cceef4eaf87a7b10af7e29"
 }