Fix geojson source bbox bug + add test

TerriaJS · Feb 7, 2025 · a73f22e · a73f22e
1 parent dac707d
commit a73f22e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/lib/Map/Vector/Protomaps/ProtomapsGeojsonSource.ts b/lib/Map/Vector/Protomaps/ProtomapsGeojsonSource.ts
@@ -238,12 +238,12 @@ export function geojsonVtTileToProtomapsFeatures(
       // Multi-polygon
       if (Array.isArray(f.geometry[0][0])) {
         // Note: the type is incorrect here
-        const geom = f.geometry as any as [number, number][][];
+        const geom = f.geometry as unknown as [number, number][][];
         transformedGeom = geom.map((g1) =>
           g1.map((g2) => {
-            const x = g2[0];
-            const y = g2[1];
-            g2 = [x * scale, y * scale];
+            const x = g2[0] * scale;
+            const y = g2[1] * scale;
+
             if (bbox.minX > x) {
               bbox.minX = x;
             }
@@ -272,9 +272,8 @@ export function geojsonVtTileToProtomapsFeatures(
         const geom = f.geometry as [number, number][];
         transformedGeom = [
           geom.map((g1) => {
-            const x = g1[0];
-            const y = g1[1];
-            g1 = [x * scale, y * scale];
+            const x = g1[0] * scale;
+            const y = g1[1] * scale;
 
             if (bbox.minX > x) {
               bbox.minX = x;

diff --git a/test/Models/Catalog/CatalogItems/GeoJsonCatalogItemSpec.ts b/test/Models/Catalog/CatalogItems/GeoJsonCatalogItemSpec.ts
@@ -1248,6 +1248,13 @@ describe("GeoJsonCatalogItemSpec", () => {
       expect(features.get(GEOJSON_SOURCE_LAYER_NAME)?.length).toEqual(1);
       const feature = features.get(GEOJSON_SOURCE_LAYER_NAME)?.[0];
       expect(feature?.geom.length).toEqual(4);
+
+      expect(feature?.bbox).toEqual({
+        maxX: 288,
+        maxY: 204.3125,
+        minX: -32,
+        minY: -32
+      });
     });
   });