Merge pull request #154 from TileDB-Inc/xan/sc-40029/geo-polygon-fix

Fix polygons with different coordinate systems
TileDB-Inc · Jan 26, 2024 · 70eb7e0 · 70eb7e0
2 parents bcdd070 + 188b0ae
commit 70eb7e0
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 15 deletions.
diff --git a/packages/core/src/tile/model/geometry/geometry.ts b/packages/core/src/tile/model/geometry/geometry.ts
@@ -201,9 +201,12 @@ export class GeometryTile extends Tile<GeometryResponse> {
       this.mesh.material!.disableColorWrite = !(
         updateOptions.style & GeometryStyle.FILLED
       );
-      this.mesh.edgesRenderer!.isEnabled = Boolean(
-        updateOptions.style & GeometryStyle.OUTLINED
-      );
+
+      if (this.mesh.edgesRenderer) {
+        this.mesh.edgesRenderer.isEnabled = Boolean(
+          updateOptions.style & GeometryStyle.OUTLINED
+        );
+      }
     }
 
     this.mesh.visibility = updateOptions.fillOpacity ?? this.mesh.visibility;

diff --git a/packages/core/src/tile/model/geometry/geometryManager.ts b/packages/core/src/tile/model/geometry/geometryManager.ts
@@ -171,6 +171,8 @@ export class GeometryManager extends Manager<GeometryTile> {
         continue;
       }
 
+      this.tileStatus.delete(key);
+
       if (status.state !== TileState.VISIBLE) {
         this.workerPool.cancelRequest({
           type: RequestType.CANCEL,
@@ -181,8 +183,6 @@ export class GeometryManager extends Manager<GeometryTile> {
       } else if (status.state === TileState.VISIBLE) {
         status.tile?.dispose();
       }
-
-      this.tileStatus.delete(key);
     }
   }
 
@@ -503,6 +503,7 @@ export class GeometryManager extends Manager<GeometryTile> {
           geometryCRS: this.metadata.crs,
           geotransformCoefficients: this.transformationCoefficients,
           metersPerUnit: this.metersPerUnit,
+          features: this.metadata.features,
           nonce: response.nonce
         } as GeometryMessage
       } as DataRequest);

diff --git a/packages/core/src/tile/tileImage.ts b/packages/core/src/tile/tileImage.ts
@@ -224,9 +224,7 @@ export class TileDBTileImageVisualization extends TileDBVisualization {
           )
         );
 
-        await initializeCacheDB([
-          `${geometryArrayID}_${this.tileSize / 2 ** nativeZoom}`
-        ]);
+        await initializeCacheDB([`${id}_${this.tileSize / 2 ** nativeZoom}`]);
       }
     }
 

diff --git a/packages/core/src/tile/worker/loaders/geometryLoader.ts b/packages/core/src/tile/worker/loaders/geometryLoader.ts
@@ -83,6 +83,7 @@ export async function geometryRequest(
     request.index,
     tileSize,
     affineMatrix,
+    request.pad,
     request.imageCRS,
     request.geometryCRS
   );
@@ -135,6 +136,11 @@ export async function geometryRequest(
     vertexMap: new Map<bigint, number[]>()
   };
 
+  const converter =
+    request.imageCRS && request.geometryCRS
+      ? proj4(request.geometryCRS, request.imageCRS)
+      : null;
+
   try {
     for await (const result of generator) {
       switch (request.geometryAttribute.type) {
@@ -145,6 +151,7 @@ export async function geometryRequest(
             request.features,
             request.type,
             inv(affineMatrix),
+            converter,
             geometryOutput
           );
           break;
@@ -155,6 +162,7 @@ export async function geometryRequest(
             request.features,
             request.type,
             inv(affineMatrix),
+            converter,
             geometryOutput
           );
           break;
@@ -242,8 +250,8 @@ function calculateQueryRanges(
   let minPoint = matrix([x * tilesize, y * tilesize, 1]);
   let maxPoint = matrix([(x + 1) * tilesize, (y + 1) * tilesize, 1]);
 
-  minPoint = multiply(minPoint, affineMatrix);
-  maxPoint = multiply(maxPoint, affineMatrix);
+  minPoint = multiply(affineMatrix, minPoint);
+  maxPoint = multiply(affineMatrix, maxPoint);
 
   if (baseCRS && sourceCRS) {
     const converter = proj4(baseCRS, sourceCRS);
@@ -289,6 +297,7 @@ function loadBinaryGeometry(
   features: Feature[],
   geometryType: string,
   affineTransform: Matrix,
+  converter: any | undefined,
   outputGeometry: OutputGeometry
 ) {
   const offsets = data['__offsets'][attributes.geometry.name] as BigUint64Array;
@@ -353,7 +362,8 @@ function loadBinaryGeometry(
         id,
         outputGeometry,
         featureData,
-        affineTransform
+        affineTransform,
+        converter
       );
       break;
     default:
@@ -367,6 +377,7 @@ function loadStringGeometry(
   features: Feature[],
   geometryType: string,
   affineTransform: Matrix,
+  converter: any | undefined,
   outputGeometry: OutputGeometry
 ) {
   const wkt = data[attributes.geometry.name] as string[];
@@ -425,7 +436,8 @@ function loadStringGeometry(
         id,
         outputGeometry,
         featureData,
-        affineTransform
+        affineTransform,
+        converter
       );
       break;
     default:

diff --git a/packages/core/src/tile/worker/parsers.ts b/packages/core/src/tile/worker/parsers.ts
@@ -61,9 +61,9 @@ export function parsePolygon(
       }
 
       shape.push(
-        multiply([point.x, point.y, 1], affineTransform)
+        multiply(affineTransform, [point.x!, point.y!, 1])
           .subset(index([true, true, false]))
-          .toArray()
+          .toArray() as number[]
       );
     }
     data.push(shape);
@@ -85,7 +85,7 @@ export function parsePolygon(
         }
 
         hole.push(
-          multiply([point.x, point.y, 1], affineTransform)
+          multiply(affineTransform, [point.x, point.y, 1])
             .subset(index([true, true, false]))
             .toArray()
         );