From 097273cc8c4e9f19d5c10141454efec24bd9c3e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Fri, 6 Aug 2021 21:58:34 -0700 Subject: [PATCH 1/4] Added cardinal direction field to some route presets --- data/fields/direction_cardinal.json | 14 ++++++++++++++ data/presets/type/route/bicycle.json | 1 + data/presets/type/route/road.json | 1 + data/presets/type/route/train.json | 1 + interim/source_strings.yaml | 12 ++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 data/fields/direction_cardinal.json diff --git a/data/fields/direction_cardinal.json b/data/fields/direction_cardinal.json new file mode 100644 index 00000000..bcb81250 --- /dev/null +++ b/data/fields/direction_cardinal.json @@ -0,0 +1,14 @@ +{ + "key": "direction", + "type": "combo", + "label": "Direction", + "strings": { + "options": { + "north": "Northbound", + "south": "Southbound", + "east": "Eastbound", + "west": "Westbound" + } + }, + "autoSuggestions" : false +} diff --git a/data/presets/type/route/bicycle.json b/data/presets/type/route/bicycle.json index d6d822ae..64fdd7bf 100644 --- a/data/presets/type/route/bicycle.json +++ b/data/presets/type/route/bicycle.json @@ -6,6 +6,7 @@ "network_bicycle", "cycle_network", "network/type", + "direction_cardinal", "from", "to", "via" diff --git a/data/presets/type/route/road.json b/data/presets/type/route/road.json index 7f62aa42..346abfc6 100644 --- a/data/presets/type/route/road.json +++ b/data/presets/type/route/road.json @@ -4,6 +4,7 @@ "name", "ref_route", "network_road", + "direction_cardinal", "from", "to", "via" diff --git a/data/presets/type/route/train.json b/data/presets/type/route/train.json index cb37ada1..4effa0eb 100644 --- a/data/presets/type/route/train.json +++ b/data/presets/type/route/train.json @@ -5,6 +5,7 @@ "ref_route", "operator", "network", + "direction_cardinal", "from", "to", "via" diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 7820faac..bbcbd4ea 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -857,6 +857,18 @@ en: # direction field placeholder placeholder: '45, 90, 180, 270' terms: '[translate with synonyms or related terms for ''Direction (Degrees Clockwise)'', separated by commas]' + direction_cardinal: + # direction=* + label: Direction + options: + # direction=east + east: Eastbound + # direction=north + north: Northbound + # direction=south + south: Southbound + # direction=west + west: Westbound direction_clock: # direction=* label: Direction From e4fda02ff1124cecdcc04e5bedc30ebaeda6a14a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Wed, 15 Dec 2021 16:29:54 -0800 Subject: [PATCH 2/4] Limit cardinal direction field to MUTCD countries --- data/fields/direction_cardinal.json | 5 ++++- interim/source_strings.yaml | 30 ++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/data/fields/direction_cardinal.json b/data/fields/direction_cardinal.json index bcb81250..0420417d 100644 --- a/data/fields/direction_cardinal.json +++ b/data/fields/direction_cardinal.json @@ -10,5 +10,8 @@ "west": "Westbound" } }, - "autoSuggestions" : false + "autoSuggestions" : false, + "locationSet": { + "include": [ "CA", "NZ", "US" ] + } } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index bbcbd4ea..deacc1e4 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -643,14 +643,24 @@ en: american: American # cuisine=asian asian: Asian + # cuisine=bubble_tea + bubble_tea: Bubble Tea # cuisine=burger burger: Burger + # cuisine=cake + cake: Cake # cuisine=chicken chicken: Chicken # cuisine=chinese chinese: Chinese + # cuisine=chocolate + chocolate: Chocolate # cuisine=coffee_shop coffee_shop: Coffee Shop + # cuisine=dessert + dessert: Dessert + # cuisine=donut + donut: Donut # cuisine=fish fish: Fish # cuisine=french @@ -659,22 +669,34 @@ en: german: German # cuisine=greek greek: Greek + # cuisine=hot_dog + hot_dog: Hot Dog # cuisine=ice_cream ice_cream: Ice Cream # cuisine=indian indian: Indian + # cuisine=indonesian + indonesian: Indonesian # cuisine=italian italian: Italian # cuisine=japanese japanese: Japanese + # cuisine=juice + juice: Juice # cuisine=kebab kebab: Kebab # cuisine=korean korean: Korean # cuisine=lebanese lebanese: Lebanese + # cuisine=malaysian + malaysian: Malaysian # cuisine=mexican mexican: Mexican + # cuisine=pankcake + pankcake: Pancake + # cuisine=pasta + pasta: Pasta # cuisine=pizza pizza: Pizza # cuisine=polish @@ -685,14 +707,20 @@ en: regional: Regional # cuisine=russian russian: Russian + # cuisine=salad + salad: Salad # cuisine=sandwich sandwich: Sandwich # cuisine=seafood seafood: Seafood # cuisine=spanish spanish: Spanish + # cuisine=steak_house + steak_house: Steak House # cuisine=sushi sushi: Sushi + # cuisine=taiwanese + taiwanese: Taiwanese # cuisine=thai thai: Thai # cuisine=turkish @@ -6675,7 +6703,7 @@ en: # 'terms: boat launch,boat ramp,boat landing' terms: '' leisure/slipway_drivable: - # 'leisure=slipway\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).' + # 'leisure=slipway + highway=service\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).' name: Slipway (Drivable) # 'terms: boat launch,boat ramp,boat landing' terms: '' From f1fd4ff7d6195a2a5c3ce3a2e36c6c89b5e849c2 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 3 Jan 2022 19:16:39 +0100 Subject: [PATCH 3/4] move direction field to "moreFields" for bike/train routes reason: the tag is (currently) used too rarely for these relations --- data/presets/type/route/bicycle.json | 2 +- data/presets/type/route/train.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/presets/type/route/bicycle.json b/data/presets/type/route/bicycle.json index 64fdd7bf..50043e1e 100644 --- a/data/presets/type/route/bicycle.json +++ b/data/presets/type/route/bicycle.json @@ -6,7 +6,6 @@ "network_bicycle", "cycle_network", "network/type", - "direction_cardinal", "from", "to", "via" @@ -15,6 +14,7 @@ "ascent", "colour", "descent", + "direction_cardinal", "distance", "roundtrip" ], diff --git a/data/presets/type/route/train.json b/data/presets/type/route/train.json index 4effa0eb..f67873c6 100644 --- a/data/presets/type/route/train.json +++ b/data/presets/type/route/train.json @@ -5,13 +5,13 @@ "ref_route", "operator", "network", - "direction_cardinal", "from", "to", "via" ], "moreFields": [ "colour", + "direction_cardinal", "distance", "duration", "interval", From ee89b0f506ee5505ebc06dd7f1b490b2bd6713b1 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 3 Jan 2022 19:28:47 +0100 Subject: [PATCH 4/4] add suffix to regional field --- ...irection_cardinal.json => direction_cardinal-US-CA-NZ.json} | 0 data/presets/type/route/bicycle.json | 2 +- data/presets/type/route/road.json | 2 +- data/presets/type/route/train.json | 2 +- interim/source_strings.yaml | 3 ++- 5 files changed, 5 insertions(+), 4 deletions(-) rename data/fields/{direction_cardinal.json => direction_cardinal-US-CA-NZ.json} (100%) diff --git a/data/fields/direction_cardinal.json b/data/fields/direction_cardinal-US-CA-NZ.json similarity index 100% rename from data/fields/direction_cardinal.json rename to data/fields/direction_cardinal-US-CA-NZ.json diff --git a/data/presets/type/route/bicycle.json b/data/presets/type/route/bicycle.json index 50043e1e..9eb3c8b4 100644 --- a/data/presets/type/route/bicycle.json +++ b/data/presets/type/route/bicycle.json @@ -14,7 +14,7 @@ "ascent", "colour", "descent", - "direction_cardinal", + "direction_cardinal-US-CA-NZ", "distance", "roundtrip" ], diff --git a/data/presets/type/route/road.json b/data/presets/type/route/road.json index 346abfc6..f412382b 100644 --- a/data/presets/type/route/road.json +++ b/data/presets/type/route/road.json @@ -4,7 +4,7 @@ "name", "ref_route", "network_road", - "direction_cardinal", + "direction_cardinal-US-CA-NZ", "from", "to", "via" diff --git a/data/presets/type/route/train.json b/data/presets/type/route/train.json index f67873c6..e7747fc4 100644 --- a/data/presets/type/route/train.json +++ b/data/presets/type/route/train.json @@ -11,7 +11,7 @@ ], "moreFields": [ "colour", - "direction_cardinal", + "direction_cardinal-US-CA-NZ", "distance", "duration", "interval", diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index deacc1e4..2d723ff2 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -885,7 +885,7 @@ en: # direction field placeholder placeholder: '45, 90, 180, 270' terms: '[translate with synonyms or related terms for ''Direction (Degrees Clockwise)'', separated by commas]' - direction_cardinal: + direction_cardinal-US-CA-NZ: # direction=* label: Direction options: @@ -897,6 +897,7 @@ en: south: Southbound # direction=west west: Westbound + terms: '[translate with synonyms or related terms for ''Direction'', separated by commas]' direction_clock: # direction=* label: Direction