From 7c0e25e1932fbabd537a92b2a1ad2b7511e67e36 Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Sat, 15 Aug 2020 13:15:02 -0400 Subject: [PATCH] Add road and path tram crossing presets (re: #7902) --- data/presets.yaml | 10 ++++++++++ data/presets/presets.json | 2 ++ .../presets/railway/tram_crossing.json | 19 +++++++++++++++++++ .../presets/railway/tram_level_crossing.json | 19 +++++++++++++++++++ data/taginfo.json | 2 ++ dist/locales/en.json | 8 ++++++++ svg/fontawesome/fas-car-side.svg | 1 + 7 files changed, 61 insertions(+) create mode 100644 data/presets/presets/railway/tram_crossing.json create mode 100644 data/presets/presets/railway/tram_level_crossing.json create mode 100644 svg/fontawesome/fas-car-side.svg diff --git a/data/presets.yaml b/data/presets.yaml index e63611b99..6c5e63ee8 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -7680,6 +7680,16 @@ en: name: Tram Track # 'terms: electric street railway,light rail,streetcar,tramway,trolley' terms: '' + railway/tram_crossing: + # railway=tram_crossing + name: Tram Crossing (Path) + # 'terms: crossing,grade crossing,level crossing,pedestrian crossing,streetcar crossing,tramway crossing,trolley crossing' + terms: '' + railway/tram_level_crossing: + # railway=tram_level_crossing + name: Tram Crossing (Road) + # 'terms: crossing,grade crossing,level crossing,pedestrian crossing,streetcar crossing,tramway crossing,trolley crossing' + terms: '' railway/tram_stop: # railway=tram_stop name: Tram Stopping Position diff --git a/data/presets/presets.json b/data/presets/presets.json index 4a407e656..5048c59b8 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1037,6 +1037,8 @@ "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit", "underground railway"], "name": "Subway Track"}, "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"}, "railway/train_wash": {"icon": "temaki-train_wash", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"}, + "railway/tram_crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "tram_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "pedestrian crossing", "streetcar crossing", "tramway crossing", "trolley crossing"], "name": "Tram Crossing (Path)"}, + "railway/tram_level_crossing": {"icon": "fas-car-side", "geometry": ["vertex"], "tags": {"railway": "tram_level_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "pedestrian crossing", "streetcar crossing", "tramway crossing", "trolley crossing"], "name": "Tram Crossing (Road)"}, "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["electric street railway", "light rail", "streetcar", "tramway", "trolley"], "name": "Tram Track"}, "railway/yard": {"icon": "temaki-freight_car", "fields": ["name", "operator"], "moreFields": ["gnis/feature_id"], "geometry": ["point"], "tags": {"railway": "yard"}, "terms": ["freight car stop", "freight train station", "rail freight station", "railroad yard", "railway yard"], "name": "Rail Yard"}, "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"}, diff --git a/data/presets/presets/railway/tram_crossing.json b/data/presets/presets/railway/tram_crossing.json new file mode 100644 index 000000000..e92d934e6 --- /dev/null +++ b/data/presets/presets/railway/tram_crossing.json @@ -0,0 +1,19 @@ +{ + "icon": "temaki-pedestrian", + "geometry": [ + "vertex" + ], + "tags": { + "railway": "tram_crossing" + }, + "terms": [ + "crossing", + "grade crossing", + "level crossing", + "pedestrian crossing", + "streetcar crossing", + "tramway crossing", + "trolley crossing" + ], + "name": "Tram Crossing (Path)" +} diff --git a/data/presets/presets/railway/tram_level_crossing.json b/data/presets/presets/railway/tram_level_crossing.json new file mode 100644 index 000000000..7403a48de --- /dev/null +++ b/data/presets/presets/railway/tram_level_crossing.json @@ -0,0 +1,19 @@ +{ + "icon": "fas-car-side", + "geometry": [ + "vertex" + ], + "tags": { + "railway": "tram_level_crossing" + }, + "terms": [ + "crossing", + "grade crossing", + "level crossing", + "pedestrian crossing", + "streetcar crossing", + "tramway crossing", + "trolley crossing" + ], + "name": "Tram Crossing (Road)" +} diff --git a/data/taginfo.json b/data/taginfo.json index 7d4b07d2f..62ff24598 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -985,6 +985,8 @@ {"key": "railway", "value": "subway", "description": "🄿 Subway Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/subway.svg"}, {"key": "railway", "value": "switch", "description": "🄿 Railway Switch", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/junction.svg"}, {"key": "railway", "value": "wash", "description": "🄿 Train Wash", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/train_wash.svg"}, + {"key": "railway", "value": "tram_crossing", "description": "🄿 Tram Crossing (Path)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian.svg"}, + {"key": "railway", "value": "tram_level_crossing", "description": "🄿 Tram Crossing (Road)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-car-side.svg"}, {"key": "railway", "value": "tram", "description": "🄿 Tram Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tram.svg"}, {"key": "railway", "value": "yard", "description": "🄿 Rail Yard", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/freight_car.svg"}, {"key": "route", "value": "ferry", "description": "🄿 Ferry Route", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/ferry.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index d8f8d0d9b..39be3bc14 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -9281,6 +9281,14 @@ "name": "Train Wash", "terms": "wash,clean" }, + "railway/tram_crossing": { + "name": "Tram Crossing (Path)", + "terms": "crossing,grade crossing,level crossing,pedestrian crossing,streetcar crossing,tramway crossing,trolley crossing" + }, + "railway/tram_level_crossing": { + "name": "Tram Crossing (Road)", + "terms": "crossing,grade crossing,level crossing,pedestrian crossing,streetcar crossing,tramway crossing,trolley crossing" + }, "railway/tram": { "name": "Tram Track", "terms": "electric street railway,light rail,streetcar,tramway,trolley" diff --git a/svg/fontawesome/fas-car-side.svg b/svg/fontawesome/fas-car-side.svg new file mode 100644 index 000000000..a9eff2e20 --- /dev/null +++ b/svg/fontawesome/fas-car-side.svg @@ -0,0 +1 @@ + \ No newline at end of file