From 0faef9790bd8d2b97b551ba4dc4df334ae8765c0 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 7 Jan 2020 09:39:50 -0500 Subject: [PATCH] Don't offer to add train=yes to features with railway=platform but no other vehicle tags (close #7231) --- data/deprecated.json | 4 ++++ data/presets/presets.json | 2 +- data/presets/presets/railway/_platform.json | 14 ++++++-------- data/taginfo.json | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/data/deprecated.json b/data/deprecated.json index 878a708de..bcec93ab3 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -908,6 +908,10 @@ "old": {"railway": "station"}, "replace": {"railway": "station", "public_transport": "station"} }, + { + "old": {"railway": "platform"}, + "replace": {"railway": "platform", "public_transport": "platform"} + }, { "old": {"recommended_speed": "*"}, "replace": {"maxspeed:advisory": "$1"} diff --git a/data/presets/presets.json b/data/presets/presets.json index eb4ddb455..2fdcd5260 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -983,7 +983,7 @@ "public_transport/stop_position_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "trolleybus": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["bus", "electric", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Stopping Location"}, "public_transport/stop_position": {"icon": "maki-bus", "fields": ["name", "ref_stop_position", "network", "operator"], "moreFields": ["level"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position"}, "terms": ["public transit", "public transportation", "transit", "transportation"], "name": "Transit Stopping Location", "matchScore": 0.2}, "railway/halt": {"icon": "maki-rail", "geometry": ["point", "vertex"], "tags": {"railway": "halt"}, "name": "Train Station (Halt / Request)", "searchable": false}, - "railway/platform": {"icon": "temaki-pedestrian", "fields": ["name", "ref_platform", "surface", "lit", "shelter"], "geometry": ["line", "area"], "tags": {"railway": "platform"}, "name": "Train Platform", "searchable": false, "replacement": "public_transport/platform/train"}, + "railway/platform": {"icon": "temaki-sign_and_pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"railway": "platform"}, "name": "Train Platform", "searchable": false}, "railway/station": {"icon": "maki-rail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "vertex", "area"], "tags": {"railway": "station"}, "matchScore": 0.95, "name": "Train Station", "searchable": false}, "railway/tram_stop": {"icon": "temaki-tram", "fields": ["name", "network", "operator"], "geometry": ["vertex"], "tags": {"railway": "tram_stop"}, "name": "Tram Stopping Position", "searchable": false}, "railway/abandoned": {"icon": "iD-railway-abandoned", "fields": ["name", "structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "abandoned"}, "terms": [], "matchScore": 0.85, "name": "Abandoned Railway"}, diff --git a/data/presets/presets/railway/_platform.json b/data/presets/presets/railway/_platform.json index 7ab9b541b..721b8f265 100644 --- a/data/presets/presets/railway/_platform.json +++ b/data/presets/presets/railway/_platform.json @@ -1,11 +1,10 @@ { - "icon": "temaki-pedestrian", + "icon": "temaki-sign_and_pedestrian", "fields": [ - "name", - "ref_platform", - "surface", - "lit", - "shelter" + "{public_transport/platform}" + ], + "moreFields": [ + "{public_transport/platform}" ], "geometry": [ "line", @@ -15,6 +14,5 @@ "railway": "platform" }, "name": "Train Platform", - "searchable": false, - "replacement": "public_transport/platform/train" + "searchable": false } diff --git a/data/taginfo.json b/data/taginfo.json index 601f86b50..8abfb9d0b 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -928,7 +928,7 @@ {"key": "public_transport", "value": "station", "description": "🄿 Transit Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"}, {"key": "public_transport", "value": "stop_area", "description": "🄿 Transit Stop Area", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/relation.svg"}, {"key": "public_transport", "value": "stop_position", "description": "🄿 Transit Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bus-15.svg"}, - {"key": "railway", "value": "platform", "description": "🄿 Train Platform (unsearchable)", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian.svg"}, + {"key": "railway", "value": "platform", "description": "🄿 Train Platform (unsearchable), 🄳 ➜ railway=platform + public_transport=platform", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/sign_and_pedestrian.svg"}, {"key": "railway", "value": "station", "description": "🄿 Train Station (unsearchable), 🄳 ➜ railway=station + public_transport=station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"}, {"key": "railway", "value": "tram_stop", "description": "🄿 Tram Stopping Position (unsearchable)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tram.svg"}, {"key": "railway", "value": "abandoned", "description": "🄿 Abandoned Railway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-abandoned.svg"},