Merge branch 'master' into feat/aerial-style-config

linz · Jul 11, 2024 · c7295c3 · c7295c3
2 parents 852dc38 + 1dbc415
commit c7295c3
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
       - master
 
 env: 
-  BASEMAPS_CONTAINER_VERSION: v7.5
+  BASEMAPS_CONTAINER_VERSION: v7
 
 jobs:
   build:

diff --git a/config/tileset/53382-nz-roads-addressing.json b/config/tileset/53382-nz-roads-addressing.json
@@ -7,7 +7,7 @@
   "format": "pbf",
   "layers": [
     {
-      "3857": "s3://linz-basemaps/vector/3857/53382-nz-roads-addressing/01J18KKF22SZZKRW30295X505Y/53382-nz-roads-addressing.tar.co",
+      "3857": "s3://linz-basemaps/vector/3857/53382-nz-roads-addressing/01J2CAEHG9N7TKEGBJCC875JM6/53382-nz-roads-addressing.tar.co",
       "name": "53382-nz-roads-addressing",
       "title": "NZ Roads (Addressing)"
     }

diff --git a/config/tileset/aerial.json b/config/tileset/aerial.json
@@ -164,11 +164,11 @@
       "category": "Rural Aerial Photos"
     },
     {
-      "2193": "s3://linz-basemaps/2193/southland_2023_0.25m/01H9S5K5N9BHQEPC9EW207TQ94/",
-      "3857": "s3://linz-basemaps/3857/southland_2023_0.25m/01H9S5K5N7Q3WX9F3XB4VHHNQP/",
+      "2193": "s3://linz-basemaps/2193/southland_2023_0.25m/01J2CYGDFGE0JBCDGP8K37VHY6/",
+      "3857": "s3://linz-basemaps/3857/southland_2023_0.25m/01J2CYGDFXH71XBHE1HXRXVEQR/",
       "name": "southland-2023-0.25m",
       "minZoom": 13,
-      "title": "Southland 0.25m Rural Aerial Photos (2023)",
+      "title": "Southland 0.25m Rural Aerial Photos (2023-2024)",
       "category": "Rural Aerial Photos"
     },
     {
@@ -411,6 +411,14 @@
       "category": "Rural Aerial Photos",
       "minZoom": 13
     },
+    {
+      "2193": "s3://linz-basemaps/2193/waimakariri_2024_0.25m/01J1RESR6CDNEHH4A2DXTP1G0X/",
+      "3857": "s3://linz-basemaps/3857/waimakariri_2024_0.25m/01J1RESR6C1MNR0A8SH34PKHAF/",
+      "name": "waimakariri_2024_0.25m",
+      "title": "Waimakariri 0.25m Rural Aerial Photos (2024)",
+      "category": "Rural Aerial Photos",
+      "minZoom": 13
+    },
     {
       "2193": "s3://linz-basemaps/2193/northland_urban_2014-2015_0-10m_RGBA/01F6P1K57WYSAZVCTP35DVKG4B/",
       "3857": "s3://linz-basemaps/3857/northland_urban_2014-2015_0-10m_RGBA/01ED82YEHRRNR3YQC55TJY37E6/",
@@ -731,6 +739,14 @@
       "title": "Auckland 0.075m Rural Aerial Photos (2020)",
       "category": "Rural Aerial Photos"
     },
+    {
+      "2193": "s3://linz-basemaps/2193/auckland_rural_2022_0-075m_RGB/01G6HJ9S4PGK6MTVEZWWHV56QN/",
+      "3857": "s3://linz-basemaps/3857/auckland_rural_2022_0-075m_RGB/01G6HJBFJRBKJ7FQPHVRACKMNQ/",
+      "name": "auckland-rural-2022-0.075m",
+      "minZoom": 13,
+      "title": "Auckland 0.075m Rural Aerial Photos (2022)",
+      "category": "Rural Aerial Photos"
+    },
     {
       "2193": "s3://linz-basemaps/2193/waikato_2021-2023_0.3m/01HP3A3YX4116CC023JVVXRTW4/",
       "3857": "s3://linz-basemaps/3857/waikato_2021-2023_0.3m/01HP3A3YX4HAYBWEDSJYCJ2XY2/",
@@ -740,12 +756,12 @@
       "minZoom": 13
     },
     {
-      "2193": "s3://linz-basemaps/2193/auckland_rural_2022_0-075m_RGB/01G6HJ9S4PGK6MTVEZWWHV56QN/",
-      "3857": "s3://linz-basemaps/3857/auckland_rural_2022_0-075m_RGB/01G6HJBFJRBKJ7FQPHVRACKMNQ/",
-      "name": "auckland-rural-2022-0.075m",
-      "minZoom": 13,
-      "title": "Auckland 0.075m Rural Aerial Photos (2022)",
-      "category": "Rural Aerial Photos"
+      "2193": "s3://linz-basemaps/2193/waikato_2023-2024_0.3m/01J28AWNAN0S3JS50C4VWC3X1G/",
+      "3857": "s3://linz-basemaps/3857/waikato_2023-2024_0.3m/01J28AWNANR2ME3JY3C61DD37X/",
+      "name": "waikato-2023-2024-0.3m",
+      "title": "Waikato 0.3m Rural Aerial Photos (2023-2024)",
+      "category": "Rural Aerial Photos",
+      "minZoom": 13
     },
     {
       "2193": "s3://linz-basemaps/2193/ōtorohanga_urban_2021_0-1m_RGB/01FYWKAJ86W9P7RWM1VB62KD0H/",

diff --git a/config/tileset/hawkes-bay/imagery/hawkes-bay-2023-2024-0.125m.json b/config/tileset/hawkes-bay/imagery/hawkes-bay-2023-2024-0.125m.json
@@ -2,12 +2,17 @@
   "type": "raster",
   "id": "ts_hawkes-bay-2023-2024-0.125m",
   "title": "Hawke's Bay 0.125m Rural Aerial Photos (2023-2024) - Draft",
-  "background": "#00000000",
+  "background": {
+    "r": 0,
+    "g": 0,
+    "b": 0,
+    "alpha": 0
+  },
   "category": "Rural Aerial Photos",
   "layers": [
     {
-      "2193": "s3://linz-basemaps/2193/hawkes-bay_2023-2024_0.125m/01HYM6K0HGW5A57DWC3XBG0R3V/",
-      "3857": "s3://linz-basemaps/3857/hawkes-bay_2023-2024_0.125m/01HYM6K0HQWV0GG4T51GNF4HX8/",
+      "2193": "s3://linz-basemaps/2193/hawkes-bay_2023-2024_0.125m/01J2FS0WKMQR2YA27R8VJKNZSY/",
+      "3857": "s3://linz-basemaps/3857/hawkes-bay_2023-2024_0.125m/01J2FS0WKT851XDFAPCF7BH57P/",
       "name": "hawkes-bay-2023-2024-0.125m",
       "title": "Hawke's Bay 0.125m Rural Aerial Photos (2023-2024) - Draft",
       "category": "Rural Aerial Photos",

diff --git a/config/tileset/hawkes-bay/imagery/wairoa-flood-2024-0.1m.json b/config/tileset/hawkes-bay/imagery/wairoa-flood-2024-0.1m.json
@@ -0,0 +1,23 @@
+{
+  "type": "raster",
+  "id": "ts_wairoa-flood-2024-0.1m",
+  "title": "Wairoa Flood 0.1m Urban Aerial Photos (2024)",
+  "background": {
+    "r": 0,
+    "g": 0,
+    "b": 0,
+    "alpha": 0
+  },
+  "category": "Event",
+  "layers": [
+    {
+      "2193": "s3://linz-basemaps/2193/wairoa-flood_2024_0.1m/01J2HWHG3CMT9GKKP41RQE002V/",
+      "3857": "s3://linz-basemaps/3857/wairoa-flood_2024_0.1m/01J2HWHG3ZPTS71V39N2B83259/",
+      "name": "wairoa-flood-2024-0.1m",
+      "title": "Wairoa Flood 0.1m Urban Aerial Photos (2024)",
+      "category": "Event",
+      "minZoom": 0,
+      "maxZoom": 32
+    }
+  ]
+}
diff --git a/config/tileset/topographic.json b/config/tileset/topographic.json
@@ -6,7 +6,7 @@
   "format": "pbf",
   "layers": [
     {
-      "3857": "s3://linz-basemaps/vector/3857/topographic/01J188XY9RCGSG5SFCQGBSWJY0/topographic.tar.co",
+      "3857": "s3://linz-basemaps/vector/3857/topographic/01J2CAEHG9VX8N22RDMB47AXAX/topographic.tar.co",
       "name": "topographic",
       "title": "Topographic"
     }