Merge remote-tracking branch 'origin/master'

railway-infrastructure.yaml

@@ -24,12 +24,27 @@ query:
   14: (way[railway];node[railway~'^(station|halt|tram_stop)$'];)
   17: (node[railway];way[railway];)
 feature:
+  pre: |-
+    {% set width = 2 %}
+    {% if tags.service == 'yard' or tags.service == 'siding' or tags.service == 'spur' or tags.service == 'crossover' %}
+      {% set width = 1 %}
+    {% elseif tags.railway in ['rail', 'narrow_gauge', 'abandoned', 'disused', 'razed'] %}
+      {% if tags.usage in ['main', 'branch'] %}
+        {% set width = 3 %}
+      {% else %}
+        {% set width = 2 %}
+      {% endif %}
+    {% elseif tags.railway in ['signal', 'switch', 'railway_crossing'] %}
+      {% set width = 0 %}
+    {% endif %}
   title: |-
     {% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}
     {{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator')) }}
 
     {% if attribute(tags, 'tunnel:name') %}- {{ localizedTag(tags, 'tunnel:name') }}{% endif %}
     {% if attribute(tags, 'bridge:name') %}- {{ localizedTag(tags, 'bridge:name') }}{% endif %}
+  details: |-
+    {{ width }}
   description: |-
     {{ tagTrans('railway', tags.railway) -}}
     {%- if tags.usage %}
@@ -43,8 +58,14 @@ feature:
     {% if tags.usage %}{{ keyTrans('railway=rail usage') }}: {{ tagTrans('railway=rail usage', tags.usage)|default(trans('unknown')) }}<br/>{% endif %}
     {% if tags.service %}{{ keyTrans('railway=rail service') }}: {{ tagTrans('railway=rail service', tags.service ) }}<br/>{% endif %}
     {{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown')) }}<br/>
-    {% if tags.electrified == 'no' %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', 'no') }}{% elseif tags.electrified %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', tags.electrified) }}, {{ keyTrans('voltage') }}: {{ tags.voltage|default(trans('unknown')) }}, {{ keyTrans('frequency') }}: {{ tags.frequency|default(trans('unknown')) }}<br/>{% endif %}
-  markerSign: '{% if tags.railway in [ ''halt'', ''tram_stop'', ''station'', ''stop'', ''subway_entrance'' ] %}X{% endif %}'
+    {% if tags.electrified == 'no' %}
+      {{ keyTrans('electrified') }}: {{ tagTrans('electrified', 'no') }}
+    {% elseif tags.electrified %}
+      {{ keyTrans('electrified') }}: {{ tagTrans('electrified', tags.electrified) }}, {{ keyTrans('voltage') }}: {{ tags.voltage|default(trans('unknown')) }}, {{ keyTrans('frequency') }}: {{ tags.frequency|default(trans('unknown')) }}
+    {% endif %}<br/>
+  markerSign: |-
+    {% if tags.railway in [ 'halt', 'tram_stop', 'station', 'stop', 'subway_entrance' ] %}X
+    {% endif %}
   markerSymbol: |-
     {% if tags.railway == 'signal' %}
     <svg anchorX='5' anchorY='8' width='9' height='15'>
@@ -64,7 +85,7 @@ feature:
       <line x1='2' x2='7' y1='2' y2='13' style='stroke-width: 2; stroke: #000000; stroke-linecap: round;'/>
       <line x1='7' x2='2' y1='2' y2='13' style='stroke-width: 2; stroke: #000000; stroke-linecap: round;'/>
     </svg>
-    {% elseif tags.railway not in [ 'rail', 'tram', 'subway', 'narrow_gauge', 'abandoned', 'disused' ] %}
+    {% elseif tags.railway not in [ 'rail', 'tram', 'subway', 'narrow_gauge', 'abandoned', 'disused', 'razed' ] %}
     {{ markerPointer({})|raw }}
     {% endif %}
   listMarkerSymbol: |-
@@ -82,28 +103,13 @@ feature:
   styles: |-
     {% if tags.bridge and tags.bridge != 'no' %}casing_bridge,{% endif %}
     {% if const.color[tags.railway] %}casing,casing_layer,{% endif %}
+    {% if tags.railway in ['abandoned', 'disused', 'razed'] %}disused,{% endif %}
     {% if tags.railway == 'narrow_gauge' %}default,narrow
     {% else %}default
     {% endif %}
   style:
     width: |-
-      {% if tags.service == 'yard' or tags.service == 'siding' or tags.service == 'spur' or tags.service == 'crossover' %}
-      1
-      {% else %}
-        {% if tags.railway == 'rail' %}
-          {% if tags.usage == 'main' or tags.usage == 'branch' %}
-          3
-          {% else %}
-          2
-          {% endif %}
-        {% elseif tags.railway == 'platform' %}
-        1
-        {% elseif tags.railway in [ 'signal', 'switch', 'railway_crossing' ] %}
-        0
-        {% else %}
-        2
-        {% endif %}
-      {% endif %}
+      {{ width }}
     zIndex: |-
       {{ tags.layer|default(0) + 10 }}
     color: |-
@@ -114,8 +120,12 @@ feature:
       {% else %}
         {{ color }}
       {% endif %}
-    opacity: '1'
-    dashArray: '{% if tags.railway == ''rail'' %}{% elseif tags.railway == ''disused'' %}1,5{% elseif tags.railway == ''abandoned'' %}1,7{% endif %}'
+    opacity: 1
+    dashArray: |-
+      {% if tags.railway == 'disused' %}1,5
+      {% elseif tags.railway == 'abandoned' %}1,7
+      {% elseif tags.railway == 'razed' %}1,9
+      {% endif %}
     fill: |-
       {% if tags.railway == 'platform' %}
       1
@@ -135,42 +145,28 @@ feature:
       {% elseif type == 'node' %}
       0
       {% endif %}
+
+  style:disused:
+    width: |-
+      {{ width }}
+    zIndex: |-
+      {{ tags.layer|default(0) + 9.995 }}
+    color: white
+    opacity: 1
+    fill: false
+
   style:casing:
     color: '#ffffff'
     pane: casing
     width: |-
-      {% if tags.service == 'yard' or tags.service == 'siding' or tags.service == 'spur' or tags.service == 'crossover' %}
-      2
-      {% else %}
-        {% if tags.railway == 'rail' %}
-          {% if tags.usage == 'main' or tags.usage == 'branch' %}
-          5
-          {% else %}
-          4
-          {% endif %}
-        {% else %}
-        3
-        {% endif %}
-      {% endif %}
+      {{ width + 2 }}
 
   style:casing_layer:
     color: '#ffffff'
     zIndex: |-
       {{ tags.layer|default(0) + 9.99 }}
     width: |-
-      {% if tags.service == 'yard' or tags.service == 'siding' or tags.service == 'spur' or tags.service == 'crossover' %}
-      2
-      {% else %}
-        {% if tags.railway == 'rail' %}
-          {% if tags.usage == 'main' or tags.usage == 'branch' %}
-          5
-          {% else %}
-          4
-          {% endif %}
-        {% else %}
-        3
-        {% endif %}
-      {% endif %}
+      {{ width + 2 }}
     lineCap: butt
 
   style:casing_bridge:
@@ -178,24 +174,24 @@ feature:
     zIndex: |-
       {{ tags.layer|default(0) + 9.98 }}
     width: |-
-      {% if tags.service == 'yard' or tags.service == 'siding' or tags.service == 'spur' or tags.service == 'crossover' %}
-      4
-      {% else %}
-        {% if tags.railway == 'rail' %}
-          {% if tags.usage == 'main' or tags.usage == 'branch' %}
-          7
-          {% else %}
-          6
-          {% endif %}
-        {% else %}
-        5
-        {% endif %}
-      {% endif %}
+      {{ width + 4 }}
     lineCap: butt
 
   style:narrow:
-    width: '{% if tags.service == ''yard'' or tags.service == ''siding'' or tags.service == ''spur'' or tags.service == ''crossover'' %}5{% else %}{% if tags.railway == ''rail'' %}{% if tags.usage == ''main'' or tags.usage == ''branch'' %}7{% else %}6{% endif %}{% elseif tags.railway == ''platform'' %}5{% else %}6{% endif %}{% endif %}'
-    color: '{% if tags.railway == ''rail'' or tags.railway == ''narrow_gauge'' or tags.railway == ''disused'' %}{% if tags.usage == ''main'' %}#ff8100{% elseif tags.usage == ''branch'' %}#daca00{% else %}#000000{% endif %}{% elseif tags.railway == ''subway'' %}#0000ff{% elseif tags.railway == ''tram'' %}#ff00ff{% elseif tags.railway == ''light_rail'' %}#00BD14{% elseif tags.railway == ''platform'' %}#3f3f3f{% else %}#000000{% endif %}'
+    width: |-
+      {{ width + 2 }}
+    color: |-
+      {% if tags.railway == 'rail' or tags.railway == 'narrow_gauge' or tags.railway == 'disused' %}
+        {% if tags.usage == 'main' %}#ff8100
+        {% elseif tags.usage == 'branch' %}#daca00
+        {% else %}#000000
+        {% endif %}
+      {% elseif tags.railway == 'subway' %}#0000ff
+      {% elseif tags.railway == 'tram' %}#ff00ff
+      {% elseif tags.railway == 'light_rail' %}#00BD14
+      {% elseif tags.railway == 'platform' %}#3f3f3f
+      {% else %}#000000
+      {% endif %}
     lineCap: butt
     dashArray: '2,4'
 info: |-