@deck.gl/core 9.3.0-alpha.1 → 9.3.0-alpha.3

package/dist/controllers/orthographic-controller.d.ts

@@ -1,21 +1,129 @@
-import Controller from "./controller.js";
-import { OrbitState } from "./orbit-controller.js";
+import Controller, { ControllerProps } from "./controller.js";
+import ViewState from "./view-state.js";
+import type Viewport from "../viewports/viewport.js";
 import LinearInterpolator from "../transitions/linear-interpolator.js";
-declare class OrthographicState extends OrbitState {
-    zoomAxis: 'X' | 'Y' | 'all';
-    constructor(props: any);
+export type OrthographicStateProps = {
+    width: number;
+    height: number;
+    target?: number[];
+    zoom?: number | number[];
+    zoomX?: number;
+    zoomY?: number;
+    zoomAxis?: 'X' | 'Y' | 'all';
+    /** Viewport constraints */
+    maxZoomX?: number;
+    minZoomX?: number;
+    maxZoomY?: number;
+    minZoomY?: number;
+    maxBounds?: ControllerProps['maxBounds'];
+};
+type OrthographicStateInternal = {
+    startPanPosition?: number[];
+    startZoomPosition?: number[];
+    startZoom?: number[];
+};
+export declare class OrthographicState extends ViewState<OrthographicState, OrthographicStateProps, OrthographicStateInternal> {
+    constructor(options: OrthographicStateProps & OrthographicStateInternal & {
+        maxZoom?: number;
+        minZoom?: number;
+        makeViewport: (props: Record<string, any>) => Viewport;
+    });
+    /**
+     * Start panning
+     * @param {[Number, Number]} pos - position on screen where the pointer grabs
+     */
+    panStart({ pos }: {
+        pos: [number, number];
+    }): OrthographicState;
+    /**
+     * Pan
+     * @param {[Number, Number]} pos - position on screen where the pointer is
+     */
+    pan({ pos, startPosition }: {
+        pos: [number, number];
+        startPosition?: number[];
+    }): OrthographicState;
+    /**
+     * End panning
+     * Must call if `panStart()` was called
+     */
+    panEnd(): OrthographicState;
+    /**
+     * Start rotating
+     */
+    rotateStart(): OrthographicState;
+    /**
+     * Rotate
+     */
+    rotate(): OrthographicState;
+    /**
+     * End rotating
+     */
+    rotateEnd(): OrthographicState;
+    shortestPathFrom(viewState: OrthographicState): OrthographicStateProps;
+    /**
+     * Start zooming
+     * @param {[Number, Number]} pos - position on screen where the pointer grabs
+     */
+    zoomStart({ pos }: {
+        pos: [number, number];
+    }): OrthographicState;
+    /**
+     * Zoom
+     * @param {[Number, Number]} pos - position on screen where the current target is
+     * @param {[Number, Number]} startPos - the target position at
+     *   the start of the operation. Must be supplied of `zoomStart()` was not called
+     * @param {Number} scale - a number between [0, 1] specifying the accumulated
+     *   relative scale.
+     */
+    zoom({ pos, startPos, scale }: {
+        pos: [number, number];
+        startPos?: [number, number];
+        scale: number;
+    }): OrthographicState;
+    /**
+     * End zooming
+     * Must call if `zoomStart()` was called
+     */
+    zoomEnd(): OrthographicState;
+    zoomIn(speed?: number): OrthographicState;
+    zoomOut(speed?: number): OrthographicState;
+    moveLeft(speed?: number): OrthographicState;
+    moveRight(speed?: number): OrthographicState;
+    moveUp(speed?: number): OrthographicState;
+    moveDown(speed?: number): OrthographicState;
+    rotateLeft(speed?: number): OrthographicState;
+    rotateRight(speed?: number): OrthographicState;
+    rotateUp(speed?: number): OrthographicState;
+    rotateDown(speed?: number): OrthographicState;
+    _project(pos: number[]): number[];
+    _unproject(pos: number[]): number[];
     _calculateNewZoom({ scale, startZoom }: {
-        scale: any;
-        startZoom: any;
-    }): number | any[];
+        scale: number;
+        startZoom?: number[];
+    }): {
+        zoomX: number;
+        zoomY: number;
+    };
+    _panFromCenter(offset: any): OrthographicState;
+    _getUpdatedState(newProps: any): OrthographicState;
+    applyConstraints(props: Required<OrthographicStateProps>): Required<OrthographicStateProps>;
+    _constrainZoom({ zoomX, zoomY }: {
+        zoomX: number;
+        zoomY: number;
+    }, props?: Required<OrthographicStateProps>): {
+        zoomX: number;
+        zoomY: number;
+    };
 }
-export default class OrthographicController extends Controller<OrbitState> {
+export default class OrthographicController extends Controller<OrthographicState> {
     ControllerState: typeof OrthographicState;
     transition: {
         transitionDuration: number;
         transitionInterpolator: LinearInterpolator;
     };
     dragMode: 'pan' | 'rotate';
+    setProps(props: ControllerProps & OrthographicStateProps): void;
     _onPanRotate(): boolean;
 }
 export {};

package/dist/controllers/orthographic-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orthographic-controller.d.ts","sourceRoot":"","sources":["../../src/controllers/orthographic-controller.ts"],"names":[],"mappings":"AAKA,OAAO,UAAU,wBAAqB;AACtC,OAAO,EAAC,UAAU,EAAC,8BAA2B;AAC9C,OAAO,kBAAkB,8CAA2C;AAEpE,cAAM,iBAAkB,SAAQ,UAAU;IACxC,QAAQ,EAAE,GAAG,GAAG,GAAG,GAAG,KAAK,CAAC;gBAEhB,KAAK,KAAA;IAMjB,iBAAiB,CAAC,EAAC,KAAK,EAAE,SAAS,EAAC;;;KAAA;CAqCrC;AAED,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU,CAAC,UAAU,CAAC;IACxE,eAAe,2BAAqB;IACpC,UAAU;;;MAGR;IACF,QAAQ,EAAE,KAAK,GAAG,QAAQ,CAAS;IAEnC,YAAY;CAIb"}
+{"version":3,"file":"orthographic-controller.d.ts","sourceRoot":"","sources":["../../src/controllers/orthographic-controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/orthographic-controller.js

@@ -3,49 +3,310 @@
 // Copyright (c) vis.gl contributors
 import { clamp } from '@math.gl/core';
 import Controller from "./controller.js";
-import { OrbitState } from "./orbit-controller.js";
+import ViewState from "./view-state.js";
 import LinearInterpolator from "../transitions/linear-interpolator.js";
-class OrthographicState extends OrbitState {
-    constructor(props) {
-        super(props);
-        this.zoomAxis = props.zoomAxis || 'all';
+function normalizeZoom({ zoom = 0, zoomX, zoomY }) {
+    zoomX = zoomX ?? (Array.isArray(zoom) ? zoom[0] : zoom);
+    zoomY = zoomY ?? (Array.isArray(zoom) ? zoom[1] : zoom);
+    return { zoomX, zoomY };
+}
+export class OrthographicState extends ViewState {
+    constructor(options) {
+        const { 
+        /* Viewport arguments */
+        width, // Width of viewport
+        height, // Height of viewport
+        target = [0, 0, 0], zoom = 0, zoomAxis = 'all', 
+        /* Viewport constraints */
+        minZoom = -Infinity, maxZoom = Infinity, minZoomX = minZoom, maxZoomX = maxZoom, minZoomY = minZoom, maxZoomY = maxZoom, maxBounds = null, 
+        /** Interaction states, required to calculate change during transform */
+        // Model state when the pan operation first started
+        startPanPosition, 
+        // Model state when the zoom operation first started
+        startZoomPosition, startZoom } = options;
+        const { zoomX, zoomY } = normalizeZoom(options);
+        super({
+            width,
+            height,
+            target,
+            zoom,
+            zoomX,
+            zoomY,
+            zoomAxis,
+            minZoomX,
+            maxZoomX,
+            minZoomY,
+            maxZoomY,
+            maxBounds
+        }, {
+            startPanPosition,
+            startZoomPosition,
+            startZoom
+        }, options.makeViewport);
+    }
+    /**
+     * Start panning
+     * @param {[Number, Number]} pos - position on screen where the pointer grabs
+     */
+    panStart({ pos }) {
+        return this._getUpdatedState({
+            startPanPosition: this._unproject(pos)
+        });
+    }
+    /**
+     * Pan
+     * @param {[Number, Number]} pos - position on screen where the pointer is
+     */
+    pan({ pos, startPosition }) {
+        const startPanPosition = this.getState().startPanPosition || startPosition;
+        if (!startPanPosition) {
+            return this;
+        }
+        const viewport = this.makeViewport(this.getViewportProps());
+        const newProps = viewport.panByPosition(startPanPosition, pos);
+        return this._getUpdatedState(newProps);
+    }
+    /**
+     * End panning
+     * Must call if `panStart()` was called
+     */
+    panEnd() {
+        return this._getUpdatedState({
+            startPanPosition: null
+        });
+    }
+    /**
+     * Start rotating
+     */
+    rotateStart() {
+        return this;
+    }
+    /**
+     * Rotate
+     */
+    rotate() {
+        return this;
+    }
+    /**
+     * End rotating
+     */
+    rotateEnd() {
+        return this;
+    }
+    // shortest path between two view states
+    shortestPathFrom(viewState) {
+        const fromProps = viewState.getViewportProps();
+        const props = { ...this.getViewportProps() };
+        return props;
+    }
+    /**
+     * Start zooming
+     * @param {[Number, Number]} pos - position on screen where the pointer grabs
+     */
+    zoomStart({ pos }) {
+        const { zoomX, zoomY } = this.getViewportProps();
+        return this._getUpdatedState({
+            startZoomPosition: this._unproject(pos),
+            startZoom: [zoomX, zoomY]
+        });
+    }
+    /**
+     * Zoom
+     * @param {[Number, Number]} pos - position on screen where the current target is
+     * @param {[Number, Number]} startPos - the target position at
+     *   the start of the operation. Must be supplied of `zoomStart()` was not called
+     * @param {Number} scale - a number between [0, 1] specifying the accumulated
+     *   relative scale.
+     */
+    zoom({ pos, startPos, scale }) {
+        let { startZoom, startZoomPosition } = this.getState();
+        if (!startZoomPosition) {
+            // We have two modes of zoom:
+            // scroll zoom that are discrete events (transform from the current zoom level),
+            // and pinch zoom that are continuous events (transform from the zoom level when
+            // pinch started).
+            // If startZoom state is defined, then use the startZoom state;
+            // otherwise assume discrete zooming
+            const { zoomX, zoomY } = this.getViewportProps();
+            startZoom = [zoomX, zoomY];
+            startZoomPosition = this._unproject(startPos || pos);
+        }
+        if (!startZoomPosition) {
+            return this;
+        }
+        const newZoomProps = this._constrainZoom(this._calculateNewZoom({ scale, startZoom }));
+        const zoomedViewport = this.makeViewport({ ...this.getViewportProps(), ...newZoomProps });
+        return this._getUpdatedState({
+            ...newZoomProps,
+            ...zoomedViewport.panByPosition(startZoomPosition, pos)
+        });
+    }
+    /**
+     * End zooming
+     * Must call if `zoomStart()` was called
+     */
+    zoomEnd() {
+        return this._getUpdatedState({
+            startZoomPosition: null,
+            startZoom: null
+        });
+    }
+    zoomIn(speed = 2) {
+        return this._getUpdatedState(this._calculateNewZoom({ scale: speed }));
+    }
+    zoomOut(speed = 2) {
+        return this._getUpdatedState(this._calculateNewZoom({ scale: 1 / speed }));
+    }
+    moveLeft(speed = 50) {
+        return this._panFromCenter([-speed, 0]);
+    }
+    moveRight(speed = 50) {
+        return this._panFromCenter([speed, 0]);
+    }
+    moveUp(speed = 50) {
+        return this._panFromCenter([0, -speed]);
     }
+    moveDown(speed = 50) {
+        return this._panFromCenter([0, speed]);
+    }
+    rotateLeft(speed = 15) {
+        return this;
+    }
+    rotateRight(speed = 15) {
+        return this;
+    }
+    rotateUp(speed = 10) {
+        return this;
+    }
+    rotateDown(speed = 10) {
+        return this;
+    }
+    /* Private methods */
+    _project(pos) {
+        const viewport = this.makeViewport(this.getViewportProps());
+        return viewport.project(pos);
+    }
+    _unproject(pos) {
+        const viewport = this.makeViewport(this.getViewportProps());
+        return viewport.unproject(pos);
+    }
+    // Calculates new zoom
     _calculateNewZoom({ scale, startZoom }) {
-        const { maxZoom, minZoom } = this.getViewportProps();
+        const { zoomX, zoomY, zoomAxis } = this.getViewportProps();
         if (startZoom === undefined) {
-            startZoom = this.getViewportProps().zoom;
+            startZoom = [zoomX, zoomY];
+        }
+        const deltaZoom = Math.log2(scale);
+        let [newZoomX, newZoomY] = startZoom;
+        switch (zoomAxis) {
+            case 'X':
+                // Scale x only
+                newZoomX += deltaZoom;
+                break;
+            case 'Y':
+                // Scale y only
+                newZoomY += deltaZoom;
+                break;
+            default:
+                // Lock aspect ratio
+                newZoomX += deltaZoom;
+                newZoomY += deltaZoom;
+        }
+        return {
+            zoomX: newZoomX,
+            zoomY: newZoomY
+        };
+    }
+    _panFromCenter(offset) {
+        const { target } = this.getViewportProps();
+        const center = this._project(target);
+        return this.pan({
+            startPosition: target,
+            pos: [center[0] + offset[0], center[1] + offset[1]]
+        });
+    }
+    _getUpdatedState(newProps) {
+        // @ts-ignore
+        return new this.constructor({
+            makeViewport: this.makeViewport,
+            ...this.getViewportProps(),
+            ...this.getState(),
+            ...newProps
+        });
+    }
+    // Apply any constraints (mathematical or defined by _viewportProps) to map state
+    applyConstraints(props) {
+        // Ensure zoom is within specified range
+        const { zoomX, zoomY } = this._constrainZoom(props, props);
+        props.zoomX = zoomX;
+        props.zoomY = zoomY;
+        // Backward compatibility: update zoom to reflect new view state
+        // zoom will always be ignored when zoomX and zoomY are specified, but legacy apps may still read zoom in `onViewStateChange`
+        props.zoom =
+            Array.isArray(props.zoom) || props.zoomX !== props.zoomY
+                ? [props.zoomX, props.zoomY]
+                : props.zoomX;
+        const { maxBounds, target } = props;
+        if (maxBounds) {
+            // only calculate center and zoom ranges at rotation=0
+            // to maintain visual stability when rotating
+            const halfWidth = props.width / 2 / 2 ** zoomX;
+            const halfHeight = props.height / 2 / 2 ** zoomY;
+            const minX = maxBounds[0][0] + halfWidth;
+            const maxX = maxBounds[1][0] - halfWidth;
+            const minY = maxBounds[0][1] + halfHeight;
+            const maxY = maxBounds[1][1] - halfHeight;
+            const x = clamp(target[0], minX, maxX);
+            const y = clamp(target[1], minY, maxY);
+            if (x !== target[0] || y !== target[1]) {
+                props.target = target.slice();
+                props.target[0] = x;
+                props.target[1] = y;
+            }
         }
-        let deltaZoom = Math.log2(scale);
-        if (Array.isArray(startZoom)) {
-            let [newZoomX, newZoomY] = startZoom;
-            switch (this.zoomAxis) {
-                case 'X':
-                    // Scale x only
-                    newZoomX = clamp(newZoomX + deltaZoom, minZoom, maxZoom);
-                    break;
-                case 'Y':
-                    // Scale y only
-                    newZoomY = clamp(newZoomY + deltaZoom, minZoom, maxZoom);
-                    break;
-                default:
-                    // Lock aspect ratio
-                    let z = Math.min(newZoomX + deltaZoom, newZoomY + deltaZoom);
-                    if (z < minZoom) {
-                        deltaZoom += minZoom - z;
-                    }
-                    z = Math.max(newZoomX + deltaZoom, newZoomY + deltaZoom);
-                    if (z > maxZoom) {
-                        deltaZoom += maxZoom - z;
-                    }
-                    newZoomX += deltaZoom;
-                    newZoomY += deltaZoom;
+        return props;
+    }
+    _constrainZoom({ zoomX, zoomY }, props) {
+        props || (props = this.getViewportProps());
+        const { zoomAxis, maxZoomX, maxZoomY, maxBounds } = props;
+        let { minZoomX, minZoomY } = props;
+        const shouldApplyMaxBounds = maxBounds !== null && props.width > 0 && props.height > 0;
+        if (shouldApplyMaxBounds) {
+            const bl = maxBounds[0];
+            const tr = maxBounds[1];
+            const w = tr[0] - bl[0];
+            const h = tr[1] - bl[1];
+            // ignore bound size of 0 or Infinity
+            if (Number.isFinite(w) && w > 0) {
+                minZoomX = Math.max(minZoomX, Math.log2(props.width / w));
+                if (minZoomX > maxZoomX)
+                    minZoomX = maxZoomX;
+            }
+            if (Number.isFinite(h) && h > 0) {
+                minZoomY = Math.max(minZoomY, Math.log2(props.height / h));
+                if (minZoomY > maxZoomY)
+                    minZoomY = maxZoomY;
             }
-            return [newZoomX, newZoomY];
         }
-        // Ignore `zoomAxis`
-        // `LinearTransitionInterpolator` does not support interpolation between a number and an array
-        // So if zoom is a number (legacy use case), new zoom still has to be a number
-        return clamp(startZoom + deltaZoom, minZoom, maxZoom);
+        switch (zoomAxis) {
+            case 'X':
+                zoomX = clamp(zoomX, minZoomX, maxZoomX);
+                break;
+            case 'Y':
+                zoomY = clamp(zoomY, minZoomY, maxZoomY);
+                break;
+            default:
+                // Lock aspect ratio
+                let delta = Math.min(maxZoomX - zoomX, maxZoomY - zoomY, 0);
+                if (delta === 0) {
+                    delta = Math.max(minZoomX - zoomX, minZoomY - zoomY, 0);
+                }
+                if (delta !== 0) {
+                    zoomX += delta;
+                    zoomY += delta;
+                }
+        }
+        return { zoomX, zoomY };
     }
 }
 export default class OrthographicController extends Controller {
@@ -54,10 +315,14 @@ export default class OrthographicController extends Controller {
         this.ControllerState = OrthographicState;
         this.transition = {
             transitionDuration: 300,
-            transitionInterpolator: new LinearInterpolator(['target', 'zoom'])
+            transitionInterpolator: new LinearInterpolator(['target', 'zoomX', 'zoomY'])
         };
         this.dragMode = 'pan';
     }
+    setProps(props) {
+        Object.assign(props, normalizeZoom(props));
+        super.setProps(props);
+    }
     _onPanRotate() {
         // No rotation in orthographic view
         return false;

package/dist/controllers/orthographic-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"orthographic-controller.js","sourceRoot":"","sources":["../../src/controllers/orthographic-controller.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AACpC,OAAO,UAAU,wBAAqB;AACtC,OAAO,EAAC,UAAU,EAAC,8BAA2B;AAC9C,OAAO,kBAAkB,8CAA2C;AAEpE,MAAM,iBAAkB,SAAQ,UAAU;IAGxC,YAAY,KAAK;QACf,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC;IAC1C,CAAC;IAED,iBAAiB,CAAC,EAAC,KAAK,EAAE,SAAS,EAAC;QAClC,MAAM,EAAC,OAAO,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACnD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,SAAS,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC;QAC3C,CAAC;QACD,IAAI,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,SAAS,CAAC;YACrC,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACtB,KAAK,GAAG;oBACN,eAAe;oBACf,QAAQ,GAAG,KAAK,CAAC,QAAQ,GAAG,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;oBACzD,MAAM;gBACR,KAAK,GAAG;oBACN,eAAe;oBACf,QAAQ,GAAG,KAAK,CAAC,QAAQ,GAAG,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;oBACzD,MAAM;gBACR;oBACE,oBAAoB;oBACpB,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,SAAS,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAC;oBAC7D,IAAI,CAAC,GAAG,OAAO,EAAE,CAAC;wBAChB,SAAS,IAAI,OAAO,GAAG,CAAC,CAAC;oBAC3B,CAAC;oBACD,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,SAAS,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAC;oBACzD,IAAI,CAAC,GAAG,OAAO,EAAE,CAAC;wBAChB,SAAS,IAAI,OAAO,GAAG,CAAC,CAAC;oBAC3B,CAAC;oBACD,QAAQ,IAAI,SAAS,CAAC;oBACtB,QAAQ,IAAI,SAAS,CAAC;YAC1B,CAAC;YACD,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC9B,CAAC;QACD,oBAAoB;QACpB,8FAA8F;QAC9F,8EAA8E;QAC9E,OAAO,KAAK,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;CACF;AAED,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAsB;IAA1E;;QACE,oBAAe,GAAG,iBAAiB,CAAC;QACpC,eAAU,GAAG;YACX,kBAAkB,EAAE,GAAG;YACvB,sBAAsB,EAAE,IAAI,kBAAkB,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SACnE,CAAC;QACF,aAAQ,GAAqB,KAAK,CAAC;IAMrC,CAAC;IAJC,YAAY;QACV,mCAAmC;QACnC,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
+{"version":3,"file":"orthographic-controller.js","sourceRoot":"","sources":["../../src/controllers/orthographic-controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/terrain-controller.d.ts

@@ -0,0 +1,29 @@
+import MapController from "./map-controller.js";
+import { MapState, MapStateProps } from "./map-controller.js";
+import type { ControllerProps, InteractionState } from "./controller.js";
+import type { MjolnirGestureEvent, MjolnirWheelEvent } from 'mjolnir.js';
+/**
+ * Controller that extends MapController with terrain-aware behavior.
+ * The camera smoothly follows terrain elevation during pan/zoom.
+ */
+export default class TerrainController extends MapController {
+    /** Cached terrain altitude from depth picking at viewport center (smoothed) */
+    private _terrainAltitude?;
+    /** Raw (unsmoothed) terrain altitude from latest pick */
+    private _terrainAltitudeTarget?;
+    setProps(props: ControllerProps & MapStateProps & {
+        rotationPivot?: 'center' | '2d' | '3d';
+        getAltitude?: (pos: [number, number]) => number | undefined;
+    }): void;
+    protected updateViewport(newControllerState: MapState, extraProps?: Record<string, any> | null, interactionState?: InteractionState): void;
+    protected _onPanStart(event: MjolnirGestureEvent): boolean;
+    protected _onWheel(event: MjolnirWheelEvent): boolean;
+    protected _onDoubleClick(event: MjolnirGestureEvent): boolean;
+    private _pickTerrainCenterAltitude;
+    /**
+     * Utility function to return viewport that looks the same, but with
+     * a position shifted to [0, 0, altitude]
+     */
+    private _rebaseViewport;
+}
+//# sourceMappingURL=terrain-controller.d.ts.map

package/dist/controllers/terrain-controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"terrain-controller.d.ts","sourceRoot":"","sources":["../../src/controllers/terrain-controller.ts"],"names":[],"mappings":"AAIA,OAAO,aAAa,4BAAyB;AAC7C,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,4BAAyB;AACzD,OAAO,KAAK,EAAC,eAAe,EAAE,gBAAgB,EAAC,wBAAqB;AACpE,OAAO,KAAK,EAAC,mBAAmB,EAAE,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAEvE;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,aAAa;IAC1D,+EAA+E;IAC/E,OAAO,CAAC,gBAAgB,CAAC,CAAqB;IAC9C,yDAAyD;IACzD,OAAO,CAAC,sBAAsB,CAAC,CAAqB;IAEpD,QAAQ,CACN,KAAK,EAAE,eAAe,GACpB,aAAa,GAAG;QACd,aAAa,CAAC,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC;QACvC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,MAAM,GAAG,SAAS,CAAC;KAC7D;IAoBL,SAAS,CAAC,cAAc,CACtB,kBAAkB,EAAE,QAAQ,EAC5B,UAAU,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAW,EAC7C,gBAAgB,GAAE,gBAAqB,GACtC,IAAI;IA6BP,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO;IAK1D,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO;IAKrD,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO;IAK7D,OAAO,CAAC,0BAA0B;IAYlC;;;OAGG;IACH,OAAO,CAAC,eAAe;CAqCxB"}