From 8ac6ede028f9dfaa968e7b5b9f307478c56d5257 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 12 Mar 2019 14:01:15 -0400 Subject: [PATCH] Add highway=footway when setting pier, platform, and foot racing track presets Add highway=bridleway when setting horse racetrack preset Style racetracks with highway tag with white/yellow pattern --- css/30_highways.css | 11 +++++++++ data/deprecated.json | 2 +- data/presets/presets.json | 24 +++++++++---------- data/presets/presets/highway/footway.json | 1 + .../presets/leisure/track/horse_racing.json | 10 ++++++++ .../presets/leisure/track/running.json | 10 ++++++++ data/presets/presets/man_made/pier.json | 8 +++++++ .../presets/public_transport/platform.json | 8 +++++++ .../public_transport/platform_aerialway.json | 10 ++++++++ .../public_transport/platform_ferry.json | 10 ++++++++ .../public_transport/platform_light_rail.json | 6 +++-- .../public_transport/platform_monorail.json | 6 +++-- .../public_transport/platform_subway.json | 6 +++-- .../public_transport/platform_train.json | 6 +++-- .../public_transport/platform_tram.json | 6 +++-- modules/osm/entity.js | 18 ++++++++++++-- modules/svg/tag_classes.js | 4 ++-- 17 files changed, 119 insertions(+), 27 deletions(-) diff --git a/css/30_highways.css b/css/30_highways.css index 74539e189..0eea4ed66 100644 --- a/css/30_highways.css +++ b/css/30_highways.css @@ -503,6 +503,17 @@ path.line.stroke.tag-highway-bridleway, stroke: #fff; } +.preset-icon .icon.tag-leisure-track { + color: rgb(229, 184, 43); +} +path.line.stroke.tag-leisure-track, +.preset-icon-line path.casing.tag-highway.tag-leisure-track { + stroke: rgb(229, 184, 43); +} +.preset-icon-line path.line.stroke.tag-highway.tag-leisure-track { + stroke: #fff; +} + .preset-icon .icon.tag-highway-steps { color: #81d25c; fill: #fff; diff --git a/data/deprecated.json b/data/deprecated.json index 489dd1cef..0c12d3c49 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -229,7 +229,7 @@ }, { "old": {"man_made": "jetty"}, - "replace": {"man_made": "pier"} + "replace": {"highway": "footway", "man_made": "pier"} }, { "old": {"man_made": "mdf"}, diff --git a/data/presets/presets.json b/data/presets/presets.json index a53196a70..cccdacfd4 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -425,7 +425,7 @@ "highway/crossing/unmarked": {"fields": ["crossing", "kerb", "tactile_paving"], "geometry": ["vertex"], "addTags": {"highway": "crossing", "crossing": "unmarked"}, "removeTags": {"highway": "crossing", "crossing": "unmarked"}, "tags": {"highway": "crossing"}, "reference": {"key": "highway", "value": "crossing"}, "terms": [], "name": "Unmarked Crossing"}, "highway/cycleway": {"icon": "maki-bicycle", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "maxspeed", "covered", "dog"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bike"], "name": "Cycle Path"}, "highway/elevator": {"icon": "temaki-elevator", "fields": ["access_simple", "opening_hours", "maxweight", "ref", "wheelchair"], "moreFields": ["maxheight"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"}, - "highway/footway": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "covered", "dog"], "geometry": ["line"], "terms": ["hike", "hiking", "promenade", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "name": "Foot Path"}, + "highway/footway": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "covered", "dog"], "geometry": ["line"], "terms": ["hike", "hiking", "promenade", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "matchScore": 0.95, "name": "Foot Path"}, "highway/footway/zebra-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)", "searchable": false}, "highway/footway/zebra": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk", "searchable": false}, "highway/footway/conveying": {"icon": "temaki-pedestrian", "fields": ["name", "conveying", "access_simple", "lit", "width", "wheelchair"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"}, @@ -606,8 +606,8 @@ "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"}, "leisure/swimming_pool": {"icon": "maki-swimming", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["operator", "address"], "geometry": ["point", "area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"}, "leisure/track": {"icon": "iD-other-line", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track"}, "terms": ["cycle", "dog", "greyhound", "horse", "race*", "track"], "name": "Racetrack (Non-Motorsport)"}, - "leisure/track/horse_racing": {"icon": "maki-horse-riding", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "horse_racing"}, "terms": ["race*", "horse", "track"], "name": "Racetrack (Horse Racing)"}, - "leisure/track/running": {"icon": "maki-pitch", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "running"}, "terms": ["race*", "running", "sprint", "track"], "name": "Racetrack (Running)"}, + "leisure/track/horse_racing": {"icon": "maki-horse-riding", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "horse_racing"}, "addTags": {"leisure": "track", "sport": "horse_racing", "highway": "bridleway"}, "removeTags": {"leisure": "track", "sport": "horse_racing", "highway": "bridleway"}, "terms": ["race*", "horse", "track"], "name": "Racetrack (Horse Racing)"}, + "leisure/track/running": {"icon": "maki-pitch", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "running"}, "addTags": {"leisure": "track", "sport": "running", "highway": "footway"}, "removeTags": {"leisure": "track", "sport": "running", "highway": "footway"}, "terms": ["race*", "running", "sprint", "track"], "name": "Racetrack (Running)"}, "leisure/water_park": {"icon": "maki-swimming", "fields": ["name", "operator", "address"], "moreFields": ["payment_multi", "brand", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"}, "line": {"fields": ["name"], "geometry": ["line"], "tags": {}, "name": "Line", "matchScore": 0.1}, "man_made/adit": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["operator", "direction"], "terms": ["entrance", "underground", "mine", "cave"], "tags": {"man_made": "adit"}, "name": "Adit"}, @@ -632,7 +632,7 @@ "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "vertex", "area"], "fields": ["monitoring_multi", "operator"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"}, "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"}, "man_made/petroleum_well": {"icon": "temaki-storage_tank", "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"}, - "man_made/pier": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "access"], "geometry": ["line", "area"], "terms": ["dock", "jetty"], "tags": {"man_made": "pier"}, "name": "Pier"}, + "man_made/pier": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "access"], "geometry": ["line", "area"], "terms": ["dock", "jetty"], "tags": {"man_made": "pier"}, "addTags": {"highway": "footway", "man_made": "pier"}, "removeTags": {"highway": "footway", "man_made": "pier"}, "name": "Pier"}, "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["location", "operator", "substance", "layer"], "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"}, "man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"}, "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"}, @@ -782,16 +782,16 @@ "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_aerialway": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stop / Platform"}, + "public_transport/platform_aerialway": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "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 Stop / Platform"}, "public_transport/platform_bus": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "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 / Platform"}, - "public_transport/platform_ferry": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["boat", "dock", "ferry", "pier", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Ferry Stop / Platform"}, - "public_transport/platform_light_rail": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "addTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "track", "tram", "trolley", "transit", "transportation"], "name": "Light Rail Stop / Platform"}, - "public_transport/platform_monorail": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "monorail": "yes"}, "addTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["monorail", "platform", "public transit", "public transportation", "rail", "transit", "transportation"], "name": "Monorail Stop / Platform"}, - "public_transport/platform_subway": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "subway": "yes"}, "addTags": {"public_transport": "platform", "subway": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "subway": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["metro", "platform", "public transit", "public transportation", "rail", "subway", "track", "transit", "transportation", "underground"], "name": "Subway Stop / Platform"}, - "public_transport/platform_train": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "train": "yes"}, "addTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["platform", "public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "name": "Train Stop / Platform"}, - "public_transport/platform_tram": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "tram": "yes"}, "addTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "removeTags": {"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 Stop / Platform"}, + "public_transport/platform_ferry": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "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 Stop / Platform"}, + "public_transport/platform_light_rail": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "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 Stop / Platform"}, + "public_transport/platform_monorail": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "monorail": "yes"}, "addTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform", "highway": "footway"}, "removeTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform", "highway": "footway"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["monorail", "platform", "public transit", "public transportation", "rail", "transit", "transportation"], "name": "Monorail Stop / Platform"}, + "public_transport/platform_subway": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "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 Stop / Platform"}, + "public_transport/platform_train": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "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 Stop / Platform"}, + "public_transport/platform_tram": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "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 Stop / Platform"}, "public_transport/platform_trolleybus": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "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 / Platform"}, - "public_transport/platform": {"icon": "temaki-pedestrian", "fields": ["name", "ref_platform", "network", "operator", "departures_board", "surface"], "moreFields": ["lit", "bench", "shelter", "wheelchair"], "geometry": ["point", "line", "area"], "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": ["name", "ref_platform", "network", "operator", "departures_board", "surface"], "moreFields": ["lit", "bench", "shelter", "wheelchair"], "geometry": ["point", "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 Stop / Platform", "matchScore": 0.2}, "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_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"}, diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json index ca4b89ba4..94c37ac63 100644 --- a/data/presets/presets/highway/footway.json +++ b/data/presets/presets/highway/footway.json @@ -29,5 +29,6 @@ "tags": { "highway": "footway" }, + "matchScore": 0.95, "name": "Foot Path" } diff --git a/data/presets/presets/leisure/track/horse_racing.json b/data/presets/presets/leisure/track/horse_racing.json index 6801993c8..5f0329581 100644 --- a/data/presets/presets/leisure/track/horse_racing.json +++ b/data/presets/presets/leisure/track/horse_racing.json @@ -16,6 +16,16 @@ "leisure": "track", "sport": "horse_racing" }, + "addTags": { + "leisure": "track", + "sport": "horse_racing", + "highway": "bridleway" + }, + "removeTags": { + "leisure": "track", + "sport": "horse_racing", + "highway": "bridleway" + }, "terms": [ "race*", "horse", diff --git a/data/presets/presets/leisure/track/running.json b/data/presets/presets/leisure/track/running.json index d65be6a93..e62b0f9ce 100644 --- a/data/presets/presets/leisure/track/running.json +++ b/data/presets/presets/leisure/track/running.json @@ -16,6 +16,16 @@ "leisure": "track", "sport": "running" }, + "addTags": { + "leisure": "track", + "sport": "running", + "highway": "footway" + }, + "removeTags": { + "leisure": "track", + "sport": "running", + "highway": "footway" + }, "terms": [ "race*", "running", diff --git a/data/presets/presets/man_made/pier.json b/data/presets/presets/man_made/pier.json index 6aa46cf2f..f349a08fc 100644 --- a/data/presets/presets/man_made/pier.json +++ b/data/presets/presets/man_made/pier.json @@ -18,5 +18,13 @@ "tags": { "man_made": "pier" }, + "addTags": { + "highway": "footway", + "man_made": "pier" + }, + "removeTags": { + "highway": "footway", + "man_made": "pier" + }, "name": "Pier" } diff --git a/data/presets/presets/public_transport/platform.json b/data/presets/presets/public_transport/platform.json index 7666d5aa3..330de64a2 100644 --- a/data/presets/presets/public_transport/platform.json +++ b/data/presets/presets/public_transport/platform.json @@ -22,6 +22,14 @@ "tags": { "public_transport": "platform" }, + "addTags": { + "public_transport": "platform", + "highway": "footway" + }, + "removeTags": { + "public_transport": "platform", + "highway": "footway" + }, "terms": [ "platform", "public transit", diff --git a/data/presets/presets/public_transport/platform_aerialway.json b/data/presets/presets/public_transport/platform_aerialway.json index 582cb59c8..26e3ac989 100644 --- a/data/presets/presets/public_transport/platform_aerialway.json +++ b/data/presets/presets/public_transport/platform_aerialway.json @@ -15,6 +15,16 @@ "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" diff --git a/data/presets/presets/public_transport/platform_ferry.json b/data/presets/presets/public_transport/platform_ferry.json index 66f432fa9..edf5216b8 100644 --- a/data/presets/presets/public_transport/platform_ferry.json +++ b/data/presets/presets/public_transport/platform_ferry.json @@ -15,6 +15,16 @@ "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" diff --git a/data/presets/presets/public_transport/platform_light_rail.json b/data/presets/presets/public_transport/platform_light_rail.json index 6b5714b89..2df064296 100644 --- a/data/presets/presets/public_transport/platform_light_rail.json +++ b/data/presets/presets/public_transport/platform_light_rail.json @@ -18,12 +18,14 @@ "addTags": { "public_transport": "platform", "light_rail": "yes", - "railway": "platform" + "railway": "platform", + "highway": "footway" }, "removeTags": { "public_transport": "platform", "light_rail": "yes", - "railway": "platform" + "railway": "platform", + "highway": "footway" }, "reference": { "key": "railway", diff --git a/data/presets/presets/public_transport/platform_monorail.json b/data/presets/presets/public_transport/platform_monorail.json index 848af6e5b..bddf2dff7 100644 --- a/data/presets/presets/public_transport/platform_monorail.json +++ b/data/presets/presets/public_transport/platform_monorail.json @@ -18,12 +18,14 @@ "addTags": { "public_transport": "platform", "monorail": "yes", - "railway": "platform" + "railway": "platform", + "highway": "footway" }, "removeTags": { "public_transport": "platform", "monorail": "yes", - "railway": "platform" + "railway": "platform", + "highway": "footway" }, "reference": { "key": "railway", diff --git a/data/presets/presets/public_transport/platform_subway.json b/data/presets/presets/public_transport/platform_subway.json index 1606625bf..7ac675de1 100644 --- a/data/presets/presets/public_transport/platform_subway.json +++ b/data/presets/presets/public_transport/platform_subway.json @@ -18,12 +18,14 @@ "addTags": { "public_transport": "platform", "subway": "yes", - "railway": "platform" + "railway": "platform", + "highway": "footway" }, "removeTags": { "public_transport": "platform", "subway": "yes", - "railway": "platform" + "railway": "platform", + "highway": "footway" }, "reference": { "key": "railway", diff --git a/data/presets/presets/public_transport/platform_train.json b/data/presets/presets/public_transport/platform_train.json index bede99254..e451f37fa 100644 --- a/data/presets/presets/public_transport/platform_train.json +++ b/data/presets/presets/public_transport/platform_train.json @@ -18,12 +18,14 @@ "addTags": { "public_transport": "platform", "train": "yes", - "railway": "platform" + "railway": "platform", + "highway": "footway" }, "removeTags": { "public_transport": "platform", "train": "yes", - "railway": "platform" + "railway": "platform", + "highway": "footway" }, "reference": { "key": "railway", diff --git a/data/presets/presets/public_transport/platform_tram.json b/data/presets/presets/public_transport/platform_tram.json index f1da97f74..e4b9892e2 100644 --- a/data/presets/presets/public_transport/platform_tram.json +++ b/data/presets/presets/public_transport/platform_tram.json @@ -18,12 +18,14 @@ "addTags": { "public_transport": "platform", "tram": "yes", - "railway": "platform" + "railway": "platform", + "highway": "footway" }, "removeTags": { "public_transport": "platform", "tram": "yes", - "railway": "platform" + "railway": "platform", + "highway": "footway" }, "reference": { "key": "public_transport", diff --git a/modules/osm/entity.js b/modules/osm/entity.js index 3ebdf1099..42eebc082 100644 --- a/modules/osm/entity.js +++ b/modules/osm/entity.js @@ -177,8 +177,22 @@ osmEntity.prototype = { if (d.old[key] === '*') return true; var vals = tags[key].split(';').filter(Boolean); - if (!vals.length) return false; - return vals.indexOf(d.old[key]) !== -1; + if (vals.length === 0) { + return false; + } else if (vals.length > 1) { + return vals.indexOf(d.old[key]) !== -1; + } else { + if (tags[key] === d.old[key]) { + if (d.old[key] === d.replace[key]) { + return !_every(Object.keys(d.replace), function(key) { + return tags[key] === d.replace[key]; + }); + } else { + return true; + } + } + } + return false; }); if (matchesDeprecatedTags) { deprecated.push(d); diff --git a/modules/svg/tag_classes.js b/modules/svg/tag_classes.js index a86dee20b..4d3035fb8 100644 --- a/modules/svg/tag_classes.js +++ b/modules/svg/tag_classes.js @@ -15,7 +15,7 @@ export function svgTagClasses() { var secondaries = [ 'oneway', 'bridge', 'tunnel', 'embankment', 'cutting', 'barrier', 'surface', 'tracktype', 'footway', 'crossing', 'service', 'sport', - 'public_transport', 'location', 'parking', 'golf', 'type' + 'public_transport', 'location', 'parking', 'golf', 'type', 'leisure', 'man_made' ]; var _tags = function(entity) { return entity.tags; }; @@ -115,7 +115,7 @@ export function svgTagClasses() { for (i = 0; i < secondaries.length; i++) { k = secondaries[i]; v = t[k]; - if (!v || v === 'no') continue; + if (!v || v === 'no' || k === primary) continue; classes.push('tag-' + k); classes.push('tag-' + k + '-' + v); }