From a34ab71bda4d86b296f95b11dda7647c5c9f2e69 Mon Sep 17 00:00:00 2001
From: Harry Bond <endim8@pm.me>
Date: Mon, 4 Sep 2023 00:28:19 +0100
Subject: [PATCH] [styles] regenerated

Signed-off-by: Harry Bond <endim8@pm.me>
---
 data/classificator.txt                        |   4 +
 data/colors.txt                               |   4 +
 data/drules_proto.bin                         | Bin 351621 -> 355373 bytes
 data/drules_proto.txt                         | 923 +++++++++++++++++-
 data/drules_proto_clear.bin                   | Bin 352310 -> 356062 bytes
 data/drules_proto_clear.txt                   | 923 +++++++++++++++++-
 data/drules_proto_dark.bin                    | Bin 350801 -> 354364 bytes
 data/drules_proto_dark.txt                    | 923 +++++++++++++++++-
 data/drules_proto_vehicle_clear.bin           | Bin 257784 -> 261158 bytes
 data/drules_proto_vehicle_clear.txt           | 743 +++++++++++++-
 data/drules_proto_vehicle_dark.bin            | Bin 257275 -> 260484 bytes
 data/drules_proto_vehicle_dark.txt            | 743 +++++++++++++-
 .../include/priorities_2_BG-top.prio.txt      |  10 +-
 .../clear/include/priorities_3_FG.prio.txt    |   2 +-
 .../include/priorities_4_overlays.prio.txt    |   6 +-
 .../include/priorities_2_BG-top.prio.txt      |  10 +-
 data/types.txt                                |   8 +-
 data/visibility.txt                           |   8 +-
 18 files changed, 4152 insertions(+), 155 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index 42b44bf190..9b5040a309 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -733,12 +733,16 @@ world  +
         volcano  -
         water  +
             basin  -
+            ditch  -
+            drain  -
             lake  -
             lock  -
+            moat  -
             pond  -
             reservoir  -
             river  -
             tunnel  -
+            wastewater  -
             {}
         wetland  +
             bog  -
diff --git a/data/colors.txt b/data/colors.txt
index ee5c2672dd..b741440f7c 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -1,6 +1,7 @@
 0
 6425
 8738
+9758
 13615
 13655
 19033
@@ -175,6 +176,7 @@
 8060972
 8079449
 8163038
+8212259
 8263442
 8327953
 8355711
@@ -189,6 +191,7 @@
 8916559
 8947848
 9163744
+9197606
 9210752
 9211020
 9287808
@@ -203,6 +206,7 @@
 10197647
 10242335
 10255717
+10340289
 10426903
 10506258
 10592406
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 62759c90bfba14cbe37954891e292c7507a8616d..96077445d2285a7c105245d07780ab50e2b6b8a4 100644
GIT binary patch
delta 1646
zcmZqOExPuG=!UpSs@oa4c#{%~iZWA+bW<`*k~4%fI0S@LIM1E|fj{;F%QkFenSRil
zRaDdsC?$whYVwRpf-I;Cg|RAZeluzNn@Nn*PUx;<<r2<IEGaEY%+W1REJ3oJS4x26
zVE=a(i8Vj|LjdFS#BYq^>`;m6j^7y-L^U}0aH)ezz|`^MQU{fQsT07iPMR6$7?2tz
zc0q`W=^I0tB&Od@W|EwqkjcaXmIn*TM=?pT3!y7Q6#=Q4E|7q%4P+9#FtRqFB2hgq
zEJ0M1n3)HRh0!3I4ho{_H3>{2+owh|J?0d9!@(tlnx1m=6HBHq3}iaas4;zE5Kwi}
zH%77P{b@|<K!JlXOd{Y^HT?rbARry4A|V2-Vk2B&T_IRNF%qU_+gC=A8I2h*0r78O
zfek+y!G=ame-O!}07@M4Aa_b^pOeBAFJRQh#wCI3#PY=Al2mZ&2SzFn_Vgz{9q1rP
zB7-LU(bxyae*3QyCLm_s{;Py#;Wf42Ok8~6pe#?UgqCE+9K1sMoD5*_!(ISXs7#NF
zWK|RqGUnjJDZ`IL#t>L8>OxK9aDba8FCt_JEEaLe2;r0w#wxSj&4+a>Bbsl(*?vg+
KW|<%BeLetrAW66Y

delta 363
zcmZ2`L$r0b=!UpSs=bU{yh({gMVYBZx+$3@$r(Z#9D+hBoM+E~z#n^o{SR+3PG+1e
zCIXZY!X`2K?IZyfkg8_J$=iWSSD)C<m&o*ub2^X|+TNPaRLI}{zmW-unYaIMWLa=c
zZ6zZYUwL9lYEgM&CDc+wpryJPmWs+P`tctE7=;Xh))Q1Bj7`aQp(xh<jA+&tC1&OU
N&7`HZF0rgH`2Z>|r^EmN

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 6f34914746..dc9b856e8a 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -11157,11 +11157,23 @@ cont {
 }
 cont {
   name: "barrier-ditch"
+  element {
+    scale: 16
+    lines {
+      width: 1.8
+      color: 9197606
+      dashdot {
+        dd: 1.0
+        dd: 1.0
+      }
+      priority: 70
+    }
+  }
   element {
     scale: 17
     lines {
       width: 1.8
-      color: 3584191
+      color: 9197606
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -11173,7 +11185,7 @@ cont {
     scale: 18
     lines {
       width: 1.8
-      color: 3584191
+      color: 9197606
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -11185,7 +11197,7 @@ cont {
     scale: 19
     lines {
       width: 1.8
-      color: 3584191
+      color: 9197606
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -48277,6 +48289,320 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-ditch"
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
+cont {
+  name: "natural-water-drain"
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-water-lake"
   element {
@@ -48953,6 +49279,274 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-moat"
+  element {
+    scale: 1
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-water-pond"
   element {
@@ -50005,6 +50599,179 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-water-wastewater"
+  element {
+    scale: 12
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-wetland"
   element {
@@ -103916,14 +104683,65 @@ cont {
 }
 cont {
   name: "waterway-ditch"
+  element {
+    scale: 13
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.0
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+    }
+  }
   element {
     scale: 17
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -103931,11 +104749,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -103943,11 +104761,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -104091,14 +104909,65 @@ cont {
 }
 cont {
   name: "waterway-drain"
+  element {
+    scale: 13
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.0
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+    }
+  }
   element {
     scale: 17
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -104106,11 +104975,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -104118,11 +104987,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 9cd49262d036cc65231715eb9f1b4b5e9db6aa69..a3e7adca2280cdd07d9ebef0c481bac05090fa5e 100644
GIT binary patch
delta 1518
zcmdmXK=j^S(GAllsBUNE;!R2{D#}bP(oM-MNzM?`;1Cc};XHc=1pe3yEZeY=WwO9T
zF%h7IAT9|ZY!Z|IOb}oJX>S&oxLsf(<Gy3M>sYyj^Abx+ixP8m%M(kG?Btaa;5gX-
zoke2JkN*(BIQ?TJlQc6>aQeq!CIwLq4nFK^#Mz+|Fm?R6)IlX+>I879gGzwZDNQfP
zXJP@nLNI~JkX;a>XS!iHlL5OBlmn8Pu8;^-2b3~FXb?td(ADF@5&%VsnR&pl9T5Sr
z{cJeXcTTZ499%-E$sjjBv1Iy&FO0_-HKuP2W)cC#z4-J8u}tbf0f#sy(dkOLOtwJw
zLJ<2?B$L>5hmVXP$%DBN)pkHO<0nR_B-1Cb<itFfQOOVi#{`(bkxz_{(-N5!rtc4A
zlHYzIfvH@;sEv(F0@YpRiNz(U;FJoCA|4#+1>_V+5`iYv5fPW|ZiP%h%)H&Lkmbo`
zwcku!eBgj8PppKNB*q-PLi(HxVDQ6U0F=F_+Xt~KiU=8V@Zpr<$01_~ESGelrg1pH
oO_LW9G6WV(xMYNI$_QhX*?!fPbt@y9Z@^h}NczUqgOyPN0Ld8`qW}N^

delta 351
zcmcb2S9IF}(GAllsP-~)@g^k}6=kLt>850sBxeX|a0m*iaGpH_0)OlU_CLJEI9Xt#
z<mCSocv+wvH5fyzIbh=UfQgJNj!oa6%_OuvCzk06=XM~onZMn;jtPjFw|m#IJie^9
zl97wAJh3FTs64R}YLOw(B3%rNMCBI!_zwY$LWUedgp~+mQ?h+wFzbFsG;50zGxLCE
M($d<?VXWK|0CsMpxc~qF

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 363e2fba78..ad3ae70775 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -11015,11 +11015,23 @@ cont {
 }
 cont {
   name: "barrier-ditch"
+  element {
+    scale: 16
+    lines {
+      width: 1.8
+      color: 9197606
+      dashdot {
+        dd: 1.0
+        dd: 1.0
+      }
+      priority: 70
+    }
+  }
   element {
     scale: 17
     lines {
       width: 1.8
-      color: 3584191
+      color: 9197606
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -11031,7 +11043,7 @@ cont {
     scale: 18
     lines {
       width: 1.8
-      color: 3584191
+      color: 9197606
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -11043,7 +11055,7 @@ cont {
     scale: 19
     lines {
       width: 1.8
-      color: 3584191
+      color: 9197606
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -47969,6 +47981,320 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-ditch"
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
+cont {
+  name: "natural-water-drain"
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-water-lake"
   element {
@@ -48645,6 +48971,274 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-moat"
+  element {
+    scale: 1
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-water-pond"
   element {
@@ -49697,6 +50291,179 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-water-wastewater"
+  element {
+    scale: 12
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-wetland"
   element {
@@ -103385,14 +104152,65 @@ cont {
 }
 cont {
   name: "waterway-ditch"
+  element {
+    scale: 13
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.0
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+    }
+  }
   element {
     scale: 17
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -103400,11 +104218,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -103412,11 +104230,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -103560,14 +104378,65 @@ cont {
 }
 cont {
   name: "waterway-drain"
+  element {
+    scale: 13
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.0
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+    }
+  }
   element {
     scale: 17
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -103575,11 +104444,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -103587,11 +104456,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 07753411607a54c6d530b8c4b82e776687f76730..6a997e4fb483c1914d4f299f1eb118fd521e8f50 100644
GIT binary patch
delta 1532
zcmcb(MRd;v(G3w3RJJp6@g^k}6=kLt>850sBxeX|a0m#gaGpH_0)OlU7SH=S*^o<k
z@`DL1!azAeJaR&K<b<)vH9wfJ{lNsr+@sn(tX#r*i6x~)i8;FEi6wBisB!R0@o~)a
zky!KNKLjvNH}qo?pXSfR!Zgok`o?f3d0{mUKCFt^Ai^+3{MZ#igkg#Vuq%QHgA^%F
zSNOsRu{(rGpG^>~e)`5ZCL^$WfMU}Ep>B&~(qj{b%7fHG*@|III@mm1l$e<(Gz>kw
z9q8dcPO&u{TtcW(oSUCmGR>E1D=-4NfWfrL1tXSYm{ft1+}I>-fD$|y5({IPY#7z1
zZwzJ<o^IsFBnC_;AQM0d0n_;Dj-MGpvY-@zMRqPk78LbZWPg5Uw4E*x#l*JVAe2d;
zar?n|rpbH;4_LV*P(4|mSX`0{PSU`*1vwZsF#{bejg*jwXKHT`$zuXy=ItSQEORfa
zyk+9z1BXa?VkNZ9G34MC(&c0TgCF(+z?_}v!>TAGWXQpXL!2M0xIVD#(uSJD;Q%#9
mUPwqESZ-k#7s4Sfj75C=Ob6C}Ml|<>v+WRZ{{<)3MsWZF;`)IA

delta 368
zcmdmULG<Dl(G3w3RJs_sc#{%~iZWA+bW<`*k~4(VIRu52InSN}fj{;F%MM6PzBoY~
zC@h3sSQt}StXXj4cEO2^nMbF4CNK$aUmeZl&$(SQlW8em`^G9JAZFgav5IBxMb%}D
zTzut;C8<T_iIq_M4S@FRpxZAhyXeP%2w)U406K+`3SlfNwr}=joymx1XHjBi9?(RZ
L*|{-*wObqjU=FJ&

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index d082217882..9f1959365a 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -11015,11 +11015,23 @@ cont {
 }
 cont {
   name: "barrier-ditch"
+  element {
+    scale: 16
+    lines {
+      width: 1.8
+      color: 8212259
+      dashdot {
+        dd: 1.0
+        dd: 1.0
+      }
+      priority: 70
+    }
+  }
   element {
     scale: 17
     lines {
       width: 1.8
-      color: 401446
+      color: 8212259
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -11031,7 +11043,7 @@ cont {
     scale: 18
     lines {
       width: 1.8
-      color: 401446
+      color: 8212259
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -11043,7 +11055,7 @@ cont {
     scale: 19
     lines {
       width: 1.8
-      color: 401446
+      color: 8212259
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -48065,6 +48077,320 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-ditch"
+  element {
+    scale: 13
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
+cont {
+  name: "natural-water-drain"
+  element {
+    scale: 13
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-water-lake"
   element {
@@ -48741,6 +49067,274 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-moat"
+  element {
+    scale: 1
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-water-pond"
   element {
@@ -49793,6 +50387,179 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-water-wastewater"
+  element {
+    scale: 12
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9758
+      priority: -980
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 2900
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-wetland"
   element {
@@ -103471,14 +104238,65 @@ cont {
 }
 cont {
   name: "waterway-ditch"
+  element {
+    scale: 13
+    lines {
+      width: 1.5
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.0
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+    }
+  }
   element {
     scale: 17
     lines {
-      width: 1.8
-      color: 401446
+      width: 3.0
+      color: 9758
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -103486,11 +104304,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.8
-      color: 401446
+      width: 3.0
+      color: 9758
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -103498,11 +104316,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 401446
+      width: 3.0
+      color: 9758
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -103646,14 +104464,65 @@ cont {
 }
 cont {
   name: "waterway-drain"
+  element {
+    scale: 13
+    lines {
+      width: 1.5
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.0
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+    }
+  }
   element {
     scale: 17
     lines {
-      width: 1.8
-      color: 401446
+      width: 3.0
+      color: 9758
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -103661,11 +104530,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.8
-      color: 401446
+      width: 3.0
+      color: 9758
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -103673,11 +104542,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 401446
+      width: 3.0
+      color: 9758
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 47b81afd34a88e2c7c983f9ff9e53fff021001c6..7b0f4f6da481dc20e9e96d806aa1222d86708767 100644
GIT binary patch
delta 2009
zcmexymw(w0{tai%Se9+r$TIn&nHr2CDJU$Y!g=-#2>h`ZfJ%!sTbpmUHfMZgpnHpj
zOE@pFq_ik8N4Gq&B(+F4C9@<sLr8;zS4x26VE=a(i8Vj|LjdFSh5C%r%s|2EjRuSg
zq8c20*wu)$LnUD9_;IO&O2E_!;8F*bfT<J2r4A|qQzwK=9aI9QP8gRus02uzydD>p
zz$!}2%o`0XP{I&rM-Hs%^0|y6+buE}A9IS$;NTKMO=G$Fi6zqwix`hHYD_mQW)z*i
zNS{$`x?U}#I#6I?3Q(XakI@#$RuEwn0UJL314L3WA0l7}l-yVclaw?7>vS}L2~<G@
z5(;1fw;=+8=`aBsL$H>@GMK<zh`<B5z(1hCbcI|-q3yawj8FNDHnDO^pn9V`vA84^
zoNItdfCon!0=b+8In#`0EVQ)JF4)Kj#7x@-8=0M=>VGqF@qq)iJh2j58X0r&3h8q)
zfWZ%Y0Z_3dCB!8#YbFS=I>2a!Mew4^f>FqrgO40d_57skGUN~t(uKN@!+{w02^n$-
vV%JiS(@#J>LfG}-(;`fwmhJy;GjC-?iv@5oHyR7TdXSM$u@HBUd6obG@Q@>1

delta 327
zcmZ4Xga5}}{tai%SoS}>#W?w*nHr2CDJU$Y!g=-#2>h`ZfJ%!sTbpmUHfMZgF#SUn
zqtNz`IgC#@w*#5q`P%37Faj~t_BlPwj!|kW8M*k%6H8Ky$`dPfQ!-1EGlUE|1ch`l
rj1-ky^y5DSFanhb5mq9MP099v7tH$^(X1^>%*>;)wN0;?mk0m=Ee4=}

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 77a8db1659..bc140f0d6b 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -4078,7 +4078,7 @@ cont {
     scale: 17
     lines {
       width: 1.8
-      color: 3584191
+      color: 9197606
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -4090,7 +4090,7 @@ cont {
     scale: 18
     lines {
       width: 1.8
-      color: 3584191
+      color: 9197606
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -4102,7 +4102,7 @@ cont {
     scale: 19
     lines {
       width: 1.8
-      color: 3584191
+      color: 9197606
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -28650,6 +28650,236 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-ditch"
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
+cont {
+  name: "natural-water-drain"
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-water-lake"
   element {
@@ -29326,6 +29556,232 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-moat"
+  element {
+    scale: 1
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 9163744
+      priority: -980
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-water-pond"
   element {
@@ -30340,6 +30796,137 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-wastewater"
+  element {
+    scale: 12
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 10340289
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-wetland"
   element {
@@ -73535,14 +74122,65 @@ cont {
 }
 cont {
   name: "waterway-ditch"
+  element {
+    scale: 13
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.0
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+    }
+  }
   element {
     scale: 17
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -73550,11 +74188,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -73562,11 +74200,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -73710,14 +74348,65 @@ cont {
 }
 cont {
   name: "waterway-drain"
+  element {
+    scale: 13
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.0
+      color: 10340289
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+    }
+  }
   element {
     scale: 17
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -73725,11 +74414,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -73737,11 +74426,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 3584191
+      width: 3.0
+      color: 10340289
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index e3105de600490f8c9565afade27c0cff3617c556..8dcf8d23aa714786f4c7e6c46d8a19a9daa9a072 100644
GIT binary patch
delta 2062
zcmex;lfUIN{{}ZR)m}y}-lW8$qRiAH-IUCd<P0GV4nZLm&a-Dg;E%n);(1@0rzhTF
z78NxDN(teX62>ake9>(CMKi`f#@hQ>xP<c(OG=9pb9BoSOW^jYaqvp<am@3PSo7mQ
z1TaoFG+~rxn&&g!Fo#iISdD`Zn*wn*h%ihMKUPK4Oc_~_OcKDVhz%kPGf5Cb(Lz%c
z_XuGq06JKl4I&IPMHs81=>=wR2g&JhVF{F?#LPUQ5gaJf^-36px8KiV4B!;I$Ic~$
znr3qI6HBHyBr<LVCJQcL2rqI$OE==v8wwazfwJ5fvKx~aZGaLy7!rzwj5dsF(+x8i
zg{K>tFj_;C92T>en1Ia&r8P`hU|IuN3`$IxlG9@#vY^C;Dho_pAZLM652^$xQB4;y
z0~-oTO;}`ssY!LaehH%_pTQ(nE(z4IDo-pfNd;#$V0r@i8a0yveT|&SMr<x@cW+_@
zVy5lxP0T&v^>3ND_`rcyo>&Pj5)C<cg>*R?z~G0yz&sx*AufSgGeLmW0Y)n<f|p+w
zj6#MSe57mP2WqJ&$r^nQ0U>Ru%QzeeyG%$QSi0lYkOuM-l3##2gz)RY)F4b)!}fw(
m%(EEL0vlZPjikV?#|%4K1U6E1a)odS!Bcn6_5*jAtpxz_Qy>`t

delta 366
zcmZqq%>Vl){{}ZRl`cju-lW8$qRiAH-IUCd<P0Ho4nZMh&a-Dg;E%n)vI7#6_nV0c
z1I2}Khzp~MH}5ywzTb>d&}9158b+b*Dfx^6oZEp+NxpXHUPd5h+V0%T+#RmEjFF44
zJh3FTs64R}YP$i@b{%xvMP(QL_zwY$LIyy05K<wGMa6dGXUsDh(d;Zr%*+FtNHaSP
JUor;^000P;qtyTa

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 8b5f2aa239..2a5736dfa8 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -4078,7 +4078,7 @@ cont {
     scale: 17
     lines {
       width: 1.8
-      color: 401446
+      color: 8212259
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -4090,7 +4090,7 @@ cont {
     scale: 18
     lines {
       width: 1.8
-      color: 401446
+      color: 8212259
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -4102,7 +4102,7 @@ cont {
     scale: 19
     lines {
       width: 1.8
-      color: 401446
+      color: 8212259
       dashdot {
         dd: 1.0
         dd: 1.0
@@ -29026,6 +29026,236 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-ditch"
+  element {
+    scale: 13
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
+cont {
+  name: "natural-water-drain"
+  element {
+    scale: 13
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-water-lake"
   element {
@@ -29702,6 +29932,232 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-moat"
+  element {
+    scale: 1
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 8738
+      priority: -980
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-water-pond"
   element {
@@ -30716,6 +31172,137 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-wastewater"
+  element {
+    scale: 12
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9758
+      priority: -980
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-wetland"
   element {
@@ -73911,14 +74498,65 @@ cont {
 }
 cont {
   name: "waterway-ditch"
+  element {
+    scale: 13
+    lines {
+      width: 1.5
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.0
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+    }
+  }
   element {
     scale: 17
     lines {
-      width: 1.8
-      color: 401446
+      width: 3.0
+      color: 9758
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -73926,11 +74564,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.8
-      color: 401446
+      width: 3.0
+      color: 9758
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -73938,11 +74576,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 401446
+      width: 3.0
+      color: 9758
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -74086,14 +74724,65 @@ cont {
 }
 cont {
   name: "waterway-drain"
+  element {
+    scale: 13
+    lines {
+      width: 1.5
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.5
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.0
+      color: 9758
+      dashdot {
+        dd: 2.7
+        dd: 2.7
+      }
+      priority: -990
+    }
+  }
   element {
     scale: 17
     lines {
-      width: 1.8
-      color: 401446
+      width: 3.0
+      color: 9758
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -74101,11 +74790,11 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.8
-      color: 401446
+      width: 3.0
+      color: 9758
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
@@ -74113,11 +74802,11 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.8
-      color: 401446
+      width: 3.0
+      color: 9758
       dashdot {
-        dd: 1.0
-        dd: 1.0
+        dd: 2.7
+        dd: 2.7
       }
       priority: -990
     }
diff --git a/data/styles/clear/include/priorities_2_BG-top.prio.txt b/data/styles/clear/include/priorities_2_BG-top.prio.txt
index 0e475f31ca..932f393ed3 100644
--- a/data/styles/clear/include/priorities_2_BG-top.prio.txt
+++ b/data/styles/clear/include/priorities_2_BG-top.prio.txt
@@ -21,8 +21,8 @@ landuse-reservoir                                   # area z12- (also has captio
 landuse-salt_pond                                   # area z1-
 natural-water                                       # area z1- (also has caption z10-)
 natural-water-basin                                 # area z1- (also has caption z10-)
-natural-water-ditch                                 # area z1- (also has caption z17-)
-natural-water-drain                                 # area z1- (also has caption z17-)
+natural-water-ditch                                 # area z13- (also has caption z17-)
+natural-water-drain                                 # area z13- (also has caption z17-)
 natural-water-lake                                  # area z1- (also has caption z10-)
 natural-water-lock                                  # area z1- (also has caption z10-)
 natural-water-moat                                  # area z1- (also has caption z17-)
@@ -30,15 +30,15 @@ natural-water-pond                                  # area z1- (also has caption
 natural-water-reservoir                             # area z1- (also has caption z10-)
 natural-water-river                                 # area z1- (also has caption z10-)
 natural-water-tunnel                                # area z15-
-natural-water-wastewater                            # area z1- (also has caption z17-)
+natural-water-wastewater                            # area z12- (also has caption z17-)
 waterway-dock                                       # area z1-
 waterway-riverbank                                  # line z10- and area z1- (also has pathtext z11-)
 === 20
 
 natural-strait                                      # line z13- (also has caption z13-)
 waterway-canal                                      # line z13- (also has pathtext z13-)
-waterway-ditch                                      # line z14-
-waterway-drain                                      # line z14-
+waterway-ditch                                      # line z13-
+waterway-drain                                      # line z13-
 waterway-fish_pass                                  # line z13- (also has pathtext z13-)
 waterway-river                                      # line z10- (also has pathtext z11-)
 waterway-stream                                     # line z13- (also has pathtext z13-)
diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt
index 5e80731ed0..e07f699f41 100644
--- a/data/styles/clear/include/priorities_3_FG.prio.txt
+++ b/data/styles/clear/include/priorities_3_FG.prio.txt
@@ -419,7 +419,7 @@ route-ferry                                         # line z7- (also has pathtex
 
 aeroway-runway                                      # line z12-
 aeroway-taxiway                                     # line z14-
-barrier-ditch                                       # line z17-
+barrier-ditch                                       # line z16-
 === 70
 
 isoline-step_10                                     # line z15- (also has pathtext z17-)
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index f4266f4398..82912f867d 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -675,11 +675,11 @@ highway-tertiary_link-tunnel                        # pathtext z18- (also has li
 
 historic-ship                                       # icon z16- (also has caption(optional) z16-)
 natural-water-basin                                 # caption z10- (also has area z1-)
-natural-water-ditch                                 # caption z17- (also has area z1-)
-natural-water-drain                                 # caption z17- (also has area z1-)
+natural-water-ditch                                 # caption z17- (also has area z13-)
+natural-water-drain                                 # caption z17- (also has area z13-)
 natural-water-lock                                  # caption z10- (also has area z1-)
 natural-water-moat                                  # caption z17- (also has area z1-)
-natural-water-wastewater                            # caption z17- (also has area z1-)
+natural-water-wastewater                            # caption z17- (also has area z12-)
 waterway-canal                                      # pathtext z13- (also has line z13-)
 waterway-fish_pass                                  # pathtext z13- (also has line z13-)
 waterway-stream                                     # pathtext z13- (also has line z13-)
diff --git a/data/styles/vehicle/include/priorities_2_BG-top.prio.txt b/data/styles/vehicle/include/priorities_2_BG-top.prio.txt
index 6674b6a4c2..09d92b7bb1 100644
--- a/data/styles/vehicle/include/priorities_2_BG-top.prio.txt
+++ b/data/styles/vehicle/include/priorities_2_BG-top.prio.txt
@@ -21,20 +21,20 @@ landuse-reservoir                                   # area z12- (also has captio
 landuse-salt_pond                                   # area z1-
 natural-water                                       # area z1- (also has caption z10-)
 natural-water-basin                                 # area z1- (also has caption z10-)
-natural-water-ditch                                 # area z1-
-natural-water-drain                                 # area z1-
+natural-water-ditch                                 # area z13-
+natural-water-drain                                 # area z13-
 natural-water-lake                                  # area z1- (also has caption z10-)
 natural-water-lock                                  # area z1- (also has caption z10-)
 natural-water-moat                                  # area z1-
 natural-water-pond                                  # area z1- (also has caption z10-)
 natural-water-reservoir                             # area z1- (also has caption z10-)
 natural-water-river                                 # area z1- (also has caption z10-)
-natural-water-wastewater                            # area z1-
+natural-water-wastewater                            # area z12-
 waterway-dock                                       # area z1-
 waterway-riverbank                                  # line z10- and area z1- (also has pathtext z11-)
 === 20
 
-waterway-ditch                                      # line z14-
-waterway-drain                                      # line z14-
+waterway-ditch                                      # line z13-
+waterway-drain                                      # line z13-
 waterway-river                                      # line z10- (also has pathtext z11-)
 === 10
diff --git a/data/types.txt b/data/types.txt
index 4a5865505b..be0d9e97eb 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -443,11 +443,11 @@ mapswithme
 *amenity|parking|fee|street_side
 *highway|path|difficult_alpine_hiking
 *earthquake:damage|spontaneous_camp
+*natural|water|drain
 mapswithme
-mapswithme
-mapswithme
-landuse|meadow
-mapswithme
+*natural|water|ditch
+*natural|water|moat
+*natural|water|wastewater
 mapswithme
 *highway|footway|demanding_mountain_hiking
 mapswithme
diff --git a/data/visibility.txt b/data/visibility.txt
index a70dd04396..6c0ce43857 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -733,12 +733,16 @@ world  00000000000000000000  +
         volcano  00000000000000000000  -
         water  11111111111111111111  +
             basin  11111111111111111111  -
+            ditch  00000000000001111111  -
+            drain  00000000000001111111  -
             lake  11111111111111111111  -
             lock  11111111111111111111  -
+            moat  11111111111111111111  -
             pond  11111111111111111111  -
             reservoir  11111111111111111111  -
             river  11111111111111111111  -
             tunnel  00000000000000000000  -
+            wastewater  00000000000011111111  -
             {}
         wetland  00000000000111111111  +
             bog  00000000000111111111  -
@@ -1360,11 +1364,11 @@ world  00000000000000000000  +
             tunnel  00000000000001111111  -
             {}
         dam  00000000000000011111  -
-        ditch  00000000000000000111  +
+        ditch  00000000000001111111  +
             tunnel  00000000000000000000  -
             {}
         dock  11111111111111111111  -
-        drain  00000000000000000111  +
+        drain  00000000000001111111  +
             tunnel  00000000000000000000  -
             {}
         fish_pass  00000000000000000000  +