From 3a2757576b313b9e2e6c198a51514399fcb4abe7 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 16 Apr 2019 11:41:56 -0700 Subject: [PATCH] Add Monorail Route, Turnstile, and Transit Stop Area Group presets (close #5757) --- data/presets.yaml | 13 ++++++++++ data/presets/presets.json | 3 +++ data/presets/presets/barrier/turnstile.json | 17 ++++++++++++ .../public_transport/stop_area_group.json | 21 +++++++++++++++ data/presets/presets/type/route/monorail.json | 26 +++++++++++++++++++ data/taginfo.json | 3 +++ dist/locales/en.json | 12 +++++++++ modules/ui/preset_icon.js | 1 + 8 files changed, 96 insertions(+) create mode 100644 data/presets/presets/barrier/turnstile.json create mode 100644 data/presets/presets/type/public_transport/stop_area_group.json create mode 100644 data/presets/presets/type/route/monorail.json diff --git a/data/presets.yaml b/data/presets.yaml index 606d3bc6ec..da6049a6b1 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3404,6 +3404,11 @@ en: # barrier=toll_booth name: Toll Booth terms: '' + barrier/turnstile: + # barrier=turnstile + name: Turnstile + # 'terms: baffle gate,turnstyle' + terms: '' barrier/wall: # barrier=wall name: Wall @@ -7164,6 +7169,10 @@ en: type/multipolygon: # type=multipolygon name: Multipolygon + type/public_transport/stop_area_group: + # 'type=public_transport, public_transport=stop_area_group' + name: Transit Stop Area Group + terms: '' type/restriction: # type=restriction name: Restriction @@ -7236,6 +7245,10 @@ en: # 'type=route, route=light_rail' name: Light Rail Route terms: '' + type/route/monorail: + # 'type=route, route=monorail' + name: Monorail Route + terms: '' type/route/pipeline: # 'type=route, route=pipeline' name: Pipeline Route diff --git a/data/presets/presets.json b/data/presets/presets.json index b2807c19df..001febb946 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -269,6 +269,7 @@ "barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"}, "barrier/stile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"}, "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"}, + "barrier/turnstile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "terms": ["baffle gate", "turnstyle"], "tags": {"barrier": "turnstile"}, "name": "Turnstile"}, "barrier/wall": {"icon": "temaki-wall", "fields": ["wall", "height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25}, "boundary/administrative": {"fields": ["name", "admin_level"], "geometry": ["line"], "tags": {"boundary": "administrative"}, "name": "Administrative Boundary", "matchScore": 0.5}, "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"}, @@ -1087,6 +1088,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"], "geometry": ["relation"], "tags": {"type": "boundary", "boundary": "administrative"}, "reference": {"key": "boundary", "value": "administrative"}, "name": "Administrative Boundary"}, "type/enforcement": {"icon": "iD-relation", "fields": ["name", "enforcement"], "geometry": ["relation"], "tags": {"type": "enforcement"}, "name": "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"}, "type/restriction": {"icon": "iD-restriction", "fields": ["restriction", "except"], "geometry": ["relation"], "tags": {"type": "restriction"}, "name": "Restriction"}, "type/restriction/no_left_turn": {"icon": "iD-restriction-no-left-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_left_turn"}, "name": "No Left Turn"}, "type/restriction/no_right_turn": {"icon": "iD-restriction-no-right-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_right_turn"}, "name": "No Right Turn"}, @@ -1106,6 +1108,7 @@ "type/route/hiking": {"icon": "fas-hiking", "fields": ["name", "ref_route", "operator", "network_foot", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "hiking"}, "name": "Hiking Route"}, "type/route/horse": {"icon": "maki-horse-riding", "fields": ["name", "ref_route", "operator", "network_horse", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "name": "Riding Route"}, "type/route/light_rail": {"icon": "temaki-light_rail", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "name": "Light Rail Route"}, + "type/route/monorail": {"icon": "temaki-monorail", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "monorail"}, "name": "Monorail Route"}, "type/route/pipeline": {"icon": "iD-pipeline-line", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "pipeline"}, "name": "Pipeline Route"}, "type/route/piste": {"icon": "fas-skiing", "fields": ["name", "piste/type", "colour", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "name": "Piste/Ski Route"}, "type/route/power": {"icon": "iD-power-line", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"}, diff --git a/data/presets/presets/barrier/turnstile.json b/data/presets/presets/barrier/turnstile.json new file mode 100644 index 0000000000..df3a2ef7bb --- /dev/null +++ b/data/presets/presets/barrier/turnstile.json @@ -0,0 +1,17 @@ +{ + "icon": "maki-roadblock", + "fields": [ + "access" + ], + "geometry": [ + "vertex" + ], + "terms": [ + "baffle gate", + "turnstyle" + ], + "tags": { + "barrier": "turnstile" + }, + "name": "Turnstile" +} diff --git a/data/presets/presets/type/public_transport/stop_area_group.json b/data/presets/presets/type/public_transport/stop_area_group.json new file mode 100644 index 0000000000..64a493873b --- /dev/null +++ b/data/presets/presets/type/public_transport/stop_area_group.json @@ -0,0 +1,21 @@ +{ + "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/route/monorail.json b/data/presets/presets/type/route/monorail.json new file mode 100644 index 0000000000..666ac28e71 --- /dev/null +++ b/data/presets/presets/type/route/monorail.json @@ -0,0 +1,26 @@ +{ + "icon": "temaki-monorail", + "fields": [ + "name", + "ref_route", + "operator", + "network", + "to", + "from" + ], + "moreFields" : [ + "colour", + "interval", + "opening_hours", + "duration", + "wheelchair" + ], + "geometry": [ + "relation" + ], + "tags": { + "type": "route", + "route": "monorail" + }, + "name": "Monorail Route" +} diff --git a/data/taginfo.json b/data/taginfo.json index 420c49db72..111f765b5e 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -266,6 +266,7 @@ {"key": "barrier", "value": "retaining_wall", "description": "🄿 Retaining Wall", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/wall.svg?sanitize=true"}, {"key": "barrier", "value": "stile", "description": "🄿 Stile", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, {"key": "barrier", "value": "toll_booth", "description": "🄿 Toll Booth", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, + {"key": "barrier", "value": "turnstile", "description": "🄿 Turnstile", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, {"key": "barrier", "value": "wall", "description": "🄿 Wall", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/wall.svg?sanitize=true"}, {"key": "boundary", "value": "administrative", "description": "🄿 Administrative Boundary", "object_types": ["way"]}, {"key": "bridge:support", "description": "🄿 Bridge Support, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-archway.svg?sanitize=true"}, @@ -1025,6 +1026,7 @@ {"key": "type", "value": "multipolygon", "description": "🄿 Multipolygon (unsearchable)", "object_types": ["area", "relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/multipolygon.svg?sanitize=true"}, {"key": "type", "value": "boundary", "description": "🄿 Boundary", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/boundary.svg?sanitize=true"}, {"key": "type", "value": "enforcement", "description": "🄿 Enforcement", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/relation.svg?sanitize=true"}, + {"key": "public_transport", "value": "stop_area_group", "description": "🄿 Transit Stop Area Group", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/relation.svg?sanitize=true"}, {"key": "type", "value": "restriction", "description": "🄿 Restriction", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction.svg?sanitize=true"}, {"key": "restriction", "value": "no_left_turn", "description": "🄿 No Left Turn", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction-no-left-turn.svg?sanitize=true"}, {"key": "restriction", "value": "no_right_turn", "description": "🄿 No Right Turn", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/restriction-no-right-turn.svg?sanitize=true"}, @@ -1043,6 +1045,7 @@ {"key": "route", "value": "hiking", "description": "🄿 Hiking Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-hiking.svg?sanitize=true"}, {"key": "route", "value": "horse", "description": "🄿 Riding Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/horse-riding-15.svg?sanitize=true"}, {"key": "route", "value": "light_rail", "description": "🄿 Light Rail Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/light_rail.svg?sanitize=true"}, + {"key": "route", "value": "monorail", "description": "🄿 Monorail Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/monorail.svg?sanitize=true"}, {"key": "route", "value": "pipeline", "description": "🄿 Pipeline Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/pipeline-line.svg?sanitize=true"}, {"key": "route", "value": "piste", "description": "🄿 Piste/Ski Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-skiing.svg?sanitize=true"}, {"key": "route", "value": "power", "description": "🄿 Power Route", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/power-line.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index fd3422a897..2a4f3a2fa9 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5138,6 +5138,10 @@ "name": "Toll Booth", "terms": "" }, + "barrier/turnstile": { + "name": "Turnstile", + "terms": "baffle gate,turnstyle" + }, "barrier/wall": { "name": "Wall", "terms": "" @@ -8410,6 +8414,10 @@ "name": "Enforcement", "terms": "" }, + "type/public_transport/stop_area_group": { + "name": "Transit Stop Area Group", + "terms": "" + }, "type/restriction": { "name": "Restriction", "terms": "" @@ -8486,6 +8494,10 @@ "name": "Light Rail Route", "terms": "" }, + "type/route/monorail": { + "name": "Monorail Route", + "terms": "" + }, "type/route/pipeline": { "name": "Pipeline Route", "terms": "" diff --git a/modules/ui/preset_icon.js b/modules/ui/preset_icon.js index e8d7a6c0fa..c7041339ec 100644 --- a/modules/ui/preset_icon.js +++ b/modules/ui/preset_icon.js @@ -182,6 +182,7 @@ export function uiPresetIcon(context) { hiking: ['highway/path', 'highway/path', 'highway/path'], horse: ['highway/bridleway', 'highway/bridleway', 'highway/bridleway'], light_rail: ['railway/light_rail', 'railway/light_rail', 'railway/light_rail'], + monorail: ['railway/monorail', 'railway/monorail', 'railway/monorail'], pipeline: ['man_made/pipeline', 'man_made/pipeline', 'man_made/pipeline'], piste: ['piste/downhill', 'piste/hike', 'piste/nordic'], power: ['power/line', 'power/line', 'power/line'],