Create darker river-color for river & canal areas and ditch, drain, s…

…tream, canal & river lines (gravitystorm#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

@@ -228,6 +228,7 @@ Layer:
         (SELECT
             way,
             "natural",
+            water,
             waterway,
             landuse,
             name,

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);

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;