@antv/l7-scene 2.15.2 → 2.15.3

package/es/boxSelect.js

@@ -5,61 +5,41 @@ 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";
-
 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); }; }
-
 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, getBBoxFromPoints } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
 export var BoxSelectEventList = ['selectstart', 'selecting', 'selectend'];
-
 // TODO: 将 BoxSelect 模块放在哪里比较合适
 var BoxSelect = /*#__PURE__*/function (_EventEmitter) {
   _inherits(BoxSelect, _EventEmitter);
-
   var _super = _createSuper(BoxSelect);
-
   function BoxSelect(scene) {
     var _this;
-
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
     _classCallCheck(this, BoxSelect);
-
     _this = _super.call(this);
-
     _defineProperty(_assertThisInitialized(_this), "isEnable", false);
-
     _defineProperty(_assertThisInitialized(_this), "onDragStart", function (e) {
       _this.box.style.display = 'block';
       _this.startEvent = _this.endEvent = e;
-
       _this.syncBoxBound();
-
       _this.emit('selectstart', _this.getLngLatBox(), _this.startEvent, _this.endEvent);
     });
-
     _defineProperty(_assertThisInitialized(_this), "onDragging", function (e) {
       _this.endEvent = e;
-
       _this.syncBoxBound();
-
       _this.emit('selecting', _this.getLngLatBox(), _this.startEvent, _this.endEvent);
     });
-
     _defineProperty(_assertThisInitialized(_this), "onDragEnd", function (e) {
       _this.endEvent = e;
       _this.box.style.display = 'none';
-
       _this.emit('selectend', _this.getLngLatBox(), _this.startEvent, _this.endEvent);
     });
-
     _this.scene = scene;
     _this.options = options;
     return _this;
   }
-
   _createClass(BoxSelect, [{
     key: "container",
     get: function get() {
@@ -71,25 +51,20 @@ var BoxSelect = /*#__PURE__*/function (_EventEmitter) {
       if (this.isEnable) {
         return;
       }
-
       var className = this.options.className;
       this.scene.setMapStatus({
         dragEnable: false
       });
       this.container.style.cursor = 'crosshair';
-
       if (!this.box) {
         var box = DOM.create('div', undefined, this.container);
         box.classList.add('l7-select-box');
-
         if (className) {
           box.classList.add(className);
         }
-
         box.style.display = 'none';
         this.box = box;
       }
-
       this.scene.on('dragstart', this.onDragStart);
       this.scene.on('dragging', this.onDragging);
       this.scene.on('dragend', this.onDragEnd);
@@ -101,7 +76,6 @@ var BoxSelect = /*#__PURE__*/function (_EventEmitter) {
       if (!this.isEnable) {
         return;
       }
-
       this.scene.setMapStatus({
         dragEnable: true
       });
@@ -115,11 +89,11 @@ var BoxSelect = /*#__PURE__*/function (_EventEmitter) {
     key: "syncBoxBound",
     value: function syncBoxBound() {
       var _this$startEvent = this.startEvent,
-          x1 = _this$startEvent.x,
-          y1 = _this$startEvent.y;
+        x1 = _this$startEvent.x,
+        y1 = _this$startEvent.y;
       var _this$endEvent = this.endEvent,
-          x2 = _this$endEvent.x,
-          y2 = _this$endEvent.y;
+        x2 = _this$endEvent.x,
+        y2 = _this$endEvent.y;
       var left = Math.min(x1, x2);
       var top = Math.min(y1, y2);
       var width = Math.abs(x1 - x2);
@@ -133,16 +107,14 @@ var BoxSelect = /*#__PURE__*/function (_EventEmitter) {
     key: "getLngLatBox",
     value: function getLngLatBox() {
       var _this$startEvent$lngL = this.startEvent.lngLat,
-          lng1 = _this$startEvent$lngL.lng,
-          lat1 = _this$startEvent$lngL.lat;
+        lng1 = _this$startEvent$lngL.lng,
+        lat1 = _this$startEvent$lngL.lat;
       var _this$endEvent$lngLat = this.endEvent.lngLat,
-          lng2 = _this$endEvent$lngLat.lng,
-          lat2 = _this$endEvent$lngLat.lat;
+        lng2 = _this$endEvent$lngLat.lng,
+        lat2 = _this$endEvent$lngLat.lat;
       return getBBoxFromPoints([[lng1, lat1], [lng2, lat2]]);
     }
   }]);
-
   return BoxSelect;
 }(EventEmitter);
-
 export { BoxSelect as default };

package/es/index.js

@@ -10,7 +10,6 @@ import { MaskLayer } from '@antv/l7-layers';
 import { ReglRendererService } from '@antv/l7-renderer';
 import { DOM, isMini, setMiniScene } from '@antv/l7-utils';
 import BoxSelect, { BoxSelectEventList } from "./boxSelect";
-
 /**
  * 暴露 Scene API
  *
@@ -26,19 +25,20 @@ import BoxSelect, { BoxSelectEventList } from "./boxSelect";
 var Scene = /*#__PURE__*/function () {
   function Scene(config) {
     _classCallCheck(this, Scene);
-
     var id = config.id,
-        map = config.map,
-        canvas = config.canvas,
-        hasBaseMap = config.hasBaseMap; // 创建场景容器
-
+      map = config.map,
+      canvas = config.canvas,
+      hasBaseMap = config.hasBaseMap;
+    // 创建场景容器
     var sceneContainer = createSceneContainer();
-    this.container = sceneContainer; // 绑定地图服务
-
-    map.setContainer(sceneContainer, id, canvas, hasBaseMap); // 绑定渲染引擎服务
+    this.container = sceneContainer;
+    // 绑定地图服务
+    map.setContainer(sceneContainer, id, canvas, hasBaseMap);
 
-    sceneContainer.bind(TYPES.IRendererService).to(ReglRendererService).inSingletonScope(); // 依赖注入
+    // 绑定渲染引擎服务
+    sceneContainer.bind(TYPES.IRendererService).to(ReglRendererService).inSingletonScope();
 
+    // 依赖注入
     this.sceneService = sceneContainer.get(TYPES.ISceneService);
     this.mapService = sceneContainer.get(TYPES.IMapService);
     this.iconService = sceneContainer.get(TYPES.IIconService);
@@ -52,18 +52,18 @@ var Scene = /*#__PURE__*/function () {
     this.popupService = sceneContainer.get(TYPES.IPopupService);
     this.boxSelect = new BoxSelect(this, {});
     setMiniScene((config === null || config === void 0 ? void 0 : config.isMini) || false);
-
     if (isMini) {
       this.sceneService.initMiniScene(config);
     } else {
-      this.initComponent(id); // 初始化 scene
+      this.initComponent(id);
 
-      this.sceneService.init(config); // TODO: 初始化组件
+      // 初始化 scene
+      this.sceneService.init(config);
+      // TODO: 初始化组件
 
       this.initControl();
     }
   }
-
   _createClass(Scene, [{
     key: "map",
     get: function get() {
@@ -114,11 +114,11 @@ var Scene = /*#__PURE__*/function () {
     value: function getMapService() {
       return this.mapService;
     }
+
     /**
      * 对外暴露 debugService
      * @returns
      */
-
   }, {
     key: "getDebugService",
     value: function getDebugService() {
@@ -129,23 +129,18 @@ var Scene = /*#__PURE__*/function () {
     value: function () {
       var _exportPng = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(type) {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                return _context.abrupt("return", this.sceneService.exportPng(type));
-
-              case 1:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              return _context.abrupt("return", this.sceneService.exportPng(type));
+            case 1:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function exportPng(_x) {
         return _exportPng.apply(this, arguments);
       }
-
       return exportPng;
     }()
   }, {
@@ -153,30 +148,24 @@ var Scene = /*#__PURE__*/function () {
     value: function () {
       var _exportMap = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(type) {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                return _context2.abrupt("return", this.sceneService.exportPng(type));
-
-              case 1:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              return _context2.abrupt("return", this.sceneService.exportPng(type));
+            case 1:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
-
       function exportMap(_x2) {
         return _exportMap.apply(this, arguments);
       }
-
       return exportMap;
     }()
   }, {
     key: "registerRenderService",
     value: function registerRenderService(render) {
       var _this = this;
-
       if (this.sceneService.loaded) {
         var renderSerivce = new render(this);
         renderSerivce.init();
@@ -191,27 +180,26 @@ var Scene = /*#__PURE__*/function () {
     key: "setBgColor",
     value: function setBgColor(color) {
       this.mapService.setBgColor(color);
-    } // layer 管理
+    }
 
+    // layer 管理
   }, {
     key: "addLayer",
     value: function addLayer(layer) {
       var _this2 = this;
-
       // 为当前图层创建一个容器
       // TODO: 初始化的时候设置 容器
       var layerContainer = createLayerContainer(this.container);
       layer.setContainer(layerContainer, this.container);
-      this.sceneService.addLayer(layer); // mask 在 scene loaded 之后执行
+      this.sceneService.addLayer(layer);
 
+      // mask 在 scene loaded 之后执行
       if (layer.inited) {
         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);
         });
       }
@@ -220,17 +208,15 @@ var Scene = /*#__PURE__*/function () {
     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;
-
+        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 || !maskfence) {
         return undefined;
       }
-
       var maskInstance = new MaskLayer().source(maskfence).shape('fill').style({
         color: maskColor,
         opacity: maskOpacity
@@ -243,9 +229,7 @@ var Scene = /*#__PURE__*/function () {
       if (!mask) {
         return;
       }
-
       var parent = this.getLayer(layerId);
-
       if (parent) {
         var layerContainer = createLayerContainer(this.container);
         mask.setContainer(layerContainer, this.container);
@@ -280,24 +264,19 @@ var Scene = /*#__PURE__*/function () {
     value: function () {
       var _removeLayer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(layer, parentLayer) {
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                _context3.next = 2;
-                return this.layerService.remove(layer, parentLayer);
-
-              case 2:
-              case "end":
-                return _context3.stop();
-            }
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.next = 2;
+              return this.layerService.remove(layer, parentLayer);
+            case 2:
+            case "end":
+              return _context3.stop();
           }
         }, _callee3, this);
       }));
-
       function removeLayer(_x3, _x4) {
         return _removeLayer.apply(this, arguments);
       }
-
       return removeLayer;
     }()
   }, {
@@ -305,24 +284,19 @@ var Scene = /*#__PURE__*/function () {
     value: function () {
       var _removeAllLayer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _context4.next = 2;
-                return this.layerService.removeAllLayers();
-
-              case 2:
-              case "end":
-                return _context4.stop();
-            }
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return this.layerService.removeAllLayers();
+            case 2:
+            case "end":
+              return _context4.stop();
           }
         }, _callee4, this);
       }));
-
       function removeAllLayer() {
         return _removeAllLayer.apply(this, arguments);
       }
-
       return removeAllLayer;
     }()
   }, {
@@ -334,14 +308,14 @@ var Scene = /*#__PURE__*/function () {
     key: "setEnableRender",
     value: function setEnableRender(flag) {
       this.layerService.setEnableRender(flag);
-    } // asset method
+    }
 
+    // asset method
     /**
      * 为 layer/point/text 支持 iconfont 模式支持
      * @param fontUnicode
      * @param name
      */
-
   }, {
     key: "addIconFont",
     value: function addIconFont(name, fontUnicode) {
@@ -351,12 +325,10 @@ var Scene = /*#__PURE__*/function () {
     key: "addIconFonts",
     value: function addIconFonts(options) {
       var _this3 = this;
-
       options.forEach(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
-            name = _ref2[0],
-            fontUnicode = _ref2[1];
-
+          name = _ref2[0],
+          fontUnicode = _ref2[1];
         _this3.fontService.addIconFont(name, fontUnicode);
       });
     }
@@ -365,12 +337,10 @@ var Scene = /*#__PURE__*/function () {
      * @param fontFamily
      * @param fontPath
      */
-
   }, {
     key: "addFontFace",
     value: function addFontFace(fontFamily, fontPath) {
       var _this4 = this;
-
       this.fontService.once('fontloaded', function (e) {
         _this4.emit('fontloaded', e);
       });
@@ -381,36 +351,28 @@ var Scene = /*#__PURE__*/function () {
     value: function () {
       var _addImage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(id, img) {
         return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-          while (1) {
-            switch (_context5.prev = _context5.next) {
-              case 0:
-                if (isMini) {
-                  _context5.next = 5;
-                  break;
-                }
-
-                _context5.next = 3;
-                return this.iconService.addImage(id, img);
-
-              case 3:
-                _context5.next = 6;
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              if (isMini) {
+                _context5.next = 5;
                 break;
-
-              case 5:
-                this.iconService.addImageMini(id, img, this.sceneService);
-
-              case 6:
-              case "end":
-                return _context5.stop();
-            }
+              }
+              _context5.next = 3;
+              return this.iconService.addImage(id, img);
+            case 3:
+              _context5.next = 6;
+              break;
+            case 5:
+              this.iconService.addImageMini(id, img, this.sceneService);
+            case 6:
+            case "end":
+              return _context5.stop();
           }
         }, _callee5, this);
       }));
-
       function addImage(_x5, _x6) {
         return _addImage.apply(this, arguments);
       }
-
       return addImage;
     }()
   }, {
@@ -427,8 +389,9 @@ var Scene = /*#__PURE__*/function () {
     key: "addIconFontGlyphs",
     value: function addIconFontGlyphs(fontFamily, glyphs) {
       this.fontService.addIconGlyphs(glyphs);
-    } // map control method
+    }
 
+    // map control method
   }, {
     key: "addControl",
     value: function addControl(ctr) {
@@ -443,8 +406,9 @@ var Scene = /*#__PURE__*/function () {
     key: "getControlByName",
     value: function getControlByName(name) {
       return this.controlService.getControlByName(name);
-    } // marker
+    }
 
+    // marker
   }, {
     key: "addMarker",
     value: function addMarker(marker) {
@@ -480,7 +444,6 @@ var Scene = /*#__PURE__*/function () {
     value: function on(type, handle) {
       if (BoxSelectEventList.includes(type)) {
         var _this$boxSelect;
-
         (_this$boxSelect = this.boxSelect) === null || _this$boxSelect === void 0 ? void 0 : _this$boxSelect.on(type, handle);
       } else if (SceneEventList.includes(type)) {
         this.sceneService.on(type, handle);
@@ -493,7 +456,6 @@ var Scene = /*#__PURE__*/function () {
     value: function once(type, handle) {
       if (BoxSelectEventList.includes(type)) {
         var _this$boxSelect2;
-
         (_this$boxSelect2 = this.boxSelect) === null || _this$boxSelect2 === void 0 ? void 0 : _this$boxSelect2.once(type, handle);
       } else if (SceneEventList.includes(type)) {
         this.sceneService.once(type, handle);
@@ -511,15 +473,15 @@ var Scene = /*#__PURE__*/function () {
     value: function off(type, handle) {
       if (BoxSelectEventList.includes(type)) {
         var _this$boxSelect3;
-
         (_this$boxSelect3 = this.boxSelect) === null || _this$boxSelect3 === void 0 ? void 0 : _this$boxSelect3.off(type, handle);
       } else if (SceneEventList.includes(type)) {
         this.sceneService.off(type, handle);
       } else {
         this.mapService.off(type, handle);
       }
-    } // implements IMapController
+    }
 
+    // implements IMapController
   }, {
     key: "getZoom",
     value: function getZoom() {
@@ -594,10 +556,10 @@ var Scene = /*#__PURE__*/function () {
     key: "fitBounds",
     value: function fitBounds(bound, options) {
       var _this$sceneService$ge = this.sceneService.getSceneConfig(),
-          fitBoundsOptions = _this$sceneService$ge.fitBoundsOptions,
-          animate = _this$sceneService$ge.animate;
-
-      this.mapService.fitBounds(bound, // 选项优先级：用户传入，覆盖animate直接配置，覆盖Scene配置项传入
+        fitBoundsOptions = _this$sceneService$ge.fitBoundsOptions,
+        animate = _this$sceneService$ge.animate;
+      this.mapService.fitBounds(bound,
+      // 选项优先级：用户传入，覆盖animate直接配置，覆盖Scene配置项传入
       options || _objectSpread(_objectSpread({}, fitBoundsOptions), {}, {
         animate: animate
       }));
@@ -616,8 +578,9 @@ var Scene = /*#__PURE__*/function () {
     key: "setMapStatus",
     value: function setMapStatus(options) {
       this.mapService.setMapStatus(options);
-    } // conversion Method
+    }
 
+    // conversion Method
   }, {
     key: "pixelToLngLat",
     value: function pixelToLngLat(pixel) {
@@ -641,14 +604,16 @@ var Scene = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function destroy() {
-      this.sceneService.destroy(); // TODO: 清理其他 Service 例如 IconService
+      this.sceneService.destroy();
+      // TODO: 清理其他 Service 例如 IconService
     }
   }, {
     key: "registerPostProcessingPass",
     value: function registerPostProcessingPass(constructor, name) {
       this.container.bind(TYPES.IPostProcessingPass).to(constructor).whenTargetNamed(name);
-    } // 控制 shader pick 计算
+    }
 
+    // 控制 shader pick 计算
   }, {
     key: "enableShaderPick",
     value: function enableShaderPick() {
@@ -663,10 +628,8 @@ var Scene = /*#__PURE__*/function () {
     key: "enableBoxSelect",
     value: function enableBoxSelect() {
       var _this5 = this;
-
       var once = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
       this.boxSelect.enable();
-
       if (once) {
         this.boxSelect.once('selectend', function () {
           _this5.disableBoxSelect();
@@ -677,8 +640,9 @@ var Scene = /*#__PURE__*/function () {
     key: "disableBoxSelect",
     value: function disableBoxSelect() {
       this.boxSelect.disable();
-    } // get current point size info
+    }
 
+    // get current point size info
   }, {
     key: "getPointSizeRange",
     value: function getPointSizeRange() {
@@ -697,9 +661,8 @@ var Scene = /*#__PURE__*/function () {
     key: "initControl",
     value: function initControl() {
       var _this$sceneService$ge2 = this.sceneService.getSceneConfig(),
-          logoVisible = _this$sceneService$ge2.logoVisible,
-          logoPosition = _this$sceneService$ge2.logoPosition;
-
+        logoVisible = _this$sceneService$ge2.logoVisible,
+        logoPosition = _this$sceneService$ge2.logoPosition;
       if (logoVisible) {
         this.addControl(new Logo({
           position: logoPosition
@@ -707,8 +670,6 @@ var Scene = /*#__PURE__*/function () {
       }
     }
   }]);
-
   return Scene;
 }();
-
 export { Scene };

package/lib/boxSelect.js

@@ -34,7 +34,12 @@ var BoxSelect = class extends import_eventemitter3.EventEmitter {
       this.box.style.display = "block";
       this.startEvent = this.endEvent = e;
       this.syncBoxBound();
-      this.emit("selectstart", this.getLngLatBox(), this.startEvent, this.endEvent);
+      this.emit(
+        "selectstart",
+        this.getLngLatBox(),
+        this.startEvent,
+        this.endEvent
+      );
     };
     this.onDragging = (e) => {
       this.endEvent = e;
@@ -62,7 +67,11 @@ var BoxSelect = class extends import_eventemitter3.EventEmitter {
     });
     this.container.style.cursor = "crosshair";
     if (!this.box) {
-      const box = import_l7_utils.DOM.create("div", void 0, this.container);
+      const box = import_l7_utils.DOM.create(
+        "div",
+        void 0,
+        this.container
+      );
       box.classList.add("l7-select-box");
       if (className) {
         box.classList.add(className);

package/lib/index.js

@@ -16,7 +16,14 @@ 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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -39,15 +46,23 @@ var Scene = class {
     map.setContainer(sceneContainer, id, canvas, hasBaseMap);
     sceneContainer.bind(import_l7_core.TYPES.IRendererService).to(import_l7_renderer.ReglRendererService).inSingletonScope();
     this.sceneService = sceneContainer.get(import_l7_core.TYPES.ISceneService);
-    this.mapService = sceneContainer.get(import_l7_core.TYPES.IMapService);
+    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.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);
     this.debugService.setEnable(config.debug);
-    this.markerService = sceneContainer.get(import_l7_core.TYPES.IMarkerService);
-    this.interactionService = sceneContainer.get(import_l7_core.TYPES.IInteractionService);
+    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, {});
     (0, import_l7_utils.setMiniScene)((config == null ? void 0 : config.isMini) || false);
@@ -89,6 +104,10 @@ var Scene = class {
   getMapService() {
     return this.mapService;
   }
+  /**
+   * 对外暴露 debugService
+   * @returns
+   */
   getDebugService() {
     return this.debugService;
   }
@@ -112,6 +131,7 @@ var Scene = class {
   setBgColor(color) {
     this.mapService.setBgColor(color);
   }
+  // layer 管理
   addLayer(layer) {
     const layerContainer = (0, import_l7_core.createLayerContainer)(this.container);
     layer.setContainer(layerContainer, this.container);
@@ -180,6 +200,12 @@ var Scene = class {
   setEnableRender(flag) {
     this.layerService.setEnableRender(flag);
   }
+  // asset method
+  /**
+   * 为 layer/point/text 支持 iconfont 模式支持
+   * @param fontUnicode
+   * @param name
+   */
   addIconFont(name, fontUnicode) {
     this.fontService.addIconFont(name, fontUnicode);
   }
@@ -188,6 +214,11 @@ var Scene = class {
       this.fontService.addIconFont(name, fontUnicode);
     });
   }
+  /**
+   * 用户自定义添加第三方字体
+   * @param fontFamily
+   * @param fontPath
+   */
   addFontFace(fontFamily, fontPath) {
     this.fontService.once("fontloaded", (e) => {
       this.emit("fontloaded", e);
@@ -210,6 +241,7 @@ var Scene = class {
   addIconFontGlyphs(fontFamily, glyphs) {
     this.fontService.addIconGlyphs(glyphs);
   }
+  // map control method
   addControl(ctr) {
     this.controlService.addControl(ctr, this.container);
   }
@@ -219,6 +251,7 @@ var Scene = class {
   getControlByName(name) {
     return this.controlService.getControlByName(name);
   }
+  // marker
   addMarker(marker) {
     this.markerService.addMarker(marker);
   }
@@ -270,6 +303,7 @@ var Scene = class {
       this.mapService.off(type, handle);
     }
   }
+  // implements IMapController
   getZoom() {
     return this.mapService.getZoom();
   }
@@ -314,10 +348,14 @@ var Scene = class {
   }
   fitBounds(bound, options) {
     const { fitBoundsOptions, animate } = this.sceneService.getSceneConfig();
-    this.mapService.fitBounds(bound, options || {
-      ...fitBoundsOptions,
-      animate
-    });
+    this.mapService.fitBounds(
+      bound,
+      // 选项优先级：用户传入，覆盖animate直接配置，覆盖Scene配置项传入
+      options || {
+        ...fitBoundsOptions,
+        animate
+      }
+    );
   }
   setZoomAndCenter(zoom, center) {
     this.mapService.setZoomAndCenter(zoom, center);
@@ -328,6 +366,7 @@ var Scene = class {
   setMapStatus(options) {
     this.mapService.setMapStatus(options);
   }
+  // conversion Method
   pixelToLngLat(pixel) {
     return this.mapService.pixelToLngLat(pixel);
   }
@@ -346,6 +385,7 @@ var Scene = class {
   registerPostProcessingPass(constructor, name) {
     this.container.bind(import_l7_core.TYPES.IPostProcessingPass).to(constructor).whenTargetNamed(name);
   }
+  // 控制 shader pick 计算
   enableShaderPick() {
     this.layerService.enableShaderPick();
   }
@@ -363,13 +403,17 @@ var Scene = class {
   disableBoxSelect() {
     this.boxSelect.disable();
   }
+  // get current point size info
   getPointSizeRange() {
     return this.sceneService.getPointSizeRange();
   }
   initComponent(id) {
-    this.controlService.init({
-      container: import_l7_utils.DOM.getContainer(id)
-    }, this.container);
+    this.controlService.init(
+      {
+        container: import_l7_utils.DOM.getContainer(id)
+      },
+      this.container
+    );
     this.markerService.init(this.container);
     this.popupService.init(this.container);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-scene",
-  "version": "2.15.2",
+  "version": "2.15.3",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -23,12 +23,12 @@
   "author": "xiaoiver",
   "license": "ISC",
   "dependencies": {
-    "@antv/l7-component": "2.15.2",
-    "@antv/l7-core": "2.15.2",
-    "@antv/l7-layers": "2.15.2",
-    "@antv/l7-maps": "2.15.2",
-    "@antv/l7-renderer": "2.15.2",
-    "@antv/l7-utils": "2.15.2",
+    "@antv/l7-component": "2.15.3",
+    "@antv/l7-core": "2.15.3",
+    "@antv/l7-layers": "2.15.3",
+    "@antv/l7-maps": "2.15.3",
+    "@antv/l7-renderer": "2.15.3",
+    "@antv/l7-utils": "2.15.3",
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.7",
     "inversify": "^5.0.1",
@@ -36,9 +36,9 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.15.2"
+    "@antv/l7-test-utils": "2.15.3"
   },
-  "gitHead": "89b84277323240e51f75d4e486072b8bb17b0c93",
+  "gitHead": "615a788e45363d5f811d318e02e5959a1583a4cf",
   "publishConfig": {
     "access": "public"
   }