From 073a13d01238199419d6eb84967cfe4458ec3fbf Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 23 Jun 2020 19:03:42 -0400 Subject: [PATCH] Add destination_sign preset (close #6970) --- data/presets.yaml | 11 +++++++++++ data/presets/fields.json | 2 ++ data/presets/fields/destination/ref.json | 6 ++++++ data/presets/fields/destination/symbol.json | 5 +++++ data/presets/presets.json | 1 + .../presets/type/destination_sign.json | 19 +++++++++++++++++++ data/taginfo.json | 1 + dist/locales/en.json | 10 ++++++++++ 8 files changed, 55 insertions(+) create mode 100644 data/presets/fields/destination/ref.json create mode 100644 data/presets/fields/destination/symbol.json create mode 100644 data/presets/presets/type/destination_sign.json diff --git a/data/presets.yaml b/data/presets.yaml index 29f972b32..66fc82bdf 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -667,9 +667,15 @@ en: destination: # destination=* label: Destination + destination/ref: + # 'destination:ref=*' + label: Destination Road Numbers destination/ref_oneway: # 'destination:ref=*' label: Destination Road Numbers + destination/symbol: + # 'destination:symbol=*' + label: Destination Symbols destination/symbol_oneway: # 'destination:symbol=*' label: Destination Symbols @@ -8802,6 +8808,11 @@ en: # type=connectivity name: Lane Connectivity terms: '' + type/destination_sign: + # type=destination_sign + name: Destination Sign + # 'terms: exit sign' + terms: '' type/enforcement: # type=enforcement name: Enforcement diff --git a/data/presets/fields.json b/data/presets/fields.json index d54df2cc8..76734db01 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -118,7 +118,9 @@ "destination_oneway": {"key": "destination", "type": "semiCombo", "label": "Destinations", "prerequisiteTag": {"key": "oneway", "value": "yes"}, "snake_case": false}, "destination": {"key": "destination", "type": "text", "label": "Destination"}, "destination/ref_oneway": {"key": "destination:ref", "type": "semiCombo", "label": "Destination Road Numbers", "prerequisiteTag": {"key": "oneway", "value": "yes"}, "snake_case": false}, + "destination/ref": {"key": "destination:ref", "type": "semiCombo", "label": "Destination Road Numbers", "snake_case": false}, "destination/symbol_oneway": {"key": "destination:symbol", "type": "semiCombo", "label": "Destination Symbols", "prerequisiteTag": {"key": "oneway", "value": "yes"}}, + "destination/symbol": {"key": "destination:symbol", "type": "semiCombo", "label": "Destination Symbols"}, "devices": {"key": "devices", "type": "number", "minValue": 0, "label": "Devices", "placeholder": "1, 2, 3..."}, "diameter": {"key": "diameter", "type": "combo", "label": "Diameter", "snake_case": false, "placeholder": "5 mm, 10 cm, 15 inโ€ฆ"}, "diet_multi": {"key": "diet:", "type": "multiCombo", "label": "Diet Types", "terms": ["gluten free", "fruitarian", "halal", "kosher", "lactose free", "meat", "pescatarian", "raw", "vegan", "vegetarian"]}, diff --git a/data/presets/fields/destination/ref.json b/data/presets/fields/destination/ref.json new file mode 100644 index 000000000..ab5b64d43 --- /dev/null +++ b/data/presets/fields/destination/ref.json @@ -0,0 +1,6 @@ +{ + "key": "destination:ref", + "type": "semiCombo", + "label": "Destination Road Numbers", + "snake_case": false +} diff --git a/data/presets/fields/destination/symbol.json b/data/presets/fields/destination/symbol.json new file mode 100644 index 000000000..407a12136 --- /dev/null +++ b/data/presets/fields/destination/symbol.json @@ -0,0 +1,5 @@ +{ + "key": "destination:symbol", + "type": "semiCombo", + "label": "Destination Symbols" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index d27652e70..0be4bf6d6 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1279,6 +1279,7 @@ "type/boundary": {"icon": "iD-boundary", "fields": ["name", "boundary"], "geometry": ["relation"], "tags": {"type": "boundary"}, "name": "Boundary"}, "type/boundary/administrative": {"icon": "iD-boundary", "fields": ["name", "admin_level"], "moreFields": ["gnis/feature_id"], "geometry": ["relation"], "tags": {"type": "boundary", "boundary": "administrative"}, "reference": {"key": "boundary", "value": "administrative"}, "name": "Administrative Boundary"}, "type/connectivity": {"icon": "iD-relation", "fields": ["connectivity"], "geometry": ["relation"], "tags": {"type": "connectivity"}, "name": "Lane Connectivity"}, + "type/destination_sign": {"icon": "iD-relation", "fields": ["destination", "destination/ref", "destination/symbol", "distance"], "geometry": ["relation"], "tags": {"type": "destination_sign"}, "terms": ["exit sign"], "name": "Destination Sign"}, "type/enforcement": {"icon": "iD-relation", "fields": ["enforcement"], "geometry": ["relation"], "tags": {"type": "enforcement"}, "name": "Enforcement"}, "type/enforcement/maxspeed": {"icon": "iD-relation", "fields": ["maxspeed"], "geometry": ["relation"], "tags": {"type": "enforcement", "enforcement": "maxspeed"}, "reference": {"key": "enforcement", "value": "maxspeed"}, "terms": ["maxspeed", "radar", "speed camera"], "name": "Speed Limit Enforcement"}, "type/public_transport/stop_area_group": {"icon": "iD-relation", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area_group"}, "reference": {"key": "public_transport", "value": "stop_area_group"}, "name": "Transit Stop Area Group"}, diff --git a/data/presets/presets/type/destination_sign.json b/data/presets/presets/type/destination_sign.json new file mode 100644 index 000000000..1e1a1d2f7 --- /dev/null +++ b/data/presets/presets/type/destination_sign.json @@ -0,0 +1,19 @@ +{ + "icon": "iD-relation", + "fields": [ + "destination", + "destination/ref", + "destination/symbol", + "distance" + ], + "geometry": [ + "relation" + ], + "tags": { + "type": "destination_sign" + }, + "terms": [ + "exit sign" + ], + "name": "Destination Sign" +} diff --git a/data/taginfo.json b/data/taginfo.json index 97dd5e8a6..45b0bcd33 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1219,6 +1219,7 @@ {"key": "type", "value": "multipolygon", "description": "๐Ÿ„ฟ Multipolygon (unsearchable)", "object_types": ["area", "relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/iD-sprite/presets/multipolygon.svg"}, {"key": "type", "value": "boundary", "description": "๐Ÿ„ฟ Boundary", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/iD-sprite/presets/boundary.svg"}, {"key": "type", "value": "connectivity", "description": "๐Ÿ„ฟ Lane Connectivity", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/iD-sprite/presets/relation.svg"}, + {"key": "type", "value": "destination_sign", "description": "๐Ÿ„ฟ Destination Sign", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/iD-sprite/presets/relation.svg"}, {"key": "type", "value": "enforcement", "description": "๐Ÿ„ฟ Enforcement", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/iD-sprite/presets/relation.svg"}, {"key": "enforcement", "value": "maxspeed", "description": "๐Ÿ„ฟ Speed Limit Enforcement", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/iD-sprite/presets/relation.svg"}, {"key": "public_transport", "value": "stop_area_group", "description": "๐Ÿ„ฟ Transit Stop Area Group", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/iD-sprite/presets/relation.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 18c180a51..5f6d2b550 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3284,10 +3284,16 @@ "destination/ref_oneway": { "label": "Destination Road Numbers" }, + "destination/ref": { + "label": "Destination Road Numbers" + }, "destination/symbol_oneway": { "label": "Destination Symbols", "terms": "" }, + "destination/symbol": { + "label": "Destination Symbols" + }, "devices": { "label": "Devices", "placeholder": "1, 2, 3..." @@ -10171,6 +10177,10 @@ "name": "Lane Connectivity", "terms": "" }, + "type/destination_sign": { + "name": "Destination Sign", + "terms": "exit sign" + }, "type/enforcement": { "name": "Enforcement", "terms": ""