@treasuryspatial/map-kit 0.1.12 → 0.1.14

package/dist/mapThreeLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mapThreeLayer.d.ts","sourceRoot":"","sources":["../src/mapThreeLayer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,QAAQ,CAAC,oBAAoB,CAAC;IACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,IAAI,KAAK,IAAI,CAAC;IAC9C,SAAS,EAAE,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,KAAK,IAAI,CAAC;IACjE,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC;IAC3F,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,aAAa,CAmWhF"}
+{"version":3,"file":"mapThreeLayer.d.ts","sourceRoot":"","sources":["../src/mapThreeLayer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,QAAQ,CAAC,oBAAoB,CAAC;IACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,IAAI,KAAK,IAAI,CAAC;IAC9C,SAAS,EAAE,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,KAAK,IAAI,CAAC;IACjE,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC;IAC3F,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,aAAa,CA2VhF"}

package/dist/mapThreeLayer.js

@@ -24,15 +24,6 @@ export function createMapThreeLayer(options) {
     let originResolved = false;
     let didPrerender = false;
     let lastMatrix = null;
-    const applyMatrix = (matrix) => {
-        if (!matrix || !camera)
-            return;
-        lastMatrix = matrix;
-        camera.projectionMatrix = new THREE.Matrix4().fromArray(matrix);
-        if ('projectionMatrixInverse' in camera) {
-            camera.projectionMatrixInverse.copy(camera.projectionMatrix).invert();
-        }
-    };
     const renderOffscreen = () => {
         if (renderDisabled)
             return;
@@ -40,9 +31,6 @@ export function createMapThreeLayer(options) {
             return;
         if (!hasRenderable)
             return;
-        if (lastMatrix) {
-            applyMatrix(lastMatrix);
-        }
         if (!mercatorOrigin && mapRef && !originResolved) {
             try {
                 const center = mapRef.getCenter();
@@ -61,11 +49,15 @@ export function createMapThreeLayer(options) {
                 logError('origin fallback failed', err);
             }
         }
-        if (mercatorOrigin) {
+        if (mercatorOrigin && lastMatrix && camera) {
+            const m = new THREE.Matrix4().fromArray(lastMatrix);
             const translate = new THREE.Matrix4().makeTranslation(mercatorOrigin.x, mercatorOrigin.y, (mercatorOrigin.z ?? 0) + zOffset * meterScale);
             const scale = new THREE.Matrix4().makeScale(meterScale, -meterScale, meterScale);
-            rootGroup.matrix = new THREE.Matrix4().multiplyMatrices(translate, scale);
-            rootGroup.matrixWorldNeedsUpdate = true;
+            const l = new THREE.Matrix4().multiplyMatrices(translate, scale);
+            camera.projectionMatrix = m.multiply(l);
+            if ('projectionMatrixInverse' in camera) {
+                camera.projectionMatrixInverse.copy(camera.projectionMatrix).invert();
+            }
         }
         const canvas = mapRef?.getCanvas();
         if (canvas && (canvas.width !== targetWidth || canvas.height !== targetHeight)) {
@@ -227,7 +219,7 @@ export function createMapThreeLayer(options) {
             if (!hasRenderable)
                 return;
             try {
-                applyMatrix(matrix);
+                lastMatrix = matrix;
                 renderOffscreen();
                 didPrerender = true;
             }
@@ -249,7 +241,7 @@ export function createMapThreeLayer(options) {
                 return;
             try {
                 if (matrix) {
-                    applyMatrix(matrix);
+                    lastMatrix = matrix;
                 }
                 if (!didPrerender) {
                     renderOffscreen();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@treasuryspatial/map-kit",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "type": "module",
   "license": "UNLICENSED",
   "main": "./dist/index.js",