From 5d750f065438e6686c8780425be6078a384bb8d6 Mon Sep 17 00:00:00 2001
From: math1985 <info@matthijsmelissen.nl>
Date: Mon, 20 Nov 2017 19:19:21 +0100
Subject: [PATCH 1/4] Do not render small water areas on low zoom

On zoom levels 0-8, don't render small water areas (smaller than 32px).
---
 water.mss | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/water.mss b/water.mss
index e234e17e57..9395c2030f 100644
--- a/water.mss
+++ b/water.mss
@@ -30,20 +30,24 @@
     }
   }
 
-  [landuse = 'basin'][zoom >= 7]::landuse {
-    polygon-fill: @water-color;
-    [way_pixels >= 4] {
-      polygon-gamma: 0.75;
-    }
-    [way_pixels >= 64] {
-      polygon-gamma: 0.6;
+  [landuse = 'basin']::landuse {
+    [zoom >= 7][way_pixels >= 32],
+    [zoom >= 8] {
+      polygon-fill: @water-color;
+      [way_pixels >= 4] {
+        polygon-gamma: 0.75;
+      }
+      [way_pixels >= 64] {
+        polygon-gamma: 0.6;
+      }
     }
   }
 
   [natural = 'water']::natural,
   [landuse = 'reservoir']::landuse,
   [waterway = 'riverbank']::waterway {
-    [zoom >= 0] {
+    [zoom >= 0][way_pixels >= 32],
+    [zoom >= 8] {
       polygon-fill: @water-color;
       [way_pixels >= 4] {
         polygon-gamma: 0.75;

From a7cfb238c75fb6ca08ccba46a6de4a6b5b378bd3 Mon Sep 17 00:00:00 2001
From: math1985 <info@matthijsmelissen.nl>
Date: Wed, 6 Dec 2017 22:42:22 +0100
Subject: [PATCH 2/4] Less aggressive filtering of water on z0, z1 and z2

---
 water.mss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/water.mss b/water.mss
index 9395c2030f..30c8223c91 100644
--- a/water.mss
+++ b/water.mss
@@ -46,7 +46,9 @@
   [natural = 'water']::natural,
   [landuse = 'reservoir']::landuse,
   [waterway = 'riverbank']::waterway {
-    [zoom >= 0][way_pixels >= 32],
+    [zoom >= 0][way_pixels >= 4],
+    [zoom >= 1][way_pixels >= 16],
+    [zoom >= 2][way_pixels >= 32],
     [zoom >= 8] {
       polygon-fill: @water-color;
       [way_pixels >= 4] {

From bc1e777f16bc4fbce34ebea2d9021532f515d65c Mon Sep 17 00:00:00 2001
From: math1985 <info@matthijsmelissen.nl>
Date: Sat, 9 Dec 2017 14:46:24 +0100
Subject: [PATCH 3/4] Move cutoff for water on z2-7 to 64 pixels

---
 water.mss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/water.mss b/water.mss
index 30c8223c91..53c9fd3084 100644
--- a/water.mss
+++ b/water.mss
@@ -48,7 +48,7 @@
   [waterway = 'riverbank']::waterway {
     [zoom >= 0][way_pixels >= 4],
     [zoom >= 1][way_pixels >= 16],
-    [zoom >= 2][way_pixels >= 32],
+    [zoom >= 2][way_pixels >= 64],
     [zoom >= 8] {
       polygon-fill: @water-color;
       [way_pixels >= 4] {

From ba368d3212ee4203ba402eaa95ac8b9f199a18ab Mon Sep 17 00:00:00 2001
From: math1985 <info@matthijsmelissen.nl>
Date: Sat, 9 Dec 2017 15:10:51 +0100
Subject: [PATCH 4/4] Fix low-zoom water filtering

---
 water.mss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/water.mss b/water.mss
index 53c9fd3084..e42f055902 100644
--- a/water.mss
+++ b/water.mss
@@ -46,9 +46,9 @@
   [natural = 'water']::natural,
   [landuse = 'reservoir']::landuse,
   [waterway = 'riverbank']::waterway {
-    [zoom >= 0][way_pixels >= 4],
-    [zoom >= 1][way_pixels >= 16],
-    [zoom >= 2][way_pixels >= 64],
+    [zoom >= 0][zoom < 1][way_pixels >= 4],
+    [zoom >= 1][zoom < 2][way_pixels >= 16],
+    [zoom >= 2][zoom < 8][way_pixels >= 32],
     [zoom >= 8] {
       polygon-fill: @water-color;
       [way_pixels >= 4] {