@antv/l7-scene 2.9.36-alpha.1 → 2.9.37-alpha.1

package/es/boxSelect.js

@@ -10,12 +10,11 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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 { DOM } from '@antv/l7-utils';
+import { DOM, getBBoxFromPoints } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
-import bbox from '@turf/bbox';
-import { featureCollection, lineString } from '@turf/helpers';
 export var BoxSelectEventList = ['selectstart', 'selecting', 'selectend'];
 
+// TODO: 将 BoxSelect 模块放在哪里比较合适
 var BoxSelect = /*#__PURE__*/function (_EventEmitter) {
   _inherits(BoxSelect, _EventEmitter);
 
@@ -139,7 +138,7 @@ var BoxSelect = /*#__PURE__*/function (_EventEmitter) {
       var _this$endEvent$lngLat = this.endEvent.lngLat,
           lng2 = _this$endEvent$lngLat.lng,
           lat2 = _this$endEvent$lngLat.lat;
-      return bbox(featureCollection([lineString([[lng1, lat1], [lng2, lat2]])]));
+      return getBBoxFromPoints([[lng1, lat1], [lng2, lat2]]);
     }
   }]);
 

package/es/index.d.ts

@@ -43,6 +43,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

@@ -46,9 +46,7 @@ var Scene = /*#__PURE__*/function () {
     this.markerService = sceneContainer.get(TYPES.IMarkerService);
     this.interactionService = sceneContainer.get(TYPES.IInteractionService);
     this.popupService = sceneContainer.get(TYPES.IPopupService);
-    this.boxSelect = new BoxSelect(this, {
-      className: config.selectBoxClassName
-    });
+    this.boxSelect = new BoxSelect(this, {});
 
     if (isMini) {
       this.sceneService.initMiniScene(config);
@@ -145,36 +143,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) {
@@ -241,14 +250,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);
       });
     }
     /**
@@ -260,10 +269,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);
     }
@@ -525,14 +534,14 @@ var Scene = /*#__PURE__*/function () {
   }, {
     key: "enableBoxSelect",
     value: function enableBoxSelect() {
-      var _this4 = this;
+      var _this5 = this;
 
       var once = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
       this.boxSelect.enable();
 
       if (once) {
         this.boxSelect.once('selectend', function () {
-          _this4.disableBoxSelect();
+          _this5.disableBoxSelect();
         });
       }
     }

package/lib/boxSelect.js

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,7 +14,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/boxSelect.ts
@@ -28,8 +25,6 @@ __export(boxSelect_exports, {
 module.exports = __toCommonJS(boxSelect_exports);
 var import_l7_utils = require("@antv/l7-utils");
 var import_eventemitter3 = require("eventemitter3");
-var import_bbox = __toESM(require("@turf/bbox"));
-var import_helpers = require("@turf/helpers");
 var BoxSelectEventList = ["selectstart", "selecting", "selectend"];
 var BoxSelect = class extends import_eventemitter3.EventEmitter {
   constructor(scene, options = {}) {
@@ -112,12 +107,10 @@ var BoxSelect = class extends import_eventemitter3.EventEmitter {
     const {
       lngLat: { lng: lng2, lat: lat2 }
     } = this.endEvent;
-    return (0, import_bbox.default)((0, import_helpers.featureCollection)([
-      (0, import_helpers.lineString)([
-        [lng1, lat1],
-        [lng2, lat2]
-      ])
-    ]));
+    return (0, import_l7_utils.getBBoxFromPoints)([
+      [lng1, lat1],
+      [lng2, lat2]
+    ]);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/index.js

@@ -47,9 +47,7 @@ var Scene = class {
     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.boxSelect = new import_boxSelect.default(this, {
-      className: config.selectBoxClassName
-    });
+    this.boxSelect = new import_boxSelect.default(this, {});
     if (import_l7_utils.isMini) {
       this.sceneService.initMiniScene(config);
     } else {
@@ -112,26 +110,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-alpha.1",
+  "version": "2.9.37-alpha.1",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -23,23 +23,22 @@
   "author": "xiaoiver",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-component": "2.9.36-alpha.1",
-    "@antv/l7-core": "2.9.36-alpha.1",
-    "@antv/l7-layers": "2.9.36-alpha.1",
-    "@antv/l7-maps": "2.9.36-alpha.1",
-    "@antv/l7-renderer": "2.9.36-alpha.1",
-    "@antv/l7-utils": "2.9.36-alpha.1",
+    "@antv/l7-component": "2.9.37-alpha.1",
+    "@antv/l7-core": "2.9.37-alpha.1",
+    "@antv/l7-layers": "2.9.37-alpha.1",
+    "@antv/l7-maps": "2.9.37-alpha.1",
+    "@antv/l7-renderer": "2.9.37-alpha.1",
+    "@antv/l7-utils": "2.9.37-alpha.1",
     "@babel/runtime": "^7.7.7",
-    "@turf/turf": "^6.5.0",
     "eventemitter3": "^4.0.7",
     "inversify": "^5.0.1",
     "mapbox-gl": "^1.2.1",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.9.36-alpha.1"
+    "@antv/l7-test-utils": "2.9.37-alpha.1"
   },
-  "gitHead": "dafb82e5eb2cf73db95d8dbdcef63d4ad5f99554",
+  "gitHead": "6ac153816c5f28967f71888c2a3e9684eb6e7be8",
   "publishConfig": {
     "access": "public"
   }