From b6faefe86362cad8b7933919f6cc820bfc09acdd Mon Sep 17 00:00:00 2001
From: Joseph E <42757252+jeisenbe@users.noreply.github.com>
Date: Fri, 25 Oct 2019 22:33:21 +0900
Subject: [PATCH] Create darker river-color for river & canal areas and ditch,
 drain, stream, canal & river lines (#3930)

* Change river color to #8fcadd - Lch(78,21,227)

The color of river, canal, ditch and drain lines is changed to `@river-color` in `#8fcadd` to be more visible over forest and other dark landcover areas.
The color of river and canal areas is changed to match. This also improves mapper feedback about tagging of water areas
Added a new intermittent_river.png pattern in the new river-color
---
 project.mml                    |   1 +
 style.mss                      |   4 ++-
 symbols/intermittent_river.png | Bin 0 -> 558 bytes
 water.mss                      |  50 +++++++++++++++++++++++----------
 4 files changed, 39 insertions(+), 16 deletions(-)
 create mode 100644 symbols/intermittent_river.png

diff --git a/project.mml b/project.mml
index 4668297a95..aa06662452 100644
--- a/project.mml
+++ b/project.mml
@@ -228,6 +228,7 @@ Layer:
         (SELECT
             way,
             "natural",
+            water,
             waterway,
             landuse,
             name,
diff --git a/style.mss b/style.mss
index 6bb5b6aee5..7e3ee5d470 100644
--- a/style.mss
+++ b/style.mss
@@ -2,8 +2,10 @@ Map {
   background-color: @land-color;
 }
 
-@water-color: #aad3df;
 @land-color: #f2efe9;
 
+@water-color: #aad3df;
+@river-color: #8fcadd;     // Lch(78,21,227)
+
 @standard-halo-radius: 1;
 @standard-halo-fill: rgba(255,255,255,0.6);
diff --git a/symbols/intermittent_river.png b/symbols/intermittent_river.png
new file mode 100644
index 0000000000000000000000000000000000000000..a782778627d2a67083c77a3c688e1b1cc68582af
GIT binary patch
literal 558
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NSwWJ?9znhg
z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!CBxDS<Jw|cLanPr)u*_
zGcYhlW`;zRMELqxCFkerC8p#jrRr7W764T<FxXUB0hzg}C5Z|ZxjA{oRu#5NU=>zC
zHb_`sNdc^+B->Ug!Z$#{Ilm}X!Bo#g&p^qJOF==wrYI%ND#*nRsvXF)RmvzSDX`Ml
zFE20GD>v55FG|-pw6wI;H!#vSGSUUA&@HaaD@m--%_~-h7y>iLCAB!YD6^m>Ge1uO
zWNu<oerbuVk`l-wIDojbBr^?RQ(iIDTR;!$gJkp#^$hgkW&^d_fJCkQi!xJzHiOK!
zGqeG#L=l79W1|nU9LX^dpMph!UbW-0(T4|{9hc7`^+;ey+IzY<hD30_y>yV1L4k+m
z;E{g^_q{n7#dE_&Zf17E!x?v;@5{K8mE--NeNy8`Aqfe81&M?PMm8w1fFZtJ@?h&_
RK0i>bc)I$ztaD0e0sv?OrC<O6

literal 0
HcmV?d00001

diff --git a/water.mss b/water.mss
index 8ae9d76e94..23fc0eefe0 100644
--- a/water.mss
+++ b/water.mss
@@ -60,22 +60,42 @@
     [zoom >= 1][zoom < 2][way_pixels >= 16],
     [zoom >= 2][zoom < 8][way_pixels >= 32],
     [zoom >= 8] {
-      [int_intermittent = 'no'] {
-        polygon-fill: @water-color;
-        [way_pixels >= 4] {
-          polygon-gamma: 0.75;
+      [water != 'river'][water != 'canal'][waterway != 'riverbank'] {
+        [int_intermittent = 'no'] {
+          polygon-fill: @water-color;
+          [way_pixels >= 4] {
+            polygon-gamma: 0.75;
+          }
+          [way_pixels >= 64] {
+            polygon-gamma: 0.6;
+          }
         }
-        [way_pixels >= 64] {
-          polygon-gamma: 0.6;
+        [int_intermittent = 'yes'] {
+          polygon-pattern-file: url('symbols/intermittent_water.png');
+          polygon-pattern-alignment: global;
+          [way_pixels >= 4] {
+            polygon-pattern-gamma: 0.75;
+          }
+          [way_pixels >= 64] {
+            polygon-pattern-gamma: 0.6;
+          }
         }
       }
-      [int_intermittent = 'yes'] {
-        polygon-pattern-file: url('symbols/intermittent_water.png');
-        [way_pixels >= 4] {
-          polygon-pattern-gamma: 0.75;
+      [natural = 'water'][water = 'river'],
+      [natural = 'water'][water = 'canal'],
+      [waterway = 'riverbank'] {
+        [int_intermittent = 'no'] {
+          polygon-fill: @river-color;
+          [way_pixels >= 4] { polygon-gamma: 0.75; }
+          [way_pixels >= 64] { polygon-gamma: 0.6; }
         }
-        [way_pixels >= 64] {
-          polygon-pattern-gamma: 0.6;
+        [int_intermittent  = 'yes'] {
+          [zoom >= 15] {
+            polygon-pattern-file: url('symbols/intermittent_river.png');
+            polygon-pattern-alignment: global;
+            [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
+            [way_pixels >= 64] { polygon-pattern-gamma: 0.6;  }
+          }
         }
       }
     }
@@ -113,7 +133,7 @@
       line-join: round;
       line-clip: false;
     }
-    line-color: @water-color;
+    line-color: @river-color;
     line-width: 0.7;
     [zoom >= 9] { line-width: 1.2; }
     [zoom >= 10] { line-width: 1.6; }
@@ -143,7 +163,7 @@
       }
     }
 
-    water/line-color: @water-color;
+    water/line-color: @river-color;
     water/line-width: 2;
     water/line-cap: round;
     water/line-join: round;
@@ -201,7 +221,7 @@
         background/line-color: @land-color;
       }
       water/line-width: 2;
-      water/line-color: @water-color;
+      water/line-color: @river-color;
 
       [bridge = 'yes'] {
         bridgecasing/line-color: black;