Update to temaki 3.13.0 (close #7298)

Add new rail icons (close #7255) Render "statused" railways with lighter colors Don't render disused features with a dashed stroke
2026-02-12 16:52:50 +00:00 · 2020-01-28 11:42:53 -05:00
parent 6d81a00daf
commit d7e4575a7b
21 changed files with 55 additions and 89 deletions
--- 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 {
--- 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;
 }

--- 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",
--- 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",
--- 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"},
--- a/data/presets/presets/_railway.json
+++ b/data/presets/presets/_railway.json
@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-rail_profile",
    "fields": [
        "railway"
    ],
--- 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"
    ],
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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}"
    ],
--- 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",
--- 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"
    ],
--- 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",
--- 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"},
--- 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",
--- a/svg/iD-sprite/presets/railway-abandoned.svg
+++ b/svg/iD-sprite/presets/railway-abandoned.svg
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
-  <g id="railway-abandoned-base">
-    <path d="M36.044,23.685 L34.595,23.803 L35.324,25 L42.751,25 C43.305,25 43.885,24.537 43.751,24 L43.501,23 C43.367,22.463 43.055,22 42.501,22 L40.157,22 L39.688,20 L37.188,20 L37.657,22 L34.831,22 L35.01,22.248 L36.044,23.685 z M39.25,23 C39.526,23 39.75,23.224 39.75,23.5 C39.75,23.776 39.526,24 39.25,24 C38.974,24 38.75,23.776 38.75,23.5 C38.75,23.224 38.974,23 39.25,23 z" fill="#989898"/>
-    <path d="M33.846,19 L41.75,19 C42.304,19 42.884,18.537 42.75,18 L42.5,17 C42.366,16.463 42.054,16 41.5,16 L38.719,16 L38.25,14 L36.75,13 L35.75,14 L36.219,16 L32.206,16 L33.519,18.403 L33.846,19 z M38.25,17 C38.526,17 38.75,17.224 38.75,17.5 C38.75,17.776 38.526,18 38.25,18 C37.974,18 37.75,17.776 37.75,17.5 C37.75,17.224 37.974,17 38.25,17 z" fill="#989898"/>
-    <path d="M27.666,16 L23.781,16 L24.25,14 L23.25,13 L21.75,14 L21.281,16 L18,16 C17.446,16 17.134,16.463 17,17 L16.75,18 C16.616,18.537 17.196,19 17.75,19 L26.027,19 L26.374,18.365 L27.666,16 z M21.25,18 C20.974,18 20.75,17.776 20.75,17.5 C20.75,17.224 20.974,17 21.25,17 C21.526,17 21.75,17.224 21.75,17.5 C21.75,17.776 21.526,18 21.25,18 z" fill="#989898"/>
-    <path d="M20.936,28 L21.408,26 L18.907,26 L18.438,28 L16,28 C15.446,28 15.134,28.463 15,29 L14.75,30 C14.616,30.537 15.196,31 15.75,31 L22.661,31 L24.251,28 L20.936,28 z M19.25,30 C18.974,30 18.75,29.776 18.75,29.5 C18.75,29.224 18.974,29 19.25,29 C19.526,29 19.75,29.224 19.75,29.5 C19.75,29.776 19.526,30 19.25,30 z" fill="#989898"/>
-    <path d="M40.031,32 L40.75,35 L41.75,36 L43.25,35 L42.531,32 z" fill="#989898"/>
-    <path d="M23.848,23.647 L24.884,22.209 L25.034,22 L22.343,22 L22.815,20 L20.313,20 L19.844,22 L17,22 C16.446,22 16.134,22.463 16,23 L15.75,24 C15.616,24.537 16.196,25 16.75,25 L24.548,25 L25.297,23.765 L23.848,23.647 z M20.25,24 C19.974,24 19.75,23.776 19.75,23.5 C19.75,23.224 19.974,23 20.25,23 C20.526,23 20.75,23.224 20.75,23.5 C20.75,23.776 20.526,24 20.25,24 z" fill="#989898"/>
-    <path d="M44.749,30 L44.499,29 C44.365,28.463 44.053,28 43.499,28 L41.561,28 L41.092,26 L38.592,26 L39.061,28 L35.625,28 L37.213,31 L43.749,31 C44.303,31 44.883,30.537 44.749,30 z M40.25,30 C39.974,30 39.75,29.776 39.75,29.5 C39.75,29.224 39.974,29 40.25,29 C40.526,29 40.75,29.224 40.75,29.5 C40.75,29.776 40.526,30 40.25,30 z" fill="#989898"/>
-    <path d="M16.75,35 L18.25,36 L19.25,35 L19.969,32 L17.469,32 z" fill="#989898"/>
-  </g>
-  <path d="M30.803,31.655 L36.446,31.686 L36.083,31 L34.495,28 L33.678,26.457 L34.976,26.351 L34.154,25 L32.898,22.936 L34.198,22.83 L33.6,22 L31.438,19 L31.429,18.988 L32.642,18.881 L31.066,16 L29.959,13.973 L29.933,14.095 L29.933,13.937 L28.806,16 L27.253,18.844 L28.465,18.95 L28.429,19 L26.267,22 L25.696,22.792 L26.993,22.897 L25.716,25 L24.919,26.313 L26.217,26.42 L25.38,28 L23.792,31 L23.448,31.649 L25.721,31.618 L25.718,31.627 L29.188,31.646 L29.188,32.147 L29.188,32.649 L29.188,36.023 L30.813,36.023 L30.805,32.658 L30.804,32.156 z" fill="#555555" id="railway-abandoned-tree"/>
-</svg>
--- a/svg/iD-sprite/presets/railway-disused.svg
+++ b/svg/iD-sprite/presets/railway-disused.svg
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
-  <g id="railway-disused-base">
-    <path d="M17.001,35 L18.501,36 L19.501,35 L20.22,32 L17.72,32 z" fill="#989898"/>
-    <path d="M40.282,32 L41.001,35 L42.001,36 L43.501,35 L42.782,32 z" fill="#989898"/>
-    <path d="M21.187,28 L21.659,26 L19.158,26 L18.689,28 L16.251,28 C15.697,28 15.385,28.463 15.251,29 L15.001,30 C14.867,30.537 15.447,31 16.001,31 L27.791,31 C27.478,29.969 27.016,28.919 26.334,28 L21.187,28 z M19.501,30 C19.225,30 19.001,29.776 19.001,29.5 C19.001,29.224 19.225,29 19.501,29 C19.777,29 20.001,29.224 20.001,29.5 C20.001,29.776 19.777,30 19.501,30 z" fill="#989898"/>
-    <path d="M17.001,25 L43.001,25 C43.555,25 44.135,24.537 44.001,24 L43.751,23 C43.617,22.463 43.305,22 42.751,22 L40.407,22 L39.938,20 L37.438,20 L37.907,22 L22.594,22 L23.066,20 L20.564,20 L20.095,22 L17.251,22 C16.697,22 16.385,22.463 16.251,23 L16.001,24 C15.867,24.537 16.447,25 17.001,25 z M39.501,23 C39.777,23 40.001,23.224 40.001,23.5 C40.001,23.776 39.777,24 39.501,24 C39.225,24 39.001,23.776 39.001,23.5 C39.001,23.224 39.225,23 39.501,23 z M20.501,23 C20.777,23 21.001,23.224 21.001,23.5 C21.001,23.776 20.777,24 20.501,24 C20.225,24 20.001,23.776 20.001,23.5 C20.001,23.224 20.225,23 20.501,23 z" fill="#989898"/>
-    <path d="M18.001,19 L42.001,19 C42.555,19 43.135,18.537 43.001,18 L42.751,17 C42.617,16.463 42.305,16 41.751,16 L38.97,16 L38.501,14 L37.001,13 L36.001,14 L36.47,16 L24.032,16 L24.501,14 L23.501,13 L22.001,14 L21.532,16 L18.251,16 C17.697,16 17.385,16.463 17.251,17 L17.001,18 C16.867,18.537 17.447,19 18.001,19 z M38.501,17 C38.777,17 39.001,17.224 39.001,17.5 C39.001,17.776 38.777,18 38.501,18 C38.225,18 38.001,17.776 38.001,17.5 C38.001,17.224 38.225,17 38.501,17 z M21.501,17 C21.777,17 22.001,17.224 22.001,17.5 C22.001,17.776 21.777,18 21.501,18 C21.225,18 21.001,17.776 21.001,17.5 C21.001,17.224 21.225,17 21.501,17 z" fill="#989898"/>
-    <path d="M45,30 L44.75,29 C44.616,28.463 44.304,28 43.75,28 L41.812,28 L41.343,26 L38.843,26 L39.312,28 L35.068,28 L34.753,28.285 C33.666,29.267 33.078,30.226 32.743,31 L44.001,31 C44.554,31 45.134,30.537 45,30 z M40.501,30 C40.225,30 40.001,29.776 40.001,29.5 C40.001,29.224 40.225,29 40.501,29 C40.777,29 41.001,29.224 41.001,29.5 C41.001,29.776 40.777,30 40.501,30 z" fill="#989898"/>
-  </g>
-  <g id="railway-disused-weed">
-    <path d="M24.407,31.625 C27.445,34.703 26.785,36.01 26.785,36.01 C26.785,36.01 26.996,36.049 28.454,36.049 C28.573,32.92 26.161,32.188 24.407,31.625 z" fill="#555555"/>
-    <path d="M30.979,36.031 C31.025,34.017 30.715,32.403 30.23,31.109 C29.739,29.8 29.068,28.827 28.397,28.109 C27.121,26.744 25.851,26.309 25.851,26.309 C26.476,26.836 26.979,27.453 27.401,28.109 C28.013,29.061 28.436,30.099 28.722,31.109 C29.454,33.69 29.325,36.044 29.325,36.044 C29.325,36.044 29.897,36.031 30.979,36.031 z" fill="#555555"/>
-    <path d="M33.557,28 C31.753,28.807 31.117,30.824 31.117,30.824 L31.164,31 L31.601,32.64 C31.601,32.64 31.6,31.976 31.974,31 C32.295,30.16 32.901,29.088 34.027,28 C34.11,27.92 34.188,27.84 34.277,27.76 C34.017,27.816 33.779,27.9 33.557,28 z" fill="#555555"/>
-    <path d="M32.019,36.038 L33.599,36.029 C33.599,36.029 33.369,33.661 35.595,31.703 C33.861,32.201 32.21,33.783 32.019,36.038 z" fill="#555555"/>
-  </g>
-</svg>
--- a/svg/iD-sprite/presets/railway-rail.svg
+++ b/svg/iD-sprite/presets/railway-rail.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="50" height="50" viewBox="5 0 50 50">
-  <path d="M23.5,13 L22,14 L21.531,16 L18.25,16 C17.696,16 17.384,16.463 17.25,17 L17,18 C16.866,18.537 17.446,19 18,19 L42,19 C42.554,19 43.134,18.537 43,18 L42.75,17 C42.616,16.463 42.304,16 41.75,16 L38.969,16 L38.5,14 L37,13 L36,14 L36.469,16 L24.031,16 L24.5,14 L23.5,13 z M21.5,17 C21.776,17 22,17.224 22,17.5 C22,17.776 21.776,18 21.5,18 C21.224,18 21,17.776 21,17.5 C21,17.224 21.224,17 21.5,17 z M38.5,17 C38.776,17 39,17.224 39,17.5 C39,17.776 38.776,18 38.5,18 C38.224,18 38,17.776 38,17.5 C38,17.224 38.224,17 38.5,17 z M20.562,20 L20.094,22 L17.25,22 C16.696,22 16.384,22.463 16.25,23 L16,24 C15.866,24.537 16.446,25 17,25 L43,25 C43.554,25 44.134,24.537 44,24 L43.75,23 C43.616,22.463 43.304,22 42.75,22 L40.406,22 L39.938,20 L37.438,20 L37.906,22 L22.594,22 L23.062,20 L20.562,20 z M20.5,23 C20.776,23 21,23.224 21,23.5 C21,23.776 20.776,24 20.5,24 C20.224,24 20,23.776 20,23.5 C20,23.224 20.224,23 20.5,23 z M39.5,23 C39.776,23 40,23.224 40,23.5 C40,23.776 39.776,24 39.5,24 C39.224,24 39,23.776 39,23.5 C39,23.224 39.224,23 39.5,23 z M19.156,26 L18.688,28 L16.25,28 C15.696,28 15.384,28.463 15.25,29 L15,30 C14.866,30.537 15.446,31 16,31 L44,31 C44.554,31 45.134,30.537 45,30 L44.75,29 C44.616,28.463 44.304,28 43.75,28 L41.812,28 L41.344,26 L38.844,26 L39.312,28 L21.188,28 L21.656,26 L19.156,26 z M19.5,29 C19.776,29 20,29.224 20,29.5 C20,29.776 19.776,30 19.5,30 C19.224,30 19,29.776 19,29.5 C19,29.224 19.224,29 19.5,29 z M40.5,29 C40.776,29 41,29.224 41,29.5 C41,29.776 40.776,30 40.5,30 C40.224,30 40,29.776 40,29.5 C40,29.224 40.224,29 40.5,29 z M17.719,32 L17,35 L18.5,36 L19.5,35 L20.219,32 L17.719,32 z M40.281,32 L41,35 L42,36 L43.5,35 L42.781,32 L40.281,32 z" fill="#989898"/>
-</svg>