From ce3e5c3ab219efd2e1dd768d54048355663265b0 Mon Sep 17 00:00:00 2001 From: Wentao Kuang Date: Mon, 6 Oct 2025 13:40:46 +1300 Subject: [PATCH 1/4] Add screenshot tests for topographic-v2 maps. --- src/tiles.ts | 102 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 66 insertions(+), 36 deletions(-) diff --git a/src/tiles.ts b/src/tiles.ts index 5287170..4f7bfd7 100644 --- a/src/tiles.ts +++ b/src/tiles.ts @@ -47,74 +47,74 @@ export const DefaultTestTiles: TestTile[] = [ tileSet: 'aerial', }, { - name: 'topographic-3857-z8', + name: 'topographic-v2-3857-z8', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -39.2169833, lng: 176.4774344, z: 8 }, - tileSet: 'topographic', - style: 'topographic', + tileSet: 'topographic-v2', + style: 'topographic-v2', }, { - name: 'topolite-3857-z8', + name: 'topolite-v2-3857-z8', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -39.2169833, lng: 176.4774344, z: 8 }, - tileSet: 'topographic', - style: 'topolite', + tileSet: 'topographic-v2', + style: 'topolite-v2', }, { - name: 'topographic-3857-z14', + name: 'topographic-v2-3857-z14', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -41.8899962, lng: 174.0492437, z: 14 }, - tileSet: 'topographic', - style: 'topographic', + tileSet: 'topographic-v2', + style: 'topographic-v2', }, { - name: 'topographic-3857-ngauranga-z15', + name: 'topographic-v2-3857-ngauranga-z15', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -41.2454458, lng: 174.8101136, z: 15 }, - tileSet: 'topographic', - style: 'topographic', + tileSet: 'topographic-v2', + style: 'topographic-v2', }, { - name: 'topographic-3857-auckland-airport-z13', + name: 'topographic-v2-3857-auckland-airport-z13', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -37.000845, lng: 174.8064383, z: 13 }, - tileSet: 'topographic', - style: 'topographic', + tileSet: 'topographic-v2', + style: 'topographic-v2', }, { - name: 'topographic-3857-otaki-south-z13', + name: 'topographic-v2-3857-otaki-south-z13', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -40.7727954, lng: 175.1504838, z: 13 }, - tileSet: 'topographic', - style: 'topographic', + tileSet: 'topographic-v2', + style: 'topographic-v2', }, { - name: 'topographic-3857-christchurch-north-urban-z17', + name: 'topographic-v2-3857-christchurch-north-urban-z17', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -43.4567506, lng: 172.6109426, z: 17 }, - tileSet: 'topographic', - style: 'topographic', + tileSet: 'topographic-v2', + style: 'topographic-v2', }, { - name: 'topographic-3857-mount-cook-village-z12', + name: 'topographic-v2-3857-mount-cook-village-z12', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -43.717227, lng: 170.0844837, z: 12 }, - tileSet: 'topographic', - style: 'topographic', + tileSet: 'topographic-v2', + style: 'topographic-v2', }, { - name: 'topolite-3857-ngauranga-z15', + name: 'topolite-v2-3857-ngauranga-z15', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -41.2454458, lng: 174.8101136, z: 15 }, - tileSet: 'topographic', - style: 'topolite', + tileSet: 'topographic-v2', + style: 'topolite-v2', }, { - name: 'topolite-3857-z17', + name: 'topolite-v2-3857-z17', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -43.8063936, lng: 172.9679876, z: 17 }, - tileSet: 'topographic', - style: 'topolite', + tileSet: 'topographic-v2', + style: 'topolite-v2', }, { name: 'aerial-3857-terrain-hillshade-z6', @@ -142,20 +142,20 @@ export const DefaultTestTiles: TestTile[] = [ terrain: 'LINZ-Terrain', }, { - name: 'topographic-3857-terrain-hillshade-z12', + name: 'topographic-v2-3857-terrain-hillshade-z12', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -42.4146988, lng: 174.1766669, z: 5 }, - tileSet: 'topographic', - style: 'topographic', + tileSet: 'topographic-v2', + style: 'topographic-v2', terrain: 'LINZ-Terrain', hillshade: 'LINZ-Terrain', }, { - name: 'topolite-3857-hillshade-z4', + name: 'topolite-v2-3857-hillshade-z4', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -41.6092133, lng: 173.0748696, z: 4 }, - tileSet: 'topographic', - style: 'topolite', + tileSet: 'topographic-v2', + style: 'topolite-v2', hillshade: 'LINZ-Terrain', }, { @@ -182,4 +182,34 @@ export const DefaultTestTiles: TestTile[] = [ tileSet: 'topo-raster', style: 'topo-raster', }, + + // TODO: We will keep support for these tilesets for 90 days, please remove the tests after deprecating + { + name: 'topographic-3857-z8', + tileMatrix: TileMatrixIdentifier.Google, + location: { lat: -39.2169833, lng: 176.4774344, z: 8 }, + tileSet: 'topographic', + style: 'topographic', + }, + { + name: 'topolite-3857-z8', + tileMatrix: TileMatrixIdentifier.Google, + location: { lat: -39.2169833, lng: 176.4774344, z: 8 }, + tileSet: 'topographic', + style: 'topolite', + }, + { + name: 'topographic-3857-mount-cook-village-z12', + tileMatrix: TileMatrixIdentifier.Google, + location: { lat: -43.717227, lng: 170.0844837, z: 12 }, + tileSet: 'topographic', + style: 'topographic', + }, + { + name: 'topolite-3857-ngauranga-z15', + tileMatrix: TileMatrixIdentifier.Google, + location: { lat: -41.2454458, lng: 174.8101136, z: 15 }, + tileSet: 'topographic', + style: 'topolite', + }, ]; From 61ad73997a115f9c7f2f4ea80459112bd4b11344 Mon Sep 17 00:00:00 2001 From: Tawera Manaena Date: Wed, 8 Oct 2025 13:21:23 +1300 Subject: [PATCH 2/4] refactor: group similar tests under headings --- src/tiles.ts | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/tiles.ts b/src/tiles.ts index 4f7bfd7..14535ca 100644 --- a/src/tiles.ts +++ b/src/tiles.ts @@ -22,6 +22,9 @@ export interface TestTile { } export const DefaultTestTiles: TestTile[] = [ + /** + * health: mainland + */ { name: 'health-3857-z5', tileMatrix: TileMatrixIdentifier.Google, @@ -34,6 +37,9 @@ export const DefaultTestTiles: TestTile[] = [ location: { lat: -41.8899962, lng: 174.0492437, z: 3 }, tileSet: 'health', }, + /** + * aerial: specific locations + */ { name: 'aerial-3857-wellington-urban-z16', tileMatrix: TileMatrixIdentifier.Google, @@ -46,6 +52,9 @@ export const DefaultTestTiles: TestTile[] = [ location: { lat: -43.4040409, lng: 172.5393086, z: 12 }, tileSet: 'aerial', }, + /** + * topographic-v2: north island + */ { name: 'topographic-v2-3857-z8', tileMatrix: TileMatrixIdentifier.Google, @@ -53,6 +62,9 @@ export const DefaultTestTiles: TestTile[] = [ tileSet: 'topographic-v2', style: 'topographic-v2', }, + /** + * topolite-v2: north island + */ { name: 'topolite-v2-3857-z8', tileMatrix: TileMatrixIdentifier.Google, @@ -60,6 +72,9 @@ export const DefaultTestTiles: TestTile[] = [ tileSet: 'topographic-v2', style: 'topolite-v2', }, + /** + * topographic-v2: specific locations + */ { name: 'topographic-v2-3857-z14', tileMatrix: TileMatrixIdentifier.Google, @@ -102,6 +117,9 @@ export const DefaultTestTiles: TestTile[] = [ tileSet: 'topographic-v2', style: 'topographic-v2', }, + /** + * topolite-v2: specific locations + */ { name: 'topolite-v2-3857-ngauranga-z15', tileMatrix: TileMatrixIdentifier.Google, @@ -116,6 +134,9 @@ export const DefaultTestTiles: TestTile[] = [ tileSet: 'topographic-v2', style: 'topolite-v2', }, + /** + * aerial: terrain + hillshade, hillshade, terrain + */ { name: 'aerial-3857-terrain-hillshade-z6', tileMatrix: TileMatrixIdentifier.Google, @@ -141,6 +162,9 @@ export const DefaultTestTiles: TestTile[] = [ style: 'aerial', terrain: 'LINZ-Terrain', }, + /** + * topographic-v2: terrain + hillshade, hillshade + */ { name: 'topographic-v2-3857-terrain-hillshade-z12', tileMatrix: TileMatrixIdentifier.Google, @@ -150,6 +174,9 @@ export const DefaultTestTiles: TestTile[] = [ terrain: 'LINZ-Terrain', hillshade: 'LINZ-Terrain', }, + /** + * topolite-v2: hillshade + */ { name: 'topolite-v2-3857-hillshade-z4', tileMatrix: TileMatrixIdentifier.Google, @@ -158,6 +185,9 @@ export const DefaultTestTiles: TestTile[] = [ style: 'topolite-v2', hillshade: 'LINZ-Terrain', }, + /** + * topo-raster: specific locations + */ { // verify the absence of black edge artifacts around the imagery's perimeter name: 'nz-topo-gridless-maps-2193-nz-250k-z4', @@ -184,6 +214,10 @@ export const DefaultTestTiles: TestTile[] = [ }, // TODO: We will keep support for these tilesets for 90 days, please remove the tests after deprecating + + /** + * topographic: north island + */ { name: 'topographic-3857-z8', tileMatrix: TileMatrixIdentifier.Google, @@ -191,6 +225,9 @@ export const DefaultTestTiles: TestTile[] = [ tileSet: 'topographic', style: 'topographic', }, + /** + * topolite: north island + */ { name: 'topolite-3857-z8', tileMatrix: TileMatrixIdentifier.Google, @@ -198,6 +235,9 @@ export const DefaultTestTiles: TestTile[] = [ tileSet: 'topographic', style: 'topolite', }, + /** + * topographic: specific locations + */ { name: 'topographic-3857-mount-cook-village-z12', tileMatrix: TileMatrixIdentifier.Google, From 11fa190249f46181e3fb18b48f73a2383e024bd7 Mon Sep 17 00:00:00 2001 From: Tawera Manaena Date: Wed, 8 Oct 2025 13:23:03 +1300 Subject: [PATCH 3/4] refactor: add detail to non-descriptive test names --- src/tiles.ts | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/tiles.ts b/src/tiles.ts index 14535ca..3df78e0 100644 --- a/src/tiles.ts +++ b/src/tiles.ts @@ -26,13 +26,13 @@ export const DefaultTestTiles: TestTile[] = [ * health: mainland */ { - name: 'health-3857-z5', + name: 'health-3857-mainland-z5', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -41.8899962, lng: 174.0492437, z: 5 }, tileSet: 'health', }, { - name: 'health-2193-z3', + name: 'health-2193-mainland-z3', tileMatrix: TileMatrixIdentifier.Nztm2000Quad, location: { lat: -41.8899962, lng: 174.0492437, z: 3 }, tileSet: 'health', @@ -56,7 +56,7 @@ export const DefaultTestTiles: TestTile[] = [ * topographic-v2: north island */ { - name: 'topographic-v2-3857-z8', + name: 'topographic-v2-3857-north-island-z8', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -39.2169833, lng: 176.4774344, z: 8 }, tileSet: 'topographic-v2', @@ -66,7 +66,7 @@ export const DefaultTestTiles: TestTile[] = [ * topolite-v2: north island */ { - name: 'topolite-v2-3857-z8', + name: 'topolite-v2-3857-north-island-z8', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -39.2169833, lng: 176.4774344, z: 8 }, tileSet: 'topographic-v2', @@ -76,7 +76,7 @@ export const DefaultTestTiles: TestTile[] = [ * topographic-v2: specific locations */ { - name: 'topographic-v2-3857-z14', + name: 'topographic-v2-3857-mainland-z14', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -41.8899962, lng: 174.0492437, z: 14 }, tileSet: 'topographic-v2', @@ -128,7 +128,7 @@ export const DefaultTestTiles: TestTile[] = [ style: 'topolite-v2', }, { - name: 'topolite-v2-3857-z17', + name: 'topolite-v2-3857-akaroa-z17', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -43.8063936, lng: 172.9679876, z: 17 }, tileSet: 'topographic-v2', @@ -138,7 +138,7 @@ export const DefaultTestTiles: TestTile[] = [ * aerial: terrain + hillshade, hillshade, terrain */ { - name: 'aerial-3857-terrain-hillshade-z6', + name: 'aerial-3857-south-island-terrain-hillshade-z6', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -45.0735206, lng: 169.1674805, z: 6 }, tileSet: 'aerial', @@ -147,7 +147,7 @@ export const DefaultTestTiles: TestTile[] = [ hillshade: 'LINZ-Terrain', }, { - name: 'aerial-3857-terrain-hillshade-z5', + name: 'aerial-3857-mainland-hillshade-z5', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -40.7681948, lng: 172.4544741, z: 5 }, tileSet: 'aerial', @@ -155,7 +155,7 @@ export const DefaultTestTiles: TestTile[] = [ hillshade: 'LINZ-Terrain', }, { - name: 'aerial-3857-mount-taranaki-terrain-hillshade-z14', + name: 'aerial-3857-mount-taranaki-terrain-z14', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -39.3031717, lng: 174.0585208, z: 14, p: 43 }, tileSet: 'aerial', @@ -166,7 +166,7 @@ export const DefaultTestTiles: TestTile[] = [ * topographic-v2: terrain + hillshade, hillshade */ { - name: 'topographic-v2-3857-terrain-hillshade-z12', + name: 'topographic-v2-3857-mainland-terrain-hillshade-z5', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -42.4146988, lng: 174.1766669, z: 5 }, tileSet: 'topographic-v2', @@ -178,7 +178,7 @@ export const DefaultTestTiles: TestTile[] = [ * topolite-v2: hillshade */ { - name: 'topolite-v2-3857-hillshade-z4', + name: 'topolite-v2-3857-mainland-hillshade-z4', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -41.6092133, lng: 173.0748696, z: 4 }, tileSet: 'topographic-v2', @@ -190,7 +190,7 @@ export const DefaultTestTiles: TestTile[] = [ */ { // verify the absence of black edge artifacts around the imagery's perimeter - name: 'nz-topo-gridless-maps-2193-nz-250k-z4', + name: 'topo-gridless-maps-2193-mainland-250k-z4', tileMatrix: TileMatrixIdentifier.Nztm2000Quad, location: { lat: -40.7899231, lng: 172.2977984, z: 4 }, tileSet: 'topo-raster', @@ -198,7 +198,7 @@ export const DefaultTestTiles: TestTile[] = [ }, { // verify the location and re-projection of the chatham islands imagery - name: 'nz-topo-gridless-maps-3857-chatham-islands-250k-z10', + name: 'topo-gridless-maps-3857-chatham-islands-250k-z10', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -43.9090948, lng: -176.540438, z: 10 }, tileSet: 'topo-raster', @@ -206,7 +206,7 @@ export const DefaultTestTiles: TestTile[] = [ }, { // verify the tileset displays the 50k imagery - name: 'nz-topo-gridless-maps-3857-wellington-50k-z12', + name: 'topo-gridless-maps-3857-wellington-urban-50k-z12', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -41.299807, lng: 174.8041651, z: 12 }, tileSet: 'topo-raster', @@ -219,7 +219,7 @@ export const DefaultTestTiles: TestTile[] = [ * topographic: north island */ { - name: 'topographic-3857-z8', + name: 'topographic-3857-north-island-z8', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -39.2169833, lng: 176.4774344, z: 8 }, tileSet: 'topographic', @@ -229,7 +229,7 @@ export const DefaultTestTiles: TestTile[] = [ * topolite: north island */ { - name: 'topolite-3857-z8', + name: 'topolite-3857-north-island-z8', tileMatrix: TileMatrixIdentifier.Google, location: { lat: -39.2169833, lng: 176.4774344, z: 8 }, tileSet: 'topographic', From 95da6ac1b1f45403a76a8e83b790bd8993494a95 Mon Sep 17 00:00:00 2001 From: Tawera Manaena Date: Wed, 8 Oct 2025 13:23:52 +1300 Subject: [PATCH 4/4] feat: reference test locations by constants --- src/tiles.ts | 70 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 26 deletions(-) diff --git a/src/tiles.ts b/src/tiles.ts index 3df78e0..1b67445 100644 --- a/src/tiles.ts +++ b/src/tiles.ts @@ -21,6 +21,24 @@ export interface TestTile { hillshade?: string; } +const Locs = { + Mainland: { lat: -41.8899962, lng: 174.0492437 }, + NorthIsland: { lat: -39.2169833, lng: 176.4774344 }, + SouthIsland: { lat: -45.0735206, lng: 169.1674805 }, + ChathamIslands: { lat: -43.9090948, lng: -176.540438 }, + + WellingtonUrban: { lat: -41.2890657, lng: 174.7769262 }, + ChristchurchNorthUrban: { lat: -43.4567506, lng: 172.6109426 }, + + Akaroa: { lat: -43.8063936, lng: 172.9679876 }, + AucklandAirport: { lat: -37.000845, lng: 174.8064383 }, + CanterburyRural: { lat: -43.4040409, lng: 172.5393086 }, + MountCookVillage: { lat: -43.717227, lng: 170.0844837 }, + MountTaranaki: { lat: -39.3031717, lng: 174.0585208 }, + Ngauranga: { lat: -41.2454458, lng: 174.8101136 }, + OtakiSouth: { lat: -40.7727954, lng: 175.1504838 }, +} as const; + export const DefaultTestTiles: TestTile[] = [ /** * health: mainland @@ -28,13 +46,13 @@ export const DefaultTestTiles: TestTile[] = [ { name: 'health-3857-mainland-z5', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -41.8899962, lng: 174.0492437, z: 5 }, + location: { ...Locs.Mainland, z: 5 }, tileSet: 'health', }, { name: 'health-2193-mainland-z3', tileMatrix: TileMatrixIdentifier.Nztm2000Quad, - location: { lat: -41.8899962, lng: 174.0492437, z: 3 }, + location: { ...Locs.Mainland, z: 3 }, tileSet: 'health', }, /** @@ -43,13 +61,13 @@ export const DefaultTestTiles: TestTile[] = [ { name: 'aerial-3857-wellington-urban-z16', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -41.2890657, lng: 174.7769262, z: 16 }, + location: { ...Locs.WellingtonUrban, z: 16 }, tileSet: 'aerial', }, { name: 'aerial-3857-canterbury-rural-z12', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -43.4040409, lng: 172.5393086, z: 12 }, + location: { ...Locs.CanterburyRural, z: 12 }, tileSet: 'aerial', }, /** @@ -58,7 +76,7 @@ export const DefaultTestTiles: TestTile[] = [ { name: 'topographic-v2-3857-north-island-z8', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -39.2169833, lng: 176.4774344, z: 8 }, + location: { ...Locs.NorthIsland, z: 8 }, tileSet: 'topographic-v2', style: 'topographic-v2', }, @@ -68,7 +86,7 @@ export const DefaultTestTiles: TestTile[] = [ { name: 'topolite-v2-3857-north-island-z8', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -39.2169833, lng: 176.4774344, z: 8 }, + location: { ...Locs.NorthIsland, z: 8 }, tileSet: 'topographic-v2', style: 'topolite-v2', }, @@ -78,42 +96,42 @@ export const DefaultTestTiles: TestTile[] = [ { name: 'topographic-v2-3857-mainland-z14', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -41.8899962, lng: 174.0492437, z: 14 }, + location: { ...Locs.Mainland, z: 14 }, tileSet: 'topographic-v2', style: 'topographic-v2', }, { name: 'topographic-v2-3857-ngauranga-z15', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -41.2454458, lng: 174.8101136, z: 15 }, + location: { ...Locs.Ngauranga, z: 15 }, tileSet: 'topographic-v2', style: 'topographic-v2', }, { name: 'topographic-v2-3857-auckland-airport-z13', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -37.000845, lng: 174.8064383, z: 13 }, + location: { ...Locs.AucklandAirport, z: 13 }, tileSet: 'topographic-v2', style: 'topographic-v2', }, { name: 'topographic-v2-3857-otaki-south-z13', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -40.7727954, lng: 175.1504838, z: 13 }, + location: { ...Locs.OtakiSouth, z: 13 }, tileSet: 'topographic-v2', style: 'topographic-v2', }, { name: 'topographic-v2-3857-christchurch-north-urban-z17', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -43.4567506, lng: 172.6109426, z: 17 }, + location: { ...Locs.ChristchurchNorthUrban, z: 17 }, tileSet: 'topographic-v2', style: 'topographic-v2', }, { name: 'topographic-v2-3857-mount-cook-village-z12', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -43.717227, lng: 170.0844837, z: 12 }, + location: { ...Locs.MountCookVillage, z: 12 }, tileSet: 'topographic-v2', style: 'topographic-v2', }, @@ -123,14 +141,14 @@ export const DefaultTestTiles: TestTile[] = [ { name: 'topolite-v2-3857-ngauranga-z15', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -41.2454458, lng: 174.8101136, z: 15 }, + location: { ...Locs.Ngauranga, z: 15 }, tileSet: 'topographic-v2', style: 'topolite-v2', }, { name: 'topolite-v2-3857-akaroa-z17', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -43.8063936, lng: 172.9679876, z: 17 }, + location: { ...Locs.Akaroa, z: 17 }, tileSet: 'topographic-v2', style: 'topolite-v2', }, @@ -140,7 +158,7 @@ export const DefaultTestTiles: TestTile[] = [ { name: 'aerial-3857-south-island-terrain-hillshade-z6', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -45.0735206, lng: 169.1674805, z: 6 }, + location: { ...Locs.SouthIsland, z: 6 }, tileSet: 'aerial', style: 'aerial', terrain: 'LINZ-Terrain', @@ -149,7 +167,7 @@ export const DefaultTestTiles: TestTile[] = [ { name: 'aerial-3857-mainland-hillshade-z5', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -40.7681948, lng: 172.4544741, z: 5 }, + location: { ...Locs.Mainland, z: 5 }, tileSet: 'aerial', style: 'aerial', hillshade: 'LINZ-Terrain', @@ -157,7 +175,7 @@ export const DefaultTestTiles: TestTile[] = [ { name: 'aerial-3857-mount-taranaki-terrain-z14', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -39.3031717, lng: 174.0585208, z: 14, p: 43 }, + location: { ...Locs.MountTaranaki, z: 14, p: 43 }, tileSet: 'aerial', style: 'aerial', terrain: 'LINZ-Terrain', @@ -168,7 +186,7 @@ export const DefaultTestTiles: TestTile[] = [ { name: 'topographic-v2-3857-mainland-terrain-hillshade-z5', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -42.4146988, lng: 174.1766669, z: 5 }, + location: { ...Locs.Mainland, z: 5 }, tileSet: 'topographic-v2', style: 'topographic-v2', terrain: 'LINZ-Terrain', @@ -180,7 +198,7 @@ export const DefaultTestTiles: TestTile[] = [ { name: 'topolite-v2-3857-mainland-hillshade-z4', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -41.6092133, lng: 173.0748696, z: 4 }, + location: { ...Locs.Mainland, z: 4 }, tileSet: 'topographic-v2', style: 'topolite-v2', hillshade: 'LINZ-Terrain', @@ -192,7 +210,7 @@ export const DefaultTestTiles: TestTile[] = [ // verify the absence of black edge artifacts around the imagery's perimeter name: 'topo-gridless-maps-2193-mainland-250k-z4', tileMatrix: TileMatrixIdentifier.Nztm2000Quad, - location: { lat: -40.7899231, lng: 172.2977984, z: 4 }, + location: { ...Locs.Mainland, z: 4 }, tileSet: 'topo-raster', style: 'topo-raster', }, @@ -200,7 +218,7 @@ export const DefaultTestTiles: TestTile[] = [ // verify the location and re-projection of the chatham islands imagery name: 'topo-gridless-maps-3857-chatham-islands-250k-z10', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -43.9090948, lng: -176.540438, z: 10 }, + location: { ...Locs.ChathamIslands, z: 10 }, tileSet: 'topo-raster', style: 'topo-raster', }, @@ -208,7 +226,7 @@ export const DefaultTestTiles: TestTile[] = [ // verify the tileset displays the 50k imagery name: 'topo-gridless-maps-3857-wellington-urban-50k-z12', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -41.299807, lng: 174.8041651, z: 12 }, + location: { ...Locs.WellingtonUrban, z: 12 }, tileSet: 'topo-raster', style: 'topo-raster', }, @@ -221,7 +239,7 @@ export const DefaultTestTiles: TestTile[] = [ { name: 'topographic-3857-north-island-z8', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -39.2169833, lng: 176.4774344, z: 8 }, + location: { ...Locs.NorthIsland, z: 8 }, tileSet: 'topographic', style: 'topographic', }, @@ -231,7 +249,7 @@ export const DefaultTestTiles: TestTile[] = [ { name: 'topolite-3857-north-island-z8', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -39.2169833, lng: 176.4774344, z: 8 }, + location: { ...Locs.NorthIsland, z: 8 }, tileSet: 'topographic', style: 'topolite', }, @@ -241,14 +259,14 @@ export const DefaultTestTiles: TestTile[] = [ { name: 'topographic-3857-mount-cook-village-z12', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -43.717227, lng: 170.0844837, z: 12 }, + location: { ...Locs.MountCookVillage, z: 12 }, tileSet: 'topographic', style: 'topographic', }, { name: 'topolite-3857-ngauranga-z15', tileMatrix: TileMatrixIdentifier.Google, - location: { lat: -41.2454458, lng: 174.8101136, z: 15 }, + location: { ...Locs.Ngauranga, z: 15 }, tileSet: 'topographic', style: 'topolite', },