From 5df6c79dac2dc1ceab21d49a95d7d154ae8b9855 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Thu, 26 May 2022 14:15:04 +0200 Subject: [PATCH 1/7] move aliases of highway=track from terms to aliases field see https://github.com/openstreetmap/id-tagging-schema/pull/288#issuecomment-1134043557 --- data/presets/highway/track.json | 33 +++++++++++++++++++-------------- interim/source_strings.yaml | 4 ++-- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/data/presets/highway/track.json b/data/presets/highway/track.json index de2336245..14d9e8105 100644 --- a/data/presets/highway/track.json +++ b/data/presets/highway/track.json @@ -30,29 +30,34 @@ "terms": [ "4wd", "4x4", - "agricultural road", "atv", - "carriage road", "double track", - "farm road", - "fire road", - "forest road", "four wheel drive", "high-clearance", "jeep", - "land access road", - "logging road", "offroad", + "off-road", "overgrown", "primitive", "quad", - "ranch road", "rut", - "track", - "track road", - "two track", - "unmaintained", - "woods road" + "unmaintained", + "unmaintained road", + "dirt road" ], - "name": "Track / Land-Access Road" + "name": "Track / Land-Access Road", + "aliases": [ + "Land-Access Road", + "Track Road", + "Logging Road", + "Woods Road", + "Forest Road", + "Forestry Road", + "Ranch Road", + "Farm Road", + "Agricultural Road", + "Fire Road", + "Carriage Road", + "Two-Track Road" + ] } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 52092a40c..0d9299454 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -6300,8 +6300,8 @@ en: terms: highway/track: # highway=track | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Land Access / Track Road - # 'terms: 4wd,4x4,agricultural road,atv,carriage road,double track,farm road,fire road,forest road,four wheel drive,high-clearance,jeep,land access road,logging road,offroad,overgrown,primitive,quad,ranch road,rut,track,track road,two track,unmaintained,woods road' + name: Track / Land-Access / Road + # 'terms: 4wd,4x4,atv,double track,four wheel drive,high-clearance,jeep,offroad,off-road,overgrown,primitive,quad,rut,unmaintained,unmaintained road,dirt road' terms: highway/traffic_mirror: # highway=traffic_mirror | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). From 6103f353f338f76372682e151eda130b635d46aa Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Thu, 26 May 2022 14:22:52 +0200 Subject: [PATCH 2/7] remove those pesky tabs --- data/presets/highway/track.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/presets/highway/track.json b/data/presets/highway/track.json index 14d9e8105..007916b97 100644 --- a/data/presets/highway/track.json +++ b/data/presets/highway/track.json @@ -41,9 +41,9 @@ "primitive", "quad", "rut", - "unmaintained", - "unmaintained road", - "dirt road" + "unmaintained", + "unmaintained road", + "dirt road" ], "name": "Track / Land-Access Road", "aliases": [ From f768642b752e0bcaf13f3a44e1cac411527b97ff Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Thu, 26 May 2022 17:11:10 +0200 Subject: [PATCH 3/7] sort all aliases alphabetically --- data/presets/highway/track.json | 22 +++++++++++----------- interim/source_strings.yaml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/data/presets/highway/track.json b/data/presets/highway/track.json index 007916b97..8fae9d239 100644 --- a/data/presets/highway/track.json +++ b/data/presets/highway/track.json @@ -41,23 +41,23 @@ "primitive", "quad", "rut", - "unmaintained", - "unmaintained road", - "dirt road" + "unmaintained" ], "name": "Track / Land-Access Road", "aliases": [ + "Agricultural Road", + "Carriage Road", + "Dirt Road", "Land-Access Road", - "Track Road", - "Logging Road", - "Woods Road", + "Farm Road", + "Fire Road", "Forest Road", "Forestry Road", + "Logging Road", "Ranch Road", - "Farm Road", - "Agricultural Road", - "Fire Road", - "Carriage Road", - "Two-Track Road" + "Track Road", + "Two-Track Road", + "Unmaintained Road", + "Woods Road", ] } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 0d9299454..8f1ed9098 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -6301,7 +6301,7 @@ en: highway/track: # highway=track | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Track / Land-Access / Road - # 'terms: 4wd,4x4,atv,double track,four wheel drive,high-clearance,jeep,offroad,off-road,overgrown,primitive,quad,rut,unmaintained,unmaintained road,dirt road' + # 'terms: 4wd,4x4,atv,double track,four wheel drive,high-clearance,jeep,offroad,off-road,overgrown,primitive,quad,rut,unmaintained' terms: highway/traffic_mirror: # highway=traffic_mirror | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). From ddc1c3de9993da3631cba71903f8893098358f4b Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Thu, 26 May 2022 17:12:38 +0200 Subject: [PATCH 4/7] remove trailing "," --- data/presets/highway/track.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/highway/track.json b/data/presets/highway/track.json index 8fae9d239..7a73496c7 100644 --- a/data/presets/highway/track.json +++ b/data/presets/highway/track.json @@ -58,6 +58,6 @@ "Track Road", "Two-Track Road", "Unmaintained Road", - "Woods Road", + "Woods Road" ] } From f1a5b35df356ab14a616ac0ca7af86943c321ef2 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Thu, 29 Sep 2022 14:20:48 +0200 Subject: [PATCH 5/7] add suggestions from review - add suggestions from @1ec5 - demote all except land-access road and track road to terms --- data/presets/highway/track.json | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/data/presets/highway/track.json b/data/presets/highway/track.json index 7a73496c7..11789f08e 100644 --- a/data/presets/highway/track.json +++ b/data/presets/highway/track.json @@ -30,34 +30,38 @@ "terms": [ "4wd", "4x4", + "agricultural road", "atv", + "carriage road", + "dirt road", "double track", + "farm road", + "fire road", + "forest road", + "forestry road", "four wheel drive", + "haul road", + "haulage road", "high-clearance", "jeep", + "logging road", + "mining road", "offroad", "off-road", "overgrown", "primitive", + "ranch road", "quad", "rut", - "unmaintained" + "two-track", + "two track", + "unmaintained", + "vehicular trail", + "woods road" ], "name": "Track / Land-Access Road", "aliases": [ - "Agricultural Road", - "Carriage Road", - "Dirt Road", "Land-Access Road", - "Farm Road", - "Fire Road", - "Forest Road", - "Forestry Road", - "Logging Road", - "Ranch Road", - "Track Road", - "Two-Track Road", - "Unmaintained Road", - "Woods Road" + "Track Road" ] } From 32c8e1ae671a259d098d2a9e1fe1a46efe3d7398 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Thu, 29 Sep 2022 14:22:00 +0200 Subject: [PATCH 6/7] sort alphabetically --- data/presets/highway/track.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/highway/track.json b/data/presets/highway/track.json index 11789f08e..c786e6765 100644 --- a/data/presets/highway/track.json +++ b/data/presets/highway/track.json @@ -50,8 +50,8 @@ "off-road", "overgrown", "primitive", - "ranch road", "quad", + "ranch road", "rut", "two-track", "two track", From 73a83c507d9b1e105abd1e4fd300eb098586d46b Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Thu, 29 Sep 2022 14:24:08 +0200 Subject: [PATCH 7/7] update source_strings.yaml --- interim/source_strings.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 8f1ed9098..116085472 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -6300,9 +6300,9 @@ en: terms: highway/track: # highway=track | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). - name: Track / Land-Access / Road - # 'terms: 4wd,4x4,atv,double track,four wheel drive,high-clearance,jeep,offroad,off-road,overgrown,primitive,quad,rut,unmaintained' - terms: + name: Track / Land-Access Road + # 'terms: 4wd,4x4,agricultural road,atv,carriage road,dirt road,double track,farm road,fire road,forest road,forestry road,four wheel drive,haul road,haulage road,high-clearance,jeep,logging road,mining road,offroad,off-road,overgrown,primitive,ranch road,quad,rut,two-track,two track,unmaintained,vehicular trail,woods road' + terms: highway/traffic_mirror: # highway=traffic_mirror | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Traffic Mirror