Clarify railway preset names (close #7440)

openstreetmap · Mar 22, 2020 · 6b9b58a · 6b9b58a
1 parent ebc3a2c
commit 6b9b58a
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 66 deletions.
diff --git a/data/presets.yaml b/data/presets.yaml
@@ -7364,9 +7364,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Disused Railway'', separated by commas>'
       railway/funicular:
         # railway=funicular
-        name: Funicular
+        name: Funicular Track
         # 'terms: venicular,cliff railway,cable car,cable railway,funicular railway'
-        terms: '<translate with synonyms or related terms for ''Funicular'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Funicular Track'', separated by commas>'
       railway/halt:
         # railway=halt
         name: Train Station (Halt / Request)
@@ -7377,41 +7377,41 @@ en:
         terms: '<translate with synonyms or related terms for ''Railway Crossing (Road)'', separated by commas>'
       railway/light_rail:
         # railway=light_rail
-        name: Light Rail
+        name: Light Rail Track
         # 'terms: light rail,streetcar,trolley'
-        terms: '<translate with synonyms or related terms for ''Light Rail'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Light Rail Track'', separated by commas>'
       railway/milestone:
         # railway=milestone
         name: Railway Milestone
         # 'terms: milestone,marker'
         terms: '<translate with synonyms or related terms for ''Railway Milestone'', separated by commas>'
       railway/miniature:
         # railway=miniature
-        name: Miniature Railway
+        name: Miniature Train Track
         # 'terms: rideable miniature railway,narrow gauge railway,minimum gauge railway'
-        terms: '<translate with synonyms or related terms for ''Miniature Railway'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Miniature Train Track'', separated by commas>'
       railway/monorail:
         # railway=monorail
-        name: Monorail
-        terms: '<translate with synonyms or related terms for ''Monorail'', separated by commas>'
+        name: Monorail Track
+        terms: '<translate with synonyms or related terms for ''Monorail Track'', separated by commas>'
       railway/narrow_gauge:
         # railway=narrow_gauge
-        name: Narrow Gauge Rail
+        name: Narrow Gauge Track
         # 'terms: narrow gauge railway,narrow gauge railroad'
-        terms: '<translate with synonyms or related terms for ''Narrow Gauge Rail'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Narrow Gauge Track'', separated by commas>'
       railway/platform:
         # railway=platform
         name: Train Platform
       railway/rail:
         # railway=rail
-        name: Rail
-        # 'terms: rail line,railroad track,train track'
-        terms: '<translate with synonyms or related terms for ''Rail'', separated by commas>'
+        name: Train Track
+        # 'terms: permanent way,rail line,railroad track,railway track,track,train track'
+        terms: '<translate with synonyms or related terms for ''Train Track'', separated by commas>'
       railway/rail/highspeed:
         # 'railway=rail, highspeed=yes'
-        name: High-Speed Rail
+        name: High-Speed Train Track
         # 'terms: bullet train,fast rail,high speed rail,highspeed rail,HSR'
-        terms: '<translate with synonyms or related terms for ''High-Speed Rail'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''High-Speed Train Track'', separated by commas>'
       railway/signal:
         # railway=signal
         name: Railway Signal
@@ -7422,9 +7422,9 @@ en:
         name: Train Station
       railway/subway:
         # railway=subway
-        name: Subway
-        # 'terms: metro,transit'
-        terms: '<translate with synonyms or related terms for ''Subway'', separated by commas>'
+        name: Subway Track
+        # 'terms: metro,transit,underground railway'
+        terms: '<translate with synonyms or related terms for ''Subway Track'', separated by commas>'
       railway/subway_entrance:
         # railway=subway_entrance
         name: Subway Entrance
@@ -7442,9 +7442,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Train Wash'', separated by commas>'
       railway/tram:
         # railway=tram
-        name: Tram
-        # 'terms: light rail,streetcar,tram,trolley'
-        terms: '<translate with synonyms or related terms for ''Tram'', separated by commas>'
+        name: Tram Track
+        # 'terms: electric street railway,light rail,streetcar,tramway,trolley'
+        terms: '<translate with synonyms or related terms for ''Tram Track'', separated by commas>'
       railway/tram_stop:
         # railway=tram_stop
         name: Tram Stopping Position

diff --git a/data/presets/presets.json b/data/presets/presets.json
@@ -1000,25 +1000,25 @@
   "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_askew", "fields": ["name", "structure", "service_rail", "usage_rail"], "moreFields": ["covered", "incline"], "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_unfinished", "fields": ["name", "opening_date", "check_date", "note", "structure", "gauge", "electrified"], "moreFields": ["covered", "frequency_electrified", "highspeed", "incline", "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", "incline", "maxspeed", "service_rail", "usage_rail", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "construction"}, "matchScore": 0.95, "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": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}", "highspeed"], "geometry": ["line"], "tags": {"railway": "disused"}, "terms": [], "name": "Disused Railway"},
-  "railway/funicular": {"icon": "temaki-railway_cable_track", "fields": ["name", "operator", "incline", "structure", "gauge", "service_rail"], "moreFields": ["covered", "electrified", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "tags": {"railway": "funicular"}, "name": "Funicular"},
+  "railway/disused": {"icon": "temaki-railway_track", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}", "highspeed"], "geometry": ["line"], "tags": {"railway": "disused"}, "matchScore": 0.95, "name": "Disused Railway"},
+  "railway/funicular": {"icon": "temaki-railway_cable_track", "fields": ["name", "operator", "incline", "structure", "gauge", "service_rail"], "moreFields": ["covered", "electrified", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "tags": {"railway": "funicular"}, "name": "Funicular Track"},
   "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": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "incline", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "light_rail"}, "terms": ["light rail", "streetcar", "trolley"], "name": "Light Rail"},
+  "railway/light_rail": {"icon": "temaki-light_rail", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "incline", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "light_rail"}, "terms": ["light rail", "streetcar", "trolley"], "name": "Light Rail Track"},
   "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": "temaki-railway_track_mini", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "miniature"}, "terms": ["rideable miniature railway", "narrow gauge railway", "minimum gauge railway"], "name": "Miniature Railway"},
-  "railway/monorail": {"icon": "temaki-monorail", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "monorail"}, "terms": [], "name": "Monorail"},
-  "railway/narrow_gauge": {"icon": "temaki-railway_track_narrow", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railway", "narrow gauge railroad"], "name": "Narrow Gauge Rail"},
-  "railway/rail": {"icon": "temaki-railway_track", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}", "highspeed"], "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/miniature": {"icon": "temaki-railway_track_mini", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "miniature"}, "terms": ["rideable miniature railway", "narrow gauge railway", "minimum gauge railway"], "name": "Miniature Train Track"},
+  "railway/monorail": {"icon": "temaki-monorail", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "monorail"}, "name": "Monorail Track"},
+  "railway/narrow_gauge": {"icon": "temaki-railway_track_narrow", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railway", "narrow gauge railroad"], "name": "Narrow Gauge Track"},
+  "railway/rail": {"icon": "temaki-railway_track", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}", "highspeed"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": ["permanent way", "rail line", "railroad track", "railway track", "track", "train track"], "name": "Train Track"},
+  "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 Train Track"},
   "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/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"},
+  "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit", "underground railway"], "name": "Subway Track"},
   "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"},
   "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
-  "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"},
+  "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["electric street railway", "light rail", "streetcar", "tramway", "trolley"], "name": "Tram Track"},
   "railway/yard": {"icon": "maki-rail", "fields": ["name", "operator"], "moreFields": ["gnis/feature_id"], "geometry": ["point"], "tags": {"railway": "yard"}, "terms": ["freight car stop", "freight train station", "rail freight station", "railroad yard", "railway yard"], "name": "Rail Yard"},
   "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"},
   "route/ferry": {"icon": "maki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "to", "from"], "moreFields": ["charge_toll", "dog", "interval", "maxheight", "maxweight", "network", "network/type", "opening_hours", "ref_route", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"},

diff --git a/data/presets/presets/railway/construction.json b/data/presets/presets/railway/construction.json
@@ -25,5 +25,6 @@
     "tags": {
         "railway": "construction"
     },
+    "matchScore": 0.95,
     "name": "Railway Under Construction"
 }
diff --git a/data/presets/presets/railway/disused.json b/data/presets/presets/railway/disused.json
@@ -13,6 +13,6 @@
     "tags": {
         "railway": "disused"
     },
-    "terms": [],
+    "matchScore": 0.95,
     "name": "Disused Railway"
 }
diff --git a/data/presets/presets/railway/funicular.json b/data/presets/presets/railway/funicular.json
@@ -28,5 +28,5 @@
     "tags": {
         "railway": "funicular"
     },
-    "name": "Funicular"
+    "name": "Funicular Track"
 }
diff --git a/data/presets/presets/railway/light_rail.json b/data/presets/presets/railway/light_rail.json
@@ -27,5 +27,5 @@
         "streetcar",
         "trolley"
     ],
-    "name": "Light Rail"
+    "name": "Light Rail Track"
 }
diff --git a/data/presets/presets/railway/miniature.json b/data/presets/presets/railway/miniature.json
@@ -17,5 +17,5 @@
         "narrow gauge railway",
         "minimum gauge railway"
     ],
-    "name": "Miniature Railway"
+    "name": "Miniature Train Track"
 }
diff --git a/data/presets/presets/railway/monorail.json b/data/presets/presets/railway/monorail.json
@@ -12,6 +12,5 @@
     "tags": {
         "railway": "monorail"
     },
-    "terms": [],
-    "name": "Monorail"
+    "name": "Monorail Track"
 }
diff --git a/data/presets/presets/railway/narrow_gauge.json b/data/presets/presets/railway/narrow_gauge.json
@@ -16,5 +16,5 @@
         "narrow gauge railway",
         "narrow gauge railroad"
     ],
-    "name": "Narrow Gauge Rail"
+    "name": "Narrow Gauge Track"
 }
diff --git a/data/presets/presets/railway/rail.json b/data/presets/presets/railway/rail.json
@@ -14,9 +14,12 @@
         "railway": "rail"
     },
     "terms": [
+        "permanent way",
         "rail line",
         "railroad track",
+        "railway track",
+        "track",
         "train track"
     ],
-    "name": "Rail"
+    "name": "Train Track"
 }
diff --git a/data/presets/presets/railway/rail/highspeed.json b/data/presets/presets/railway/rail/highspeed.json
@@ -17,5 +17,5 @@
         "highspeed rail",
         "HSR"
     ],
-    "name": "High-Speed Rail"
+    "name": "High-Speed Train Track"
 }
diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json
@@ -14,7 +14,8 @@
     },
     "terms": [
         "metro",
-        "transit"
+        "transit",
+        "underground railway"
     ],
-    "name": "Subway"
+    "name": "Subway Track"
 }
diff --git a/data/presets/presets/railway/tram.json b/data/presets/presets/railway/tram.json
@@ -13,10 +13,11 @@
         "railway": "tram"
     },
     "terms": [
+        "electric street railway",
         "light rail",
         "streetcar",
-        "tram",
+        "tramway",
         "trolley"
     ],
-    "name": "Tram"
+    "name": "Tram Track"
 }