@antv/l7-map 2.17.12 → 2.18.0

package/es/camera.js

@@ -5,40 +5,31 @@ 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; } }
-
 // @ts-ignore
+import { lodashUtil } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
-import { merge } from 'lodash';
 import LngLat from "./geo/lng_lat";
 import LngLatBounds from "./geo/lng_lat_bounds";
 import Point from "./geo/point";
 import Transform from "./geo/transform";
 import { Event } from "./handler/events/event";
 import { clamp, ease as defaultEasing, extend, interpolate, now, pick, prefersReducedMotion, wrap } from "./util";
-
+var merge = lodashUtil.merge;
 var Camera = /*#__PURE__*/function (_EventEmitter) {
   _inherits(Camera, _EventEmitter);
-
   var _super = _createSuper(Camera);
-
   // public requestRenderFrame: (_: any) => number;
   // public cancelRenderFrame: (_: number) => void;
+
   function Camera(options) {
     var _this;
-
     _classCallCheck(this, Camera);
-
     _this = _super.call(this);
-
     _defineProperty(_assertThisInitialized(_this), "renderFrameCallback", function () {
       var t = Math.min((now() - _this.easeStart) / _this.easeOptions.duration, 1);
-
       _this.onEaseFrame(_this.easeOptions.easing(t));
-
       if (t < 1) {
         // this.easeFrameId = window.requestAnimationFrame(this.renderFrameCallback);
         _this.easeFrameId = _this.requestRenderFrame(_this.renderFrameCallback);
@@ -46,13 +37,12 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
         _this.stop();
       }
     });
-
     _this.options = options;
     var minZoom = options.minZoom,
-        maxZoom = options.maxZoom,
-        minPitch = options.minPitch,
-        maxPitch = options.maxPitch,
-        renderWorldCopies = options.renderWorldCopies;
+      maxZoom = options.maxZoom,
+      minPitch = options.minPitch,
+      maxPitch = options.maxPitch,
+      renderWorldCopies = options.renderWorldCopies;
     _this.moving = false;
     _this.zooming = false;
     _this.bearingSnap = options.bearingSnap;
@@ -60,15 +50,14 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
     _this.rotateEnabled = options.rotateEnabled;
     _this.transform = new Transform(minZoom, maxZoom, minPitch, maxPitch, renderWorldCopies);
     return _this;
-  } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
-
+  }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   _createClass(Camera, [{
     key: "requestRenderFrame",
     value: function requestRenderFrame(cb) {
       return 0;
-    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "cancelRenderFrame",
     value: function cancelRenderFrame(_) {
@@ -78,8 +67,8 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
     key: "getCenter",
     value: function getCenter() {
       var _this$transform$cente = this.transform.center,
-          lng = _this$transform$cente.lng,
-          lat = _this$transform$cente.lat;
+        lng = _this$transform$cente.lng,
+        lat = _this$transform$cente.lat;
       return new LngLat(lng, lat);
     }
   }, {
@@ -203,14 +192,16 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "fitBounds",
     value: function fitBounds(bounds, options, eventData) {
-      return this.fitInternal( // @ts-ignore
+      return this.fitInternal(
+      // @ts-ignore
       this.cameraForBounds(bounds, options), options, eventData);
     }
   }, {
     key: "cameraForBounds",
     value: function cameraForBounds(bounds, options) {
       bounds = LngLatBounds.convert(bounds);
-      return this.cameraForBoxAndBearing(bounds.getNorthWest(), bounds.getSouthEast(), 0, // @ts-ignore
+      return this.cameraForBoxAndBearing(bounds.getNorthWest(), bounds.getSouthEast(), 0,
+      // @ts-ignore
       options);
     }
   }, {
@@ -219,7 +210,6 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
       if (Math.abs(this.getBearing()) < this.bearingSnap) {
         return this.resetNorth(options, eventData);
       }
-
       return this;
     }
   }, {
@@ -232,58 +222,47 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
       var zoomChanged = false;
       var bearingChanged = false;
       var pitchChanged = false;
-
       if (options.zoom !== undefined && tr.zoom !== +options.zoom) {
         zoomChanged = true;
         tr.zoom = +options.zoom;
       }
-
       if (options.center !== undefined) {
         tr.center = LngLat.convert(options.center);
       }
-
       if (options.bearing !== undefined && tr.bearing !== +options.bearing) {
         bearingChanged = true;
         tr.bearing = +options.bearing;
       }
-
       if (options.pitch !== undefined && tr.pitch !== +options.pitch) {
         pitchChanged = true;
         tr.pitch = +options.pitch;
       }
-
       if (options.padding !== undefined && !tr.isPaddingEqual(options.padding)) {
         tr.padding = options.padding;
       }
-
       this.emit('movestart', new Event('movestart', eventData));
       this.emit('move', new Event('move', eventData));
-
       if (zoomChanged) {
         this.emit('zoomstart', new Event('zoomstart', eventData));
         this.emit('zoom', new Event('zoom', eventData));
         this.emit('zoomend', new Event('zoomend', eventData));
       }
-
       if (bearingChanged) {
         this.emit('rotatestart', new Event('rotatestart', eventData));
         this.emit('rotate', new Event('rotate', eventData));
         this.emit('rotateend', new Event('rotateend', eventData));
       }
-
       if (pitchChanged) {
         this.emit('pitchstart', new Event('pitchstart', eventData));
         this.emit('pitch', new Event('pitch', eventData));
         this.emit('pitchend', new Event('pitchend', eventData));
       }
-
       return this.emit('moveend', new Event('moveend', eventData));
     }
   }, {
     key: "easeTo",
     value: function easeTo() {
       var _this2 = this;
-
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var eventData = arguments.length > 1 ? arguments[1] : undefined;
       options = merge({
@@ -291,11 +270,9 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
         duration: 500,
         easing: defaultEasing
       }, options);
-
       if (options.animate === false || !options.essential && prefersReducedMotion()) {
         options.duration = 0;
       }
-
       var tr = this.transform;
       var startZoom = this.getZoom();
       var startBearing = this.getBearing();
@@ -315,12 +292,10 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
       var finalScale = tr.zoomScale(zoom - startZoom);
       var around;
       var aroundPoint;
-
       if (options.around) {
         around = LngLat.convert(options.around);
         aroundPoint = tr.locationPoint(around);
       }
-
       var currently = {
         moving: this.moving,
         zooming: this.zooming,
@@ -338,22 +313,18 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
         if (_this2.zooming) {
           tr.zoom = interpolate(startZoom, zoom, k);
         }
-
         if (_this2.rotating && _this2.rotateEnabled) {
           tr.bearing = interpolate(startBearing, bearing, k);
         }
-
         if (_this2.pitching && _this2.pitchEnabled) {
           tr.pitch = interpolate(startPitch, pitch, k);
         }
-
         if (_this2.padding) {
-          tr.interpolatePadding(startPadding, padding, k); // When padding is being applied, Transform#centerPoint is changing continously,
+          tr.interpolatePadding(startPadding, padding, k);
+          // When padding is being applied, Transform#centerPoint is changing continously,
           // thus we need to recalculate offsetPoint every fra,e
-
           pointAtOffset = tr.centerPoint.add(offsetAsPoint);
         }
-
         if (around) {
           tr.setLocationAtPoint(around, aroundPoint);
         } else {
@@ -363,11 +334,11 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
           var newCenter = tr.unproject(from.add(delta.mult(k * speedup)).mult(scale));
           tr.setLocationAtPoint(tr.renderWorldCopies ? newCenter.wrap() : newCenter, pointAtOffset);
         }
-
         _this2.fireMoveEvents(eventData);
       }, function (interruptingEaseId) {
         _this2.afterEase(eventData, interruptingEaseId);
-      }, // @ts-ignore
+      },
+      // @ts-ignore
       options);
       return this;
     }
@@ -375,16 +346,13 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
     key: "flyTo",
     value: function flyTo() {
       var _this3 = this;
-
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var eventData = arguments.length > 1 ? arguments[1] : undefined;
-
       // Fall through to jumpTo if user has set prefers-reduced-motion
       if (!options.essential && prefersReducedMotion()) {
         var coercedOptions = pick(options, ['center', 'zoom', 'bearing', 'pitch', 'around']);
         return this.jumpTo(coercedOptions, eventData);
       }
-
       this.stop();
       options = merge({
         offset: [0, 0],
@@ -409,95 +377,88 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
       this.normalizeCenter(center);
       var from = tr.project(locationAtOffset);
       var delta = tr.project(center).sub(from);
-      var rho = options.curve; // w₀: Initial visible span, measured in pixels at the initial scale.
-
-      var w0 = Math.max(tr.width, tr.height); // w₁: Final visible span, measured in pixels with respect to the initial scale.
+      var rho = options.curve;
 
-      var w1 = w0 / scale; // Length of the flight path as projected onto the ground plane, measured in pixels from
+      // w₀: Initial visible span, measured in pixels at the initial scale.
+      var w0 = Math.max(tr.width, tr.height);
+      // w₁: Final visible span, measured in pixels with respect to the initial scale.
+      var w1 = w0 / scale;
+      // Length of the flight path as projected onto the ground plane, measured in pixels from
       // the world image origin at the initial scale.
-
       var u1 = delta.mag();
-
       if ('minZoom' in options) {
-        var minZoom = clamp(Math.min(options.minZoom, startZoom, zoom), tr.minZoom, tr.maxZoom); // w<sub>m</sub>: Maximum visible span, measured in pixels with respect to the initial
+        var minZoom = clamp(Math.min(options.minZoom, startZoom, zoom), tr.minZoom, tr.maxZoom);
+        // w<sub>m</sub>: Maximum visible span, measured in pixels with respect to the initial
         // scale.
-
         var wMax = w0 / tr.zoomScale(minZoom - startZoom);
         rho = Math.sqrt(wMax / u1 * 2);
-      } // ρ²
-
+      }
 
+      // ρ²
       var rho2 = rho * rho;
+
       /**
        * rᵢ: Returns the zoom-out factor at one end of the animation.
        *
        * @param i 0 for the ascent or 1 for the descent.
        * @private
        */
-
       function r(i) {
         var b = (w1 * w1 - w0 * w0 + (i ? -1 : 1) * rho2 * rho2 * u1 * u1) / (2 * (i ? w1 : w0) * rho2 * u1);
         return Math.log(Math.sqrt(b * b + 1) - b);
       }
-
       function sinh(n) {
         return (Math.exp(n) - Math.exp(-n)) / 2;
       }
-
       function cosh(n) {
         return (Math.exp(n) + Math.exp(-n)) / 2;
       }
-
       function tanh(n) {
         return sinh(n) / cosh(n);
-      } // r₀: Zoom-out factor during ascent.
+      }
 
+      // r₀: Zoom-out factor during ascent.
+      var r0 = r(0);
 
-      var r0 = r(0); // w(s): Returns the visible span on the ground, measured in pixels with respect to the
+      // w(s): Returns the visible span on the ground, measured in pixels with respect to the
       // initial scale. Assumes an angular field of view of 2 arctan ½ ≈ 53°.
-
       var w = function w(s) {
         return cosh(r0) / cosh(r0 + rho * s);
-      }; // u(s): Returns the distance along the flight path as projected onto the ground plane,
-      // measured in pixels from the world image origin at the initial scale.
-
+      };
 
+      // u(s): Returns the distance along the flight path as projected onto the ground plane,
+      // measured in pixels from the world image origin at the initial scale.
       var u = function u(s) {
         return w0 * ((cosh(r0) * tanh(r0 + rho * s) - sinh(r0)) / rho2) / u1;
-      }; // S: Total length of the flight path, measured in ρ-screenfuls.
-
+      };
 
-      var S = (r(1) - r0) / rho; // When u₀ = u₁, the optimal path doesn’t require both ascent and descent.
+      // S: Total length of the flight path, measured in ρ-screenfuls.
+      var S = (r(1) - r0) / rho;
 
+      // When u₀ = u₁, the optimal path doesn’t require both ascent and descent.
       if (Math.abs(u1) < 0.000001 || !isFinite(S)) {
         // Perform a more or less instantaneous transition if the path is too short.
         if (Math.abs(w0 - w1) < 0.000001) {
           return this.easeTo(options, eventData);
         }
-
         var k = w1 < w0 ? -1 : 1;
         S = Math.abs(Math.log(w1 / w0)) / rho;
-
         u = function u() {
           return 0;
         };
-
         w = function w(s) {
           return Math.exp(k * rho * s);
         };
       }
-
       if ('duration' in options) {
         options.duration = +options.duration;
       } else {
         var V = 'screenSpeed' in options ? +options.screenSpeed / rho : +options.speed;
         options.duration = 1000 * S / V;
       }
-
       if (options.maxDuration && options.duration > options.maxDuration) {
         options.duration = 0;
       }
-
       this.zooming = true;
       this.rotating = startBearing !== bearing;
       this.pitching = pitch !== startPitch;
@@ -505,29 +466,24 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
       this.prepareEase(eventData, false);
       this.ease(function (k) {
         // s: The distance traveled along the flight path, measured in ρ-screenfuls.
-        var s = k * S; // @ts-ignore
-
+        var s = k * S;
+        // @ts-ignore
         var easeScale = 1 / w(s);
         tr.zoom = k === 1 ? zoom : startZoom + tr.scaleZoom(easeScale);
-
         if (_this3.rotating) {
           tr.bearing = interpolate(startBearing, bearing, k);
         }
-
         if (_this3.pitching) {
           tr.pitch = interpolate(startPitch, pitch, k);
         }
-
         if (_this3.padding) {
-          tr.interpolatePadding(startPadding, padding, k); // When padding is being applied, Transform#centerPoint is changing continously,
+          tr.interpolatePadding(startPadding, padding, k);
+          // When padding is being applied, Transform#centerPoint is changing continously,
           // thus we need to recalculate offsetPoint every frame
-
           pointAtOffset = tr.centerPoint.add(offsetAsPoint);
         }
-
         var newCenter = k === 1 ? center : tr.unproject(from.add(delta.mult(u(s))).mult(easeScale));
         tr.setLocationAtPoint(tr.renderWorldCopies ? newCenter.wrap() : newCenter, pointAtOffset);
-
         _this3.fireMoveEvents(eventData);
       }, function () {
         return _this3.afterEase(eventData);
@@ -537,35 +493,35 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "fitScreenCoordinates",
     value: function fitScreenCoordinates(p0, p1, bearing, options, eventData) {
-      return this.fitInternal( // @ts-ignore
-      this.cameraForBoxAndBearing(this.transform.pointLocation(Point.convert(p0)), this.transform.pointLocation(Point.convert(p1)), bearing, // @ts-ignore
+      return this.fitInternal(
+      // @ts-ignore
+      this.cameraForBoxAndBearing(this.transform.pointLocation(Point.convert(p0)), this.transform.pointLocation(Point.convert(p1)), bearing,
+      // @ts-ignore
       options), options, eventData);
     }
   }, {
     key: "stop",
     value: function stop(allowGestures, easeId) {
       if (this.easeFrameId) {
-        this.cancelRenderFrame(this.easeFrameId); // @ts-ignore
-
-        delete this.easeFrameId; // @ts-ignore
-
+        this.cancelRenderFrame(this.easeFrameId);
+        // @ts-ignore
+        delete this.easeFrameId;
+        // @ts-ignore
         delete this.onEaseFrame;
       }
-
       if (this.onEaseEnd) {
         // The _onEaseEnd function might emit events which trigger new
         // animation, which sets a new _onEaseEnd. Ensure we don't delete
         // it unintentionally.
-        var onEaseEnd = this.onEaseEnd; // @ts-ignore
-
+        var onEaseEnd = this.onEaseEnd;
+        // @ts-ignore
         delete this.onEaseEnd;
         onEaseEnd.call(this, easeId);
-      } // if (!allowGestures) {
+      }
+      // if (!allowGestures) {
       //     const handlers = (this: any).handlers;
       //     if (handlers) handlers.stop();
       // }
-
-
       return this;
     }
   }, {
@@ -573,26 +529,21 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
     value: function normalizeBearing(bearing, currentBearing) {
       bearing = wrap(bearing, -180, 180);
       var diff = Math.abs(bearing - currentBearing);
-
       if (Math.abs(bearing - 360 - currentBearing) < diff) {
         bearing -= 360;
       }
-
       if (Math.abs(bearing + 360 - currentBearing) < diff) {
         bearing += 360;
       }
-
       return bearing;
     }
   }, {
     key: "normalizeCenter",
     value: function normalizeCenter(center) {
       var tr = this.transform;
-
       if (!tr.renderWorldCopies || tr.lngRange) {
         return;
       }
-
       var delta = center.lng - tr.center.lng;
       center.lng += delta > 180 ? -360 : delta < -180 ? 360 : 0;
     }
@@ -600,15 +551,12 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
     key: "fireMoveEvents",
     value: function fireMoveEvents(eventData) {
       this.emit('move', new Event('move', eventData));
-
       if (this.zooming) {
         this.emit('zoom', new Event('zoom', eventData));
       }
-
       if (this.rotating) {
         this.emit('rotate', new Event('rotate', eventData));
       }
-
       if (this.pitching) {
         this.emit('rotate', new Event('pitch', eventData));
       }
@@ -619,19 +567,15 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
       var noMoveStart = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var currently = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       this.moving = true;
-
       if (!noMoveStart && !currently.moving) {
         this.emit('movestart', new Event('movestart', eventData));
       }
-
       if (this.zooming && !currently.zooming) {
         this.emit('zoomstart', new Event('zoomstart', eventData));
       }
-
       if (this.rotating && !currently.rotating) {
         this.emit('rotatestart', new Event('rotatestart', eventData));
       }
-
       if (this.pitching && !currently.pitching) {
         this.emit('pitchstart', new Event('pitchstart', eventData));
       }
@@ -643,9 +587,8 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
       // the same id then don't fire any events to avoid extra start/stop events
       if (this.easeId && easeId && this.easeId === easeId) {
         return;
-      } // @ts-ignore
-
-
+      }
+      // @ts-ignore
       delete this.easeId;
       var wasZooming = this.zooming;
       var wasRotating = this.rotating;
@@ -655,19 +598,15 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
       this.rotating = false;
       this.pitching = false;
       this.padding = false;
-
       if (wasZooming) {
         this.emit('zoomend', new Event('zoomend', eventData));
       }
-
       if (wasRotating) {
         this.emit('rotateend', new Event('rotateend', eventData));
       }
-
       if (wasPitching) {
         this.emit('pitchend', new Event('pitchend', eventData));
       }
-
       this.emit('moveend', new Event('moveend', eventData));
     }
   }, {
@@ -698,7 +637,6 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
         offset: [0, 0],
         maxZoom: this.transform.maxZoom
       }, options);
-
       if (typeof options.padding === 'number') {
         var p = options.padding;
         options.padding = {
@@ -708,41 +646,49 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
           left: p
         };
       }
-
       options.padding = merge(defaultPadding, options.padding);
       var tr = this.transform;
-      var edgePadding = tr.padding; // We want to calculate the upper right and lower left of the box defined by p0 and p1
-      // in a coordinate system rotate to match the destination bearing.
+      var edgePadding = tr.padding;
 
+      // We want to calculate the upper right and lower left of the box defined by p0 and p1
+      // in a coordinate system rotate to match the destination bearing.
       var p0world = tr.project(LngLat.convert(p0));
       var p1world = tr.project(LngLat.convert(p1));
       var p0rotated = p0world.rotate(-bearing * Math.PI / 180);
       var p1rotated = p1world.rotate(-bearing * Math.PI / 180);
       var upperRight = new Point(Math.max(p0rotated.x, p1rotated.x), Math.max(p0rotated.y, p1rotated.y));
-      var lowerLeft = new Point(Math.min(p0rotated.x, p1rotated.x), Math.min(p0rotated.y, p1rotated.y)); // Calculate zoom: consider the original bbox and padding.
+      var lowerLeft = new Point(Math.min(p0rotated.x, p1rotated.x), Math.min(p0rotated.y, p1rotated.y));
 
+      // Calculate zoom: consider the original bbox and padding.
       var size = upperRight.sub(lowerLeft);
-      var scaleX = (tr.width - ( // @ts-ignore
-      edgePadding.left + // @ts-ignore
-      edgePadding.right + // @ts-ignore
-      options.padding.left + // @ts-ignore
+      var scaleX = (tr.width - (
+      // @ts-ignore
+      edgePadding.left +
+      // @ts-ignore
+      edgePadding.right +
+      // @ts-ignore
+      options.padding.left +
+      // @ts-ignore
       options.padding.right)) / size.x;
-      var scaleY = (tr.height - ( // @ts-ignore
-      edgePadding.top + // @ts-ignore
-      edgePadding.bottom + // @ts-ignore
-      options.padding.top + // @ts-ignore
+      var scaleY = (tr.height - (
+      // @ts-ignore
+      edgePadding.top +
+      // @ts-ignore
+      edgePadding.bottom +
+      // @ts-ignore
+      options.padding.top +
+      // @ts-ignore
       options.padding.bottom)) / size.y;
-
       if (scaleY < 0 || scaleX < 0) {
         return;
       }
+      var zoom = Math.min(tr.scaleZoom(tr.scale * Math.min(scaleX, scaleY)), options.maxZoom);
 
-      var zoom = Math.min(tr.scaleZoom(tr.scale * Math.min(scaleX, scaleY)), options.maxZoom); // Calculate center: apply the zoom, the configured offset, as well as offset that exists as a result of padding.
-
-      var offset = Point.convert(options.offset); // @ts-ignore
-
-      var paddingOffsetX = (options.padding.left - options.padding.right) / 2; // @ts-ignore
-
+      // Calculate center: apply the zoom, the configured offset, as well as offset that exists as a result of padding.
+      var offset = Point.convert(options.offset);
+      // @ts-ignore
+      var paddingOffsetX = (options.padding.left - options.padding.right) / 2;
+      // @ts-ignore
       var paddingOffsetY = (options.padding.top - options.padding.bottom) / 2;
       var offsetAtInitialZoom = new Point(offset.x + paddingOffsetX, offset.y + paddingOffsetY);
       var offsetAtFinalZoom = offsetAtInitialZoom.mult(tr.scale / tr.zoomScale(zoom));
@@ -760,16 +706,13 @@ var Camera = /*#__PURE__*/function (_EventEmitter) {
       if (!calculatedOptions) {
         return this;
       }
-
-      options = merge(calculatedOptions, options); // Explictly remove the padding field because, calculatedOptions already accounts for padding by setting zoom and center accordingly.
-
-      delete options.padding; // @ts-ignore
-
+      options = merge(calculatedOptions, options);
+      // Explictly remove the padding field because, calculatedOptions already accounts for padding by setting zoom and center accordingly.
+      delete options.padding;
+      // @ts-ignore
       return options.linear ? this.easeTo(options, eventData) : this.flyTo(options, eventData);
     }
   }]);
-
   return Camera;
 }(EventEmitter);
-
 export { Camera as default };