diff --git a/css/40_railways.css b/css/40_railways.css index 2e08618b9..09f7a1ddd 100644 --- a/css/40_railways.css +++ b/css/40_railways.css @@ -7,7 +7,6 @@ } .preset-icon .icon.tag-railway { color: #555; - fill: #eee; } /* lines */ @@ -33,7 +32,8 @@ path.line.stroke.tag-railway { stroke-width: 2; stroke-dasharray: 6,6; } -.preset-icon-container path.line.stroke.tag-railway:not(.tag-status) { +.preset-icon-container path.line.stroke.tag-railway:not(.tag-status), +.preset-icon-container path.line.stroke.tag-railway.tag-status-disused { stroke-dasharray: 6; } @@ -53,19 +53,21 @@ path.line.stroke.tag-railway { } -.preset-icon .icon.tag-railway-disused, -.preset-icon .icon.tag-railway-abandoned { +.preset-icon .icon.tag-railway.tag-status { color: #999; - fill: #eee; } -path.line.casing.tag-railway-disused, -path.line.casing.tag-railway-abandoned { +path.line.casing.tag-railway.tag-status { stroke: #999; } -path.line.stroke.tag-railway-disused, -path.line.stroke.tag-railway-abandoned { +path.line.stroke.tag-railway.tag-status:not(.tag-service) { stroke: #eee; } +.preset-icon .icon.tag-railway.tag-status-disused { + color: #808080; +} +path.line.casing.tag-railway.tag-status-disused { + stroke: #808080; +} path.line.casing.tag-railway-subway { diff --git a/css/50_misc.css b/css/50_misc.css index e8d022691..e729f15a7 100644 --- a/css/50_misc.css +++ b/css/50_misc.css @@ -368,17 +368,17 @@ path.line.casing.tag-bridge.tag-unpaved { /* Status (e.g. proposed, abandoned) */ -path.area.stroke.tag-status, -path.line.stroke.tag-status, -path.area.casing.tag-status, -path.line.casing.tag-status { +path.area.stroke.tag-status:not(.tag-status-disused), +path.line.stroke.tag-status:not(.tag-status-disused), +path.area.casing.tag-status:not(.tag-status-disused), +path.line.casing.tag-status:not(.tag-status-disused) { stroke-linecap: butt; stroke-dasharray: 7, 3; } -.low-zoom path.area.stroke.tag-status, -.low-zoom path.line.stroke.tag-status, -.low-zoom path.area.casing.tag-status, -.low-zoom path.line.casing.tag-status { +.low-zoom path.area.stroke.tag-status:not(.tag-status-disused), +.low-zoom path.line.stroke.tag-status:not(.tag-status-disused), +.low-zoom path.area.casing.tag-status:not(.tag-status-disused), +.low-zoom path.line.casing.tag-status:not(.tag-status-disused) { stroke-dasharray: 5, 2; } diff --git a/data/presets/categories.json b/data/presets/categories.json index 7d78b4eac..d3d45f5b0 100644 --- a/data/presets/categories.json +++ b/data/presets/categories.json @@ -97,7 +97,7 @@ ] }, "category-rail": { - "icon": "iD-railway-rail", + "icon": "temaki-railway_track", "name": "Rails", "members": [ "railway/rail", diff --git a/data/presets/categories/rail.json b/data/presets/categories/rail.json index 89b226b35..648edbd81 100644 --- a/data/presets/categories/rail.json +++ b/data/presets/categories/rail.json @@ -1,5 +1,5 @@ { - "icon": "iD-railway-rail", + "icon": "temaki-railway_track", "name": "Rails", "members": [ "railway/rail", diff --git a/data/presets/presets.json b/data/presets/presets.json index 22322b560..9394429c5 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -18,7 +18,7 @@ "place": {"fields": ["name", "place"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "area"], "tags": {"place": "*"}, "searchable": false, "name": "Place"}, "playground": {"icon": "maki-playground", "fields": ["playground", "playground/theme", "min_age", "max_age", "wheelchair", "blind", "height"], "moreFields": ["access_simple", "colour", "ref"], "geometry": ["point", "vertex", "line", "area"], "tags": {"playground": "*"}, "searchable": false, "name": "Playground Equipment"}, "power": {"geometry": ["point", "vertex", "line", "area"], "tags": {"power": "*"}, "fields": ["power"], "moreFields": ["material"], "searchable": false, "name": "Power Feature"}, - "railway": {"fields": ["railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"railway": "*"}, "searchable": false, "name": "Railway Feature"}, + "railway": {"icon": "temaki-rail_profile", "fields": ["railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"railway": "*"}, "searchable": false, "name": "Railway Feature"}, "seamark": {"icon": "maki-harbor", "fields": ["seamark/type"], "geometry": ["point", "vertex", "line", "area"], "tags": {"seamark:type": "*"}, "searchable": false, "name": "Seamark"}, "tourism": {"icon": "maki-attraction", "fields": ["name", "tourism"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "*"}, "searchable": false, "name": "Tourism Feature"}, "waterway": {"fields": ["name", "waterway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"waterway": "*"}, "searchable": false, "name": "Waterway Feature"}, @@ -440,7 +440,7 @@ "craft/winery": {"icon": "maki-alcohol-shop", "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "tags": {"craft": "winery"}, "name": "Winery"}, "cycleway/asl": {"icon": "maki-bicycle", "fields": ["ref", "direction_vertex", "width"], "geometry": ["vertex"], "tags": {"cycleway": "asl"}, "terms": ["advanced stop box", "asl", "bicycle box", "bike box", "bikebox", "cycle box", "cycle stop marking"], "name": "Advanced Stop Line"}, "demolished/building": {"icon": "fas-house-damage", "fields": ["name", "address"], "geometry": ["area"], "tags": {"demolished:building": "*"}, "name": "Recently Demolished Building", "searchable": false}, - "disused/railway": {"fields": ["disused/railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"disused:railway": "*"}, "matchScore": 0.05, "searchable": false, "name": "Disused Railway Feature"}, + "disused/railway": {"icon": "temaki-rail_profile", "fields": ["disused/railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"disused:railway": "*"}, "matchScore": 0.05, "searchable": false, "name": "Disused Railway Feature"}, "emergency/designated": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "designated"}, "name": "Emergency Access Designated", "searchable": false, "matchScore": 0.01}, "emergency/destination": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "destination"}, "name": "Emergency Access Destination", "searchable": false, "matchScore": 0.01}, "emergency/no": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "no"}, "name": "Emergency Access No", "searchable": false, "matchScore": 0.01}, @@ -995,21 +995,21 @@ "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": "iD-railway-abandoned", "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", "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": "iD-railway-rail", "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", "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": "iD-railway-disused", "fields": ["operator", "structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "disused"}, "terms": [], "name": "Disused Railway"}, - "railway/funicular": {"icon": "iD-railway-rail", "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/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/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"}, - "railway/miniature": {"icon": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "miniature"}, "terms": ["rideable miniature railway", "narrow gauge railway", "minimum gauge railway"], "name": "Miniature Railway"}, + "railway/miniature": {"icon": "temaki-railway_track_mini", "fields": ["name", "structure", "gauge", "electrified", "service_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "miniature"}, "terms": ["rideable miniature railway", "narrow gauge railway", "minimum gauge railway"], "name": "Miniature Railway"}, "railway/monorail": {"icon": "temaki-monorail", "fields": ["name", "operator", "structure", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "monorail"}, "terms": [], "name": "Monorail"}, - "railway/narrow_gauge": {"icon": "iD-railway-rail", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railway", "narrow gauge railroad"], "name": "Narrow Gauge Rail"}, - "railway/rail": {"icon": "iD-railway-rail", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": ["rail line", "railroad track", "train track"], "name": "Rail"}, - "railway/rail/highspeed": {"icon": "iD-railway-rail", "geometry": ["line"], "tags": {"railway": "rail", "highspeed": "yes"}, "reference": {"key": "highspeed"}, "terms": ["bullet train", "fast rail", "high speed rail", "highspeed rail", "HSR"], "name": "High-Speed Rail"}, + "railway/narrow_gauge": {"icon": "temaki-railway_track_narrow", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railway", "narrow gauge railroad"], "name": "Narrow Gauge Rail"}, + "railway/rail": {"icon": "temaki-railway_track", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": ["rail line", "railroad track", "train track"], "name": "Rail"}, + "railway/rail/highspeed": {"icon": "temaki-railway_track", "geometry": ["line"], "tags": {"railway": "rail", "highspeed": "yes"}, "reference": {"key": "highspeed"}, "terms": ["bullet train", "fast rail", "high speed rail", "highspeed rail", "HSR"], "name": "High-Speed Rail"}, "railway/signal": {"icon": "temaki-railway_signals", "geometry": ["point", "vertex"], "fields": ["railway/position", "railway/signal/direction", "ref"], "tags": {"railway": "signal"}, "terms": ["signal", "lights"], "name": "Railway Signal"}, "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name", "level", "wheelchair"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"}, "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"}, @@ -1282,7 +1282,7 @@ "type/route/power": {"icon": "iD-power-line", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"}, "type/route/road": {"icon": "iD-highway-unclassified", "fields": ["name", "ref_route", "network_road", "network/type", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "name": "Road Route"}, "type/route/subway": {"icon": "temaki-subway", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "name": "Subway Route"}, - "type/route/train": {"icon": "iD-railway-rail", "fields": ["name", "ref_route", "operator", "network", "network/type", "to", "from"], "moreFields": ["colour", "duration", "interval", "opening_hours", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"}, + "type/route/train": {"icon": "maki-rail", "fields": ["name", "ref_route", "operator", "network", "network/type", "to", "from"], "moreFields": ["colour", "duration", "interval", "opening_hours", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"}, "type/route/tram": {"icon": "temaki-tram", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "name": "Tram Route"}, "type/site": {"icon": "iD-relation", "fields": ["name", "site"], "geometry": ["relation"], "tags": {"type": "site"}, "name": "Site"}, "type/waterway": {"icon": "iD-waterway-stream", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"}, diff --git a/data/presets/presets/_railway.json b/data/presets/presets/_railway.json index bb63e37ba..9ff136fdd 100644 --- a/data/presets/presets/_railway.json +++ b/data/presets/presets/_railway.json @@ -1,4 +1,5 @@ { + "icon": "temaki-rail_profile", "fields": [ "railway" ], diff --git a/data/presets/presets/disused/_railway.json b/data/presets/presets/disused/_railway.json index 55d46bedf..89ba0c74c 100644 --- a/data/presets/presets/disused/_railway.json +++ b/data/presets/presets/disused/_railway.json @@ -1,4 +1,5 @@ { + "icon": "temaki-rail_profile", "fields": [ "disused/railway" ], diff --git a/data/presets/presets/railway/abandoned.json b/data/presets/presets/railway/abandoned.json index 0b7aa7eff..95f7c296c 100644 --- a/data/presets/presets/railway/abandoned.json +++ b/data/presets/presets/railway/abandoned.json @@ -1,5 +1,5 @@ { - "icon": "iD-railway-abandoned", + "icon": "temaki-railway_track", "fields": [ "name", "structure", diff --git a/data/presets/presets/railway/construction.json b/data/presets/presets/railway/construction.json index 1dfde6531..7abeaa9dc 100644 --- a/data/presets/presets/railway/construction.json +++ b/data/presets/presets/railway/construction.json @@ -1,5 +1,5 @@ { - "icon": "iD-railway-rail", + "icon": "temaki-railway_track", "fields": [ "name", "opening_date", diff --git a/data/presets/presets/railway/disused.json b/data/presets/presets/railway/disused.json index 8d1c1517c..6af60280c 100644 --- a/data/presets/presets/railway/disused.json +++ b/data/presets/presets/railway/disused.json @@ -1,5 +1,5 @@ { - "icon": "iD-railway-disused", + "icon": "temaki-railway_track", "fields": [ "operator", "structure", diff --git a/data/presets/presets/railway/funicular.json b/data/presets/presets/railway/funicular.json index ee193b5e7..d7702b1fe 100644 --- a/data/presets/presets/railway/funicular.json +++ b/data/presets/presets/railway/funicular.json @@ -1,5 +1,5 @@ { - "icon": "iD-railway-rail", + "icon": "temaki-railway_track", "fields": [ "name", "operator", diff --git a/data/presets/presets/railway/miniature.json b/data/presets/presets/railway/miniature.json index 2c1eb0110..5d92e9e78 100644 --- a/data/presets/presets/railway/miniature.json +++ b/data/presets/presets/railway/miniature.json @@ -1,5 +1,5 @@ { - "icon": "iD-railway-rail", + "icon": "temaki-railway_track_mini", "fields": [ "name", "structure", diff --git a/data/presets/presets/railway/narrow_gauge.json b/data/presets/presets/railway/narrow_gauge.json index 9ac8979d8..98d7e4f29 100644 --- a/data/presets/presets/railway/narrow_gauge.json +++ b/data/presets/presets/railway/narrow_gauge.json @@ -1,5 +1,5 @@ { - "icon": "iD-railway-rail", + "icon": "temaki-railway_track_narrow", "fields": [ "{railway/rail}" ], diff --git a/data/presets/presets/railway/rail.json b/data/presets/presets/railway/rail.json index 1b99dfe19..a337468a4 100644 --- a/data/presets/presets/railway/rail.json +++ b/data/presets/presets/railway/rail.json @@ -1,5 +1,5 @@ { - "icon": "iD-railway-rail", + "icon": "temaki-railway_track", "fields": [ "name", "operator", diff --git a/data/presets/presets/railway/rail/highspeed.json b/data/presets/presets/railway/rail/highspeed.json index 51b3013f3..fd0aebc26 100644 --- a/data/presets/presets/railway/rail/highspeed.json +++ b/data/presets/presets/railway/rail/highspeed.json @@ -1,5 +1,5 @@ { - "icon": "iD-railway-rail", + "icon": "temaki-railway_track", "geometry": [ "line" ], diff --git a/data/presets/presets/type/route/train.json b/data/presets/presets/type/route/train.json index 33bf2c90e..9f0c85b87 100644 --- a/data/presets/presets/type/route/train.json +++ b/data/presets/presets/type/route/train.json @@ -1,5 +1,5 @@ { - "icon": "iD-railway-rail", + "icon": "maki-rail", "fields": [ "name", "ref_route", diff --git a/data/taginfo.json b/data/taginfo.json index 428c4a8d2..2d6ff2f57 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -21,7 +21,7 @@ {"key": "place", "description": "🄿 Place (unsearchable), 🄵 Type", "object_types": ["node", "area"]}, {"key": "playground", "description": "🄿 Playground Equipment (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, {"key": "power", "description": "🄿 Power Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]}, - {"key": "railway", "description": "🄿 Railway Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]}, + {"key": "railway", "description": "🄿 Railway Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/rail_profile.svg"}, {"key": "seamark:type", "description": "🄿 Seamark (unsearchable), 🄵 Seamark", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/harbor-15.svg"}, {"key": "tourism", "description": "🄿 Tourism Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/attraction-15.svg"}, {"key": "waterway", "description": "🄿 Waterway Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]}, @@ -435,7 +435,7 @@ {"key": "craft", "value": "winery", "description": "🄿 Winery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/alcohol-shop-15.svg"}, {"key": "cycleway", "value": "asl", "description": "🄿 Advanced Stop Line", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"}, {"key": "demolished:building", "description": "🄿 Recently Demolished Building (unsearchable)", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-house-damage.svg"}, - {"key": "disused:railway", "description": "🄿 Disused Railway Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]}, + {"key": "disused:railway", "description": "🄿 Disused Railway Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/rail_profile.svg"}, {"key": "emergency", "value": "designated", "description": "🄿 Emergency Access Designated (unsearchable)", "object_types": ["way"]}, {"key": "emergency", "value": "destination", "description": "🄿 Emergency Access Destination (unsearchable)", "object_types": ["way"]}, {"key": "emergency", "value": "no", "description": "🄿 Emergency Access No (unsearchable)", "object_types": ["way"]}, @@ -940,21 +940,21 @@ {"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/openstreetmap/iD@master/svg/iD-sprite/presets/railway-abandoned.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": "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/openstreetmap/iD@master/svg/iD-sprite/presets/railway-rail.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": "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/openstreetmap/iD@master/svg/iD-sprite/presets/railway-disused.svg"}, - {"key": "railway", "value": "funicular", "description": "🄿 Funicular", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-rail.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": "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"}, - {"key": "railway", "value": "miniature", "description": "🄿 Miniature Railway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-rail.svg"}, + {"key": "railway", "value": "miniature", "description": "🄿 Miniature Railway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track_mini.svg"}, {"key": "railway", "value": "monorail", "description": "🄿 Monorail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/monorail.svg"}, - {"key": "railway", "value": "narrow_gauge", "description": "🄿 Narrow Gauge Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-rail.svg"}, - {"key": "railway", "value": "rail", "description": "🄿 Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-rail.svg"}, - {"key": "highspeed", "value": "yes", "description": "🄿 High-Speed Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-rail.svg"}, + {"key": "railway", "value": "narrow_gauge", "description": "🄿 Narrow Gauge Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track_narrow.svg"}, + {"key": "railway", "value": "rail", "description": "🄿 Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track.svg"}, + {"key": "highspeed", "value": "yes", "description": "🄿 High-Speed Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track.svg"}, {"key": "railway", "value": "signal", "description": "🄿 Railway Signal", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_signals.svg"}, {"key": "railway", "value": "subway_entrance", "description": "🄿 Subway Entrance", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-15.svg"}, {"key": "railway", "value": "subway", "description": "🄿 Subway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/subway.svg"}, @@ -1218,7 +1218,7 @@ {"key": "route", "value": "power", "description": "🄿 Power Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/power-line.svg"}, {"key": "route", "value": "road", "description": "🄿 Road Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-unclassified.svg"}, {"key": "route", "value": "subway", "description": "🄿 Subway Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/subway.svg"}, - {"key": "route", "value": "train", "description": "🄿 Train Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-rail.svg"}, + {"key": "route", "value": "train", "description": "🄿 Train Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"}, {"key": "route", "value": "tram", "description": "🄿 Tram Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tram.svg"}, {"key": "type", "value": "site", "description": "🄿 Site", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/relation.svg"}, {"key": "type", "value": "waterway", "description": "🄿 Waterway", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"}, diff --git a/package.json b/package.json index 1ef0b604a..7ace5d774 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.12.0", + "@ideditor/temaki": "~3.13.0", "@mapbox/maki": "^6.0.0", "@rollup/plugin-buble": "^0.21.0", "@rollup/plugin-commonjs": "^11.0.1", diff --git a/svg/iD-sprite/presets/railway-abandoned.svg b/svg/iD-sprite/presets/railway-abandoned.svg deleted file mode 100644 index c0b9f0508..000000000 --- a/svg/iD-sprite/presets/railway-abandoned.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/svg/iD-sprite/presets/railway-disused.svg b/svg/iD-sprite/presets/railway-disused.svg deleted file mode 100644 index e0b43c118..000000000 --- a/svg/iD-sprite/presets/railway-disused.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/svg/iD-sprite/presets/railway-rail.svg b/svg/iD-sprite/presets/railway-rail.svg deleted file mode 100644 index 036b7c561..000000000 --- a/svg/iD-sprite/presets/railway-rail.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - -