From 7da79abd1180e4042e73411caad0bdd634d21a13 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 19 Mar 2019 10:07:59 -0400 Subject: [PATCH] Fix issues where outdated tag warnings could persist after upgrading tags (close #6063) --- build_data.js | 7 +++++- data/deprecated.json | 8 +++++++ data/presets/presets.json | 24 +++++++++---------- data/presets/presets/aerialway/_station.json | 1 + .../presets/amenity/_ferry_terminal.json | 1 + .../presets/amenity/_swimming_pool.json | 3 +-- data/presets/presets/highway/_bus_stop.json | 1 + data/presets/presets/landuse/_farm.json | 3 +-- .../public_transport/platform/bus_point.json | 3 ++- .../platform/trolleybus_point.json | 3 ++- .../public_transport/platform_point.json | 7 +++--- .../public_transport/station_aerialway.json | 1 + .../public_transport/station_ferry.json | 1 + .../public_transport/station_train.json | 1 + data/presets/presets/railway/_station.json | 1 + 15 files changed, 43 insertions(+), 22 deletions(-) diff --git a/build_data.js b/build_data.js index db7722db6..384ef0404 100644 --- a/build_data.js +++ b/build_data.js @@ -1,5 +1,6 @@ /* eslint-disable no-console */ const requireESM = require('esm')(module); +const _clone = requireESM('lodash-es/clone').default; const _cloneDeep = requireESM('lodash-es/cloneDeep').default; const _forEach = requireESM('lodash-es/forEach').default; const _isEmpty = requireESM('lodash-es/isEmpty').default; @@ -493,9 +494,13 @@ function validatePresetFields(presets, fields) { var preset = presets[presetID]; if (preset.replacement) { - if (presets[preset.replacement] === undefined) { + var replacementPreset = presets[preset.replacement]; + if (replacementPreset === undefined) { console.error('Unknown preset "' + preset.replacement + '" referenced as replacement of preset ' + preset.name); process.exit(1); + } else if (_clone(preset.geometry).sort().toString() !== _clone(replacementPreset.geometry).sort().toString()) { + console.error('The preset "' + presetID + '" has different geometry than its replacement preset, "' + preset.replacement + '". They must match for tag upgrades to work.'); + process.exit(1); } } diff --git a/data/deprecated.json b/data/deprecated.json index a7365849d..56516f2d1 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -60,6 +60,10 @@ "old": {"amenity": "shop"}, "replace": {"shop": "*"} }, + { + "old": {"amenity": "swimming_pool"}, + "replace": {"leisure": "swimming_pool"} + }, { "old": {"amenity": "toilet"}, "replace": {"amenity": "toilets"} @@ -199,6 +203,10 @@ "old": {"landuse": "conservation"}, "replace": {"boundary": "protected_area"} }, + { + "old": {"landuse": "farm"}, + "replace": {"landuse": "farmland"} + }, { "old": {"landuse": "field"}, "replace": {"landuse": "farmland"} diff --git a/data/presets/presets.json b/data/presets/presets.json index 1347f978f..687ac76ee 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -21,7 +21,7 @@ "address": {"fields": ["address"], "geometry": ["point", "vertex", "area"], "tags": {"addr:*": "*"}, "addTags": {}, "removeTags": {}, "reference": {"key": "addr"}, "name": "Address", "matchScore": 0.15}, "advertising/billboard": {"fields": ["direction", "lit"], "geometry": ["point", "vertex", "line"], "tags": {"advertising": "billboard"}, "name": "Billboard"}, "advertising/column": {"icon": "temaki-storage_tank", "fields": ["lit"], "geometry": ["point", "area"], "tags": {"advertising": "column"}, "name": "Advertising Column"}, - "aerialway/station": {"icon": "maki-aerialway", "geometry": ["point", "vertex", "area"], "fields": ["aerialway/access", "aerialway/summer/access", "elevation", "building_area"], "tags": {"aerialway": "station"}, "name": "Aerialway Station", "searchable": false, "replacement": "public_transport/station_aerialway"}, + "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": {"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", "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"}, @@ -44,12 +44,12 @@ "allotments/plot": {"geometry": ["area"], "fields": ["name", "ref"], "tags": {"allotments": "plot"}, "reference": {"key": "allotments", "value": "plot"}, "name": "Community Garden Plot"}, "amenity/bus_station": {"icon": "maki-bus", "fields": ["name", "building_area", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "bus_station"}, "name": "Bus Station / Terminal", "searchable": false, "replacement": "public_transport/station_bus"}, "amenity/coworking_space": {"icon": "maki-commercial", "fields": ["name", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "coworking_space"}, "name": "Coworking Space", "searchable": false}, - "amenity/ferry_terminal": {"icon": "maki-ferry", "fields": ["name", "network", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "ferry_terminal"}, "name": "Ferry Station / Terminal", "searchable": false, "replacement": "public_transport/station_ferry"}, + "amenity/ferry_terminal": {"icon": "maki-ferry", "fields": ["name", "network", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "ferry_terminal"}, "matchScore": 0.95, "name": "Ferry Station / Terminal", "searchable": false, "replacement": "public_transport/station_ferry"}, "amenity/nursing_home": {"icon": "maki-wheelchair", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for", "opening_hours", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nursing_home"}, "reference": {"key": "social_facility", "value": "nursing_home"}, "name": "Nursing Home", "searchable": false}, "amenity/recycling": {"icon": "maki-recycling", "fields": ["recycling_type", "recycling_accepts", "collection_times"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling"}, "name": "Recycling", "searchable": false}, "amenity/register_office": {"icon": "maki-town-hall", "fields": ["name", "address", "building_area", "opening_hours", "operator"], "geometry": ["point", "area"], "tags": {"amenity": "register_office"}, "reference": {"key": "government", "value": "register_office"}, "name": "Register Office", "searchable": false}, "amenity/scrapyard": {"icon": "maki-car", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"amenity": "scrapyard"}, "reference": {"key": "industrial", "value": "scrap_yard"}, "name": "Scrap Yard", "searchable": false}, - "amenity/swimming_pool": {"icon": "maki-swimming", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "swimming_pool"}, "reference": {"key": "leisure", "value": "swimming_pool"}, "name": "Swimming Pool", "searchable": false, "replacement": "leisure/swimming_pool"}, + "amenity/swimming_pool": {"icon": "maki-swimming", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "swimming_pool"}, "reference": {"key": "leisure", "value": "swimming_pool"}, "name": "Swimming Pool", "searchable": false}, "amenity/animal_boarding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_boarding"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["boarding", "cat", "cattery", "dog", "horse", "kennel", "kitten", "pet", "pet boarding", "pet care", "pet hotel", "puppy", "reptile"], "tags": {"amenity": "animal_boarding"}, "name": "Animal Boarding Facility"}, "amenity/animal_breeding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_breeding"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["breeding", "bull", "cat", "cow", "dog", "horse", "husbandry", "kitten", "livestock", "pet breeding", "puppy", "reptile"], "tags": {"amenity": "animal_breeding"}, "name": "Animal Breeding Facility"}, "amenity/animal_shelter": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_shelter"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["adoption", "aspca", "cat", "dog", "horse", "kitten", "pet care", "pet rescue", "puppy", "raptor", "reptile", "rescue", "spca"], "tags": {"amenity": "animal_shelter"}, "name": "Animal Shelter"}, @@ -413,7 +413,7 @@ "healthcare/psychotherapist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["anxiety", "counselor", "depression", "mental health", "mind", "suicide", "therapist", "therapy"], "tags": {"healthcare": "psychotherapist"}, "name": "Psychotherapist"}, "healthcare/rehabilitation": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["rehab", "therapist", "therapy"], "tags": {"healthcare": "rehabilitation"}, "name": "Rehabilitation Facility"}, "healthcare/speech_therapist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["speech", "therapist", "therapy", "voice"], "tags": {"healthcare": "speech_therapist"}, "name": "Speech Therapist"}, - "highway/bus_stop": {"icon": "maki-bus", "fields": ["name", "network", "operator", "bench", "shelter"], "geometry": ["point", "vertex"], "tags": {"highway": "bus_stop"}, "name": "Bus Stop", "searchable": false, "replacement": "public_transport/platform/bus_point"}, + "highway/bus_stop": {"icon": "maki-bus", "fields": ["name", "network", "operator", "bench", "shelter"], "geometry": ["point", "vertex"], "tags": {"highway": "bus_stop"}, "matchScore": 0.95, "name": "Bus Stop", "searchable": false, "replacement": "public_transport/platform/bus_point"}, "highway/bridleway": {"fields": ["name", "surface", "width", "structure", "access", "incline", "horse_scale"], "moreFields": ["wheelchair", "lit", "smoothness", "covered", "dog"], "icon": "maki-horse-riding", "geometry": ["line"], "tags": {"highway": "bridleway"}, "terms": ["bridleway", "equestrian", "horse", "trail"], "name": "Bridle Path"}, "highway/bus_guideway": {"icon": "maki-bus", "fields": ["name", "operator", "oneway", "structure", "covered"], "geometry": ["line"], "tags": {"highway": "bus_guideway"}, "addTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "removeTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "terms": [], "name": "Bus Guideway"}, "highway/construction": {"icon": "maki-barrier", "fields": ["name", "opening_date", "check_date", "note", "oneway", "structure", "access"], "geometry": ["line"], "tags": {"highway": "construction", "access": "no"}, "terms": ["closed", "closure", "construction"], "name": "Road Closed"}, @@ -493,7 +493,7 @@ "junction/jughandle": {"geometry": ["line"], "fields": ["name"], "tags": {"junction": "jughandle"}, "name": "Jughandle", "searchable": false}, "junction/roundabout": {"geometry": ["vertex", "line"], "fields": ["name"], "tags": {"junction": "roundabout"}, "name": "Roundabout", "searchable": false}, "landuse/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"landuse": "basin"}, "name": "Basin", "searchable": false, "replacement": "natural/water/basin"}, - "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "name": "Farmland", "searchable": false, "replacement": "landuse/farmland"}, + "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "name": "Farmland", "searchable": false}, "landuse/pond": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "pond"}, "name": "Pond", "searchable": false, "replacement": "natural/water/pond"}, "landuse/reservoir": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "reservoir"}, "name": "Reservoir", "searchable": false, "replacement": "natural/water/reservoir"}, "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"}, @@ -786,7 +786,7 @@ "power/switch": {"icon": "temaki-power", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"power": "switch"}, "name": "Power Switch"}, "power/tower": {"fields": ["design", "ref", "material"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"}, "power/transformer": {"icon": "temaki-power", "fields": ["ref", "operator", "transformer", "location", "rating", "devices", "phases"], "moreFields": ["frequency", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration"], "geometry": ["point", "vertex", "area"], "tags": {"power": "transformer"}, "name": "Transformer"}, - "public_transport/platform_point": {"icon": "maki-rail", "fields": ["name", "network", "operator", "departures_board"], "moreFields": ["lit", "bench", "shelter", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.2}, + "public_transport/platform_point": {"icon": "maki-rail", "fields": ["name", "network", "operator", "departures_board", "shelter"], "moreFields": ["bench", "bin", "lit", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.2}, "public_transport/platform": {"icon": "temaki-pedestrian", "fields": ["ref_platform", "network", "operator", "departures_board", "surface"], "moreFields": ["lit", "wheelchair"], "geometry": ["line", "area"], "tags": {"public_transport": "platform"}, "addTags": {"public_transport": "platform", "highway": "footway"}, "removeTags": {"public_transport": "platform", "highway": "footway"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Platform", "matchScore": 0.2}, "public_transport/platform/aerialway_point": {"icon": "maki-aerialway", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "searchable": false, "name": "Aerialway Stop / Platform"}, "public_transport/platform/ferry_point": {"icon": "maki-ferry", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["boat", "dock", "ferry", "pier", "platform", "public transit", "public transportation", "transit", "transportation"], "searchable": false, "name": "Ferry Stop / Platform"}, @@ -796,7 +796,7 @@ "public_transport/platform/train_point": {"icon": "maki-rail", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "train": "yes"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["platform", "public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "searchable": false, "name": "Train Stop / Platform"}, "public_transport/platform/tram_point": {"icon": "temaki-tram", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "tram": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "searchable": false, "name": "Tram Stop / Platform"}, "public_transport/platform/aerialway": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "addTags": {"public_transport": "platform", "aerialway": "yes", "highway": "footway"}, "removeTags": {"public_transport": "platform", "aerialway": "yes", "highway": "footway"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Platform"}, - "public_transport/platform/bus_point": {"icon": "maki-bus", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop"}, + "public_transport/platform/bus_point": {"icon": "maki-bus", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point", "vertex"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop"}, "public_transport/platform/bus": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "footway"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "footway"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Platform"}, "public_transport/platform/ferry": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "ferry": "yes"}, "addTags": {"public_transport": "platform", "ferry": "yes", "highway": "footway"}, "removeTags": {"public_transport": "platform", "ferry": "yes", "highway": "footway"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["boat", "dock", "ferry", "pier", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Ferry Platform"}, "public_transport/platform/light_rail": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "addTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform", "highway": "footway"}, "removeTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform", "highway": "footway"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "track", "tram", "trolley", "transit", "transportation"], "name": "Light Rail Platform"}, @@ -804,16 +804,16 @@ "public_transport/platform/subway": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "subway": "yes"}, "addTags": {"public_transport": "platform", "subway": "yes", "railway": "platform", "highway": "footway"}, "removeTags": {"public_transport": "platform", "subway": "yes", "railway": "platform", "highway": "footway"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["metro", "platform", "public transit", "public transportation", "rail", "subway", "track", "transit", "transportation", "underground"], "name": "Subway Platform"}, "public_transport/platform/train": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "train": "yes"}, "addTags": {"public_transport": "platform", "train": "yes", "railway": "platform", "highway": "footway"}, "removeTags": {"public_transport": "platform", "train": "yes", "railway": "platform", "highway": "footway"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["platform", "public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "name": "Train Platform"}, "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", "highway": "footway"}, "removeTags": {"public_transport": "platform", "tram": "yes", "railway": "platform", "highway": "footway"}, "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"], "tags": {"public_transport": "platform", "trolleybus": "yes"}, "addTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "removeTags": {"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_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"}, "removeTags": {"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"}, "addTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "footway"}, "removeTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "footway"}, "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", "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": {"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_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"}, "removeTags": {"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": ["point", "area"], "tags": {"public_transport": "station", "ferry": "yes"}, "addTags": {"public_transport": "station", "ferry": "yes", "amenity": "ferry_terminal"}, "removeTags": {"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_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"}, "removeTags": {"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"}, "removeTags": {"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"}, "public_transport/station_monorail": {"icon": "temaki-monorail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "monorail": "yes"}, "addTags": {"public_transport": "station", "monorail": "yes", "railway": "station"}, "removeTags": {"public_transport": "station", "monorail": "yes", "railway": "station"}, "reference": {"key": "railway", "value": "station"}, "terms": ["monorail", "public transit", "public transportation", "rail", "station", "terminal", "transit", "transportation"], "name": "Monorail Station"}, "public_transport/station_subway": {"icon": "temaki-subway", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "subway": "yes"}, "addTags": {"public_transport": "station", "subway": "yes", "railway": "station", "station": "subway"}, "removeTags": {"public_transport": "station", "subway": "yes", "railway": "station", "station": "subway"}, "reference": {"key": "station", "value": "subway"}, "terms": ["metro", "public transit", "public transportation", "rail", "station", "subway", "terminal", "track", "transit", "transportation", "underground"], "name": "Subway Station"}, "public_transport/station_train_halt": {"icon": "maki-rail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "train": "yes", "railway": "halt"}, "reference": {"key": "railway", "value": "halt"}, "terms": ["halt", "public transit", "public transportation", "rail", "station", "track", "train", "transit", "transportation", "whistle stop"], "name": "Train Station (Halt / Request)"}, - "public_transport/station_train": {"icon": "maki-rail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "train": "yes"}, "addTags": {"public_transport": "station", "train": "yes", "railway": "station"}, "removeTags": {"public_transport": "station", "train": "yes", "railway": "station"}, "reference": {"key": "railway", "value": "station"}, "terms": ["public transit", "public transportation", "rail", "station", "terminal", "track", "train", "transit", "transportation"], "name": "Train Station"}, + "public_transport/station_train": {"icon": "maki-rail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["vertex", "point", "area"], "tags": {"public_transport": "station", "train": "yes"}, "addTags": {"public_transport": "station", "train": "yes", "railway": "station"}, "removeTags": {"public_transport": "station", "train": "yes", "railway": "station"}, "reference": {"key": "railway", "value": "station"}, "terms": ["public transit", "public transportation", "rail", "station", "terminal", "track", "train", "transit", "transportation"], "name": "Train Station"}, "public_transport/station_tram": {"icon": "temaki-tram", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "tram": "yes"}, "reference": {"key": "public_transport", "value": "station"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "station", "streetcar", "terminal", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Station"}, "public_transport/station_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "trolleybus": "yes"}, "addTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "removeTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "reference": {"key": "amenity", "value": "bus_station"}, "terms": ["bus", "electric", "public transit", "public transportation", "station", "streetcar", "terminal", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Station / Terminal"}, "public_transport/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2}, @@ -830,7 +830,7 @@ "public_transport/stop_position": {"icon": "maki-bus", "fields": ["name", "ref_stop_position", "network", "operator"], "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"}, "terms": ["break", "interrupt", "rest", "wait", "interruption"], "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/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "vertex", "area"], "tags": {"railway": "station"}, "terms": ["train station", "station"], "name": "Train Station", "searchable": false, "replacement": "public_transport/station_train"}, + "railway/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "vertex", "area"], "tags": {"railway": "station"}, "terms": ["train station", "station"], "matchScore": 0.95, "name": "Train Station", "searchable": false, "replacement": "public_transport/station_train"}, "railway/tram_stop": {"icon": "temaki-tram", "fields": ["name", "network", "operator"], "geometry": ["vertex"], "tags": {"railway": "tram_stop"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "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": [], "name": "Abandoned Railway"}, "railway/buffer_stop": {"icon": "temaki-buffer_stop", "geometry": ["vertex"], "tags": {"railway": "buffer_stop"}, "terms": ["stop", "halt", "buffer"], "name": "Buffer Stop"}, diff --git a/data/presets/presets/aerialway/_station.json b/data/presets/presets/aerialway/_station.json index 4b4632a34..326cf3d3e 100644 --- a/data/presets/presets/aerialway/_station.json +++ b/data/presets/presets/aerialway/_station.json @@ -14,6 +14,7 @@ "tags": { "aerialway": "station" }, + "matchScore": 0.95, "name": "Aerialway Station", "searchable": false, "replacement": "public_transport/station_aerialway" diff --git a/data/presets/presets/amenity/_ferry_terminal.json b/data/presets/presets/amenity/_ferry_terminal.json index b75d03b4c..f576fcd4c 100644 --- a/data/presets/presets/amenity/_ferry_terminal.json +++ b/data/presets/presets/amenity/_ferry_terminal.json @@ -16,6 +16,7 @@ "tags": { "amenity": "ferry_terminal" }, + "matchScore": 0.95, "name": "Ferry Station / Terminal", "searchable": false, "replacement": "public_transport/station_ferry" diff --git a/data/presets/presets/amenity/_swimming_pool.json b/data/presets/presets/amenity/_swimming_pool.json index 48b72d023..ba0c48150 100644 --- a/data/presets/presets/amenity/_swimming_pool.json +++ b/data/presets/presets/amenity/_swimming_pool.json @@ -13,6 +13,5 @@ "value": "swimming_pool" }, "name": "Swimming Pool", - "searchable": false, - "replacement": "leisure/swimming_pool" + "searchable": false } diff --git a/data/presets/presets/highway/_bus_stop.json b/data/presets/presets/highway/_bus_stop.json index 42b1df83f..ed38f3b39 100644 --- a/data/presets/presets/highway/_bus_stop.json +++ b/data/presets/presets/highway/_bus_stop.json @@ -14,6 +14,7 @@ "tags": { "highway": "bus_stop" }, + "matchScore": 0.95, "name": "Bus Stop", "searchable": false, "replacement": "public_transport/platform/bus_point" diff --git a/data/presets/presets/landuse/_farm.json b/data/presets/presets/landuse/_farm.json index 29d06d03b..f347b04ec 100644 --- a/data/presets/presets/landuse/_farm.json +++ b/data/presets/presets/landuse/_farm.json @@ -13,6 +13,5 @@ "landuse": "farm" }, "name": "Farmland", - "searchable": false, - "replacement": "landuse/farmland" + "searchable": false } diff --git a/data/presets/presets/public_transport/platform/bus_point.json b/data/presets/presets/public_transport/platform/bus_point.json index 8f20cfd56..1127dca94 100644 --- a/data/presets/presets/public_transport/platform/bus_point.json +++ b/data/presets/presets/public_transport/platform/bus_point.json @@ -7,7 +7,8 @@ "{public_transport/platform_point}" ], "geometry": [ - "point" + "point", + "vertex" ], "tags": { "public_transport": "platform", diff --git a/data/presets/presets/public_transport/platform/trolleybus_point.json b/data/presets/presets/public_transport/platform/trolleybus_point.json index 63071e549..f15c55801 100644 --- a/data/presets/presets/public_transport/platform/trolleybus_point.json +++ b/data/presets/presets/public_transport/platform/trolleybus_point.json @@ -7,7 +7,8 @@ "{public_transport/platform_point}" ], "geometry": [ - "point" + "point", + "vertex" ], "tags": { "public_transport": "platform", diff --git a/data/presets/presets/public_transport/platform_point.json b/data/presets/presets/public_transport/platform_point.json index b8934ab67..aad6e6218 100644 --- a/data/presets/presets/public_transport/platform_point.json +++ b/data/presets/presets/public_transport/platform_point.json @@ -4,12 +4,13 @@ "name", "network", "operator", - "departures_board" + "departures_board", + "shelter" ], "moreFields": [ - "lit", "bench", - "shelter", + "bin", + "lit", "wheelchair" ], "geometry": [ diff --git a/data/presets/presets/public_transport/station_aerialway.json b/data/presets/presets/public_transport/station_aerialway.json index 4b92225a4..3457b67f1 100644 --- a/data/presets/presets/public_transport/station_aerialway.json +++ b/data/presets/presets/public_transport/station_aerialway.json @@ -10,6 +10,7 @@ ], "geometry": [ "point", + "vertex", "area" ], "tags": { diff --git a/data/presets/presets/public_transport/station_ferry.json b/data/presets/presets/public_transport/station_ferry.json index e3473bd16..a15fb63eb 100644 --- a/data/presets/presets/public_transport/station_ferry.json +++ b/data/presets/presets/public_transport/station_ferry.json @@ -7,6 +7,7 @@ "{public_transport/station}" ], "geometry": [ + "vertex", "point", "area" ], diff --git a/data/presets/presets/public_transport/station_train.json b/data/presets/presets/public_transport/station_train.json index d8ba83234..a7970ce67 100644 --- a/data/presets/presets/public_transport/station_train.json +++ b/data/presets/presets/public_transport/station_train.json @@ -7,6 +7,7 @@ "{public_transport/station}" ], "geometry": [ + "vertex", "point", "area" ], diff --git a/data/presets/presets/railway/_station.json b/data/presets/presets/railway/_station.json index e24e2020d..cba195e16 100644 --- a/data/presets/presets/railway/_station.json +++ b/data/presets/presets/railway/_station.json @@ -22,6 +22,7 @@ "train station", "station" ], + "matchScore": 0.95, "name": "Train Station", "searchable": false, "replacement": "public_transport/station_train"