@antv/l7-scene 2.9.36 → 2.9.37

package/es/index.d.ts

@@ -42,6 +42,7 @@ declare class Scene implements IPostProcessingPassPluggable, IMapController, ILa
     registerRenderService(render: any): void;
     setBgColor(color: string): void;
     addLayer(layer: ILayer): void;
+    initMask(layer: ILayer): ILayer | undefined;
     addMask(mask: ILayer, layerId: string): void;
     getPickedLayer(): number;
     getLayers(): ILayer[];

package/es/index.js

@@ -141,36 +141,47 @@ var Scene = /*#__PURE__*/function () {
   }, {
     key: "addLayer",
     value: function addLayer(layer) {
+      var _this2 = this;
+
       // 为当前图层创建一个容器
       // TODO: 初始化的时候设置 容器
       var layerContainer = createLayerContainer(this.container);
       layer.setContainer(layerContainer, this.container);
-      this.sceneService.addLayer(layer);
-      var layerConfig = layer.getLayerConfig();
-
-      if (layerConfig) {
-        // 若 layer 未初始化成功，则 layerConfig 为 undefined （scene loaded 尚未执行完成）
-        var mask = layerConfig.mask,
-            maskfence = layerConfig.maskfence,
-            _layerConfig$maskColo = layerConfig.maskColor,
-            maskColor = _layerConfig$maskColo === void 0 ? '#000' : _layerConfig$maskColo,
-            _layerConfig$maskOpac = layerConfig.maskOpacity,
-            maskOpacity = _layerConfig$maskOpac === void 0 ? 0 : _layerConfig$maskOpac;
-
-        if (mask && maskfence) {
-          var maskInstance = new MaskLayer().source(maskfence).shape('fill').style({
-            color: maskColor,
-            opacity: maskOpacity
-          });
-          this.addMask(maskInstance, layer.id);
-        }
+      this.sceneService.addLayer(layer); // mask 在 scene loaded 之后执行
+
+      if (layer.inited) {
+        var maskInstance = this.initMask(layer);
+        this.addMask(maskInstance, layer.id);
       } else {
-        console.warn('addLayer should run after scene loaded!');
+        layer.on('inited', function () {
+          var maskInstance = _this2.initMask(layer);
+
+          _this2.addMask(maskInstance, layer.id);
+        });
       }
     }
+  }, {
+    key: "initMask",
+    value: function initMask(layer) {
+      var _layer$getLayerConfig = layer.getLayerConfig(),
+          mask = _layer$getLayerConfig.mask,
+          maskfence = _layer$getLayerConfig.maskfence,
+          _layer$getLayerConfig2 = _layer$getLayerConfig.maskColor,
+          maskColor = _layer$getLayerConfig2 === void 0 ? '#000' : _layer$getLayerConfig2,
+          _layer$getLayerConfig3 = _layer$getLayerConfig.maskOpacity,
+          maskOpacity = _layer$getLayerConfig3 === void 0 ? 0 : _layer$getLayerConfig3;
+
+      if (!mask) return undefined;
+      var maskInstance = new MaskLayer().source(maskfence).shape('fill').style({
+        color: maskColor,
+        opacity: maskOpacity
+      });
+      return maskInstance;
+    }
   }, {
     key: "addMask",
     value: function addMask(mask, layerId) {
+      if (!mask) return;
       var parent = this.getLayer(layerId);
 
       if (parent) {
@@ -237,14 +248,14 @@ var Scene = /*#__PURE__*/function () {
   }, {
     key: "addIconFonts",
     value: function addIconFonts(options) {
-      var _this2 = this;
+      var _this3 = this;
 
       options.forEach(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
             name = _ref2[0],
             fontUnicode = _ref2[1];
 
-        _this2.fontService.addIconFont(name, fontUnicode);
+        _this3.fontService.addIconFont(name, fontUnicode);
       });
     }
     /**
@@ -256,10 +267,10 @@ var Scene = /*#__PURE__*/function () {
   }, {
     key: "addFontFace",
     value: function addFontFace(fontFamily, fontPath) {
-      var _this3 = this;
+      var _this4 = this;
 
       this.fontService.once('fontloaded', function (e) {
-        _this3.emit('fontloaded', e);
+        _this4.emit('fontloaded', e);
       });
       this.fontService.addFontFace(fontFamily, fontPath);
     }

package/lib/index.js

@@ -105,26 +105,34 @@ var Scene = class {
     const layerContainer = (0, import_l7_core.createLayerContainer)(this.container);
     layer.setContainer(layerContainer, this.container);
     this.sceneService.addLayer(layer);
-    const layerConfig = layer.getLayerConfig();
-    if (layerConfig) {
-      const {
-        mask,
-        maskfence,
-        maskColor = "#000",
-        maskOpacity = 0
-      } = layerConfig;
-      if (mask && maskfence) {
-        const maskInstance = new import_l7_layers.MaskLayer().source(maskfence).shape("fill").style({
-          color: maskColor,
-          opacity: maskOpacity
-        });
-        this.addMask(maskInstance, layer.id);
-      }
+    if (layer.inited) {
+      const maskInstance = this.initMask(layer);
+      this.addMask(maskInstance, layer.id);
     } else {
-      console.warn("addLayer should run after scene loaded!");
+      layer.on("inited", () => {
+        const maskInstance = this.initMask(layer);
+        this.addMask(maskInstance, layer.id);
+      });
     }
   }
+  initMask(layer) {
+    const {
+      mask,
+      maskfence,
+      maskColor = "#000",
+      maskOpacity = 0
+    } = layer.getLayerConfig();
+    if (!mask)
+      return void 0;
+    const maskInstance = new import_l7_layers.MaskLayer().source(maskfence).shape("fill").style({
+      color: maskColor,
+      opacity: maskOpacity
+    });
+    return maskInstance;
+  }
   addMask(mask, layerId) {
+    if (!mask)
+      return;
     const parent = this.getLayer(layerId);
     if (parent) {
       const layerContainer = (0, import_l7_core.createLayerContainer)(this.container);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-scene",
-  "version": "2.9.36",
+  "version": "2.9.37",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -23,21 +23,21 @@
   "author": "xiaoiver",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-component": "2.9.36",
-    "@antv/l7-core": "2.9.36",
-    "@antv/l7-layers": "2.9.36",
-    "@antv/l7-maps": "2.9.36",
-    "@antv/l7-renderer": "2.9.36",
-    "@antv/l7-utils": "2.9.36",
+    "@antv/l7-component": "2.9.37",
+    "@antv/l7-core": "2.9.37",
+    "@antv/l7-layers": "2.9.37",
+    "@antv/l7-maps": "2.9.37",
+    "@antv/l7-renderer": "2.9.37",
+    "@antv/l7-utils": "2.9.37",
     "@babel/runtime": "^7.7.7",
     "inversify": "^5.0.1",
     "mapbox-gl": "^1.2.1",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.9.36"
+    "@antv/l7-test-utils": "2.9.37"
   },
-  "gitHead": "31c164f88bfa31eeed98c0b074236493b0b2f78b",
+  "gitHead": "18d479150376cbcb0d616f921036173460293c38",
   "publishConfig": {
     "access": "public"
   }