From a3f561f8f018c6a9644893216a753dc717e1ac72 Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Thu, 3 Sep 2020 11:34:53 -0400 Subject: [PATCH] Update railway crossing preset names --- data/presets.yaml | 24 +++++++++---------- data/presets/presets.json | 8 +++---- data/presets/presets/railway/crossing.json | 6 +++-- .../presets/railway/level_crossing.json | 6 +++-- .../presets/railway/tram_crossing.json | 4 +++- .../presets/railway/tram_level_crossing.json | 4 +++- data/taginfo.json | 8 +++---- dist/locales/en.json | 16 ++++++------- 8 files changed, 42 insertions(+), 34 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 98801071e..56e8d9f89 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -7619,9 +7619,9 @@ en: terms: '' railway/crossing: # railway=crossing - name: Railway Crossing (Path) - # 'terms: crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing' - terms: '' + name: Railway-Path Crossing + # 'terms: crossing,path railway crossing,pedestrian crossing,level crossing,grade crossing,railroad crossing,railway path crossing,path through railroad,train crossing' + terms: '' railway/derail: # railway=derail name: Railway Derailer @@ -7641,9 +7641,9 @@ en: name: Train Station (Halt / Request) railway/level_crossing: # railway=level_crossing - name: Railway Crossing (Road) - # 'terms: crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing' - terms: '' + name: Railway-Road Crossing + # 'terms: crossing,level crossing,grade crossing,railroad crossing,railway road crossing,road railway crossing,road through railroad,train crossing' + terms: '' railway/light_rail: # railway=light_rail name: Light Rail Track @@ -7731,14 +7731,14 @@ en: 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: '' + name: Tram-Path Crossing + # 'terms: crossing,grade crossing,level crossing,path tram crossing,pedestrian crossing,streetcar crossing,tram path 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: '' + name: Tram-Road Crossing + # 'terms: crossing,grade crossing,level crossing,pedestrian crossing,road tram crossing,streetcar crossing,tram road 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 c607f027a..23ae84d6d 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1023,11 +1023,11 @@ "railway/abandoned": {"icon": "temaki-railway_track_askew", "fields": ["name", "structure", "service_rail", "usage_rail"], "moreFields": ["covered", "incline"], "geometry": ["line"], "tags": {"railway": "abandoned"}, "terms": [], "matchScore": 0.85, "name": "Abandoned Railway"}, "railway/buffer_stop": {"icon": "temaki-buffer_stop", "geometry": ["vertex"], "tags": {"railway": "buffer_stop"}, "terms": ["stop", "halt", "buffer"], "name": "Buffer Stop"}, "railway/construction": {"icon": "temaki-railway_track_partial", "fields": ["name", "opening_date", "check_date", "note", "structure", "gauge", "electrified"], "moreFields": ["covered", "frequency_electrified", "highspeed", "incline", "maxspeed", "service_rail", "usage_rail", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "construction"}, "matchScore": 0.95, "name": "Railway Under Construction"}, - "railway/crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "crossing"}, "terms": ["crossing", "pedestrian crossing", "railroad crossing", "level crossing", "grade crossing", "path through railroad", "train crossing"], "name": "Railway Crossing (Path)"}, + "railway/crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "crossing"}, "terms": ["crossing", "path railway crossing", "pedestrian crossing", "level crossing", "grade crossing", "railroad crossing", "railway path crossing", "path through railroad", "train crossing"], "name": "Railway-Path Crossing"}, "railway/derail": {"icon": "maki-roadblock", "geometry": ["vertex"], "tags": {"railway": "derail"}, "terms": ["derailer"], "name": "Railway Derailer"}, "railway/disused": {"icon": "temaki-railway_track", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}", "highspeed"], "geometry": ["line"], "tags": {"railway": "disused"}, "matchScore": 0.95, "name": "Disused Railway"}, "railway/funicular": {"icon": "temaki-railway_cable_track", "fields": ["name", "operator", "incline", "structure", "gauge", "service_rail"], "moreFields": ["covered", "electrified", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "tags": {"railway": "funicular"}, "name": "Funicular Track"}, - "railway/level_crossing": {"icon": "maki-cross", "geometry": ["vertex"], "tags": {"railway": "level_crossing"}, "terms": ["crossing", "railroad crossing", "level crossing", "grade crossing", "road through railroad", "train crossing"], "name": "Railway Crossing (Road)"}, + "railway/level_crossing": {"icon": "maki-cross", "geometry": ["vertex"], "tags": {"railway": "level_crossing"}, "terms": ["crossing", "level crossing", "grade crossing", "railroad crossing", "railway road crossing", "road railway crossing", "road through railroad", "train crossing"], "name": "Railway-Road Crossing"}, "railway/light_rail": {"icon": "temaki-light_rail", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "incline", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "light_rail"}, "terms": ["light rail", "streetcar", "trolley"], "name": "Light Rail Track"}, "railway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["railway/position", "direction_vertex"], "tags": {"railway": "milestone"}, "terms": ["milestone", "marker"], "name": "Railway Milestone"}, "railway/miniature": {"icon": "temaki-railway_track_mini", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "miniature"}, "terms": ["rideable miniature railway", "narrow gauge railway", "minimum gauge railway"], "name": "Miniature Train Track"}, @@ -1043,8 +1043,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_crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "tram_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "path tram crossing", "pedestrian crossing", "streetcar crossing", "tram path crossing", "tramway crossing", "trolley crossing"], "name": "Tram-Path Crossing"}, + "railway/tram_level_crossing": {"icon": "fas-car-side", "geometry": ["vertex"], "tags": {"railway": "tram_level_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "pedestrian crossing", "road tram crossing", "streetcar crossing", "tram road crossing", "tramway crossing", "trolley crossing"], "name": "Tram-Road Crossing"}, "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/crossing.json b/data/presets/presets/railway/crossing.json index d170c4c26..08ca4a85c 100644 --- a/data/presets/presets/railway/crossing.json +++ b/data/presets/presets/railway/crossing.json @@ -8,12 +8,14 @@ }, "terms": [ "crossing", + "path railway crossing", "pedestrian crossing", - "railroad crossing", "level crossing", "grade crossing", + "railroad crossing", + "railway path crossing", "path through railroad", "train crossing" ], - "name": "Railway Crossing (Path)" + "name": "Railway-Path Crossing" } diff --git a/data/presets/presets/railway/level_crossing.json b/data/presets/presets/railway/level_crossing.json index 7bcd19d22..5376cbeba 100644 --- a/data/presets/presets/railway/level_crossing.json +++ b/data/presets/presets/railway/level_crossing.json @@ -8,11 +8,13 @@ }, "terms": [ "crossing", - "railroad crossing", "level crossing", "grade crossing", + "railroad crossing", + "railway road crossing", + "road railway crossing", "road through railroad", "train crossing" ], - "name": "Railway Crossing (Road)" + "name": "Railway-Road Crossing" } diff --git a/data/presets/presets/railway/tram_crossing.json b/data/presets/presets/railway/tram_crossing.json index e92d934e6..808738e43 100644 --- a/data/presets/presets/railway/tram_crossing.json +++ b/data/presets/presets/railway/tram_crossing.json @@ -10,10 +10,12 @@ "crossing", "grade crossing", "level crossing", + "path tram crossing", "pedestrian crossing", "streetcar crossing", + "tram path crossing", "tramway crossing", "trolley crossing" ], - "name": "Tram Crossing (Path)" + "name": "Tram-Path Crossing" } diff --git a/data/presets/presets/railway/tram_level_crossing.json b/data/presets/presets/railway/tram_level_crossing.json index 7403a48de..90dc69d48 100644 --- a/data/presets/presets/railway/tram_level_crossing.json +++ b/data/presets/presets/railway/tram_level_crossing.json @@ -11,9 +11,11 @@ "grade crossing", "level crossing", "pedestrian crossing", + "road tram crossing", "streetcar crossing", + "tram road crossing", "tramway crossing", "trolley crossing" ], - "name": "Tram Crossing (Road)" + "name": "Tram-Road Crossing" } diff --git a/data/taginfo.json b/data/taginfo.json index f0e786d22..e1b25e330 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -971,11 +971,11 @@ {"key": "railway", "value": "abandoned", "description": "🄿 Abandoned Railway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track_askew.svg"}, {"key": "railway", "value": "buffer_stop", "description": "🄿 Buffer Stop", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/buffer_stop.svg"}, {"key": "railway", "value": "construction", "description": "🄿 Railway Under Construction", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track_partial.svg"}, - {"key": "railway", "value": "crossing", "description": "🄿 Railway Crossing (Path)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian.svg"}, + {"key": "railway", "value": "crossing", "description": "🄿 Railway-Path Crossing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian.svg"}, {"key": "railway", "value": "derail", "description": "🄿 Railway Derailer", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"}, {"key": "railway", "value": "disused", "description": "🄿 Disused Railway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track.svg"}, {"key": "railway", "value": "funicular", "description": "🄿 Funicular Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_cable_track.svg"}, - {"key": "railway", "value": "level_crossing", "description": "🄿 Railway Crossing (Road)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cross-15.svg"}, + {"key": "railway", "value": "level_crossing", "description": "🄿 Railway-Road Crossing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cross-15.svg"}, {"key": "railway", "value": "light_rail", "description": "🄿 Light Rail Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/light_rail.svg"}, {"key": "railway", "value": "milestone", "description": "🄿 Railway Milestone", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/milestone.svg"}, {"key": "railway", "value": "miniature", "description": "🄿 Miniature Train Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track_mini.svg"}, @@ -991,8 +991,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_crossing", "description": "🄿 Tram-Path Crossing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian.svg"}, + {"key": "railway", "value": "tram_level_crossing", "description": "🄿 Tram-Road Crossing", "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 c8d82be3f..52c1dc72e 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -9246,8 +9246,8 @@ "terms": "" }, "railway/crossing": { - "name": "Railway Crossing (Path)", - "terms": "crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing" + "name": "Railway-Path Crossing", + "terms": "crossing,path railway crossing,pedestrian crossing,level crossing,grade crossing,railroad crossing,railway path crossing,path through railroad,train crossing" }, "railway/derail": { "name": "Railway Derailer", @@ -9262,8 +9262,8 @@ "terms": "venicular,cliff railway,cable car,cable railway,funicular railway" }, "railway/level_crossing": { - "name": "Railway Crossing (Road)", - "terms": "crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing" + "name": "Railway-Road Crossing", + "terms": "crossing,level crossing,grade crossing,railroad crossing,railway road crossing,road railway crossing,road through railroad,train crossing" }, "railway/light_rail": { "name": "Light Rail Track", @@ -9326,12 +9326,12 @@ "terms": "wash,clean" }, "railway/tram_crossing": { - "name": "Tram Crossing (Path)", - "terms": "crossing,grade crossing,level crossing,pedestrian crossing,streetcar crossing,tramway crossing,trolley crossing" + "name": "Tram-Path Crossing", + "terms": "crossing,grade crossing,level crossing,path tram crossing,pedestrian crossing,streetcar crossing,tram path 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" + "name": "Tram-Road Crossing", + "terms": "crossing,grade crossing,level crossing,pedestrian crossing,road tram crossing,streetcar crossing,tram road crossing,tramway crossing,trolley crossing" }, "railway/tram": { "name": "Tram Track",