From 010c6949b9d887963eea0c5c1b02c7807fde326f Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 18 Nov 2019 15:17:52 -0500 Subject: [PATCH] Prefer aerialway=station to aerialway=yes for stations (close #6994) --- data/deprecated.json | 4 ++++ data/presets.yaml | 5 +---- data/presets/presets.json | 3 +-- data/presets/presets/aerialway/_station.json | 21 ------------------- .../public_transport/station_aerialway.json | 5 ++++- data/taginfo.json | 4 ++-- dist/locales/en.json | 3 --- 7 files changed, 12 insertions(+), 33 deletions(-) delete mode 100644 data/presets/presets/aerialway/_station.json diff --git a/data/deprecated.json b/data/deprecated.json index a77159400..4751b06f9 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -777,6 +777,10 @@ "old": {"power_rating": "*"}, "replace": {"generator:output": "$1"} }, + { + "old": {"public_transport": "station", "aerialway": "yes"}, + "replace": {"public_transport": "station", "aerialway": "station"} + }, { "old": {"railway": "station"}, "replace": {"railway": "station", "public_transport": "station"} diff --git a/data/presets.yaml b/data/presets.yaml index 8f2c70bd5..009a2fa56 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2687,9 +2687,6 @@ en: name: Rope Tow Lift # 'terms: handle tow,bugel lift' terms: '' - aerialway/station: - # aerialway=station - name: Aerialway Station aerialway/t-bar: # aerialway=t-bar name: T-bar Lift @@ -6907,7 +6904,7 @@ en: # 'terms: public transit,public transportation,station,terminal,transit,transportation' terms: '' public_transport/station_aerialway: - # 'public_transport=station, aerialway=yes' + # aerialway=station name: Aerialway Station # 'terms: aerialway,cable car,public transit,public transportation,station,terminal,transit,transportation' terms: '' diff --git a/data/presets/presets.json b/data/presets/presets.json index f55b3103a..9e7c05991 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -29,7 +29,6 @@ "advertising/column": {"icon": "temaki-storage_tank", "fields": ["lit"], "geometry": ["point", "area"], "tags": {"advertising": "column"}, "name": "Advertising Column"}, "advertising/poster_box": {"fields": ["lit", "height"], "geometry": ["point"], "tags": {"advertising": "poster_box"}, "name": "Poster Box"}, "advertising/totem": {"fields": ["operator", "lit", "visibility", "direction", "height"], "geometry": ["point"], "tags": {"advertising": "totem"}, "name": "Advertising Totem"}, - "aerialway/station": {"icon": "maki-aerialway", "geometry": ["point", "vertex", "area"], "fields": ["aerialway/access", "aerialway/summer/access", "elevation", "building_area"], "tags": {"aerialway": "station"}, "matchScore": 0.95, "name": "Aerialway Station", "searchable": false, "replacement": "public_transport/station_aerialway"}, "aerialway/cable_car": {"icon": "fas-tram", "geometry": ["line"], "terms": ["tramway", "ropeway"], "fields": ["name", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/heating"], "tags": {"aerialway": "cable_car"}, "name": "Cable Car"}, "aerialway/chair_lift": {"icon": "temaki-chairlift", "geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "chair_lift"}, "name": "Chair Lift"}, "aerialway/drag_lift": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "drag_lift"}, "name": "Drag Lift"}, @@ -945,7 +944,7 @@ "public_transport/platform/tram": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "tram": "yes"}, "addTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Platform"}, "public_transport/platform/trolleybus_point": {"icon": "temaki-trolleybus", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point", "vertex"], "tags": {"public_transport": "platform", "trolleybus": "yes"}, "addTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "electric", "platform", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Stop"}, "public_transport/platform/trolleybus": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "trolleybus": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "electric", "platform", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Platform"}, - "public_transport/station_aerialway": {"icon": "maki-aerialway", "fields": ["{public_transport/station}", "aerialway/access", "aerialway/summer/access"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "vertex", "area"], "tags": {"public_transport": "station", "aerialway": "yes"}, "reference": {"key": "aerialway", "value": "station"}, "terms": ["aerialway", "cable car", "public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Aerialway Station"}, + "public_transport/station_aerialway": {"icon": "maki-aerialway", "fields": ["{public_transport/station}", "aerialway/access", "aerialway/summer/access"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "vertex", "area"], "tags": {"aerialway": "station"}, "addTags": {"public_transport": "station", "aerialway": "station"}, "reference": {"key": "aerialway", "value": "station"}, "terms": ["aerialway", "cable car", "public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Aerialway Station"}, "public_transport/station_bus": {"icon": "maki-bus", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "bus": "yes"}, "addTags": {"public_transport": "station", "bus": "yes", "amenity": "bus_station"}, "reference": {"key": "amenity", "value": "bus_station"}, "terms": ["bus", "public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Bus Station / Terminal"}, "public_transport/station_ferry": {"icon": "maki-ferry", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["vertex", "point", "area"], "tags": {"public_transport": "station", "ferry": "yes"}, "addTags": {"public_transport": "station", "ferry": "yes", "amenity": "ferry_terminal"}, "reference": {"key": "amenity", "value": "ferry_terminal"}, "terms": ["boat", "dock", "ferry", "pier", "public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Ferry Station / Terminal"}, "public_transport/station_light_rail": {"icon": "temaki-light_rail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "light_rail": "yes"}, "addTags": {"public_transport": "station", "light_rail": "yes", "railway": "station", "station": "light_rail"}, "reference": {"key": "station", "value": "light_rail"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "station", "terminal", "track", "tram", "trolley", "transit", "transportation"], "name": "Light Rail Station"}, diff --git a/data/presets/presets/aerialway/_station.json b/data/presets/presets/aerialway/_station.json deleted file mode 100644 index 326cf3d3e..000000000 --- a/data/presets/presets/aerialway/_station.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "icon": "maki-aerialway", - "geometry": [ - "point", - "vertex", - "area" - ], - "fields": [ - "aerialway/access", - "aerialway/summer/access", - "elevation", - "building_area" - ], - "tags": { - "aerialway": "station" - }, - "matchScore": 0.95, - "name": "Aerialway Station", - "searchable": false, - "replacement": "public_transport/station_aerialway" -} diff --git a/data/presets/presets/public_transport/station_aerialway.json b/data/presets/presets/public_transport/station_aerialway.json index 3457b67f1..d404c8060 100644 --- a/data/presets/presets/public_transport/station_aerialway.json +++ b/data/presets/presets/public_transport/station_aerialway.json @@ -14,8 +14,11 @@ "area" ], "tags": { + "aerialway": "station" + }, + "addTags": { "public_transport": "station", - "aerialway": "yes" + "aerialway": "station" }, "reference": { "key": "aerialway", diff --git a/data/taginfo.json b/data/taginfo.json index cad1e70cd..714dca0c8 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -32,7 +32,6 @@ {"key": "advertising", "value": "column", "description": "🄿 Advertising Column", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/storage_tank.svg"}, {"key": "advertising", "value": "poster_box", "description": "🄿 Poster Box", "object_types": ["node"]}, {"key": "advertising", "value": "totem", "description": "🄿 Advertising Totem", "object_types": ["node"]}, - {"key": "aerialway", "value": "station", "description": "🄿 Aerialway Station (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aerialway-15.svg"}, {"key": "aerialway", "value": "cable_car", "description": "🄿 Cable Car", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tram.svg"}, {"key": "aerialway", "value": "chair_lift", "description": "🄿 Chair Lift", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/chairlift.svg"}, {"key": "aerialway", "value": "drag_lift", "description": "🄿 Drag Lift", "object_types": ["way"]}, @@ -900,7 +899,7 @@ {"key": "power", "value": "tower", "description": "🄿 High-Voltage Tower", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power_tower.svg"}, {"key": "power", "value": "transformer", "description": "🄿 Transformer", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power_transformer.svg"}, {"key": "public_transport", "value": "platform", "description": "🄿 Transit Stop / Platform, 🄿 Transit Platform", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"}, - {"key": "aerialway", "value": "yes", "description": "🄿 Aerialway Stop / Platform (unsearchable), 🄿 Aerialway Platform, 🄿 Aerialway Station, 🄿 Aerialway Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aerialway-15.svg"}, + {"key": "aerialway", "value": "yes", "description": "🄿 Aerialway Stop / Platform (unsearchable), 🄿 Aerialway Platform, 🄿 Aerialway Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aerialway-15.svg"}, {"key": "ferry", "value": "yes", "description": "🄿 Ferry Stop / Platform (unsearchable), 🄿 Ferry Platform, 🄿 Ferry Station / Terminal, 🄿 Ferry Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/ferry-15.svg"}, {"key": "light_rail", "value": "yes", "description": "🄿 Light Rail Stop / Platform (unsearchable), 🄿 Light Rail Platform, 🄿 Light Rail Station, 🄿 Light Rail Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/light_rail.svg"}, {"key": "monorail", "value": "yes", "description": "🄿 Monorail Stop / Platform (unsearchable), 🄿 Monorail Platform, 🄿 Monorail Station, 🄿 Monorail Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/monorail.svg"}, @@ -909,6 +908,7 @@ {"key": "bus", "value": "yes", "description": "🄿 Bus Stop, 🄿 Bus Platform, 🄿 Bus Station / Terminal, 🄿 Bus Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bus-15.svg"}, {"key": "tram", "value": "yes", "description": "🄿 Tram Stop / Platform, 🄿 Tram Platform, 🄿 Tram Station, 🄿 Tram Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tram.svg"}, {"key": "trolleybus", "value": "yes", "description": "🄿 Trolleybus Stop, 🄿 Trolleybus Platform, 🄿 Trolleybus Station / Terminal, 🄿 Trolleybus Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/trolleybus.svg"}, + {"key": "aerialway", "value": "station", "description": "🄿 Aerialway Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aerialway-15.svg"}, {"key": "railway", "value": "halt", "description": "🄿 Train Station (Halt / Request), 🄿 Train Station (Halt / Request) (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"}, {"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"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 99e19d01e..ded9e94c5 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4758,9 +4758,6 @@ "name": "Advertising Totem", "terms": "" }, - "aerialway/station": { - "name": "Aerialway Station" - }, "aerialway/cable_car": { "name": "Cable Car", "terms": "tramway,ropeway"