aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorevansiroky <evan.siroky@yahoo.com>2020-10-26 13:38:35 -0700
committerevansiroky <evan.siroky@yahoo.com>2020-10-26 13:38:35 -0700
commit541a6e1711612fe59d0ed4bd18b8dd440d005d72 (patch)
tree988dedc342d56a0bb96802106fc876f158e04a8f
parent76e45a811a76ec683905158e34c1f2e2e672bdff (diff)
downloadtimezone-boundary-builder-541a6e1711612fe59d0ed4bd18b8dd440d005d72.tar.gz
Add disputed area along Northwest Bhutan-China border.
-rw-r--r--CHANGELOG.md1
-rw-r--r--expectedZoneOverlaps.json3
-rw-r--r--osmBoundarySources.json3
-rw-r--r--timezones.json26
4 files changed, 25 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d2e14d..314328c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
* Update some Canadian zones as follows ([#90](https://github.com/evansiroky/timezone-boundary-builder/issues/90))
* Use OSM timezone relations in entirety for the following zones: `America/Blanc_Sablon`, `America/Glace_Bay`, `America/Halifax`, `America/Swift_Current`, `America/Toronto`
+* Add disputed area along Northwest Bhutan-China border.
* Update to latest OSM data
### Other Changes
diff --git a/expectedZoneOverlaps.json b/expectedZoneOverlaps.json
index b0362aa..9a71459 100644
--- a/expectedZoneOverlaps.json
+++ b/expectedZoneOverlaps.json
@@ -72,6 +72,9 @@
{
"bounds": [88.9, 27.2, 89.2, 27.7],
"description": "Allow disputed area near Doklam to overlap (See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam)"
+ }, {
+ "bounds": [90.7, 27.8, 91.4, 28.1],
+ "description": "Allow disputed area along Northwest Bhutan-China border to overlap (See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE)"
}
],
"Asia/Shanghai-Asia/Urumqi": [
diff --git a/osmBoundarySources.json b/osmBoundarySources.json
index 2226da7..6768f1c 100644
--- a/osmBoundarySources.json
+++ b/osmBoundarySources.json
@@ -8,6 +8,9 @@
"基伍地区": {
"name": "基伍地区"
},
+ "中国实控白玉地区": {
+ "name:zh": "中国实控白玉地区"
+ },
"שטח B": {
"name:he": "שטח B"
},
diff --git a/timezones.json b/timezones.json
index e37989f..fdecc81 100644
--- a/timezones.json
+++ b/timezones.json
@@ -3131,22 +3131,27 @@
"op": "union",
"source": "overpass",
"id": "Doklam 洞朗地区",
- "description": "Add dispuated area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
+ "description": "Add disputed area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
}, {
"op": "union",
"source": "overpass",
"id": "鲁林地区",
- "description": "Add dispuated area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
+ "description": "Add disputed area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
}, {
"op": "union",
"source": "overpass",
"id": "查马普地区",
- "description": "Add dispuated area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
+ "description": "Add disputed area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
}, {
"op": "union",
"source": "overpass",
"id": "基伍地区",
- "description": "Add dispuated area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
+ "description": "Add disputed area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
+ }, {
+ "op": "union",
+ "source": "overpass",
+ "id": "中国实控白玉地区",
+ "description": "Add disputed area along Northwest Bhutan-China border. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE"
}, {
"op": "difference",
"source": "overpass",
@@ -3209,22 +3214,27 @@
"op": "union",
"source": "overpass",
"id": "Doklam 洞朗地区",
- "description": "Add dispuated area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
+ "description": "Add disputed area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
}, {
"op": "union",
"source": "overpass",
"id": "鲁林地区",
- "description": "Add dispuated area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
+ "description": "Add disputed area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
}, {
"op": "union",
"source": "overpass",
"id": "查马普地区",
- "description": "Add dispuated area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
+ "description": "Add disputed area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
}, {
"op": "union",
"source": "overpass",
"id": "基伍地区",
- "description": "Add dispuated area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
+ "description": "Add disputed area in Doklam. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE and https://en.wikipedia.org/wiki/Doklam"
+ }, {
+ "op": "union",
+ "source": "overpass",
+ "id": "中国实控白玉地区",
+ "description": "Add disputed area along Northwest Bhutan-China border. See https://zh.wikipedia.org/wiki/%E4%B8%AD%E4%B8%8D%E8%BE%B9%E7%95%8C%E4%BA%89%E8%AE%AE"
}
],
"Asia/Tokyo": [