@antv/l7-component 2.21.0 → 2.21.2

package/es/control/exportImage.js

@@ -1,156 +1,73 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 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";
-import _get from "@babel/runtime/helpers/esm/get";
-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); }; }
-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 { createL7Icon } from "../utils/icon";
 import ButtonControl from "./baseControl/buttonControl";
 export { ExportImage };
-var ExportImage = /*#__PURE__*/function (_ButtonControl) {
-  _inherits(ExportImage, _ButtonControl);
-  var _super = _createSuper(ExportImage);
-  function ExportImage() {
+export default class ExportImage extends ButtonControl {
+  constructor(...args) {
     var _this;
-    _classCallCheck(this, ExportImage);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    _defineProperty(_assertThisInitialized(_this), "onClick", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var onExport;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            onExport = _this.controlOption.onExport;
-            _context.t0 = onExport === null || onExport === void 0;
-            if (_context.t0) {
-              _context.next = 8;
-              break;
-            }
-            _context.t1 = onExport;
-            _context.next = 6;
-            return _this.getImage();
-          case 6:
-            _context.t2 = _context.sent;
-            (0, _context.t1)(_context.t2);
-          case 8:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    })));
+    super(...args);
+    _this = this;
+    _defineProperty(this, "onClick", /*#__PURE__*/_asyncToGenerator(function* () {
+      const {
+        onExport
+      } = _this.controlOption;
+      onExport === null || onExport === void 0 || onExport(yield _this.getImage());
+    }));
     /**
      * 将多张图片合并为一张图片
      * @protected
      * @param base64List
      */
-    _defineProperty(_assertThisInitialized(_this), "mergeImage", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    _defineProperty(this, "mergeImage", /*#__PURE__*/_asyncToGenerator(function* (...base64List) {
       var _this$mapsService$get, _this$mapsService$get2;
-      var imageType,
-        _ref3,
-        _ref3$width,
-        width,
-        _ref3$height,
-        height,
-        canvas,
-        context,
-        _len2,
-        base64List,
-        _key2,
-        imgList,
-        _args2 = arguments;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            imageType = _this.controlOption.imageType;
-            _ref3 = (_this$mapsService$get = (_this$mapsService$get2 = _this.mapsService.getContainer()) === null || _this$mapsService$get2 === void 0 ? void 0 : _this$mapsService$get2.getBoundingClientRect()) !== null && _this$mapsService$get !== void 0 ? _this$mapsService$get : {}, _ref3$width = _ref3.width, width = _ref3$width === void 0 ? 0 : _ref3$width, _ref3$height = _ref3.height, height = _ref3$height === void 0 ? 0 : _ref3$height;
-            canvas = document.createElement('canvas');
-            canvas.width = width;
-            canvas.height = height;
-            context = canvas.getContext('2d');
-            for (_len2 = _args2.length, base64List = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-              base64List[_key2] = _args2[_key2];
-            }
-            _context2.next = 9;
-            return Promise.all(base64List.map(function (base64) {
-              return new Promise(function (resolve) {
-                var img = new Image();
-                img.onload = function () {
-                  resolve(img);
-                };
-                img.src = base64;
-              });
-            }));
-          case 9:
-            imgList = _context2.sent;
-            imgList.forEach(function (img) {
-              context === null || context === void 0 || context.drawImage(img, 0, 0, width, height);
-            });
-            return _context2.abrupt("return", canvas.toDataURL("image/".concat(imageType)));
-          case 12:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    })));
-    return _this;
-  }
-  _createClass(ExportImage, [{
-    key: "onAdd",
-    value: function onAdd() {
-      var button = _get(_getPrototypeOf(ExportImage.prototype), "onAdd", this).call(this);
-      button.addEventListener('click', this.onClick);
-      return button;
-    }
-  }, {
-    key: "getDefault",
-    value: function getDefault(option) {
-      return _objectSpread(_objectSpread({}, _get(_getPrototypeOf(ExportImage.prototype), "getDefault", this).call(this, option)), {}, {
-        title: '导出图片',
-        btnIcon: createL7Icon('l7-icon-export-picture'),
-        imageType: 'png'
-      });
-    }
-  }, {
-    key: "getImage",
-    value: function () {
-      var _getImage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        var mapImage, layerImage;
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.next = 2;
-              return this.mapsService.exportMap('png');
-            case 2:
-              mapImage = _context3.sent;
-              _context3.next = 5;
-              return this.scene.exportPng('png');
-            case 5:
-              layerImage = _context3.sent;
-              return _context3.abrupt("return", this.mergeImage.apply(this, _toConsumableArray([mapImage, layerImage].filter(function (base64) {
-                return base64;
-              }))));
-            case 7:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
+      const {
+        imageType
+      } = _this.controlOption;
+      const {
+        width = 0,
+        height = 0
+      } = (_this$mapsService$get = (_this$mapsService$get2 = _this.mapsService.getContainer()) === null || _this$mapsService$get2 === void 0 ? void 0 : _this$mapsService$get2.getBoundingClientRect()) !== null && _this$mapsService$get !== void 0 ? _this$mapsService$get : {};
+      const canvas = document.createElement('canvas');
+      canvas.width = width;
+      canvas.height = height;
+      const context = canvas.getContext('2d');
+      const imgList = yield Promise.all(base64List.map(base64 => {
+        return new Promise(resolve => {
+          const img = new Image();
+          img.onload = () => {
+            resolve(img);
+          };
+          img.src = base64;
+        });
       }));
-      function getImage() {
-        return _getImage.apply(this, arguments);
-      }
-      return getImage;
-    }()
-  }]);
-  return ExportImage;
-}(ButtonControl);
-export { ExportImage as default };
+      imgList.forEach(img => {
+        context === null || context === void 0 || context.drawImage(img, 0, 0, width, height);
+      });
+      return canvas.toDataURL(`image/${imageType}`);
+    }));
+  }
+  onAdd() {
+    const button = super.onAdd();
+    button.addEventListener('click', this.onClick);
+    return button;
+  }
+  getDefault(option) {
+    return _objectSpread(_objectSpread({}, super.getDefault(option)), {}, {
+      title: '导出图片',
+      btnIcon: createL7Icon('l7-icon-export-picture'),
+      imageType: 'png'
+    });
+  }
+  getImage() {
+    var _this2 = this;
+    return _asyncToGenerator(function* () {
+      const mapImage = yield _this2.mapsService.exportMap('png');
+      const layerImage = yield _this2.scene.exportPng('png');
+      return _this2.mergeImage(
+      // 在 Map 底图模式下 mapImage 为 undefined
+      ...[mapImage, layerImage].filter(base64 => base64));
+    })();
+  }
+}

package/es/control/fullscreen.js

@@ -1,119 +1,88 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 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";
-import _get from "@babel/runtime/helpers/esm/get";
-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); }; }
-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 { createL7Icon } from "../utils/icon";
 import ScreenFull from "../utils/screenfull";
 import ButtonControl from "./baseControl/buttonControl";
 export { Fullscreen };
-var Fullscreen = /*#__PURE__*/function (_ButtonControl) {
-  _inherits(Fullscreen, _ButtonControl);
-  var _super = _createSuper(Fullscreen);
-  function Fullscreen(option) {
+export default class Fullscreen extends ButtonControl {
+  constructor(option) {
     var _this;
-    _classCallCheck(this, Fullscreen);
-    _this = _super.call(this, option);
-    _defineProperty(_assertThisInitialized(_this), "isFullscreen", false);
-    _defineProperty(_assertThisInitialized(_this), "toggleFullscreen", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (!ScreenFull.isEnabled) {
-              _context.next = 3;
-              break;
-            }
-            _context.next = 3;
-            return ScreenFull.toggle(_this.mapContainer);
-          case 3:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    })));
-    _defineProperty(_assertThisInitialized(_this), "onClick", function () {
-      _this.toggleFullscreen();
+    super(option);
+    _this = this;
+    _defineProperty(this, "isFullscreen", false);
+    _defineProperty(this, "mapContainer", void 0);
+    _defineProperty(this, "toggleFullscreen", /*#__PURE__*/_asyncToGenerator(function* () {
+      if (ScreenFull.isEnabled) {
+        yield ScreenFull.toggle(_this.mapContainer);
+      }
+    }));
+    _defineProperty(this, "onClick", () => {
+      this.toggleFullscreen();
     });
-    _defineProperty(_assertThisInitialized(_this), "onFullscreenChange", function () {
-      _this.isFullscreen = !!document.fullscreenElement;
-      var _this$controlOption = _this.controlOption,
-        btnText = _this$controlOption.btnText,
-        btnIcon = _this$controlOption.btnIcon,
-        title = _this$controlOption.title,
-        exitBtnText = _this$controlOption.exitBtnText,
-        exitBtnIcon = _this$controlOption.exitBtnIcon,
-        exitTitle = _this$controlOption.exitTitle;
-      if (_this.isFullscreen) {
-        _this.setBtnTitle(exitTitle);
-        _this.setBtnText(exitBtnText);
-        _this.setBtnIcon(exitBtnIcon);
+    _defineProperty(this, "onFullscreenChange", () => {
+      this.isFullscreen = !!document.fullscreenElement;
+      const {
+        btnText,
+        btnIcon,
+        title,
+        exitBtnText,
+        exitBtnIcon,
+        exitTitle
+      } = this.controlOption;
+      if (this.isFullscreen) {
+        this.setBtnTitle(exitTitle);
+        this.setBtnText(exitBtnText);
+        this.setBtnIcon(exitBtnIcon);
       } else {
-        _this.setBtnTitle(title);
-        _this.setBtnText(btnText);
-        _this.setBtnIcon(btnIcon);
+        this.setBtnTitle(title);
+        this.setBtnText(btnText);
+        this.setBtnIcon(btnIcon);
       }
-      _this.emit('fullscreenChange', _this.isFullscreen);
+      this.emit('fullscreenChange', this.isFullscreen);
     });
     if (!ScreenFull.isEnabled) {
       console.warn('当前浏览器环境不支持对地图全屏化');
     }
-    return _this;
   }
-  _createClass(Fullscreen, [{
-    key: "setOptions",
-    value: function setOptions(newOptions) {
-      var exitBtnText = newOptions.exitBtnText,
-        exitBtnIcon = newOptions.exitBtnIcon,
-        exitTitle = newOptions.exitTitle;
-      if (this.isFullscreen) {
-        if (this.checkUpdateOption(newOptions, ['exitBtnIcon'])) {
-          this.setBtnIcon(exitBtnIcon);
-        }
-        if (this.checkUpdateOption(newOptions, ['exitBtnText'])) {
-          this.setBtnText(exitBtnText);
-        }
-        if (this.checkUpdateOption(newOptions, ['exitTitle'])) {
-          this.setBtnTitle(exitTitle);
-        }
+  setOptions(newOptions) {
+    const {
+      exitBtnText,
+      exitBtnIcon,
+      exitTitle
+    } = newOptions;
+    if (this.isFullscreen) {
+      if (this.checkUpdateOption(newOptions, ['exitBtnIcon'])) {
+        this.setBtnIcon(exitBtnIcon);
+      }
+      if (this.checkUpdateOption(newOptions, ['exitBtnText'])) {
+        this.setBtnText(exitBtnText);
+      }
+      if (this.checkUpdateOption(newOptions, ['exitTitle'])) {
+        this.setBtnTitle(exitTitle);
       }
-      _get(_getPrototypeOf(Fullscreen.prototype), "setOptions", this).call(this, newOptions);
-    }
-  }, {
-    key: "onAdd",
-    value: function onAdd() {
-      var button = _get(_getPrototypeOf(Fullscreen.prototype), "onAdd", this).call(this);
-      button.addEventListener('click', this.onClick);
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      this.mapContainer = DOM.getContainer(this.scene.getSceneConfig().id);
-      this.mapContainer.addEventListener('fullscreenchange', this.onFullscreenChange);
-      return button;
-    }
-  }, {
-    key: "onRemove",
-    value: function onRemove() {
-      _get(_getPrototypeOf(Fullscreen.prototype), "onRemove", this).call(this);
-      this.mapContainer.removeEventListener('fullscreenchange', this.onFullscreenChange);
-    }
-  }, {
-    key: "getDefault",
-    value: function getDefault(option) {
-      return _objectSpread(_objectSpread({}, _get(_getPrototypeOf(Fullscreen.prototype), "getDefault", this).call(this, option)), {}, {
-        title: '全屏',
-        btnIcon: createL7Icon('l7-icon-fullscreen'),
-        exitTitle: '退出全屏',
-        exitBtnIcon: createL7Icon('l7-icon-exit-fullscreen')
-      });
     }
-  }]);
-  return Fullscreen;
-}(ButtonControl);
-export { Fullscreen as default };
+    super.setOptions(newOptions);
+  }
+  onAdd() {
+    const button = super.onAdd();
+    button.addEventListener('click', this.onClick);
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    this.mapContainer = DOM.getContainer(this.scene.getSceneConfig().id);
+    this.mapContainer.addEventListener('fullscreenchange', this.onFullscreenChange);
+    return button;
+  }
+  onRemove() {
+    super.onRemove();
+    this.mapContainer.removeEventListener('fullscreenchange', this.onFullscreenChange);
+  }
+  getDefault(option) {
+    return _objectSpread(_objectSpread({}, super.getDefault(option)), {}, {
+      title: '全屏',
+      btnIcon: createL7Icon('l7-icon-fullscreen'),
+      exitTitle: '退出全屏',
+      exitBtnIcon: createL7Icon('l7-icon-exit-fullscreen')
+    });
+  }
+}

package/es/control/geoLocate.js

@@ -1,107 +1,60 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 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";
-import _get from "@babel/runtime/helpers/esm/get";
-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); }; }
-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 { createL7Icon } from "../utils/icon";
 import ButtonControl from "./baseControl/buttonControl";
 export { GeoLocate };
-var GeoLocate = /*#__PURE__*/function (_ButtonControl) {
-  _inherits(GeoLocate, _ButtonControl);
-  var _super = _createSuper(GeoLocate);
-  function GeoLocate(option) {
+export default class GeoLocate extends ButtonControl {
+  constructor(option) {
     var _this;
-    _classCallCheck(this, GeoLocate);
-    _this = _super.call(this, option);
+    super(option);
+    _this = this;
     /**
      * 通过浏览器 API 获取当前所在经纬度
      */
-    _defineProperty(_assertThisInitialized(_this), "getGeoLocation", function () {
-      return new Promise(function (resolve, reject) {
-        window.navigator.geolocation.getCurrentPosition(function (_ref) {
-          var coords = _ref.coords;
-          var _ref2 = coords !== null && coords !== void 0 ? coords : {},
-            longitude = _ref2.longitude,
-            latitude = _ref2.latitude;
+    _defineProperty(this, "getGeoLocation", () => {
+      return new Promise((resolve, reject) => {
+        window.navigator.geolocation.getCurrentPosition(({
+          coords
+        }) => {
+          const {
+            longitude,
+            latitude
+          } = coords !== null && coords !== void 0 ? coords : {};
           if (!isNaN(longitude) && !isNaN(latitude)) {
             resolve([longitude, latitude]);
           } else {
             reject();
           }
-        }, function (e) {
+        }, e => {
           reject(e);
         });
       });
     });
-    _defineProperty(_assertThisInitialized(_this), "onClick", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var transform, position, currentZoom;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (window.navigator.geolocation) {
-              _context.next = 2;
-              break;
-            }
-            return _context.abrupt("return");
-          case 2:
-            transform = _this.controlOption.transform;
-            _context.next = 5;
-            return _this.getGeoLocation();
-          case 5:
-            position = _context.sent;
-            currentZoom = _this.mapsService.getZoom();
-            _context.t0 = _this.mapsService;
-            _context.t1 = currentZoom > 15 ? currentZoom : 15;
-            if (!transform) {
-              _context.next = 15;
-              break;
-            }
-            _context.next = 12;
-            return transform(position);
-          case 12:
-            _context.t2 = _context.sent;
-            _context.next = 16;
-            break;
-          case 15:
-            _context.t2 = position;
-          case 16:
-            _context.t3 = _context.t2;
-            _context.t0.setZoomAndCenter.call(_context.t0, _context.t1, _context.t3);
-          case 18:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    })));
+    _defineProperty(this, "onClick", /*#__PURE__*/_asyncToGenerator(function* () {
+      if (!window.navigator.geolocation) {
+        return;
+      }
+      const {
+        transform
+      } = _this.controlOption;
+      const position = yield _this.getGeoLocation();
+      const currentZoom = _this.mapsService.getZoom();
+      _this.mapsService.setZoomAndCenter(currentZoom > 15 ? currentZoom : 15, transform ? yield transform(position) : position);
+    }));
     if (!window.navigator.geolocation) {
       console.warn('当前浏览器环境不支持获取地理定位');
     }
-    return _this;
   }
-  _createClass(GeoLocate, [{
-    key: "getDefault",
-    value: function getDefault(option) {
-      return _objectSpread(_objectSpread({}, _get(_getPrototypeOf(GeoLocate.prototype), "getDefault", this).call(this, option)), {}, {
-        title: '定位',
-        btnIcon: createL7Icon('l7-icon-reposition')
-      });
-    }
-  }, {
-    key: "onAdd",
-    value: function onAdd() {
-      var button = _get(_getPrototypeOf(GeoLocate.prototype), "onAdd", this).call(this);
-      button.addEventListener('click', this.onClick);
-      return button;
-    }
-  }]);
-  return GeoLocate;
-}(ButtonControl);
-export { GeoLocate as default };
+  getDefault(option) {
+    return _objectSpread(_objectSpread({}, super.getDefault(option)), {}, {
+      title: '定位',
+      btnIcon: createL7Icon('l7-icon-reposition')
+    });
+  }
+  onAdd() {
+    const button = super.onAdd();
+    button.addEventListener('click', this.onClick);
+    return button;
+  }
+}