From 5a17379c9c450a21d5ac844e23829f883d0f20ec Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Sun, 28 Apr 2019 17:52:51 +0200 Subject: [PATCH 01/14] Deprecate amenity=dancing_school Also deprecated in the wiki and a replacement is available, see https://wiki.openstreetmap.org/wiki/Tag%3Aamenity%3Ddancing_school --- data/deprecated.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/deprecated.json b/data/deprecated.json index 4e9d137ad..9614f1768 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -28,6 +28,10 @@ "old": {"amenity": "community_center"}, "replace": {"amenity": "community_centre"} }, + { + "old": {"amenity": "dancing_school"}, + "replace": {"leisure": "dance", "dance:teaching": "yes" } + }, { "old": {"amenity": "dog_bin"}, "replace": {"amenity": "waste_basket", "waste": "dog_excrement"} From b5e87cadfb1a8df17501d5d65fb8e1ebead579d4 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Sun, 28 Apr 2019 18:10:12 +0200 Subject: [PATCH 02/14] Deprecate amenity/leisure=club/social_club See https://wiki.openstreetmap.org/wiki/Key%3Aclub , club is documented as a top-level tag --- data/deprecated.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/deprecated.json b/data/deprecated.json index 4e9d137ad..ec0e2099e 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -24,6 +24,10 @@ "old": {"amenity": "citymap_post"}, "replace": {"tourism": "information"} }, + { + "old": {"amenity": "club"}, + "replace": {"club": "*"} + }, { "old": {"amenity": "community_center"}, "replace": {"amenity": "community_centre"} @@ -108,6 +112,10 @@ "old": {"amenity": "sloped_curb"}, "replace": {"kerb": "lowered"} }, + { + "old": {"amenity": "social_club"}, + "replace": {"club": "*"} + }, { "old": {"amenity": "swimming_pool"}, "replace": {"leisure": "swimming_pool"} @@ -419,6 +427,10 @@ "old": {"leisure": "club"}, "replace": {"club": "*"} }, + { + "old": {"leisure": "social_club"}, + "replace": {"club": "*"} + }, { "old": {"leisure": "video_arcade"}, "replace": {"leisure": "amusement_arcade"} From d3df05b9c26e3d0ac3833fd94f9a2fcc4d67c8ba Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Sun, 28 Apr 2019 18:43:56 +0200 Subject: [PATCH 03/14] Add preset for building=hangar Make the hangar building preset have a lower matchScore so that first the aeroway=hangar is found --- data/presets/presets/aeroway/hangar.json | 8 ++++++++ data/presets/presets/building/hangar.json | 13 +++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 data/presets/presets/building/hangar.json diff --git a/data/presets/presets/aeroway/hangar.json b/data/presets/presets/aeroway/hangar.json index 5f8c2ae64..4fe765ede 100644 --- a/data/presets/presets/aeroway/hangar.json +++ b/data/presets/presets/aeroway/hangar.json @@ -9,5 +9,13 @@ "tags": { "aeroway": "hangar" }, + "addTags": { + "building": "hangar", + "aeroway": "hangar" + }, + "removeTags": { + "building": "hangar", + "aeroway": "hangar" + }, "name": "Hangar" } diff --git a/data/presets/presets/building/hangar.json b/data/presets/presets/building/hangar.json new file mode 100644 index 000000000..feaf4259d --- /dev/null +++ b/data/presets/presets/building/hangar.json @@ -0,0 +1,13 @@ +{ + "fields": [ + "name" + ], + "geometry": [ + "area" + ], + "tags": { + "building": "hangar" + }, + "matchScore": 0.5, + "name": "Hangar building" +} From 54612a168e818fd30b1b12e1d043a17e50bbbce6 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Sun, 28 Apr 2019 18:56:07 +0200 Subject: [PATCH 04/14] Add shop=general for general store --- data/presets/presets/shop/general.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 data/presets/presets/shop/general.json diff --git a/data/presets/presets/shop/general.json b/data/presets/presets/shop/general.json new file mode 100644 index 000000000..f79ee8da0 --- /dev/null +++ b/data/presets/presets/shop/general.json @@ -0,0 +1,12 @@ +{ + "icon": "maki-shop", + "geometry": [ + "point", + "area" + ], + "tags": { + "shop": "general" + }, + "terms": ["village shop"], + "name": "General store" +} From 98827f60173a36bbba018149fca18c4952ae0363 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Sun, 28 Apr 2019 21:41:44 +0200 Subject: [PATCH 05/14] Add man_made=dyke preset --- data/presets/presets/man_made/dyke.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 data/presets/presets/man_made/dyke.json diff --git a/data/presets/presets/man_made/dyke.json b/data/presets/presets/man_made/dyke.json new file mode 100644 index 000000000..4307ca3c2 --- /dev/null +++ b/data/presets/presets/man_made/dyke.json @@ -0,0 +1,12 @@ +{ + "geometry": [ + "line" + ], + "tags": { + "man_made": "dyke" + }, + "terms": [ + "Dike", "Dyke", "Floodbank", "Stopbank" + ] + "name": "Levee" +} From 77a6174d368a595d8a97fb761ede70fe6cf85026 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Sun, 28 Apr 2019 21:42:27 +0200 Subject: [PATCH 06/14] add missing "," --- data/presets/presets/man_made/dyke.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/presets/man_made/dyke.json b/data/presets/presets/man_made/dyke.json index 4307ca3c2..88304126c 100644 --- a/data/presets/presets/man_made/dyke.json +++ b/data/presets/presets/man_made/dyke.json @@ -7,6 +7,6 @@ }, "terms": [ "Dike", "Dyke", "Floodbank", "Stopbank" - ] + ], "name": "Levee" } From 6cd015901b110ef1e17701fe06574dfa90eaa33a Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Sun, 28 Apr 2019 22:00:18 +0200 Subject: [PATCH 07/14] add man_made=beacon preset --- data/presets/presets/man_made/beacon.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 data/presets/presets/man_made/beacon.json diff --git a/data/presets/presets/man_made/beacon.json b/data/presets/presets/man_made/beacon.json new file mode 100644 index 000000000..abba520cc --- /dev/null +++ b/data/presets/presets/man_made/beacon.json @@ -0,0 +1,18 @@ +{ + "fields": [ + "name", + "height" + ], + "moreFields": [ + "seamark/type" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "man_made": "beacon" + }, + "name": "Beacon", + "matchScore": 0.5 +} From 1a890c3860137ffb3a40aaf515cb7c6e978f12ab Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Sun, 28 Apr 2019 22:28:24 +0200 Subject: [PATCH 08/14] Add castle tower preset See https://wiki.openstreetmap.org/wiki/Tag%3Atower%3Atype%3Ddefensive , used 3800+ times --- .../presets/man_made/tower/defensive.json | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 data/presets/presets/man_made/tower/defensive.json diff --git a/data/presets/presets/man_made/tower/defensive.json b/data/presets/presets/man_made/tower/defensive.json new file mode 100644 index 000000000..93cbaed89 --- /dev/null +++ b/data/presets/presets/man_made/tower/defensive.json @@ -0,0 +1,20 @@ +{ + "icon": "maki-castle", + "geometry": [ + "point", + "area" + ], + "tags": { + "man_made": "tower", + "tower:type": "defensive" + }, + "reference": { + "key": "tower:type", + "value": "defensive" + }, + "terms": [ + "Defensive tower", + "Castle tower" + ], + "name": "Fortified tower" +} From 773c35b2cb2fda8f2816288c0e83702fdcf51eed Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Sun, 28 Apr 2019 22:45:33 +0200 Subject: [PATCH 09/14] Add tourism information terminal preset Used 5k+ times, see https://wiki.openstreetmap.org/wiki/Tag:information%3Dterminal --- .../presets/tourism/information/terminal.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 data/presets/presets/tourism/information/terminal.json diff --git a/data/presets/presets/tourism/information/terminal.json b/data/presets/presets/tourism/information/terminal.json new file mode 100644 index 000000000..862f43b40 --- /dev/null +++ b/data/presets/presets/tourism/information/terminal.json @@ -0,0 +1,19 @@ +{ + "icon": "maki-information", + "fields": [ + "operator" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "tourism": "information", + "information": "terminal" + }, + "reference": { + "key": "information", + "value": "terminal" + }, + "name": "Information Terminal" +} From cebf05823e3c807087b832affaba8da1f120397b Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Sun, 28 Apr 2019 23:52:30 +0200 Subject: [PATCH 10/14] Mention reference in the readme for presets --- data/presets/README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/data/presets/README.md b/data/presets/README.md index 7eb8094ff..1f313c3aa 100644 --- a/data/presets/README.md +++ b/data/presets/README.md @@ -199,6 +199,17 @@ The ID of a preset that is preferable to this one. iD's validator will flag feat When possible, use `deprecated.json` instead to specify upgrade paths for old tags. This property is meant for special cases, such as upgrades with geometry requirements. +##### `reference` + +A key and optionally a value to link to the wiki documentation for this preset. Only necessary if the preset consists of several tags. + +For example, +```javascript +"reference": { + "key": "tower:type", + "value": "communication" +} +``` ## Fields From 8bab697ca97cf1414146c74a3b2dde633567e452 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Apr 2019 00:11:30 +0200 Subject: [PATCH 11/14] Capitalize General Store --- data/presets/presets/shop/general.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/presets/shop/general.json b/data/presets/presets/shop/general.json index f79ee8da0..3ce303078 100644 --- a/data/presets/presets/shop/general.json +++ b/data/presets/presets/shop/general.json @@ -8,5 +8,5 @@ "shop": "general" }, "terms": ["village shop"], - "name": "General store" + "name": "General Store" } From 554c6cd9c8d6098c3dc6928d96e53b66c317c16e Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Apr 2019 00:12:17 +0200 Subject: [PATCH 12/14] Capitalize Hangar Building --- data/presets/presets/building/hangar.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/presets/building/hangar.json b/data/presets/presets/building/hangar.json index feaf4259d..9faff8227 100644 --- a/data/presets/presets/building/hangar.json +++ b/data/presets/presets/building/hangar.json @@ -9,5 +9,5 @@ "building": "hangar" }, "matchScore": 0.5, - "name": "Hangar building" + "name": "Hangar Building" } From 7a2b4618e5d97b7606b407507a58f8d94a2daaf2 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Apr 2019 00:12:55 +0200 Subject: [PATCH 13/14] Capitalize Tower --- data/presets/presets/man_made/tower/defensive.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/presets/presets/man_made/tower/defensive.json b/data/presets/presets/man_made/tower/defensive.json index 93cbaed89..9b3ffbaa5 100644 --- a/data/presets/presets/man_made/tower/defensive.json +++ b/data/presets/presets/man_made/tower/defensive.json @@ -13,8 +13,8 @@ "value": "defensive" }, "terms": [ - "Defensive tower", - "Castle tower" + "Defensive Tower", + "Castle Tower" ], - "name": "Fortified tower" + "name": "Fortified Tower" } From 28444a4b251fe5e88d34198bf747b4d5624d6bfc Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Mon, 29 Apr 2019 00:13:22 +0200 Subject: [PATCH 14/14] Capitalize Village Shop --- data/presets/presets/shop/general.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/presets/shop/general.json b/data/presets/presets/shop/general.json index 3ce303078..07c330e21 100644 --- a/data/presets/presets/shop/general.json +++ b/data/presets/presets/shop/general.json @@ -7,6 +7,6 @@ "tags": { "shop": "general" }, - "terms": ["village shop"], + "terms": ["Village Shop"], "name": "General Store" }