@deck.gl/core 9.2.11 → 9.3.0-alpha.2

package/dist/viewports/orbit-viewport.js

@@ -4,6 +4,7 @@
 import Viewport from "../viewports/viewport.js";
 import { Matrix4 } from '@math.gl/core';
 import { pixelsToWorld, fovyToAltitude } from '@math.gl/web-mercator';
+import { getProjectionParameters } from "../utils/math-utils.js";
 const DEGREES_TO_RADIANS = Math.PI / 180;
 function getViewMatrix({ height, focalDistance, orbitAxis, rotationX, rotationOrbit, zoom }) {
     // We position the camera so that one common space unit (world space unit scaled by zoom)
@@ -72,9 +73,13 @@ class OrbitViewport extends Viewport {
     }
     panByPosition(coords, pixel, startPixel) {
         const p0 = this.project(coords);
+        const { near, far } = getProjectionParameters(this.projectionMatrix);
+        const pz = (near * far) / (far - p0[2] * (far - near));
+        const centerZ = (near * far) / (far - this.projectedCenter[2] * (far - near));
+        const shiftScale = pz / centerZ;
         const nextCenter = [
-            this.width / 2 + p0[0] - pixel[0],
-            this.height / 2 + p0[1] - pixel[1],
+            this.width / 2 + (p0[0] - pixel[0]) * shiftScale,
+            this.height / 2 + (p0[1] - pixel[1]) * shiftScale,
             this.projectedCenter[2]
         ];
         return {

package/dist/viewports/orbit-viewport.js.map

@@ -1 +1 @@
-{"version":3,"file":"orbit-viewport.js","sourceRoot":"","sources":["../../src/viewports/orbit-viewport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orbit-viewport.js","sourceRoot":"","sources":["../../src/viewports/orbit-viewport.ts"],"names":[],"mappings":"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"}

package/dist/viewports/orthographic-viewport.d.ts

@@ -1,5 +1,8 @@
 import Viewport from "../viewports/viewport.js";
 import type { Padding } from "./viewport.js";
+/** independent zoom levels for X and Y axes
+ * @deprecated use `zoomX` and `zoomY` instead */
+type Deprecated2DZoom = [number, number];
 export type OrthographicViewportOptions = {
     /** Name of the viewport */
     id?: string;
@@ -14,8 +17,10 @@ export type OrthographicViewportOptions = {
     /** The world position at the center of the viewport. Default `[0, 0, 0]`. */
     target?: [number, number, number] | [number, number];
     /**  The zoom level of the viewport. `zoom: 0` maps one unit distance to one pixel on screen, and increasing `zoom` by `1` scales the same object to twice as large.
-     *   To apply independent zoom levels to the X and Y axes, supply an array `[zoomX, zoomY]`. Default `0`. */
-    zoom?: number | [number, number];
+     *   To apply independent zoom levels to the X and Y axes, use `zoomX` and `zoomY`.
+     * @default 0
+     */
+    zoom?: number | Deprecated2DZoom;
     /** Independent zoom along the X axis. Overrides `zoom`. */
     zoomX?: number;
     /** Independent zoom along the Y axis. Overrides `zoom`. */
@@ -40,4 +45,5 @@ export default class OrthographicViewport extends Viewport {
     unprojectFlat([x, y]: number[]): [number, number];
     panByPosition(coords: number[], pixel: number[], startPixel?: number[]): OrthographicViewportOptions;
 }
+export {};
 //# sourceMappingURL=orthographic-viewport.d.ts.map

package/dist/viewports/orthographic-viewport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orthographic-viewport.d.ts","sourceRoot":"","sources":["../../src/viewports/orthographic-viewport.ts"],"names":[],"mappings":"AAIA,OAAO,QAAQ,iCAA8B;AAK7C,OAAO,KAAK,EAAC,OAAO,EAAC,sBAAmB;AAyCxC,MAAM,MAAM,2BAA2B,GAAG;IACxC,2BAA2B;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,kDAAkD;IAClD,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,iDAAiD;IACjD,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,6EAA6E;IAC7E,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD;gHAC4G;IAC5G,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,2DAA2D;IAC3D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2DAA2D;IAC3D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,sDAAsD;IACtD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,yGAAyG;IACzG,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,QAAQ;IACxD,MAAM,CAAC,WAAW,SAA0B;IAE5C,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;gBAEH,KAAK,EAAE,2BAA2B;IAmD9C,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAK/C,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAMjD,aAAa,CACX,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EAAE,EACf,UAAU,CAAC,EAAE,MAAM,EAAE,GACpB,2BAA2B;CAS/B"}
+{"version":3,"file":"orthographic-viewport.d.ts","sourceRoot":"","sources":["../../src/viewports/orthographic-viewport.ts"],"names":[],"mappings":"AAIA,OAAO,QAAQ,iCAA8B;AAK7C,OAAO,KAAK,EAAC,OAAO,EAAC,sBAAmB;AAyCxC;iDACiD;AACjD,KAAK,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEzC,MAAM,MAAM,2BAA2B,GAAG;IACxC,2BAA2B;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,kDAAkD;IAClD,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,iDAAiD;IACjD,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,6EAA6E;IAC7E,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACjC,2DAA2D;IAC3D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2DAA2D;IAC3D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,sDAAsD;IACtD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,yGAAyG;IACzG,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,QAAQ;IACxD,MAAM,CAAC,WAAW,SAA0B;IAE5C,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;gBAEH,KAAK,EAAE,2BAA2B;IAmD9C,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAK/C,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAMjD,aAAa,CACX,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EAAE,EACf,UAAU,CAAC,EAAE,MAAM,EAAE,GACpB,2BAA2B;CAS/B"}

package/dist/viewports/orthographic-viewport.js.map

@@ -1 +1 @@
-{"version":3,"file":"orthographic-viewport.js","sourceRoot":"","sources":["../../src/viewports/orthographic-viewport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orthographic-viewport.js","sourceRoot":"","sources":["../../src/viewports/orthographic-viewport.ts"],"names":[],"mappings":"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"}

package/dist/viewports/web-mercator-viewport.d.ts

@@ -82,6 +82,11 @@ export default class WebMercatorViewport extends Viewport {
      */
     addMetersToLngLat(lngLatZ: number[], xyz: number[]): number[];
     panByPosition(coords: number[], pixel: number[], startPixel?: number[]): WebMercatorViewportOptions;
+    /**
+     * Returns a new longitude and latitude that keeps a 3D world coordinate at a given screen pixel
+     * This version handles the z-component (altitude) properly for cameras positioned above ground
+     */
+    panByPosition3D(coords: number[], pixel: number[]): WebMercatorViewportOptions;
     getBounds(options?: {
         z?: number;
     }): [number, number, number, number];

package/dist/viewports/web-mercator-viewport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web-mercator-viewport.d.ts","sourceRoot":"","sources":["../../src/viewports/web-mercator-viewport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"web-mercator-viewport.d.ts","sourceRoot":"","sources":["../../src/viewports/web-mercator-viewport.ts"],"names":[],"mappings":"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"}

package/dist/viewports/web-mercator-viewport.js

@@ -159,6 +159,15 @@ class WebMercatorViewport extends Viewport {
         const [longitude, latitude] = this.unprojectFlat(newCenter);
         return { longitude, latitude };
     }
+    /**
+     * Returns a new longitude and latitude that keeps a 3D world coordinate at a given screen pixel
+     * This version handles the z-component (altitude) properly for cameras positioned above ground
+     */
+    panByPosition3D(coords, pixel) {
+        const targetZ = coords[2] || 0;
+        const deltaLngLat = vec2.sub([], coords, this.unproject(pixel, { targetZ }));
+        return { longitude: this.longitude + deltaLngLat[0], latitude: this.latitude + deltaLngLat[1] };
+    }
     getBounds(options = {}) {
         // @ts-ignore
         const corners = getBounds(this, options.z || 0);

package/dist/viewports/web-mercator-viewport.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-mercator-viewport.js","sourceRoot":"","sources":["../../src/viewports/web-mercator-viewport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"web-mercator-viewport.js","sourceRoot":"","sources":["../../src/viewports/web-mercator-viewport.ts"],"names":[],"mappings":"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"}

package/dist/views/orthographic-view.d.ts

@@ -1,16 +1,49 @@
 import View, { CommonViewState, CommonViewProps } from "./view.js";
 import OrthographicViewport from "../viewports/orthographic-viewport.js";
 import OrthographicController from "../controllers/orthographic-controller.js";
+/** independent zoom levels for X and Y axes
+ * @deprecated use `zoomX` and `zoomY` instead */
+type Deprecated2DZoom = [number, number];
 export type OrthographicViewState = {
     /** The world position at the center of the viewport. Default `[0, 0, 0]`. */
     target?: [number, number, number] | [number, number];
     /**  The zoom level of the viewport. `zoom: 0` maps one unit distance to one pixel on screen, and increasing `zoom` by `1` scales the same object to twice as large.
-     *   To apply independent zoom levels to the X and Y axes, supply an array `[zoomX, zoomY]`. Default `0`. */
-    zoom?: number | [number, number];
-    /** The min zoom level of the viewport. Default `-Infinity`. */
+     *   To apply independent zoom levels to the X and Y axes, use `zoomX` and `zoomY`.
+     * @default 0
+     */
+    zoom?: number | Deprecated2DZoom;
+    /** Which axes to apply zoom to. One of 'X', 'Y' or 'all'
+     * @default 'all'
+     */
+    zoomAxis?: 'X' | 'Y' | 'all';
+    /** The zoom level along X axis. Overrides `zoom` if supplied. */
+    zoomX?: number;
+    /** The zoom level along Y axis. Overrides `zoom` if supplied. */
+    zoomY?: number;
+    /** The min zoom level of the viewport.
+     * @default -Infinity
+     */
     minZoom?: number;
-    /** The max zoom level of the viewport. Default `Infinity`. */
+    /** The max zoom level of the viewport.
+     * @default Infinity
+     */
     maxZoom?: number;
+    /** The min zoom level along X axis.
+     * @default `minZoom`
+     */
+    maxZoomX?: number;
+    /** The max zoom level along X axis.
+     * @default `maxZoom`
+     */
+    minZoomX?: number;
+    /** The min zoom level along Y axis.
+     * @default `minZoom`
+     */
+    maxZoomY?: number;
+    /** The max zoom level along Y axis.
+     * @default `maxZoom`
+     */
+    minZoomY?: number;
 } & CommonViewState;
 export type OrthographicViewProps = {
     /** Distance of near clipping plane. Default `0.1`. */
@@ -26,4 +59,5 @@ export default class OrthographicView extends View<OrthographicViewState, Orthog
     getViewportType(): typeof OrthographicViewport;
     get ControllerType(): typeof OrthographicController;
 }
+export {};
 //# sourceMappingURL=orthographic-view.d.ts.map

package/dist/views/orthographic-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orthographic-view.d.ts","sourceRoot":"","sources":["../../src/views/orthographic-view.ts"],"names":[],"mappings":"AAIA,OAAO,IAAI,EAAE,EAAC,eAAe,EAAE,eAAe,EAAC,kBAAe;AAC9D,OAAO,oBAAoB,8CAA2C;AACtE,OAAO,sBAAsB,kDAA+C;AAE5E,MAAM,MAAM,qBAAqB,GAAG;IAClC,6EAA6E;IAC7E,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD;gHAC4G;IAC5G,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,+DAA+D;IAC/D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,eAAe,CAAC;AAEpB,MAAM,MAAM,qBAAqB,GAAG;IAClC,sDAAsD;IACtD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,yGAAyG;IACzG,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,GAAG,eAAe,CAAC,qBAAqB,CAAC,CAAC;AAE3C,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAC9F,MAAM,CAAC,WAAW,SAAsB;gBAE5B,KAAK,GAAE,qBAA0B;IAI7C,eAAe;IAIf,IAAI,cAAc,kCAEjB;CACF"}
+{"version":3,"file":"orthographic-view.d.ts","sourceRoot":"","sources":["../../src/views/orthographic-view.ts"],"names":[],"mappings":"AAIA,OAAO,IAAI,EAAE,EAAC,eAAe,EAAE,eAAe,EAAC,kBAAe;AAC9D,OAAO,oBAAoB,8CAA2C;AACtE,OAAO,sBAAsB,kDAA+C;AAE5E;iDACiD;AACjD,KAAK,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEzC,MAAM,MAAM,qBAAqB,GAAG;IAClC,6EAA6E;IAC7E,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACjC;;OAEG;IACH,QAAQ,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,KAAK,CAAC;IAC7B,iEAAiE;IACjE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iEAAiE;IACjE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,eAAe,CAAC;AAEpB,MAAM,MAAM,qBAAqB,GAAG;IAClC,sDAAsD;IACtD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,yGAAyG;IACzG,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,GAAG,eAAe,CAAC,qBAAqB,CAAC,CAAC;AAE3C,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAC9F,MAAM,CAAC,WAAW,SAAsB;gBAE5B,KAAK,GAAE,qBAA0B;IAI7C,eAAe;IAIf,IAAI,cAAc,kCAEjB;CACF"}

package/dist/views/orthographic-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"orthographic-view.js","sourceRoot":"","sources":["../../src/views/orthographic-view.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,IAAwC,kBAAe;AAC9D,OAAO,oBAAoB,8CAA2C;AACtE,OAAO,sBAAsB,kDAA+C;AAuB5E,MAAqB,gBAAiB,SAAQ,IAAkD;IAG9F,YAAY,QAA+B,EAAE;QAC3C,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAED,eAAe;QACb,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,sBAAsB,CAAC;IAChC,CAAC;;AAZM,4BAAW,GAAG,kBAAkB,CAAC;eADrB,gBAAgB"}
+{"version":3,"file":"orthographic-view.js","sourceRoot":"","sources":["../../src/views/orthographic-view.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,IAAwC,kBAAe;AAC9D,OAAO,oBAAoB,8CAA2C;AACtE,OAAO,sBAAsB,kDAA+C;AAyD5E,MAAqB,gBAAiB,SAAQ,IAAkD;IAG9F,YAAY,QAA+B,EAAE;QAC3C,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAED,eAAe;QACb,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,sBAAsB,CAAC;IAChC,CAAC;;AAZM,4BAAW,GAAG,kBAAkB,CAAC;eADrB,gBAAgB"}

package/dist/views/view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/views/view.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/views/view.ts"],"names":[],"mappings":"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"}

package/dist/views/view.js

@@ -3,6 +3,7 @@
 // Copyright (c) vis.gl contributors
 import { parsePosition, getPosition } from "../utils/positions.js";
 import { deepEqual } from "../utils/deep-equal.js";
+import { deepMergeViewState } from "../utils/deep-merge.js";
 export default class View {
     constructor(props) {
         const { id, x = 0, y = 0, width = '100%', height = '100%', padding = null } = props;
@@ -63,14 +64,7 @@ export default class View {
             if (!this.props.viewState.id) {
                 return this.props.viewState;
             }
-            // Merge in all props from View's viewState, except id
-            const newViewState = { ...viewState };
-            for (const key in this.props.viewState) {
-                if (key !== 'id') {
-                    newViewState[key] = this.props.viewState[key];
-                }
-            }
-            return newViewState;
+            return deepMergeViewState(viewState, this.props.viewState);
         }
         return viewState;
     }

package/dist/views/view.js.map

@@ -1 +1 @@
-{"version":3,"file":"view.js","sourceRoot":"","sources":["../../src/views/view.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"view.js","sourceRoot":"","sources":["../../src/views/view.ts"],"names":[],"mappings":"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"}