From aadbddba2f88d48efe23bd40af9b000e426f22bc Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 28 Jan 2020 13:21:46 -0500 Subject: [PATCH] Update to temaki 3.14.0 (close #7299, re: #7255) --- data/presets/presets.json | 6 +++--- data/presets/presets/railway/abandoned.json | 2 +- data/presets/presets/railway/construction.json | 2 +- data/presets/presets/railway/funicular.json | 2 +- data/taginfo.json | 6 +++--- package.json | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 9394429c5..d10e6205e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -995,13 +995,13 @@ "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": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"railway": "tram_stop"}, "name": "Tram Stopping Position", "searchable": false}, - "railway/abandoned": {"icon": "temaki-railway_track", "fields": ["name", "structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "abandoned"}, "terms": [], "matchScore": 0.85, "name": "Abandoned Railway"}, + "railway/abandoned": {"icon": "temaki-railway_track_askew", "fields": ["name", "structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "abandoned"}, "terms": [], "matchScore": 0.85, "name": "Abandoned Railway"}, "railway/buffer_stop": {"icon": "temaki-buffer_stop", "geometry": ["vertex"], "tags": {"railway": "buffer_stop"}, "terms": ["stop", "halt", "buffer"], "name": "Buffer Stop"}, - "railway/construction": {"icon": "temaki-railway_track", "fields": ["name", "opening_date", "check_date", "note", "structure", "gauge", "electrified"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "service_rail", "usage_rail", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "construction"}, "name": "Railway Under Construction"}, + "railway/construction": {"icon": "temaki-railway_track_unfinished", "fields": ["name", "opening_date", "check_date", "note", "structure", "gauge", "electrified"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "service_rail", "usage_rail", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "construction"}, "name": "Railway Under Construction"}, "railway/crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "crossing"}, "terms": ["crossing", "pedestrian crossing", "railroad crossing", "level crossing", "grade crossing", "path through railroad", "train crossing"], "name": "Railway Crossing (Path)"}, "railway/derail": {"icon": "maki-roadblock", "geometry": ["vertex"], "tags": {"railway": "derail"}, "terms": ["derailer"], "name": "Railway Derailer"}, "railway/disused": {"icon": "temaki-railway_track", "fields": ["operator", "structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "disused"}, "terms": [], "name": "Disused Railway"}, - "railway/funicular": {"icon": "temaki-railway_track", "fields": ["name", "operator", "structure", "gauge", "service_rail"], "moreFields": ["covered"], "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "tags": {"railway": "funicular"}, "name": "Funicular"}, + "railway/funicular": {"icon": "temaki-railway_cable_track", "fields": ["name", "operator", "structure", "gauge", "service_rail"], "moreFields": ["covered"], "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "tags": {"railway": "funicular"}, "name": "Funicular"}, "railway/level_crossing": {"icon": "maki-cross", "geometry": ["vertex"], "tags": {"railway": "level_crossing"}, "terms": ["crossing", "railroad crossing", "level crossing", "grade crossing", "road through railroad", "train crossing"], "name": "Railway Crossing (Road)"}, "railway/light_rail": {"icon": "temaki-light_rail", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "light_rail"}, "terms": ["light rail", "streetcar", "trolley"], "name": "Light Rail"}, "railway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["railway/position", "direction_vertex"], "tags": {"railway": "milestone"}, "terms": ["milestone", "marker"], "name": "Railway Milestone"}, diff --git a/data/presets/presets/railway/abandoned.json b/data/presets/presets/railway/abandoned.json index 95f7c296c..542c43437 100644 --- a/data/presets/presets/railway/abandoned.json +++ b/data/presets/presets/railway/abandoned.json @@ -1,5 +1,5 @@ { - "icon": "temaki-railway_track", + "icon": "temaki-railway_track_askew", "fields": [ "name", "structure", diff --git a/data/presets/presets/railway/construction.json b/data/presets/presets/railway/construction.json index 7abeaa9dc..134f804ff 100644 --- a/data/presets/presets/railway/construction.json +++ b/data/presets/presets/railway/construction.json @@ -1,5 +1,5 @@ { - "icon": "temaki-railway_track", + "icon": "temaki-railway_track_unfinished", "fields": [ "name", "opening_date", diff --git a/data/presets/presets/railway/funicular.json b/data/presets/presets/railway/funicular.json index d7702b1fe..3f5255c9c 100644 --- a/data/presets/presets/railway/funicular.json +++ b/data/presets/presets/railway/funicular.json @@ -1,5 +1,5 @@ { - "icon": "temaki-railway_track", + "icon": "temaki-railway_cable_track", "fields": [ "name", "operator", diff --git a/data/taginfo.json b/data/taginfo.json index 2d6ff2f57..ef145451b 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -940,13 +940,13 @@ {"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), 🄳 ➜ railway=tram_stop + public_transport=stop_position + tram=yes", "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/ideditor/temaki/icons/railway_track.svg"}, + {"key": "railway", "value": "abandoned", "description": "🄿 Abandoned Railway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track_askew.svg"}, {"key": "railway", "value": "buffer_stop", "description": "🄿 Buffer Stop", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/buffer_stop.svg"}, - {"key": "railway", "value": "construction", "description": "🄿 Railway Under Construction", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track.svg"}, + {"key": "railway", "value": "construction", "description": "🄿 Railway Under Construction", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track_unfinished.svg"}, {"key": "railway", "value": "crossing", "description": "🄿 Railway Crossing (Path)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian.svg"}, {"key": "railway", "value": "derail", "description": "🄿 Railway Derailer", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"}, {"key": "railway", "value": "disused", "description": "🄿 Disused Railway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track.svg"}, - {"key": "railway", "value": "funicular", "description": "🄿 Funicular", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track.svg"}, + {"key": "railway", "value": "funicular", "description": "🄿 Funicular", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_cable_track.svg"}, {"key": "railway", "value": "level_crossing", "description": "🄿 Railway Crossing (Road)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cross-15.svg"}, {"key": "railway", "value": "light_rail", "description": "🄿 Light Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/light_rail.svg"}, {"key": "railway", "value": "milestone", "description": "🄿 Railway Milestone", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/milestone.svg"}, diff --git a/package.json b/package.json index 7ace5d774..b12738459 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "@fortawesome/free-brands-svg-icons": "^5.11.2", "@fortawesome/free-regular-svg-icons": "^5.11.2", "@fortawesome/free-solid-svg-icons": "^5.11.2", - "@ideditor/temaki": "~3.13.0", + "@ideditor/temaki": "~3.14.0", "@mapbox/maki": "^6.0.0", "@rollup/plugin-buble": "^0.21.0", "@rollup/plugin-commonjs": "^11.0.1",