Refactor Australian zones

- All applicable zones now use the Australian country territorial waters instead of just state/territory territorial waters - Australia/Currie has been merged into Australia/Hobart Fixes #106
evansiroky · Sep 27, 2021 · 8e5b822 · 8e5b822
1 parent 537c9a5
commit 8e5b822
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 61 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,17 @@
   * `Europe/Athens`, `Europe/Istanbul` overlap. See [article](https://en.wikipedia.org/wiki/Imia/Kardak).
 * Ensure territorial waters are included in the following zones:
   * `Asia/Srednekolymsk`
+  * `Australia/Adelaide`
+  * `Australia/Brisbane`
+  * `Australia/Darwin`
+  * `Australia/Eucla`
+  * `Australia/Hobart`
+  * `Australia/Lindeman`
+  * `Australia/Melbourne`
+  * `Australia/Perth`
+  * `Australia/Sydney`
+* Merge some zones that were moved to the backzone file in the timezone database
+  * `Australia/Currie` is now a part of `Australia/Hobart`
 * Update to latest OSM data
 
 ### Other Changes

diff --git a/osmBoundarySources.json b/osmBoundarySources.json
@@ -89,9 +89,6 @@
   "Australia": {
     "ISO3166-1": "AU"
   },
-  "Australian Capital Territory": {
-    "ISO3166-2": "AU-ACT"
-  },
   "Austria": {
     "ISO3166-1": "AT"
   },
@@ -425,6 +422,9 @@
   "Ethiopia": {
     "ISO3166-1": "ET"
   },
+  "Eucla-tz": {
+    "timezone": "Australia/Eucla"
+  },
   "Falkland Islands": {
     "ISO3166-1": "FK"
   },
@@ -903,9 +903,6 @@
   "New Mexico": {
     "ISO3166-2": "US-NM"
   },
-  "New South Wales": {
-    "ISO3166-2": "AU-NSW"
-  },
   "New Zealand": {
     "ISO3166-1": "NZ"
   },
@@ -1008,6 +1005,9 @@
     "name": "Perry County",
     "nist:state_fips": "18"
   },
+  "Perth-tz": {
+    "timezone": "Australia/Perth"
+  },
   "Philippines": {
     "ISO3166-1": "PH"
   },
@@ -1280,6 +1280,9 @@
     "name": "Switzerland County",
     "nist:state_fips": "18"
   },
+  "Sydney-tz": {
+    "timezone": "Australia/Sydney"
+  },
   "Syria": {
     "ISO3166-1": "SY"
   },
@@ -1292,9 +1295,6 @@
   "Tanzania": {
     "name:en": "Tanzania"
   },
-  "Tasmania": {
-    "ISO3166-2": "AU-TAS"
-  },
   "Thailand": {
     "ISO3166-1": "TH",
     "admin_level": "2"
@@ -1448,9 +1448,6 @@
   "West Wendover": {
     "name": "West Wendover"
   },
-  "Western Australia": {
-    "ISO3166-2": "AU-WA"
-  },
   "Western Sahara": {
     "ISO3166-1": "EH"
   },

diff --git a/timezones.json b/timezones.json
@@ -3542,13 +3542,43 @@
     {
       "op": "init",
       "source": "overpass",
+      "id": "Australia"
+    }, {
+      "op": "intersect",
+      "source": "manual-polygon",
+      "data": [[[137,-27],[100,-40],[140.9658101,-40],[140.9658101,-38.1084575],[137,-27]]],
+      "description": "Intersect part of South Australia to preserve Australian territorial waters."
+    }, {
+      "op": "difference",
+      "source": "overpass",
+      "id": "Perth-tz"
+    }, {
+      "op": "difference",
+      "source": "overpass",
+      "id": "Eucla-tz"
+    }, {
+      "op": "union",
+      "source": "overpass",
       "id": "South Australia"
     }
   ],
   "Australia/Brisbane": [
     {
       "op": "init",
       "source": "overpass",
+      "id": "Australia"
+    }, {
+      "op": "intersect",
+      "source": "manual-polygon",
+      "data": [[[138.0273711,-16.4843665],[150,-31],[163,-24],[138,0],[138.3,-16.15],[138.0273711,-16.4843665]]],
+      "description": "Intersect part of Queensland to preserve Australian territorial waters."
+    }, {
+      "op": "difference",
+      "source": "overpass",
+      "id": "Sydney-tz"
+    }, {
+      "op": "union",
+      "source": "overpass",
       "id": "Queensland"
     }, {
       "op": "difference",
@@ -3564,21 +3594,22 @@
       "id": "Broken_Hill-tz"
     }
   ],
-  "Australia/Currie": [
+  "Australia/Darwin": [
     {
       "op": "init",
       "source": "overpass",
       "id": "Australia"
     }, {
       "op": "intersect",
       "source": "manual-polygon",
-      "data": [[[143,-39.2],[146,-39.2],[142.2,-41.5],[143,-39.2]]],
-      "description": "Exclude King Island from rest of Australia via an arbitraty sea boundary."
-    }
-  ],
-  "Australia/Darwin": [
-    {
-      "op": "init",
+      "data": [[[138.0273711,-16.4843665],[125,-16],[138,0],[138.3,-16.15],[138.0273711,-16.4843665]]],
+      "description": "Intersect part of Northern Territory to preserve Australian territorial waters."
+    }, {
+      "op": "difference",
+      "source": "overpass",
+      "id": "Perth-tz"
+    }, {
+      "op": "union",
       "source": "overpass",
       "id": "Northern Territory"
     }
@@ -3587,36 +3618,26 @@
     {
       "op": "init",
       "source": "overpass",
-      "id": "Western Australia"
-    }, {
-      "op": "intersect",
-      "source": "manual-polygon",
-      "data": [[[131,-31.3],[125.5,-31.3],[125.5,-35],[131,-31.3]]],
-      "description": "Intersect part of Western Australia to form zone.  Boundary is based off of the boundary coded in efele.net's shapefile."
+      "id": "Eucla-tz"
     }
   ],
   "Australia/Hobart": [
     {
       "op": "init",
       "source": "overpass",
-      "id": "Tasmania"
-    }, {
-      "op": "difference",
-      "source": "manual-polygon",
-      "data": [[[143,-39.2],[146,-39.2],[142.2,-41.5],[143,-39.2]]],
-      "description": "Exclude King Island from rest of Tasmania via an arbitraty sea boundary."
+      "id": "Australia"
     }, {
-      "op": "difference",
+      "op": "intersect",
       "source": "manual-polygon",
-      "data": [[[159,-53],[156,-56],[162,-56],[159,-53]]],
-      "description": "Exclude Macquarie Island."
+      "data": [[[141,-39.198485],[146,-50],[152,-39.198485],[141,-39.198485]]],
+      "description": "Extract Tasmania from Australia to include territorial waters."
     }
   ],
   "Australia/Lindeman": [
     {
       "op": "init",
       "source": "overpass",
-      "id": "Queensland"
+      "id": "Australia"
     }, {
       "op": "intersect",
       "source": "manual-polygon",
@@ -3640,49 +3661,44 @@
     {
       "op": "init",
       "source": "overpass",
+      "id": "Australia"
+    }, {
+      "op": "intersect",
+      "source": "manual-polygon",
+      "data": [[[147,-36.5],[140.9658101,-38.1084575],[140.9658101,-39.198485],[160,-39.198485],[147,-36.5]]],
+      "description": "Intersect part of Victoria to preserve Australian territorial waters."
+    }, {
+      "op": "difference",
+      "source": "overpass",
+      "id": "Sydney-tz"
+    }, {
+      "op": "union",
+      "source": "overpass",
       "id": "Victoria"
     }
   ],
   "Australia/Perth": [
     {
       "op": "init",
       "source": "overpass",
-      "id": "Western Australia"
-    }, {
-      "op": "difference",
-      "source": "manual-polygon",
-      "data": [[[131,-31.3],[125.5,-31.3],[125.5,-35],[131,-31.3]]],
-      "description": "Difference part of Western Australia to form zone.  Boundary is based off of the boundary coded in efele.net's shapefile."
+      "id": "Perth-tz"
     }, {
       "op": "union",
       "source": "manual-polygon",
       "data": [[[115,-86],[120,-86],[135,-86],[150,-86],[160,-86],[160,-70],[150,-70],[135,-70],[120,-70],[115,-70],[115,-86]]],
       "description": "According to chatter on the tz mailing list, the Antrarctic Concordia Station uses Australia/Perth time.  https://mm.icann.org/pipermail/tz/2013-December/020520.html"
+    }, {
+      "op": "difference",
+      "source": "overpass",
+      "id": "Eucla-tz",
+      "description": "Remove Eucla portion since it's also added to the Western Australia relation."
     }
   ],
   "Australia/Sydney": [
     {
       "op": "init",
       "source": "overpass",
-      "id": "New South Wales"
-    }, {
-      "op": "union",
-      "source": "overpass",
-      "id": "Australian Capital Territory"
-    }, {
-      "op": "difference",
-      "source": "overpass",
-      "id": "Broken_Hill-tz"
-    }, {
-      "op": "difference",
-      "source": "manual-polygon",
-      "data": [[[160,-33],[160,-31],[157,-31],[160,-33]]],
-      "description": "Difference to exclude only Lord Howe Island."
-    }, {
-      "op": "union",
-      "source": "manual-polygon",
-      "data": [[[150.85,-35.07],[150.45,-35.09],[150.7,-35.3],[150.85,-35.07]]],
-      "description": "Union this area to include Jervis Bay Territory"
+      "id": "Sydney-tz"
     }
   ],
   "Etc/UTC": [