From debcbed39134b5da971a06ec53579842f72f3ea4 Mon Sep 17 00:00:00 2001
From: Lukas Hamm <lukas@ideallygrey.uk>
Date: Tue, 26 Nov 2024 16:40:50 -0500
Subject: [PATCH] [styles] Regenerated

Signed-off-by: Lukas Hamm <lukas@ideallygrey.uk>
---
 data/classificator.txt               |   8 +-
 data/drules_proto.bin                | Bin 425136 -> 424604 bytes
 data/drules_proto.txt                | 496 ++++++++++-----------------
 data/drules_proto_default_dark.bin   | Bin 409577 -> 409573 bytes
 data/drules_proto_default_dark.txt   | 282 +++++++--------
 data/drules_proto_default_light.bin  | Bin 410935 -> 410931 bytes
 data/drules_proto_default_light.txt  | 282 +++++++--------
 data/drules_proto_outdoors_dark.bin  | Bin 426490 -> 426081 bytes
 data/drules_proto_outdoors_dark.txt  | 469 ++++++++++---------------
 data/drules_proto_outdoors_light.bin | Bin 427959 -> 427550 bytes
 data/drules_proto_outdoors_light.txt | 469 ++++++++++---------------
 data/drules_proto_vehicle_dark.bin   | Bin 275501 -> 275497 bytes
 data/drules_proto_vehicle_dark.txt   | 256 +++++++-------
 data/drules_proto_vehicle_light.bin  | Bin 275291 -> 275287 bytes
 data/drules_proto_vehicle_light.txt  | 256 +++++++-------
 data/patterns.txt                    |   6 +-
 data/types.txt                       |   4 +-
 data/visibility.txt                  |   8 +-
 18 files changed, 1079 insertions(+), 1457 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index 72d3f78eee..3263de0589 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -889,13 +889,13 @@ world  +
         platform  -
         {}
     railway  +
-        abandoned  +
+        abandoned  -
+        construction  -
+        crossing  -
+        disused  +
             bridge  -
             tunnel  -
             {}
-        construction  -
-        crossing  -
-        disused  -
         funicular  +
             bridge  -
             tunnel  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 50d6114c662ca1f83f80f85bd34f2f471a2ae844..8aadbe047868cc10ba8daa361fdd52622c1febbf 100644
GIT binary patch
delta 135
zcmdn+Q*zE%$%Yoj7N#xC+<n_4rZPt{Zr?wdxt@{fE#q{Dsmvmb0@FA4Giy%gpUk{L
z>H;&DSW#kTPI+RbZc1ixX>n?bZc<TZN_y({&I!yr8Rfn(Vk#&p&C5&85z^v7GO2yj
PG-e=X*}iES>%XS}M>{ic

delta 254
zcmbR9RdT~m$%Yoj7N#xC+<nu(OlH<#<eUC+GP5=#KbV?+WHR$Dg<Gs#5=DubIpv9!
zx`|1Nc`5mMsVTZiMVTq-sX}2Kywm^YGD=PlaAahgexaUGVETe(U~{mE@?%rG{o_RD
zZHx-Pn6Oz>Qks{Snj@qIv<B=jO!sY1?PsoM6#vM?#Se33N@j6sacT-!S3)1N_IBew
VW+TS-c~h8ym}UFCDXjmV0swZbT`>Rv

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 0e6cc82f4f..6edce24a28 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -73176,11 +73176,11 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.6
+      width: 1.0
       color: 1301714310
       dashdot {
-        dd: 6.3
-        dd: 6.3
+        dd: 1.8
+        dd: 5.4
       }
       priority: 160
     }
@@ -73188,11 +73188,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.6
+      width: 1.0
       color: 1301714310
       dashdot {
-        dd: 6.3
-        dd: 6.3
+        dd: 1.8
+        dd: 5.4
       }
       priority: 160
     }
@@ -73200,15 +73200,180 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.6
+      width: 1.0
       color: 1301714310
       dashdot {
-        dd: 6.3
-        dd: 6.3
+        dd: 1.8
+        dd: 5.4
       }
       priority: 160
     }
   }
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+}
+cont {
+  name: "railway-construction"
+  element {
+    scale: 13
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+}
+cont {
+  name: "railway-disused"
   element {
     scale: 16
     lines {
@@ -73271,79 +73436,7 @@ cont {
   }
 }
 cont {
-  name: "railway-abandoned-bridge"
-  element {
-    scale: 13
-    lines {
-      width: 7.6
-      color: 1300267136
-      priority: 140
-      cap: BUTTCAP
-    }
-    lines {
-      width: 6.4
-      color: 871230427
-      priority: 150
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.6
-      color: 1301714310
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 7.6
-      color: 1300267136
-      priority: 140
-      cap: BUTTCAP
-    }
-    lines {
-      width: 6.4
-      color: 871230427
-      priority: 150
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.6
-      color: 1301714310
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 7.6
-      color: 1300267136
-      priority: 140
-      cap: BUTTCAP
-    }
-    lines {
-      width: 6.4
-      color: 871230427
-      priority: 150
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.6
-      color: 1301714310
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-    }
-  }
+  name: "railway-disused-bridge"
   element {
     scale: 16
     lines {
@@ -73466,43 +73559,7 @@ cont {
   }
 }
 cont {
-  name: "railway-abandoned-tunnel"
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 1301714310
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 1301714310
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.6
-      color: 1301714310
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-    }
-  }
+  name: "railway-disused-tunnel"
   element {
     scale: 16
     lines {
@@ -73564,207 +73621,6 @@ cont {
     }
   }
 }
-cont {
-  name: "railway-construction"
-  element {
-    scale: 13
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-}
-cont {
-  name: "railway-disused"
-  element {
-    scale: 13
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-}
 cont {
   name: "railway-funicular"
   element {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 3fb2ec4eb4b7a1bda895ade5ddd9f47a8c26a993..a0e316cc2707194c1fec48bb32379c809f7d95f6 100644
GIT binary patch
delta 92
zcmaF)U*hS1iG~)&7N#xC!lBbyBAKsk-yXqi%Q#&)l=+(A1!gX>qQuOc^2AErl+5DN
j;_ZJznGZ1veqlrtpMEi%`C0p^C}tpL*?uaDRsJaen7<^@

delta 96
zcmaF*U*hF|iG~)&7N#xC!lBdE!kMoLUt;ExC`!!CDNn4_O-xG6OUcjM&Ktpeh*9_(
lBZkcM2a(Lrw!aKzwq=}d7RG$7{a6$;5VLGQ7R4(66aW?DCB6Uv

diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index 67524425e2..196650f843 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -69179,6 +69179,145 @@ cont {
 }
 cont {
   name: "railway-abandoned"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 1296316234
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 1296316234
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 1296316234
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 1296316234
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.0
+      color: 1296316234
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+}
+cont {
+  name: "railway-construction"
+  element {
+    scale: 15
+    lines {
+      width: 1.0
+      color: 1296316234
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 1296316234
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 1296316234
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 1296316234
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 1296316234
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.0
+      color: 1296316234
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+}
+cont {
+  name: "railway-disused"
   element {
     scale: 16
     lines {
@@ -69241,7 +69380,7 @@ cont {
   }
 }
 cont {
-  name: "railway-abandoned-bridge"
+  name: "railway-disused-bridge"
   element {
     scale: 16
     lines {
@@ -69364,7 +69503,7 @@ cont {
   }
 }
 cont {
-  name: "railway-abandoned-tunnel"
+  name: "railway-disused-tunnel"
   element {
     scale: 16
     lines {
@@ -69426,145 +69565,6 @@ cont {
     }
   }
 }
-cont {
-  name: "railway-construction"
-  element {
-    scale: 15
-    lines {
-      width: 1.0
-      color: 1296316234
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 1296316234
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 1296316234
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 1296316234
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 1296316234
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.0
-      color: 1296316234
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-}
-cont {
-  name: "railway-disused"
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 1296316234
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 1296316234
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 1296316234
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 1296316234
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.0
-      color: 1296316234
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-}
 cont {
   name: "railway-funicular"
   element {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index e4bfe3a6699751cef649acc43659e12c5bbd8cb0..884339eedc5d419a348e8af38c7fe398346d62c5 100644
GIT binary patch
delta 102
zcmdnqCAqmvvY~~sg=q_OcI5OevCJCNTVk2lZRd|=wq=}tI1<QTp2xgS@B%ZJSW#kT
rPI+RbZc1ixY4P@uDCR?qf?pWX#HVY<Fh6Toif0C5mhDRMtfJ2VgUlqC

delta 110
zcmdnoCAqyzvY~~sg=q_OcI0%AIOc0ImzcREiV`z($`dPf6O$72Qu6asQ*@JxGE>r1
zw{Og6-pMHZjS)l1bc;CVXWJd4m~9!SAC6?!n7%EFd0o3)JTnlpY?q5?6@3N(;3Fs(

diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index 638090a6c7..e323f704d7 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -68964,6 +68964,145 @@ cont {
 }
 cont {
   name: "railway-abandoned"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+}
+cont {
+  name: "railway-construction"
+  element {
+    scale: 15
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.0
+      color: 1301714310
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 160
+    }
+  }
+}
+cont {
+  name: "railway-disused"
   element {
     scale: 16
     lines {
@@ -69026,7 +69165,7 @@ cont {
   }
 }
 cont {
-  name: "railway-abandoned-bridge"
+  name: "railway-disused-bridge"
   element {
     scale: 16
     lines {
@@ -69149,7 +69288,7 @@ cont {
   }
 }
 cont {
-  name: "railway-abandoned-tunnel"
+  name: "railway-disused-tunnel"
   element {
     scale: 16
     lines {
@@ -69211,145 +69350,6 @@ cont {
     }
   }
 }
-cont {
-  name: "railway-construction"
-  element {
-    scale: 15
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-}
-cont {
-  name: "railway-disused"
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.0
-      color: 1301714310
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 160
-    }
-  }
-}
 cont {
   name: "railway-funicular"
   element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index de9a456cc105232f9da867d4031649ac3648cf46..c5d02f1ed61a260c9ffe8a4983f9e7a3f3d2cc78 100644
GIT binary patch
delta 181
zcmey>EcLKKs-cCkg=q`(l=kUO{md#H7K}pL9DG9R(;NGlRUtfnC~x}NKIU87_w_KB
zGm5`p<l-+%%*-iItkg}(EG{ihO%c-M5SV^(KC{;Js`<>Tq)sz)iJ_^`O)APvNl)G0
j-^sj%QSLn>rh<~vyu8#LRFm45_cH@A%l75{tihiEyY)c3

delta 117
zcmaFZAoZ(Rs-cCkg=q`(l=kh$bD1L;g|D!1Nfae!=9DK^>Lw;7=B4E4O`kW9Ic0kO
zLT26VuJf7qGqOX)w{tIK&S2dBrh~bhQTRO*7e7p2N@j6sacatTmQLn)#&*6wW*}zS
K&ez8p{0RUgbSm5c

diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 1220f8ce08..9258c40882 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -73495,11 +73495,11 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.6
+      width: 1.7
       color: 4470602
       dashdot {
-        dd: 6.3
-        dd: 6.3
+        dd: 2.5
+        dd: 7.0
       }
       priority: 160
       cap: BUTTCAP
@@ -73508,11 +73508,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.6
+      width: 1.7
       color: 4470602
       dashdot {
-        dd: 6.3
-        dd: 6.3
+        dd: 2.5
+        dd: 7.0
       }
       priority: 160
       cap: BUTTCAP
@@ -73521,16 +73521,181 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.6
+      width: 1.7
       color: 4470602
       dashdot {
-        dd: 6.3
-        dd: 6.3
+        dd: 2.5
+        dd: 7.0
       }
       priority: 160
       cap: BUTTCAP
     }
   }
+  element {
+    scale: 16
+    lines {
+      width: 1.7
+      color: 4470602
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.7
+      color: 4470602
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.7
+      color: 4470602
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.7
+      color: 4470602
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.7
+      color: 4470602
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+}
+cont {
+  name: "railway-construction"
+  element {
+    scale: 13
+    lines {
+      width: 1.0
+      color: 4470602
+      dashdot {
+        dd: 1.8
+        dd: 5.5
+      }
+      priority: 160
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.0
+      color: 4470602
+      dashdot {
+        dd: 1.8
+        dd: 5.5
+      }
+      priority: 160
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.0
+      color: 4470602
+      dashdot {
+        dd: 1.8
+        dd: 5.5
+      }
+      priority: 160
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.7
+      color: 4470602
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.7
+      color: 4470602
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.7
+      color: 4470602
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.7
+      color: 4470602
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.7
+      color: 4470602
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+}
+cont {
+  name: "railway-disused"
   element {
     scale: 16
     lines {
@@ -73593,46 +73758,7 @@ cont {
   }
 }
 cont {
-  name: "railway-abandoned-bridge"
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 4470602
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 4470602
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.6
-      color: 4470602
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
+  name: "railway-disused-bridge"
   element {
     scale: 16
     lines {
@@ -73755,46 +73881,7 @@ cont {
   }
 }
 cont {
-  name: "railway-abandoned-tunnel"
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 4470602
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 4470602
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.6
-      color: 4470602
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
+  name: "railway-disused-tunnel"
   element {
     scale: 16
     lines {
@@ -73856,210 +73943,6 @@ cont {
     }
   }
 }
-cont {
-  name: "railway-construction"
-  element {
-    scale: 13
-    lines {
-      width: 1.0
-      color: 4470602
-      dashdot {
-        dd: 1.8
-        dd: 5.5
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 4470602
-      dashdot {
-        dd: 1.8
-        dd: 5.5
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.0
-      color: 4470602
-      dashdot {
-        dd: 1.8
-        dd: 5.5
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.7
-      color: 4470602
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.7
-      color: 4470602
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.7
-      color: 4470602
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.7
-      color: 4470602
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.7
-      color: 4470602
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-}
-cont {
-  name: "railway-disused"
-  element {
-    scale: 13
-    lines {
-      width: 1.0
-      color: 4470602
-      dashdot {
-        dd: 1.8
-        dd: 5.5
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 4470602
-      dashdot {
-        dd: 1.8
-        dd: 5.5
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.0
-      color: 4470602
-      dashdot {
-        dd: 1.8
-        dd: 5.5
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.7
-      color: 4470602
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.7
-      color: 4470602
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.7
-      color: 4470602
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.7
-      color: 4470602
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.7
-      color: 4470602
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-}
 cont {
   name: "railway-funicular"
   element {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 4d2a9e9c4d45f6fd6c9eb40868f24c904276c398..06bf47c49de2b6db6a7790ba960f0a80737cba82 100644
GIT binary patch
delta 181
zcmdnqFEy`6s-cCkg=q`(kM8LcCNryWSTG7{bMOhNPw$`1tP0`rLwVB;Co|vLt~8Ok
zoKgG*BNu;BVrEWxVx?|MW^rk8YKo91hrslU%bB&NUs%q(O6oK-ml&D~-K3(-l=Rf?
k-b<OcFv`7W#8gmHnwOWFgKAPc_Y`IzX4%d?g>}tm08KVN_5c6?

delta 122
zcmbQ&BelI>s-cCkg=q`(kM8M@molqw->{U~kWu&w3ztMuVrEWxVx?|kQes|8e%^GR
z#mp(w?=EH5-M)D-^L|ElsQC8ErOX+O+XH%;%Nd2=GjZ|5^rd7Lmlmg{Y|rRrj%REy
Qn#2smEZd7Fv99?H0Cs~fsQ>@~

diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 0b6fe151cf..ba2d463c62 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -73280,11 +73280,11 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.6
+      width: 1.7
       color: 8487025
       dashdot {
-        dd: 6.3
-        dd: 6.3
+        dd: 2.5
+        dd: 7.0
       }
       priority: 160
       cap: BUTTCAP
@@ -73293,11 +73293,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.6
+      width: 1.7
       color: 8487025
       dashdot {
-        dd: 6.3
-        dd: 6.3
+        dd: 2.5
+        dd: 7.0
       }
       priority: 160
       cap: BUTTCAP
@@ -73306,16 +73306,181 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.6
+      width: 1.7
       color: 8487025
       dashdot {
-        dd: 6.3
-        dd: 6.3
+        dd: 2.5
+        dd: 7.0
       }
       priority: 160
       cap: BUTTCAP
     }
   }
+  element {
+    scale: 16
+    lines {
+      width: 1.7
+      color: 8487025
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.7
+      color: 8487025
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.7
+      color: 8487025
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.7
+      color: 8487025
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.7
+      color: 8487025
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+}
+cont {
+  name: "railway-construction"
+  element {
+    scale: 13
+    lines {
+      width: 1.0
+      color: 8487025
+      dashdot {
+        dd: 1.8
+        dd: 5.5
+      }
+      priority: 160
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.0
+      color: 8487025
+      dashdot {
+        dd: 1.8
+        dd: 5.5
+      }
+      priority: 160
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.0
+      color: 8487025
+      dashdot {
+        dd: 1.8
+        dd: 5.5
+      }
+      priority: 160
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.7
+      color: 8487025
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.7
+      color: 8487025
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.7
+      color: 8487025
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.7
+      color: 8487025
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.7
+      color: 8487025
+      dashdot {
+        dd: 2.5
+        dd: 7.0
+      }
+      priority: 160
+    }
+  }
+}
+cont {
+  name: "railway-disused"
   element {
     scale: 16
     lines {
@@ -73378,46 +73543,7 @@ cont {
   }
 }
 cont {
-  name: "railway-abandoned-bridge"
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 8487025
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 8487025
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.6
-      color: 8487025
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
+  name: "railway-disused-bridge"
   element {
     scale: 16
     lines {
@@ -73540,46 +73666,7 @@ cont {
   }
 }
 cont {
-  name: "railway-abandoned-tunnel"
-  element {
-    scale: 13
-    lines {
-      width: 1.6
-      color: 8487025
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 8487025
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.6
-      color: 8487025
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
+  name: "railway-disused-tunnel"
   element {
     scale: 16
     lines {
@@ -73641,210 +73728,6 @@ cont {
     }
   }
 }
-cont {
-  name: "railway-construction"
-  element {
-    scale: 13
-    lines {
-      width: 1.0
-      color: 8487025
-      dashdot {
-        dd: 1.8
-        dd: 5.5
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 8487025
-      dashdot {
-        dd: 1.8
-        dd: 5.5
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.0
-      color: 8487025
-      dashdot {
-        dd: 1.8
-        dd: 5.5
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.7
-      color: 8487025
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.7
-      color: 8487025
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.7
-      color: 8487025
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.7
-      color: 8487025
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.7
-      color: 8487025
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-}
-cont {
-  name: "railway-disused"
-  element {
-    scale: 13
-    lines {
-      width: 1.0
-      color: 8487025
-      dashdot {
-        dd: 1.8
-        dd: 5.5
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 8487025
-      dashdot {
-        dd: 1.8
-        dd: 5.5
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.0
-      color: 8487025
-      dashdot {
-        dd: 1.8
-        dd: 5.5
-      }
-      priority: 160
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.7
-      color: 8487025
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.7
-      color: 8487025
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.7
-      color: 8487025
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.7
-      color: 8487025
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.7
-      color: 8487025
-      dashdot {
-        dd: 2.5
-        dd: 7.0
-      }
-      priority: 160
-    }
-  }
-}
 cont {
   name: "railway-funicular"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 52f57b6cf15cc676d870d3c04d912ebd7a366ae6..4cb093850580fda1ebda8d5940f26606c4db8f9a 100644
GIT binary patch
delta 90
zcmZ4cLSW?!frb{wEll>J)2~V}UEID+f{BZ9`crYHi-K#Jxx|VRGjqxlD|J&ci%W~Q
huT*22&nWnw5lwu0v<B0|_K8wVK+L>-q7=&<NdOT?AnX7D

delta 99
zcmZ4aLSXF+frb{wEll>J)1}0jE()(_=8`B%%*-iItkg|RO3X{i&)fb-oM}Fz@JB`r
ondxgJnI3Kz5M$zEoPI!*Nqu^nDATI;UMVIZX5QW_#WF_{0R7Y=Q2+n{

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index f1b465e21f..2a4baa8a0e 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -42875,6 +42875,132 @@ cont {
 }
 cont {
   name: "railway-abandoned"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 1715089216
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 1715089216
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 1715089216
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 1715089216
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.0
+      color: 1715089216
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+}
+cont {
+  name: "railway-construction"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 1715089216
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 1715089216
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 1715089216
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 1715089216
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.0
+      color: 1715089216
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+}
+cont {
+  name: "railway-disused"
   element {
     scale: 16
     lines {
@@ -42937,7 +43063,7 @@ cont {
   }
 }
 cont {
-  name: "railway-abandoned-bridge"
+  name: "railway-disused-bridge"
   element {
     scale: 16
     lines {
@@ -43060,7 +43186,7 @@ cont {
   }
 }
 cont {
-  name: "railway-abandoned-tunnel"
+  name: "railway-disused-tunnel"
   element {
     scale: 16
     lines {
@@ -43122,132 +43248,6 @@ cont {
     }
   }
 }
-cont {
-  name: "railway-construction"
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 1715089216
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 1715089216
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 1715089216
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 1715089216
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.0
-      color: 1715089216
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-}
-cont {
-  name: "railway-disused"
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 1715089216
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 1715089216
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 1715089216
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 1715089216
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.0
-      color: 1715089216
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-}
 cont {
   name: "railway-halt"
   element {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index c067235fd09df2acbac47b590dd82987b0465687..fa4c5ea08aed1d1a5fac0f29dbbb9952760ba8b3 100644
GIT binary patch
delta 100
zcmccpOyK%6frb{wEldl9rymq&QlFkK&a`T~qBs*5<MbtJOe)h8RG8KZZfE8aD@x4F
rDNn4_P01`SE#9u6%CwSE@I51%_;d#`ribl+B$$AhdHWv;mUt-u11Td`

delta 96
zcmccqOyKr2frb{wEldl9r(38n-DOWqO3X{i&)Xg=#<Y@A<|8AQL{Va9PI+RbE>tEp
vMYp6hFE2G`x}gfwjqQaZOk9l96-AiTrymz)TGjqTf(eM3xBrk}iI)NZ<G&)@

diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt
index 07ace761b8..523d8533c0 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -42335,6 +42335,132 @@ cont {
 }
 cont {
   name: "railway-abandoned"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 1720486784
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 1720486784
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 1720486784
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 1720486784
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.0
+      color: 1720486784
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+}
+cont {
+  name: "railway-construction"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 1720486784
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 1720486784
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 1720486784
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 1720486784
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.0
+      color: 1720486784
+      dashdot {
+        dd: 1.8
+        dd: 5.4
+      }
+      priority: 120
+    }
+  }
+}
+cont {
+  name: "railway-disused"
   element {
     scale: 16
     lines {
@@ -42397,7 +42523,7 @@ cont {
   }
 }
 cont {
-  name: "railway-abandoned-bridge"
+  name: "railway-disused-bridge"
   element {
     scale: 16
     lines {
@@ -42520,7 +42646,7 @@ cont {
   }
 }
 cont {
-  name: "railway-abandoned-tunnel"
+  name: "railway-disused-tunnel"
   element {
     scale: 16
     lines {
@@ -42582,132 +42708,6 @@ cont {
     }
   }
 }
-cont {
-  name: "railway-construction"
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 1720486784
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 1720486784
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 1720486784
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 1720486784
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.0
-      color: 1720486784
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-}
-cont {
-  name: "railway-disused"
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 1720486784
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 1720486784
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 1720486784
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 1720486784
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 1.0
-      color: 1720486784
-      dashdot {
-        dd: 1.8
-        dd: 5.4
-      }
-      priority: 120
-    }
-  }
-}
 cont {
   name: "railway-halt"
   element {
diff --git a/data/patterns.txt b/data/patterns.txt
index 83ab80f6ec..2013209cf5 100644
--- a/data/patterns.txt
+++ b/data/patterns.txt
@@ -71,8 +71,8 @@
 4.0 6.0 8.0 1.5
 5.0 7.0 10.0 1.9
 1.0 80.0
-6.3 6.3
 1.8 5.4
+6.3 6.3
 4.5 4.5
 8.1 8.1
 10.0 10.0
@@ -97,9 +97,9 @@
 12.0 4.0
 6.0 8.5 12.0 2.3
 1.0 50.0
-8.0 8.0
-1.8 5.5
 2.5 7.0
+1.8 5.5
+8.0 8.0
 5.2 5.2
 3.5 3.5
 10.1 10.1
diff --git a/data/types.txt b/data/types.txt
index 79a722cf4e..208130db8b 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -295,7 +295,7 @@ mapswithme
 mapswithme
 *waterway|weir
 *highway|secondary|tunnel
-*railway|abandoned|bridge
+*railway|disused|bridge
 *man_made|lighthouse
 highway|path|difficult
 *man_made|storage_tank
@@ -397,7 +397,7 @@ highway|path|expert
 *highway|secondary_link|bridge
 *railway|tram|tunnel
 *railway|rail|tourism
-*railway|abandoned|tunnel
+*railway|disused|tunnel
 *area:highway|living_street
 *piste:type|sled
 *leisure|beach_resort
diff --git a/data/visibility.txt b/data/visibility.txt
index 41623e448a..ae746523e9 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -889,13 +889,13 @@ world  000000000000000000000  +
         platform  000000000000000000000  -
         {}
     railway  000000000000000000000  +
-        abandoned  000000000000000011111  +
+        abandoned  000000000000000011111  -
+        construction  000000000000000011111  -
+        crossing  000000000000000000000  -
+        disused  000000000000000011111  +
             bridge  000000000000000011111  -
             tunnel  000000000000000011111  -
             {}
-        construction  000000000000000011111  -
-        crossing  000000000000000000000  -
-        disused  000000000000000011111  -
         funicular  000000000000000000000  +
             bridge  000000000000000000000  -
             tunnel  000000000000000000000  -