From c416fd2fee980264d17979064cb630990214494a Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Fri, 4 Feb 2022 01:30:29 +0300
Subject: [PATCH] [styles] Regenerate for piers, dams, cutlines

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/colors.txt                     |  12 +
 data/drules_proto.bin               | Bin 210560 -> 210843 bytes
 data/drules_proto.txt               | 334 +++++++++++++++----------
 data/drules_proto_clear.bin         | Bin 211523 -> 211806 bytes
 data/drules_proto_clear.txt         | 326 ++++++++++++++++---------
 data/drules_proto_dark.bin          | Bin 210200 -> 210513 bytes
 data/drules_proto_dark.txt          | 320 +++++++++++++++---------
 data/drules_proto_vehicle_clear.bin | Bin 138720 -> 138874 bytes
 data/drules_proto_vehicle_clear.txt | 365 ++++++++++++++++------------
 data/drules_proto_vehicle_dark.bin  | Bin 138086 -> 138300 bytes
 data/drules_proto_vehicle_dark.txt  | 365 ++++++++++++++++------------
 data/visibility.txt                 |   6 +-
 12 files changed, 1053 insertions(+), 675 deletions(-)

diff --git a/data/colors.txt b/data/colors.txt
index 5182669583..39a2167dce 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -292,9 +292,11 @@
 67108863
 436207616
 437326080
+439563059
 440681540
 442260561
 444234362
+448970931
 451800027
 452984831
 609045837
@@ -329,12 +331,16 @@
 1090519039
 1216522952
 1291845632
+1292174597
 1292964096
+1295201075
 1296319556
 1296845900
 1297438037
 1298359132
 1301911961
+1304608947
+1306780114
 1308576652
 1308604747
 1308622847
@@ -343,6 +349,7 @@
 1545508592
 1548466662
 1711276032
+1712264192
 1712394496
 1713512994
 1714104359
@@ -351,11 +358,13 @@
 1717328977
 1719302778
 1724500155
+1724896680
 1727592696
 1728053247
 1931024665
 1943327690
 2147483648
+2149128473
 2149720610
 2150311975
 2151957572
@@ -363,11 +372,14 @@
 2153149782
 2157549977
 2159483932
+2160576191
 2160707771
 2162506037
 2163800312
 2164214668
 2566914048
+2567507722
+2579945899
 2583691263
 2787649562
 2801593470
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 5e511e2f7c7d224365bcb9ecafb4b5e2ea4694ae..d9d8ca1e45926ffa3684314a270884eb1afc1e0e 100644
GIT binary patch
delta 1639
zcmZp8%QO2u&xT?f#($F&Y(;@&ti8D4zgh)JAr%fmDFKdiPfxQ;{G0sIPMrT=t&kaq
z5Q-R3{Y5)@APJNQkq#o0ZETf+Eb5r0VW&eivt;cxsb&_xgD#cKvV)kT`LFpu1TZQI
zaB)_p7Uk<^Cg<l#V8%qABe5~@!%>}vroV8~rcxM)Oupl+E#3f1b0Qo9ApaL67G-DV
zrRx?;G)$IrnS~;U2%Cn<=Ut}bkxQBU(A6B5e6zmWc6~R-TjfkY?5EcqVw9a;aEQ^I
zkz;zoK1K~jq3IV7G3qf&fGCyeclI%IF)D!AiqkpvGj`Q4W8@OZP0WkWO-xDEO)f3T
z$;?X?lHlMI65(V3gAeusD^~B{#-^}}(}EEw!w;AFfg&TuAs{3K)x+Qb*CQmxAqW@e
zKoJ)LimO2^5kip=hHH?3if=bOz^K4Pn*Z7Z4l`~KILwrpSbv0>i>ExXB(<nKu~IiB
zF;_?#$%8;|Y;Np+$D*)_--1z!lVkV9<!u}ioB4$dk^Bnu5t1SfkRmpq8Y^Bdb`CCq
zBOMc&Bu=$33WWg!K@=JYA`Sx64z{sMF(}k;1ey%@6EF~9MoCG44HDu*gf&PDR)YoM
z21_{z^lyE~0yG%KTwoXi&ArA5^as#fAd?Md?qs`qPJ2wphH?nO%~U`&QxNJPVEBU!
z0vb74zg_~X8NzTgRIr-?G#bea#?9L+Rhi8MGTt$A@xtSzJT<cjCDoxsijX?Cm^jRB
y!H69Gw;LFRRFM)PG@Pd^nlXzAt0JXBNI<=VNq~|eBo#t@3ztA7Lx>l^62buKW%CRG

delta 1392
zcmbRJo~Pk0&xT?f#toAbY(;@&ti8D4hFS$lAr%fmDFKdiPfxQ;Y?%DfPMm*3t&kaq
z5Q-R3{Y5)@APJNQkq#o0ZETf+Eb5r0VW&eivt;cxsb&_xgD#cKvV)kTxuN+#1TZQI
zaB)_p7Uk<^Cg<l#V8%qABe5~@!%>}vroV8~rcxM)Oupl+Ee`gn2!{a3{{@Lf*_nCi
zy2ZehC+9K?MGh%!CZBhijz=zK@<Ug1T=LEOZrk<U7;lwNH`&K1KV4%Vqd6nP^n`tk
z8bGRZAEO?GQki~dA0roptvH=yKVw(@0!A)@+{C>2+{Bbr-Q?1eoXosbA#n~qAz@Ai
z2yhU%bhw{gVHKwZBT#}LyM!o*fRG@D4k1wvLF~dpP+<k29dHYP%7xLDZ#O@{sK7*m
zx7x!FGj0z%%#@i}e~yuhr#!JFwWvI?Qa2?rS4a)X`5){B8XB8e6gKf&Fk10)v2$<<
z9O;<IByp;R5m;Cte1lMjsS4paY^oe#hQU0`z<^B|OclcGa8=t&)tJo$e9kj+@xuL4
ro|;*N)gy<wQ9W|I0h>prCz>;hfJ#GnKtpVUiKDv}CXVhpkhm}a>&T$3

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index a39c0b7d83..01fc0ee389 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -5136,18 +5136,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5155,22 +5155,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5186,11 +5186,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5209,18 +5209,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5228,22 +5228,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5259,11 +5259,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5282,18 +5282,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5301,22 +5301,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5332,11 +5332,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5355,18 +5355,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5374,22 +5374,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5405,11 +5405,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5428,18 +5428,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5447,22 +5447,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5478,11 +5478,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5501,18 +5501,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5520,22 +5520,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5551,11 +5551,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5574,18 +5574,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5593,22 +5593,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5624,11 +5624,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5647,18 +5647,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5666,22 +5666,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5697,11 +5697,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5720,7 +5720,7 @@ cont {
     scale: 15
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5728,7 +5728,7 @@ cont {
     scale: 16
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5778,7 +5778,7 @@ cont {
     scale: 15
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5786,7 +5786,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5836,7 +5836,7 @@ cont {
     scale: 15
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5844,7 +5844,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5894,7 +5894,7 @@ cont {
     scale: 15
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5902,7 +5902,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -37897,7 +37897,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
+      width: 1.5
       color: 14934482
       priority: 1475
       cap: BUTTCAP
@@ -37923,7 +37923,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
+      width: 3.0
       color: 14934482
       priority: 1475
     }
@@ -37935,7 +37935,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 4.5
       color: 14934482
       priority: 1475
     }
@@ -37954,7 +37954,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.0
+      width: 6.0
       color: 14934482
       priority: 1475
     }
@@ -37973,7 +37973,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 8.0
       color: 14934482
       priority: 1475
     }
@@ -38042,8 +38042,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
-      color: 14934482
+      width: 1.0
+      color: 1724896680
       priority: 1194
       cap: BUTTCAP
     }
@@ -38051,8 +38051,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 2.0
-      color: 14934482
+      width: 1.5
+      color: 1724896680
       priority: 1194
       cap: BUTTCAP
     }
@@ -38061,31 +38061,31 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 14934482
+      color: 1724896680
       priority: 1194
     }
   }
   element {
     scale: 17
     lines {
-      width: 2.0
-      color: 14934482
+      width: 3.0
+      color: 1724896680
       priority: 1194
     }
   }
   element {
     scale: 18
     lines {
-      width: 2.0
-      color: 14934482
+      width: 4.5
+      color: 1724896680
       priority: 1194
     }
   }
   element {
     scale: 19
     lines {
-      width: 2.0
-      color: 14934482
+      width: 6.0
+      color: 1724896680
       priority: 1194
     }
   }
@@ -38281,7 +38281,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
+      width: 1.5
       color: 14934482
       priority: 1475
       cap: BUTTCAP
@@ -38307,7 +38307,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
+      width: 3.0
       color: 14934482
       priority: 1475
     }
@@ -38319,7 +38319,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 4.5
       color: 14934482
       priority: 1475
     }
@@ -38338,7 +38338,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.0
+      width: 6.0
       color: 14934482
       priority: 1475
     }
@@ -38357,7 +38357,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 8.0
       color: 14934482
       priority: 1475
     }
@@ -67928,13 +67928,30 @@ cont {
 cont {
   name: "waterway-dam"
   element {
-    scale: 15
+    scale: 14
     lines {
-      width: 1.0
-      color: 8421504
+      width: 1.5
+      color: 1304608947
       priority: 1970
       cap: BUTTCAP
     }
+    area {
+      color: 2160707771
+      priority: 1971
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 1304608947
+      priority: 1970
+      cap: BUTTCAP
+    }
+    area {
+      color: 13224123
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67946,10 +67963,26 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 8421504
+      width: 5.0
+      color: 10592406
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3.0
+      color: 1304608947
       priority: 1970
     }
+    area {
+      color: 13224123
+      border {
+        width: 1.0
+        color: 10592406
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67961,10 +67994,26 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 8421504
+      width: 6.5
+      color: 10197647
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4.5
+      color: 448970931
       priority: 1970
     }
+    area {
+      color: 12763315
+      border {
+        width: 1.0
+        color: 10197647
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67976,10 +68025,26 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 8421504
+      width: 8.0
+      color: 10197647
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 6.0
+      color: 12763315
       priority: 1970
     }
+    area {
+      color: 12763315
+      border {
+        width: 1.0
+        color: 10197647
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67991,10 +68056,26 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 8421504
+      width: 10.0
+      color: 10197647
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 8.0
+      color: 12763315
       priority: 1970
     }
+    area {
+      color: 12763315
+      border {
+        width: 1.0
+        color: 10197647
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -69307,11 +69388,20 @@ cont {
 }
 cont {
   name: "waterway-weir"
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 1304608947
+      priority: 1970
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 15
     lines {
-      width: 1.0
-      color: 8421504
+      width: 2.0
+      color: 1304608947
       priority: 1475
       cap: BUTTCAP
     }
@@ -69326,8 +69416,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 8421504
+      width: 3.0
+      color: 1304608947
       priority: 1475
     }
     path_text {
@@ -69341,8 +69431,8 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 8421504
+      width: 4.5
+      color: 1304608947
       priority: 1475
     }
     path_text {
@@ -69356,8 +69446,8 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 8421504
+      width: 6.0
+      color: 1304608947
       priority: 1475
     }
     path_text {
@@ -69371,8 +69461,8 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 8421504
+      width: 8.0
+      color: 1304608947
       priority: 1475
     }
     path_text {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index aa2d9daa0d58c6b2503e7babc5509748a662bcd8..cc93c4b3bc2814ce49951042ec27da94bff37521 100644
GIT binary patch
delta 1633
zcmX^7h3DQko(<|YjQ=Kov=;@Eg7)Hq|7sN^g;Y2Mr35(6Jw44X@o(}5TXFt>wL)eb
zLMUQD^^Gnfle_J?fh?dJFkg7`dm9xXi+bkWw$-Joc^B-osA}FJdp)X}x5GgjVxIrM
z=Km1Ds3gF}S(RFpubY{ipC^G4LkM+zsOpG~v(=6obhmT1lMYqGt>0OPv0?Ha=UG7V
zy-UjE-7dyp)@(2--@M9o`zlvP`!c2<_S54IFv?C3IKXJm$T8hv52FU7(DaQ581)z>
zK$Ob#J$o3r7!^Ql#py5hFm}~1W8@OZP0WkWO-xDEO)f3T$;?X?lHlMI65(V3gAeus
zD^~B{#-^}}(}EEw!w;AFfg&TuAs{3K)x+Qb*CQmxAqW@eKoJ)LimO2^5kip=hHH?3
zif<R($Ed(Wn*Z7j4l-^xILI_BuKox!7f*R&NorAfVx?|MVy=)fk_Um_*xcCtjzwV;
zzXhWdC&%uI%iB04HuDP^BKZ~QBP2x}AVq9IHCDV_>>OMIM>-}lNt|k76bb_df+#c)
zL>vUB9c*KjVo<2x2s9b)Ctx7JjFOT78zjVs2y2iQtOg6h4VH2c=->K|1!ypexxg?4
zntP2A=ntT|Kqec^+{p$toc5TG4doDmo2h_mrXbWo!0-nd1T=E8VvPh=Glb!0s9-k(
zXf%=;jGMQ2DKNM2XS`$N;)Taad1_`6N~%MN6d`qNF>#pNf)P3VZ#OUssUjspXgE)A
oFkluDRz*sMkbrszlK>?{NGgQ*7A}EEh7d16B(^^=U{2-)05Q4!2LJ#7

delta 1386
zcmccjjpy(eo(<|Yj2k9@v=;@Eg7)Hq8)_9Kg;Y2Mr35(6Jw44Xv0?HCTXFskwL)eb
zLMUQD^^Gnfle_J?fh?dJFkg7`dm9xXi+bkWw$-Joc^B-osA}FJdp)X}x5GgjVxIqo
z=Km1Ds3gF}S(RFpubY{ipC^G4LkM+zsOpG~v(=6obhmT1lMYqGt=}1B-X7;!K=Qpy
z%H-WH#$eWLFe%@>%60oHS4R7?=^}d=<)?G(VKirCnC`HLQ3FV2?qSq}P%6{+>|x}B
zuob7j*u&UWzkrcTAU82DJ~uHXRX4e`BquX3RY;tJPe_=P0RkKZE*<V?S6Ibq!3dP#
z$1WktAs{4(p+iWNLlC>L5L8$JXb0Q^pmJe!<=e&gF)A>T;H`GEgN)nF4l>P(t3Suc
z#Z#VGl3G-rSgD(mm@A})<oplz0u7B#EDD?WEf}qMx!5_l1den}WRf`5!U!xN5WYdE
z!&HUv95z*sFvDP;WnjRj45kX<b-1eSZHmk-{66Oyxp?9JC{N8S!s?O3+^8P8-GI#_
h(+?Oji-1Z%ctAsJgNdWN6()}EI<WZm--gV|oB(mrsy6@t

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index ba2b8da369..a5bda8c739 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -5102,18 +5102,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5121,22 +5121,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5152,11 +5152,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5175,18 +5175,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5194,22 +5194,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5225,11 +5225,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5248,18 +5248,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5267,22 +5267,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5298,11 +5298,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5321,18 +5321,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5340,22 +5340,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5371,11 +5371,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5394,18 +5394,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5413,22 +5413,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5444,11 +5444,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5467,18 +5467,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5486,22 +5486,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5517,11 +5517,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5540,18 +5540,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5559,22 +5559,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5590,11 +5590,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5613,18 +5613,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5632,22 +5632,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5663,11 +5663,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5686,7 +5686,7 @@ cont {
     scale: 16
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5736,7 +5736,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5786,7 +5786,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5836,7 +5836,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -37703,7 +37703,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
+      width: 1.5
       color: 14934482
       priority: 1475
       cap: BUTTCAP
@@ -37729,7 +37729,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
+      width: 3.0
       color: 14934482
       priority: 1475
     }
@@ -37741,7 +37741,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 4.5
       color: 14934482
       priority: 1475
     }
@@ -37760,7 +37760,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.0
+      width: 6.0
       color: 14934482
       priority: 1475
     }
@@ -37779,7 +37779,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 8.0
       color: 14934482
       priority: 1475
     }
@@ -37848,8 +37848,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
-      color: 14934482
+      width: 1.0
+      color: 1724896680
       priority: 1194
       cap: BUTTCAP
     }
@@ -37857,8 +37857,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 2.0
-      color: 14934482
+      width: 1.5
+      color: 1724896680
       priority: 1194
       cap: BUTTCAP
     }
@@ -37867,31 +37867,31 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 14934482
+      color: 1724896680
       priority: 1194
     }
   }
   element {
     scale: 17
     lines {
-      width: 2.0
-      color: 14934482
+      width: 3.0
+      color: 1724896680
       priority: 1194
     }
   }
   element {
     scale: 18
     lines {
-      width: 2.0
-      color: 14934482
+      width: 4.5
+      color: 1724896680
       priority: 1194
     }
   }
   element {
     scale: 19
     lines {
-      width: 2.0
-      color: 14934482
+      width: 6.0
+      color: 1724896680
       priority: 1194
     }
   }
@@ -38087,7 +38087,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
+      width: 1.5
       color: 14934482
       priority: 1475
       cap: BUTTCAP
@@ -38113,7 +38113,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
+      width: 3.0
       color: 14934482
       priority: 1475
     }
@@ -38125,7 +38125,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 4.5
       color: 14934482
       priority: 1475
     }
@@ -38144,7 +38144,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.0
+      width: 6.0
       color: 14934482
       priority: 1475
     }
@@ -38163,7 +38163,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 8.0
       color: 14934482
       priority: 1475
     }
@@ -67503,13 +67503,30 @@ cont {
 cont {
   name: "waterway-dam"
   element {
-    scale: 15
+    scale: 14
     lines {
-      width: 1.0
-      color: 8421504
+      width: 1.5
+      color: 1304608947
       priority: 1970
       cap: BUTTCAP
     }
+    area {
+      color: 2160707771
+      priority: 1971
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 1304608947
+      priority: 1970
+      cap: BUTTCAP
+    }
+    area {
+      color: 13224123
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67521,10 +67538,26 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 8421504
+      width: 5.0
+      color: 10592406
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3.0
+      color: 1304608947
       priority: 1970
     }
+    area {
+      color: 13224123
+      border {
+        width: 1.0
+        color: 10592406
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67536,10 +67569,26 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 8421504
+      width: 6.5
+      color: 10197647
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4.5
+      color: 448970931
       priority: 1970
     }
+    area {
+      color: 12763315
+      border {
+        width: 1.0
+        color: 10197647
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67551,10 +67600,26 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 8421504
+      width: 8.0
+      color: 10197647
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 6.0
+      color: 12763315
       priority: 1970
     }
+    area {
+      color: 12763315
+      border {
+        width: 1.0
+        color: 10197647
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67566,10 +67631,26 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 8421504
+      width: 10.0
+      color: 10197647
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 8.0
+      color: 12763315
       priority: 1970
     }
+    area {
+      color: 12763315
+      border {
+        width: 1.0
+        color: 10197647
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -68799,11 +68880,20 @@ cont {
 }
 cont {
   name: "waterway-weir"
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 1304608947
+      priority: 1970
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 15
     lines {
-      width: 1.0
-      color: 8421504
+      width: 2.0
+      color: 1304608947
       priority: 1475
       cap: BUTTCAP
     }
@@ -68818,8 +68908,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 8421504
+      width: 3.0
+      color: 1304608947
       priority: 1475
     }
     path_text {
@@ -68833,8 +68923,8 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 8421504
+      width: 4.5
+      color: 1304608947
       priority: 1475
     }
     path_text {
@@ -68848,8 +68938,8 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 8421504
+      width: 6.0
+      color: 1304608947
       priority: 1475
     }
     path_text {
@@ -68863,8 +68953,8 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 8421504
+      width: 8.0
+      color: 1304608947
       priority: 1475
     }
     path_text {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 2ddcf6190874ffa96b8b2653195524f98cab6f50..44cf2ff0e9ccc595152e7dc33d405c2851d263cf 100644
GIT binary patch
delta 1666
zcmbR7is#}Ro(&>4V*i@|Lja?YDu;j+KgaBCH4^_O3)+ec{Hs-v6jJ68gbN1Ri1Yoc
z6*A=zLKb5DH`&lp4oCu}f#gD0k;yl0lxSn{0b6a_7`(wwgEj`wwb!AI!F>*zxC}n)
zfF<(oI}#arHI8buF*w~x3zxx^CATnVZN`SlP0q7`WT313WE+<XILmdiq^mh&Lvx_(
z_CQz0Q{_xQ?58sxWOQKUm>##6QI1h)dg4Jw6-EgVB{hA)K}Ie{1rS?&`n|o3UG>Wt
zxdd_(^Wt+8Q&M%4OG|Px^HPN*IQWD_I2pj;gS|k*iai_H6jpIsFal-x;W9r^WW+cG
zgoL1a7#!ewgv2-m;o=-9;zB@iHHalbC=$YO4H8iC?JxH+iZK!Gwe~{?8Mhxg$kZHJ
ze}tKfr#!JFwWvI?Qa2?r7nt7>egpbo^RqKASrj($TQEv-ax6O1(a0gOnP12d$(umW
zASvPiDPjbwvEt=o=im~!y6P&E#HkiWp)jETMWOx|aS+(>-~gi(gF^jApviFW0R0a$
zN=gE3kPsgtm_b^w8Y~DmSjs`*c;8$mpus5S0)r1|?nOqRKY-=}nT#-VCnwZ#+G9F4
zltTz^rUI&&f=~wmgC1lM(8$SwbrM+35Qdwfg53<D(MV=6Zr;u+!+eXc{v9J1FFa1l
zQ!|TD5*$jT2&rR>iNo9$jL6}Cy8&FdV}|o#ZcJr@@o;sJa0A9aHg%xn2}zxhpunLF
Rkys(VeaW(Yo;Gt8Cjj1-0&oBT

delta 1404
zcmcckhG)hro(&>4VjG(OLja?YDu;j+KgaBCH4+;p3)+ecY^YU`6jJ68gbN1Ri1Tfz
z6*A=zLKb4&Fxk*i4oCu}f#gD0k;yl0lxSn{0b6a_7`(wwgEj`wwb!AI!F>*zxC}n)
zfF<(oI}#arHI8buF*w~x3zxx^CATnVZD7J{a-IcBgs$?FZCongEZ51BuI7vzngd<8
z2f8wzDxdChkWqBH!CppPMuzEedl}_`)cJ#q;?w6GWaNdhckYF;C8pos%h*}p#K<L(
zo0u1$o0yWSn_OCwlbM$)B*eid#K*}10S*eQI4u}~V*D6l0vrNDJjm*V1ULjSM1(Lz
zgyAAg3=Z3Q_cMwyk>L7vps%){KgcvIvi=++7f*R&NorAfVx?|MVy=)H(3Qea7k#i7
zIMOkZNnsPe1)~)&7dr=+z|~b(nIulNFbb&vT`q{B4pWsNUR91T!-ViEgQ*h6RJC1R
zmiZQ6{dq<%UbsKXQ!|UOdgL%Ssz+`&VE4#jZe))@RAG7qNtFXIR3OSQJ%XeRt_s5=
L+pp^|S8)OWm5-+s

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index a7d44aca77..adbb1bde52 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -5102,18 +5102,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5121,22 +5121,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5152,11 +5152,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5175,18 +5175,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5194,22 +5194,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5225,11 +5225,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5248,18 +5248,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5267,22 +5267,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5298,11 +5298,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5321,18 +5321,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5340,22 +5340,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5371,11 +5371,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5394,18 +5394,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5413,22 +5413,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5444,11 +5444,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5467,18 +5467,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5486,22 +5486,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5517,11 +5517,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5540,18 +5540,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5559,22 +5559,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5590,11 +5590,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5613,18 +5613,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5632,22 +5632,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5663,11 +5663,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5686,7 +5686,7 @@ cont {
     scale: 16
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5736,7 +5736,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5786,7 +5786,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5836,7 +5836,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -37877,7 +37877,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
+      width: 1.5
       priority: 1475
       cap: BUTTCAP
     }
@@ -37899,7 +37899,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
+      width: 3.0
       priority: 1475
     }
     area {
@@ -37909,7 +37909,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 4.5
       priority: 1475
     }
     area {
@@ -37926,7 +37926,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.0
+      width: 6.0
       priority: 1475
     }
     area {
@@ -37943,7 +37943,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 8.0
       priority: 1475
     }
     area {
@@ -38010,7 +38010,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
+      width: 1.0
+      color: 1712264192
       priority: 1194
       cap: BUTTCAP
     }
@@ -38018,7 +38019,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 2.0
+      width: 1.5
+      color: 1712264192
       priority: 1194
       cap: BUTTCAP
     }
@@ -38027,27 +38029,31 @@ cont {
     scale: 16
     lines {
       width: 2.0
+      color: 1712264192
       priority: 1194
     }
   }
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 3.0
+      color: 1712264192
       priority: 1194
     }
   }
   element {
     scale: 18
     lines {
-      width: 2.0
+      width: 4.5
+      color: 1712264192
       priority: 1194
     }
   }
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 6.0
+      color: 1712264192
       priority: 1194
     }
   }
@@ -38241,7 +38247,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
+      width: 1.5
       priority: 1475
       cap: BUTTCAP
     }
@@ -38263,7 +38269,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
+      width: 3.0
       priority: 1475
     }
     area {
@@ -38273,7 +38279,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 4.5
       priority: 1475
     }
     area {
@@ -38290,7 +38296,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.0
+      width: 6.0
       priority: 1475
     }
     area {
@@ -38307,7 +38313,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 8.0
       priority: 1475
     }
     area {
@@ -67615,13 +67621,30 @@ cont {
 cont {
   name: "waterway-dam"
   element {
-    scale: 15
+    scale: 14
     lines {
-      width: 1.0
-      color: 4473924
+      width: 1.5
+      color: 1295201075
       priority: 1970
       cap: BUTTCAP
     }
+    area {
+      color: 2149720610
+      priority: 1971
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 1295201075
+      priority: 1970
+      cap: BUTTCAP
+    }
+    area {
+      color: 2236962
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67633,10 +67656,26 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 4473924
+      width: 5.0
+      color: 3158064
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3.0
+      color: 1295201075
       priority: 1970
     }
+    area {
+      color: 2236962
+      border {
+        width: 1.0
+        color: 3158064
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67648,10 +67687,26 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 4473924
+      width: 6.5
+      color: 4671303
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4.5
+      color: 439563059
       priority: 1970
     }
+    area {
+      color: 3355443
+      border {
+        width: 1.0
+        color: 4671303
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67663,10 +67718,26 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 4473924
+      width: 8.0
+      color: 4671303
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 6.0
+      color: 3355443
       priority: 1970
     }
+    area {
+      color: 3355443
+      border {
+        width: 1.0
+        color: 4671303
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67678,10 +67749,26 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 4473924
+      width: 10.0
+      color: 4671303
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 8.0
+      color: 3355443
       priority: 1970
     }
+    area {
+      color: 3355443
+      border {
+        width: 1.0
+        color: 4671303
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -68911,11 +68998,20 @@ cont {
 }
 cont {
   name: "waterway-weir"
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 1295201075
+      priority: 1970
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 15
     lines {
-      width: 1.0
-      color: 4473924
+      width: 2.0
+      color: 1295201075
       priority: 1475
       cap: BUTTCAP
     }
@@ -68930,8 +69026,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 4473924
+      width: 3.0
+      color: 1295201075
       priority: 1475
     }
     path_text {
@@ -68945,8 +69041,8 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 4473924
+      width: 4.5
+      color: 1295201075
       priority: 1475
     }
     path_text {
@@ -68960,8 +69056,8 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 4473924
+      width: 6.0
+      color: 1295201075
       priority: 1475
     }
     path_text {
@@ -68975,8 +69071,8 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 4473924
+      width: 8.0
+      color: 1295201075
       priority: 1475
     }
     path_text {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index c8c1f230bf0c699b6a7bfa55fd4cdd1e0a84f2e4..ac82fc9c60aa38856e7091cb54fd977171d24851 100644
GIT binary patch
delta 1444
zcmaE`o8#9Wjt%BkjIEO`th|_QIRq#7+DT5HYo!ci3qjfJljqyW0QtgjzJm2x#-7RV
ztOH5VA;Z`|`Ik)yNjhdt=CoVS><e{OzP;$=7j|+$KE!1pzL`CU4{=$(y)k3=<i+*|
z%(4(2Y!5hvWFd+nOt8AmS`Nj_8P`mn_dJk*Lbn&Wvh{PAxP)^P^Wt+8Q&M%4ic%A^
z%M(jdi-bfuc%=k6E*<WF&mu9g{XYaS0)_do32Srk3yE+tK!Ae)SewF6ZVN_iiZwX|
zgoL1q>p2jrv8xq?s}&-oR0ytAf{;>SsM2}{1_iuoxq2A61mFRbTw0QonU^Xgf#lyG
z_5!On&pyYgaGcYEQAiBQa|{k}8K5}ABS1gHbkqYS5Y7hr5GDZ>hq;k~0q7l=IM*~L
zE?&5M3Nk5-s(KRQiWX7j0QMX#y<krPh;YCXRqd}h7`MOTU<zP#Y+~l(0Vm$_#7f<i
z#9SdSU@VD36Pkd7z^Ubz*`yd0I{1Ongp^qK_s(zQQ0N4TPL8*eH0<IR@&LvmOrHp<
zK3KX1h6PL?sMvt$5`^oL!mbM#znHp&;JSd`Lv|y~E@13q>Jo<QQo*hZXc)3C#;)!A
zxR@+B>pK~_c;TT`o|;*Nl9+)>7N!d=F(dgHB{3uU2_-Efxf(ewbAs|4*oy6yB24L=
E03xlgSpWb4

delta 1449
zcmeyhhvUI+jt%Bkj7^g*th`ulI0U66CMU3qO)jui2J(d9Jod@kY-NBV!bl=tZDl6g
zTW@6Socz%`kaWF_J(Fxh$j~-@vXI?+Rv)-i@7fsyc`&EmwG*A}XfFp8fjJc<GQnPs
zv19UjdjnP(m_CjNoI)}%Z4eGr$7V~1;^mAhC$D`TNR;x37rC<aOPRQYa})F8a}!fi
zb(4xx6SK<`OHzx3L^yb)1UN1o?q`>n*!~{^7=fa^SVUDg_@orTYK8bX86dzx09~&N
z2S28&dMwHWFqL6ZB}kMiAp)xE|NmzcQUQiJLHBcgW8@Nmhg5QDNls>7Do`s<uitNh
z2OCzegZ)%5fuanj*HKjA^g4<voL)y(Rgc^22xVOJnYei2UN6X`V)Cd*q%GWmgq#9Z
zIB<p$QaV)u<`#l63XD7<TcVWVN*?VE9E{r=IG6$$>zf(5c)&TQJh4(YB{5e>oP%FT
z7@8YC*b6i?HnAvl@>?(piE;=C31Ub9g$1z-3t<-)MiFKO8^1l6o5_N+zJ-yC7w(qw
T)XXCKI)(-0*X_chOzE5ey$ZoE

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 6ec515b452..876397a2c5 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -4881,7 +4881,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -4900,7 +4900,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -4919,7 +4919,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5030,7 +5030,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5049,7 +5049,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5068,7 +5068,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5112,7 +5112,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5131,7 +5131,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5150,7 +5150,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5223,7 +5223,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5247,7 +5247,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5271,7 +5271,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5309,7 +5309,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5320,7 +5320,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5331,7 +5331,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -20015,7 +20015,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -20026,7 +20026,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -20037,7 +20037,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -22335,235 +22335,200 @@ cont {
 }
 cont {
   name: "man_made-breakwater"
-  element {
-    scale: 12
-    area {
-      color: 14934482
-      priority: -15471
-    }
-  }
   element {
     scale: 13
     area {
-      color: 14934482
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 14
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 15
+    lines {
+      width: 2.0
+      color: 1306780114
+      priority: 1529
+      cap: BUTTCAP
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 16
+    lines {
+      width: 3.0
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 17
+    lines {
+      width: 4.5
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 18
+    lines {
+      width: 6.0
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 19
+    lines {
+      width: 8.0
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
 }
 cont {
   name: "man_made-cutline"
-  element {
-    scale: 14
-    area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15777
-    }
-  }
   element {
     scale: 15
-    area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15777
+    lines {
+      width: 1.5
+      color: 2579945899
+      priority: 1223
+      cap: BUTTCAP
     }
   }
   element {
     scale: 16
-    area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15777
+    lines {
+      width: 2.0
+      color: 2579945899
+      priority: 1223
     }
   }
   element {
     scale: 17
-    area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15777
+    lines {
+      width: 3.0
+      color: 2579945899
+      priority: 1223
     }
   }
   element {
     scale: 18
-    area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15777
+    lines {
+      width: 4.5
+      color: 2579945899
+      priority: 1223
     }
   }
   element {
     scale: 19
-    area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15777
+    lines {
+      width: 6.0
+      color: 2579945899
+      priority: 1223
     }
   }
 }
 cont {
   name: "man_made-pier"
-  element {
-    scale: 12
-    area {
-      color: 14934482
-      priority: -15471
-    }
-  }
   element {
     scale: 13
     area {
-      color: 14934482
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 14
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 15
+    lines {
+      width: 2.0
+      color: 1306780114
+      priority: 1529
+      cap: BUTTCAP
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 16
+    lines {
+      width: 3.0
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 17
+    lines {
+      width: 4.5
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 18
+    lines {
+      width: 6.0
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 19
+    lines {
+      width: 8.0
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
@@ -42154,43 +42119,123 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.0
-      color: 8421504
+      width: 4.0
+      color: 13947850
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 2.0
+      color: 2160576191
       priority: 1929
       cap: BUTTCAP
     }
+    area {
+      color: 1523897290
+      border {
+        width: 1.0
+        color: 13947850
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 8421504
+      width: 5.0
+      color: 13947850
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3.0
+      color: 2160576191
       priority: 1929
     }
+    area {
+      color: 1943327690
+      border {
+        width: 1.0
+        color: 13947850
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 8421504
+      width: 6.5
+      color: 13947850
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4.5
+      color: 2160576191
       priority: 1929
     }
+    area {
+      color: 1943327690
+      border {
+        width: 1.0
+        color: 13947850
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 8421504
+      width: 8.0
+      color: 13947850
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 6.0
+      color: 2160576191
       priority: 1929
     }
+    area {
+      color: 1943327690
+      border {
+        width: 1.0
+        color: 13947850
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 8421504
+      width: 10.0
+      color: 13947850
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 8.0
+      color: 2160576191
       priority: 1929
     }
+    area {
+      color: 1943327690
+      border {
+        width: 1.0
+        color: 13947850
+      }
+      priority: 1930
+    }
   }
 }
 cont {
@@ -43000,8 +43045,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.0
-      color: 8421504
+      width: 2.0
+      color: 2160576191
       priority: 1929
       cap: BUTTCAP
     }
@@ -43009,32 +43054,32 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 8421504
+      width: 3.0
+      color: 2160576191
       priority: 1929
     }
   }
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 8421504
+      width: 4.5
+      color: 2160576191
       priority: 1929
     }
   }
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 8421504
+      width: 6.0
+      color: 2160576191
       priority: 1929
     }
   }
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 8421504
+      width: 8.0
+      color: 2160576191
       priority: 1929
     }
   }
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index dcc7b023952cf50249bce60416386229b857b657..1828c13c0e853433aa62439638f0e9e655e354d7 100644
GIT binary patch
delta 1442
zcmaF1jbqOajtv(rc^a6wIFd>;b5b(%(kDNBBQtrOwIZ_(hu~yGdx^;jHtdt%Tgw3X
zLU6ve4Tvuc<ttA<XSI>BeR6}fKPkExyC%2T1d*g;>f~<Qwah+Hm(8^kot$PT2joLs
zHrLJ=$cDHIB=^rw4(KXbdwpgZunuV;4N?iBL8_!S&$riK%eZ{<`8WPJl@z{Bm#Lq_
z#3h`Ym=~X$n3AfSRFs;SU7lEyS|lXO!7C-m(b_fT1&hSQ_WuyT2o&bSCalfDFC@ar
z009mHU~LLNxh)v6Dc0l=5E6nauIE6g#;#Tnu2zVUQX#lf2|`MRp-Sr+7!>fT<?3PN
z5`YI#a%o9UW?rh01d@M$*b8*cTXKR^;W(!SqmUSq=NKH|GC*;JM}U5Y>8J-vAe;^K
zAxr`&4s#;|1JFA#ajt1hT)c4i6l78uRrMsq6)mF50qi+gdcmFo5aEC&s<uDpVa)pN
z@Pmnq2b^%r6DxI75_5$-kYY%{L14~~0x1TC4t`(^A*Iuqo1QdqD0BivCqJ~5FzDhJ
zasx&mOo0fBHdu-Uh5}3*sE~kY5`=4#!m0@vv6z~K;F^H`LUJI?CSa^%Y7&NPQo*VT
zXcV$0#;)z>IhfXS)ORv+@xlYBJT<cjB@F{pDohtz8b<OiN*YG;5lRw9ax`)h<^*Lk
Nuoc^X3o>PM0sy%Do__!U

delta 1397
zcmdn9gX7sYjtv(r`F=5SaU_*y=A>lir3=YS{%9*T`KP5Krxk~wlo-d%O(~NXT8U4#
zv62Cb2qB47fklMjB2O3_C%0MqldR8}v1RfEn;<gu^-rE_yOz@n?#_>Ps*|hi<bWbD
zcY;JtfJI>L{AlM4bf>AkKBp91U!c7(kO$KP;X&1JUTyEVmT}?aw{QH3)X@C4QigH*
z^uL^p;`PEDJW~7|tz9A#6Wjko0HcsF2QQ|e5(l4@97v@QFDC;8I0&F=RN~+#LX7}I
zO+8M71QCjGsu3bWjWAv{_5c4fa=l{Y639)=i_c9=N!3j*Ey>BuOBKTD-TN)@aKh<b
z6g5cRMfM3;4bXm|3xJm4@Ggo$IJ}FZ28VYMYPcpcaq+@^TVIfwS_F*mfl37R_)`;(
zP(eznO2AA(I91{Zm5J@!ckwW$|E{m&;weuoNi8Z*tkg|O%oP&j;1?2trt%N=0==_L
z6gv4W7==VQ1cU_8#et%NSVe`fiV9<jZlBG`w2q^`o{Jamit^OVB04)``(+`fOiloB
Co~AYc

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index d6be181389..12a4207cf3 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -4881,7 +4881,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -4900,7 +4900,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -4919,7 +4919,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5030,7 +5030,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5049,7 +5049,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5068,7 +5068,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5112,7 +5112,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5131,7 +5131,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5150,7 +5150,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5223,7 +5223,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5247,7 +5247,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5271,7 +5271,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5309,7 +5309,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5320,7 +5320,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5331,7 +5331,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -20405,7 +20405,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -20416,7 +20416,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -20427,7 +20427,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -22725,235 +22725,200 @@ cont {
 }
 cont {
   name: "man_made-breakwater"
-  element {
-    scale: 12
-    area {
-      color: 328965
-      priority: -15471
-    }
-  }
   element {
     scale: 13
     area {
-      color: 328965
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 14
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 15
+    lines {
+      width: 2.0
+      color: 1292174597
+      priority: 1529
+      cap: BUTTCAP
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 16
+    lines {
+      width: 3.0
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 17
+    lines {
+      width: 4.5
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 18
+    lines {
+      width: 6.0
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 19
+    lines {
+      width: 8.0
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
 }
 cont {
   name: "man_made-cutline"
-  element {
-    scale: 14
-    area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
-      priority: -15777
-    }
-  }
   element {
     scale: 15
-    area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
-      priority: -15777
+    lines {
+      width: 1.5
+      color: 2567507722
+      priority: 1223
+      cap: BUTTCAP
     }
   }
   element {
     scale: 16
-    area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
-      priority: -15777
+    lines {
+      width: 2.0
+      color: 2567507722
+      priority: 1223
     }
   }
   element {
     scale: 17
-    area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
-      priority: -15777
+    lines {
+      width: 3.0
+      color: 2567507722
+      priority: 1223
     }
   }
   element {
     scale: 18
-    area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
-      priority: -15777
+    lines {
+      width: 4.5
+      color: 2567507722
+      priority: 1223
     }
   }
   element {
     scale: 19
-    area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
-      priority: -15777
+    lines {
+      width: 6.0
+      color: 2567507722
+      priority: 1223
     }
   }
 }
 cont {
   name: "man_made-pier"
-  element {
-    scale: 12
-    area {
-      color: 328965
-      priority: -15471
-    }
-  }
   element {
     scale: 13
     area {
-      color: 328965
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 14
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 15
+    lines {
+      width: 2.0
+      color: 1292174597
+      priority: 1529
+      cap: BUTTCAP
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 16
+    lines {
+      width: 3.0
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 17
+    lines {
+      width: 4.5
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 18
+    lines {
+      width: 6.0
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 19
+    lines {
+      width: 8.0
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
@@ -42544,43 +42509,123 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.0
-      color: 855309
+      width: 4.0
+      color: 1842204
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 2.0
+      color: 2149128473
       priority: 1929
       cap: BUTTCAP
     }
+    area {
+      color: 1511594265
+      border {
+        width: 1.0
+        color: 1842204
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 855309
+      width: 5.0
+      color: 1842204
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3.0
+      color: 2149128473
       priority: 1929
     }
+    area {
+      color: 1931024665
+      border {
+        width: 1.0
+        color: 1842204
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 855309
+      width: 6.5
+      color: 1842204
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4.5
+      color: 2149128473
       priority: 1929
     }
+    area {
+      color: 1931024665
+      border {
+        width: 1.0
+        color: 1842204
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 855309
+      width: 8.0
+      color: 1842204
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 6.0
+      color: 2149128473
       priority: 1929
     }
+    area {
+      color: 1931024665
+      border {
+        width: 1.0
+        color: 1842204
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 855309
+      width: 10.0
+      color: 1842204
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 8.0
+      color: 2149128473
       priority: 1929
     }
+    area {
+      color: 1931024665
+      border {
+        width: 1.0
+        color: 1842204
+      }
+      priority: 1930
+    }
   }
 }
 cont {
@@ -43390,8 +43435,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.0
-      color: 855309
+      width: 2.0
+      color: 2149128473
       priority: 1929
       cap: BUTTCAP
     }
@@ -43399,32 +43444,32 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 855309
+      width: 3.0
+      color: 2149128473
       priority: 1929
     }
   }
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 855309
+      width: 4.5
+      color: 2149128473
       priority: 1929
     }
   }
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 855309
+      width: 6.0
+      color: 2149128473
       priority: 1929
     }
   }
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 855309
+      width: 8.0
+      color: 2149128473
       priority: 1929
     }
   }
diff --git a/data/visibility.txt b/data/visibility.txt
index 67b8dbb74b..411d9191a2 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -567,14 +567,14 @@ world  00000000000000000000  +
         water_park  00000000000000000000  -
         {}
     man_made  00000000000000000000  +
-        breakwater  00000000000011111111  -
+        breakwater  00000000000001111111  -
         cairn  00000000000000000000  -
         chimney  00000000000000000000  -
-        cutline  00000000000000111111  -
+        cutline  00000000000000011111  -
         flagpole  00000000000000000000  -
         lighthouse  00000000000000000000  -
         mast  00000000000000000000  -
-        pier  00000000000011111111  -
+        pier  00000000000001111111  -
         pipeline  00000000000000000000  +
             overground  00000000000000000000  -
             {}