From 807d13c4243541a8ca4ad3f02fbda8c30232872e Mon Sep 17 00:00:00 2001
From: Ircama <amacri@tiscali.it>
Date: Mon, 22 Aug 2016 01:25:51 +0200
Subject: [PATCH 1/2] Text size logic changed to be similar to landcover in
 amenity-points.mss#L1455-L1475 Rebased

---
 water.mss | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/water.mss b/water.mss
index 918ba1d388..312efa1331 100644
--- a/water.mss
+++ b/water.mss
@@ -1,6 +1,17 @@
 @water-text: #6699cc;
 @glacier: #ddecec;
 @glacier-line: #9cf;
+@water-font-size-small: 10;
+@water-wrap-width-size-small: 25;
+@water-font-size: 12;
+@water-wrap-width-size: 30;
+@water-font-size-big: 15;
+@water-wrap-width-size-big: 35;
+@water-font-size-bigger48k: 17;
+@water-wrap-width-size-bigger48k: 45;
+@water-font-size-bigger1000k: 22;
+@water-wrap-width-size-bigger1000k: 150;
+@water-font-size-bigger1500k: 27;
 
 #water-areas {
   [natural = 'glacier']::natural {
@@ -285,13 +296,32 @@
     [zoom >= 10][way_pixels > 3000],
     [zoom >= 17] {
       text-name: "[name]";
-      text-size: 12;
+      text-size: @water-font-size-small;
       text-fill: @water-text;
       text-face-name: @oblique-fonts;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;
-      text-wrap-width: @standard-wrap-width;
+      text-wrap-width: @water-wrap-width-size-small;
       text-placement: interior;
+      [way_pixels > 4000] {
+      text-size: @water-font-size;
+      text-wrap-width: @water-wrap-width-size;
+      }
+      [way_pixels > 12000] {
+        text-size: @water-font-size-big;
+        text-wrap-width: @water-wrap-width-size-big;
+      }
+      [way_pixels > 48000] {
+        text-size: @water-font-size-bigger48k;
+        text-wrap-width: @water-wrap-width-size-bigger48k;
+      }
+      [way_pixels > 1000000] {
+        text-size: @water-font-size-bigger1000k;
+        text-wrap-width: @water-wrap-width-size-bigger1000k;
+      }
+      [way_pixels > 1500000] {
+        text-size: @water-font-size-bigger1500k;
+      }
     }
   }
 }

From 292ce8b7e2488a9e5f7480a5038afa973013b09b Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@ip-172-31-4-88.eu-west-1.compute.internal>
Date: Sat, 17 Sep 2016 09:24:18 +0000
Subject: [PATCH 2/2] Changed the text size logic so it's the same as landcover

The logic for water features has been changed following exactly https://github.com/gravitystorm/openstreetmap-carto/blob/master/amenity-points.mss#L1455-L1475
---
 water.mss | 41 +++++++++++++----------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/water.mss b/water.mss
index 312efa1331..f4f2d6c4a9 100644
--- a/water.mss
+++ b/water.mss
@@ -1,17 +1,13 @@
 @water-text: #6699cc;
 @glacier: #ddecec;
 @glacier-line: #9cf;
-@water-font-size-small: 10;
-@water-wrap-width-size-small: 25;
-@water-font-size: 12;
-@water-wrap-width-size: 30;
-@water-font-size-big: 15;
+
+@water-font-size: 10;
+@water-font-size-big: 12;
+@water-font-size-bigger: 15;
+@water-wrap-width-size: 25;
 @water-wrap-width-size-big: 35;
-@water-font-size-bigger48k: 17;
-@water-wrap-width-size-bigger48k: 45;
-@water-font-size-bigger1000k: 22;
-@water-wrap-width-size-bigger1000k: 150;
-@water-font-size-bigger1500k: 27;
+@water-wrap-width-size-bigger: 45;
 
 #water-areas {
   [natural = 'glacier']::natural {
@@ -296,32 +292,21 @@
     [zoom >= 10][way_pixels > 3000],
     [zoom >= 17] {
       text-name: "[name]";
-      text-size: @water-font-size-small;
-      text-fill: @water-text;
-      text-face-name: @oblique-fonts;
-      text-halo-radius: @standard-halo-radius;
-      text-halo-fill: @standard-halo-fill;
-      text-wrap-width: @water-wrap-width-size-small;
-      text-placement: interior;
-      [way_pixels > 4000] {
       text-size: @water-font-size;
       text-wrap-width: @water-wrap-width-size;
-      }
       [way_pixels > 12000] {
         text-size: @water-font-size-big;
         text-wrap-width: @water-wrap-width-size-big;
       }
       [way_pixels > 48000] {
-        text-size: @water-font-size-bigger48k;
-        text-wrap-width: @water-wrap-width-size-bigger48k;
-      }
-      [way_pixels > 1000000] {
-        text-size: @water-font-size-bigger1000k;
-        text-wrap-width: @water-wrap-width-size-bigger1000k;
-      }
-      [way_pixels > 1500000] {
-        text-size: @water-font-size-bigger1500k;
+        text-size: @water-font-size-bigger;
+        text-wrap-width: @water-wrap-width-size-bigger;
       }
+      text-fill: @water-text;
+      text-face-name: @oblique-fonts;
+      text-halo-radius: @standard-halo-radius;
+      text-halo-fill: @standard-halo-fill;
+      text-placement: interior;
     }
   }
 }