#3487: Update magda to use ASGS 2021 and latest LGAs boundaries

magda-io · Jun 25, 2024 · 8e8100d · 8e8100d
1 parent 3923276
commit 8e8100d
Show file tree

Hide file tree

Showing 3 changed files with 148 additions and 390 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v4.0.2
+
+- Update magda to use ASGS 2021 and latest LGAs boundaries
+
 ## v4.0.1
 
 - Add helm chart configuration option allows users to disable gateway auto-gzip response feature

diff --git a/magda-scala-common/src/main/resources/common.conf b/magda-scala-common/src/main/resources/common.conf
@@ -93,89 +93,89 @@ logging {
 regionSources = {
     # Australia (Mainland) and all offshore territories as a whole
     COUNTRY {
-        url = "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/country.geojson"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/country.geojson"
         idField = "id"
         nameField = "name"
         order = 9
     }
     # Regions for each of Australia offshore territories
     OFFSHORE_TERRITORIES {
-        url = "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/off-shore-territories.geojson"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/off-shore-territories.geojson"
         idField = "id"
         nameField = "name"
         lv1Id = "2"
         order = 11
     }
     # ABS Statistical Area Level 4
     SA4 {
-        url = "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA4.geojson"
-        idField = "SA4_CODE11"
-        nameField = "SA4_NAME11"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/SA4_2021.geojson"
+        idField = "SA4_CODE_2021"
+        nameField = "SA4_NAME_2021"
         lv1Id = "1"
-        lv2IdField = "STE_CODE11"
+        lv2IdField = "STATE_CODE_2021"
         order = 30
     }
     # ABS Statistical Area Level 3
     SA3 {
-        url = "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA3.geojson"
-        idField = "SA3_CODE11"
-        nameField = "SA3_NAME11"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/SA3_2021.geojson"
+        idField = "SA3_CODE_2021"
+        nameField = "SA3_NAME_2021"
         lv1Id = "1"
-        lv2IdField = "STE_CODE11"
-        lv3IdField = "SA4_CODE11"
+        lv2IdField = "STATE_CODE_2021"
+        lv3IdField = "SA4_CODE_2021"
         order = 40
     }
     # ABS Statistical Area Level 2
     SA2 {
-        url = "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA2.geojson"
-        idField = "SA2_MAIN11"
-        nameField = "SA2_NAME11"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/SA2_2021.geojson"
+        idField = "SA2_CODE_2021"
+        nameField = "SA2_NAME_2021"
         lv1Id = "1"
-        lv2IdField = "STE_CODE11"
-        lv3IdField = "SA4_CODE11"
-        lv4IdField = "SA3_CODE11"
+        lv2IdField = "STATE_CODE_2021"
+        lv3IdField = "SA4_CODE_2021"
+        lv4IdField = "SA3_CODE_2021"
         order = 50
     }
     # ABS Statistical Area Level 1
     SA1 {
-        url = "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/SA1.geojson"
-        idField = "SA1_MAIN11"
-        nameField = "SA1_MAIN11",
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/SA1_2021.geojson"
+        idField = "SA1_CODE_2021"
+        nameField = "SA1_CODE_2021"
         lv1Id = "1"
-        lv2IdField = "STE_CODE11"
-        lv3IdField = "SA4_CODE11"
-        lv4IdField = "SA3_CODE11"
-        lv5IdField = "SA2_MAIN11"
+        lv2IdField = "STATE_CODE_2021"
+        lv3IdField = "SA4_CODE_2021"
+        lv4IdField = "SA3_CODE_2021"
+        lv5IdField = "SA2_CODE_2021"
         order = 60
     }
     # Australia Local Government Areas
     LGA {
-        url = "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/LGA.geojson"
-        idField = "LGA_CODE15"
-        nameField = "LGA_NAME15"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/LGA_2023.geojson"
+        idField = "LGA_CODE_2023"
+        nameField = "LGA_NAME_2023"
         lv1Id = "1"
-        steIdField = "STE_CODE11"
+        lv2IdField = "STATE_CODE_2021"
         order = 20
     }
     # Australia Postal Areas
     POA {
-        url = "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/POA.geojson"
-        idField = "POA_CODE"
-        nameField = "POA_NAME"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/POA_2021.geojson"
+        idField = "POA_CODE_2021"
+        nameField = "POA_NAME_2021"
         lv1Id = "1"
         order = 70
     }
      # Australia Commonwealth electoral boundaries
-    COM_ELB_ID_2016 {
-        url = "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/COM_ELB_ID_2016.geojson"
-        idField = "DIV_ID"
-        nameField = "SORTNAME"
+    ELB {
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/ELB_2021.geojson"
+        idField = "FID"
+        nameField = "Elect_div"
         lv1Id = "1"
         order = 80
     }
     # Australia State and Territory
     STE {
-        url = "https://github.com/magda-io/magda-regions/releases/download/v1.0.0/STE.simplified.geojson"
+        url = "https://github.com/magda-io/magda-regions/releases/download/v2.0.0/STE.simplified.geojson"
         idField = "STE_CODE11"
         nameField = "STE_NAME11"
         shortNameField = "STE_ABBREV"
@@ -189,202 +189,4 @@ regionSources = {
 # Served via search API [region-types](https://dev.magda.io/api/v0/apidocs/index.html#api-Search-GetV0SearchRegionTypes) endpoint
 # See repo here: https://github.com/magda-io/magda-regions
 # If not provided, the [default region mapping file](https://github.com/magda-io/magda/blob/main/magda-search-api/src/main/resources/regionMapping.json) will be used.
-# regionMapping = {
-#     "comments": "Matching takes place in the order defined in this file. Place code matches before name matches, and smaller regions before larger ones.",
-#     "regionWmsMap": {
-#         "STE": {
-#             "layerName": "FID_STE_2011_AUST",
-#             "server": "https://vector-tiles.terria.io/FID_STE_2011_AUST/{z}/{x}/{y}.pbf",
-#             "regionProp": "STE_CODE11",
-#             "aliases": ["ste_code", "ste_code_2011", "ste"],
-#             "digits": 1,
-#             "description": "States and Territories (STE)",
-#             "regionIdsFile": "data/regionids/region_map-FID_STE_2011_AUST_STE_CODE11.json",
-#             "serverType": "MVT",
-#             "serverSubdomains": [],
-#             "serverMinZoom": 0,
-#             "serverMaxNativeZoom": 12,
-#             "serverMaxZoom": 28,
-#             "bbox": [
-#                 96.81694140799998,
-#                 -43.74050960300003,
-#                 159.10921900799997,
-#                 -9.142175976999999
-#             ],
-#             "nameProp": "STE_NAME11"
-#         },
-#         "SA4": {
-#             "layerName": "FID_SA4_2011_AUST",
-#             "server": "https://vector-tiles.terria.io/FID_SA4_2011_AUST/{z}/{x}/{y}.pbf",
-#             "regionProp": "SA4_CODE11",
-#             "aliases": ["sa4_code_2011", "sa4_code", "sa4"],
-#             "digits": 3,
-#             "description": "Statistical Area Level 4 (SA4)",
-#             "regionIdsFile": "data/regionids/region_map-FID_SA4_2011_AUST_SA4_CODE11.json",
-#             "serverType": "MVT",
-#             "serverSubdomains": [],
-#             "serverMinZoom": 0,
-#             "serverMaxNativeZoom": 12,
-#             "serverMaxZoom": 28,
-#             "bbox": [
-#                 96.81694140799998,
-#                 -43.74050960300003,
-#                 159.10921900799997,
-#                 -9.142175976999999
-#             ],
-#             "nameProp": "SA4_NAME11"
-#         },
-#         "SA3": {
-#             "layerName": "FID_SA3_2011_AUST",
-#             "server": "https://vector-tiles.terria.io/FID_SA3_2011_AUST/{z}/{x}/{y}.pbf",
-#             "regionProp": "SA3_CODE11",
-#             "aliases": ["sa3_code_2011", "sa3_code", "sa3"],
-#             "digits": 5,
-#             "description": "Statistical Area Level 3 (SA3)",
-#             "regionIdsFile": "data/regionids/region_map-FID_SA3_2011_AUST_SA3_CODE11.json",
-#             "serverType": "MVT",
-#             "serverSubdomains": [],
-#             "serverMinZoom": 0,
-#             "serverMaxNativeZoom": 12,
-#             "serverMaxZoom": 28,
-#             "bbox": [
-#                 96.81694140799998,
-#                 -43.74050960300003,
-#                 159.10921900799997,
-#                 -9.142175976999999
-#             ],
-#             "nameProp": "SA3_NAME11"
-#         },
-#         "SA2": {
-#             "layerName": "FID_SA2_2011_AUST",
-#             "server": "https://vector-tiles.terria.io/FID_SA2_2011_AUST/{z}/{x}/{y}.pbf",
-#             "regionProp": "SA2_MAIN11",
-#             "aliases": ["sa2_code_2011", "sa2_code", "sa2"],
-#             "digits": 9,
-#             "description": "Statistical Area Level 2 (SA2)",
-#             "regionIdsFile": "data/regionids/region_map-FID_SA2_2011_AUST_SA2_MAIN11.json",
-#             "serverType": "MVT",
-#             "serverSubdomains": [],
-#             "serverMinZoom": 0,
-#             "serverMaxNativeZoom": 12,
-#             "serverMaxZoom": 28,
-#             "bbox": [
-#                 96.81694140799998,
-#                 -43.74050960300003,
-#                 159.10921900799997,
-#                 -9.142175976999999
-#             ],
-#             "nameProp": "SA2_NAME11"
-#         },
-#         "SA1": {
-#             "layerName": "FID_SA1_2011_AUST",
-#             "server": "https://vector-tiles.terria.io/FID_SA1_2011_AUST/{z}/{x}/{y}.pbf",
-#             "regionProp": "SA1_MAIN11",
-#             "aliases": [
-#                 "sa1_code_2011",
-#                 "sa1_maincode_2011",
-#                 "sa1_code",
-#                 "sa1"
-#             ],
-#             "digits": 11,
-#             "description": "Statistical Area Level 1 (SA1)",
-#             "regionIdsFile": "data/regionids/region_map-FID_SA1_2011_AUST_SA1_MAIN11.json",
-#             "serverType": "MVT",
-#             "serverSubdomains": [],
-#             "serverMinZoom": 0,
-#             "serverMaxNativeZoom": 12,
-#             "serverMaxZoom": 28,
-#             "bbox": [
-#                 96.81694140799998,
-#                 -43.74050960300003,
-#                 159.10921900799997,
-#                 -9.142175976999999
-#             ],
-#             "nameProp": "SA2_NAME11"
-#         },
-#         "LGA": {
-#             "layerName": "FID_LGA_2015_AUST",
-#             "server": "https://vector-tiles.terria.io/FID_LGA_2015_AUST/{z}/{x}/{y}.pbf",
-#             "regionProp": "LGA_CODE15",
-#             "aliases": [
-#                 "lga_code_2015",
-#                 "lga_code",
-#                 "lga",
-#                 "lga_code_2014",
-#                 "lga_code_2012",
-#                 "lga_code_2010"
-#             ],
-#             "digits": 5,
-#             "description": "Local Government Area (LGA)",
-#             "regionIdsFile": "data/regionids/region_map-FID_LGA_2015_AUST_LGA_CODE15.json",
-#             "serverType": "MVT",
-#             "serverSubdomains": [],
-#             "serverMinZoom": 0,
-#             "serverMaxNativeZoom": 12,
-#             "serverMaxZoom": 28,
-#             "bbox": [
-#                 96.81694140799998,
-#                 -43.740509602999985,
-#                 159.10921900799997,
-#                 -9.142175976999999
-#             ],
-#             "nameProp": "LGA_NAME15"
-#         },
-#         "POA": {
-#             "layerName": "FID_POA_2011_AUST",
-#             "server": "https://vector-tiles.terria.io/FID_POA_2011_AUST/{z}/{x}/{y}.pbf",
-#             "regionProp": "POA_CODE",
-#             "aliases": [
-#                 "poa_2011",
-#                 "postcode_2011",
-#                 "poa",
-#                 "poa_code",
-#                 "poa_code_2011",
-#                 "postcode",
-#                 "postcode_2015"
-#             ],
-#             "digits": 4,
-#             "dataReplacements": [["^(?=\\d\\d\\d$)", "0"]],
-#             "description": "Postal Area (POA)",
-#             "regionIdsFile": "data/regionids/region_map-FID_POA_2011_AUST_POA_CODE.json",
-#             "serverType": "MVT",
-#             "serverSubdomains": [],
-#             "serverMinZoom": 0,
-#             "serverMaxNativeZoom": 12,
-#             "serverMaxZoom": 28,
-#             "bbox": [
-#                 96.81694140799998,
-#                 -43.59821500299999,
-#                 159.10921900799997,
-#                 -9.142175976999999
-#             ],
-#             "nameProp": "POA_NAME"
-#         },
-#         "COM_ELB_ID_2016": {
-#             "layerName": "FID_COM20160509_ELB",
-#             "server": "https://vector-tiles.terria.io/FID_COM20160509_ELB/{z}/{x}/{y}.pbf",
-#             "regionProp": "DIV_ID",
-#             "aliases": [
-#                 "divisionid",
-#                 "com_elb_id_2016",
-#                 "com_elb_id",
-#                 "com_elb"
-#             ],
-#             "digits": 3,
-#             "description": "Commonwealth Electoral District",
-#             "regionIdsFile": "data/regionids/region_map-FID_COM20160509_ELB_DIV_ID.json",
-#             "serverType": "MVT",
-#             "serverSubdomains": [],
-#             "serverMinZoom": 0,
-#             "serverMaxNativeZoom": 12,
-#             "serverMaxZoom": 28,
-#             "bbox": [
-#                 96.81676599999997,
-#                 -43.740509999999986,
-#                 159.1092189999999,
-#                 -9.142175999999996
-#             ],
-#             "nameProp": "SORTNAME"
-#         }
-#     }
-# }
+# regionMapping = {}