From f7346ad6acac15103b18b3b9d24fc9fb0546c828 Mon Sep 17 00:00:00 2001
From: jeisenbe <joseph.eisenberg@gmail.com>
Date: Wed, 23 Jan 2019 19:18:35 +0900
Subject: [PATCH 1/5] Simplify low-zoom landcover rendering to 4 main colors

4 colors: tall vegetations, low vegetation, bare ground and built-up (developed) land
Glacier, water, mud, and land-color will also be shown. Farmland is still shown separately to z11.
Wetland and sand patterns are still shown early, though this may need to be reconsidered.
These colors are similar to those used in Christoph's alternative-colors fork

Remove low-zoom fading

Fix zoom level of airport fill to z11
Change track/pitch lowzoom to builtup
---
 style/landcover.mss | 337 +++++++++++++++++++++++++++++---------------
 1 file changed, 221 insertions(+), 116 deletions(-)

diff --git a/style/landcover.mss b/style/landcover.mss
index 8b43f500e5..ad5d432617 100644
--- a/style/landcover.mss
+++ b/style/landcover.mss
@@ -10,9 +10,6 @@
 @hedge: @forest;       // Lch(80,30,135)
 
 // --- "Base" landuses ---
-
-@built-up-lowzoom: #d0d0d0;
-@built-up-z12: #dddddd;
 @residential: #e0dfdf;      // Lch(89,0,0)
 @residential-line: #b9b9b9; // Lch(75,0,0)
 @retail: #ffd6d1;           // Lch(89,16,30)
@@ -68,13 +65,15 @@
 @stadium: @leisure; // also sports_centre
 @golf_course: #b5e3b5;
 
+// --- Low-zoom ---
+
+@built-up-lowzoom: #d7d4d3;
+@vegetation-tall-lowzoom: #b6dca6;
+@vegetation-low-lowzoom: #ddecbd;
+@bare_ground-lowzoom: #efe7d9;
+
 #landcover-low-zoom[zoom < 10],
 #landcover[zoom >= 10] {
-  ::low-zoom[zoom < 12] { image-filters: scale-hsla(0,1,0,1,0.2,1,0,1); }
-  ::high-zoom[zoom >= 12]                 { image-filters: scale-hsla(0,1,0,1,0,  1,   0,1); }
-
-  ::low-zoom[zoom < 12],
-  ::high-zoom[zoom >= 12] {
 
   [feature = 'leisure_swimming_pool'][zoom >= 14] {
     polygon-fill: @water-color;
@@ -90,7 +89,10 @@
   [feature = 'landuse_recreation_ground'][zoom >= 10],
   [feature = 'leisure_playground'][zoom >= 13],
   [feature = 'leisure_fitness_station'][zoom >= 13] {
-    polygon-fill: @leisure;
+    polygon-fill: @vegetation-low-lowzoom;
+    [zoom >= 12] {
+      polygon-fill: @leisure;
+    }
     [zoom >= 15] {
       line-color: darken(@leisure, 60%);
       line-width: 0.3;
@@ -103,10 +105,13 @@
   [feature = 'tourism_caravan_site'],
   [feature = 'tourism_picnic_site'] {
     [zoom >= 10] {
-      polygon-fill: @campsite;
-      [zoom >= 13] {
-        line-color: saturate(darken(@campsite, 60%), 30%);
-        line-width: 0.3;
+      polygon-fill: @vegetation-low-lowzoom;
+      [zoom >= 12] {
+        polygon-fill: @campsite;
+        [zoom >= 13] {
+          line-color: saturate(darken(@campsite, 60%), 30%);
+          line-width: 0.3;
+        }
       }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
@@ -114,19 +119,25 @@
   }
 
   [feature = 'landuse_quarry'][zoom >= 10] {
-    polygon-fill: @quarry;
-    polygon-pattern-file: url('symbols/quarry.svg');
-    [zoom >= 13] {
-      line-width: 0.5;
-      line-color: darken(@quarry, 10%);
+    polygon-fill: @bare_ground-lowzoom;
+    [zoom >= 11] {
+      polygon-fill: @quarry;
+      polygon-pattern-file: url('symbols/quarry.svg');
+      [zoom >= 13] {
+        line-width: 0.5;
+        line-color: darken(@quarry, 10%);
+      }
+      [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
+      [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
     }
-    [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
   }
 
   [feature = 'landuse_vineyard'] {
     [zoom >= 5] {
-      polygon-fill: @orchard;
+      polygon-fill: @vegetation-tall-lowzoom;
+      [zoom >= 12] {
+        polygon-fill: @orchard;
+      }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
@@ -140,7 +151,10 @@
 
   [feature = 'landuse_orchard'] {
     [zoom >= 5] {
-      polygon-fill: @orchard;
+      polygon-fill: @vegetation-tall-lowzoom;
+      [zoom >= 12] {
+        polygon-fill: @orchard;
+      }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
@@ -154,7 +168,10 @@
 
   [feature = 'leisure_garden'] {
     [zoom >= 10] {
-      polygon-fill: @grass;
+      polygon-fill: @vegetation-low-lowzoom;
+      [zoom >= 12] {
+        polygon-fill: @grass;
+      }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
@@ -169,7 +186,10 @@
 
   [feature = 'landuse_plant_nursery'] {
     [zoom >= 10] {
-      polygon-fill: @orchard;
+      polygon-fill: @vegetation-tall-lowzoom;
+      [zoom >= 12] {
+        polygon-fill: @orchard;
+      }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
@@ -184,7 +204,10 @@
   [feature = 'landuse_cemetery'],
   [feature = 'amenity_grave_yard'] {
     [zoom >= 10] {
-      polygon-fill: @cemetery;
+      polygon-fill: @vegetation-low-lowzoom;
+      [zoom >= 12] {
+        polygon-fill: @cemetery;
+      }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
@@ -224,7 +247,6 @@
 
   [feature = 'landuse_residential'][zoom >= 8] {
     polygon-fill: @built-up-lowzoom;
-    [zoom >= 12] { polygon-fill: @built-up-z12; }
     [zoom >= 13] { polygon-fill: @residential; }
     [zoom >= 16] {
       line-width: .5;
@@ -237,15 +259,19 @@
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 
-  [feature = 'landuse_garages'][zoom >= 13] {
-    polygon-fill: @garages;
+  [feature = 'landuse_garages'][zoom >= 10] {
+    polygon-fill: @built-up-lowzoom;
+    [zoom >= 13] { polygon-fill: @garages; }
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 
   [feature = 'leisure_park'] {
     [zoom >= 10] {
-      polygon-fill: @park;
+      polygon-fill: @vegetation-low-lowzoom;
+      [zoom >= 12] {
+        polygon-fill: @park;
+      }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
@@ -253,6 +279,9 @@
 
   [feature = 'leisure_ice_rink'][is_building = 'no'] {
     [zoom >= 10] {
+      polygon-fill: @built-up-lowzoom;
+    }
+    [zoom >= 13] {
       polygon-fill: @glacier;
       line-width: 0.5;
       line-color: saturate(darken(@pitch, 30%), 20%);
@@ -263,28 +292,37 @@
 
   [feature = 'leisure_dog_park'] {
     [zoom >= 10] {
-      polygon-fill: @leisure;
+      polygon-fill: @vegetation-low-lowzoom;
+      [zoom >= 12] {
+        polygon-fill: @leisure;
+      }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
-    }
-    [zoom >= 16] {
-      polygon-pattern-file: url('symbols/dog_park.png');
-      polygon-pattern-alignment: global;
-      [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
+      [zoom >= 16] {
+        polygon-pattern-file: url('symbols/dog_park.png');
+        polygon-pattern-alignment: global;
+        [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
+        [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
+      }
     }
   }
 
   [feature = 'leisure_golf_course'][zoom >= 10],
   [feature = 'leisure_miniature_golf'][zoom >= 15] {
-    polygon-fill: @golf_course;
+    polygon-fill: @vegetation-low-lowzoom;
+    [zoom >= 12] {
+      polygon-fill: @golf_course;
+    }
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 
   [feature = 'landuse_allotments'] {
     [zoom >= 10] {
-      polygon-fill: @allotments;
+      polygon-fill: @vegetation-low-lowzoom;
+      [zoom >= 11] {
+        polygon-fill: @allotments;
+      }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
@@ -306,14 +344,19 @@
   [feature = 'landuse_forest'],
   [feature = 'natural_wood'] {
     [zoom >= 5] {
-      polygon-fill: @forest;
+      polygon-fill: @vegetation-tall-lowzoom;
+      [zoom >= 12] {
+        polygon-fill: @forest;
+      }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
   }
 
   [feature = 'landuse_farmyard'][zoom >= 10] {
-    polygon-fill: @farmyard;
+    polygon-fill: @built-up-lowzoom;
+    [zoom >= 12] {
+      polygon-fill: @farmyard;
       [zoom >= 16] {
         line-width: 0.5;
         line-color: @farmyard-line;
@@ -321,6 +364,7 @@
           line-width: 0.7;
         }
       }
+    }
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
@@ -328,7 +372,10 @@
   [feature = 'landuse_farmland'],
   [feature = 'landuse_greenhouse_horticulture'] {
     [zoom >= 5] {
-      polygon-fill: @farmland;
+      polygon-fill: @vegetation-low-lowzoom;
+      [zoom >= 11] {
+        polygon-fill: @farmland;
+      }
       [zoom >= 16] {
         line-width: .5;
         line-color: @farmland-line;
@@ -342,7 +389,10 @@
   [feature = 'landuse_meadow'][zoom >= 5],
   [feature = 'landuse_grass'][zoom >= 5],
   [feature = 'landuse_village_green'][zoom >= 5] {
-    polygon-fill: @grass;
+    polygon-fill: @vegetation-low-lowzoom;
+    [zoom >= 12] {
+      polygon-fill: @grass;
+    }
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
@@ -352,7 +402,6 @@
   [feature = 'amenity_marketplace'] {
     [zoom >= 8] {
       polygon-fill: @built-up-lowzoom;
-      [zoom >= 12] { polygon-fill: @built-up-z12; }
       [zoom >= 13] { polygon-fill: @retail; }
       [zoom >= 16] {
         line-width: 0.5;
@@ -368,7 +417,6 @@
 
   [feature = 'landuse_industrial'][zoom >= 8] {
     polygon-fill: @built-up-lowzoom;
-    [zoom >= 12] { polygon-fill: @built-up-z12; }
     [zoom >= 13] { polygon-fill: @industrial; }
     [zoom >= 16] {
       line-width: .5;
@@ -390,21 +438,29 @@
   }
 
   [feature = 'man_made_wastewater_plant'] {
-    polygon-fill: @industrial;
-    [zoom >= 15] {
-      polygon-fill: @wastewater_plant;
-    }
-    [zoom >= 16] {
-      line-width: 0.5;
-      line-color: @wastewater_plant-line;
-      [name != ''] {
-        line-width: 0.7;
+    [zoom >= 10] {
+      polygon-fill: @built-up-lowzoom;
+      [zoom >= 13] {
+        polygon-fill: @industrial;
+      }
+      [zoom >= 15] {
+        polygon-fill: @wastewater_plant;
+      }
+      [zoom >= 16] {
+        line-width: 0.5;
+        line-color: @wastewater_plant-line;
+        [name != ''] {
+          line-width: 0.7;
+        }
       }
     }
   }
 
-  [feature = 'man_made_water_works'] {
-    polygon-fill: @industrial;
+  [feature = 'man_made_water_works'][zoom >= 10] {
+    polygon-fill: @built-up-lowzoom;
+    [zoom >= 13] {
+      polygon-fill: @industrial;
+    }
     [zoom >= 15] {
       polygon-fill: @water_works;
     }
@@ -417,9 +473,11 @@
     }
   }
 
+  [feature = 'railway_station'][zoom >= 10],
   [feature = 'landuse_railway'][zoom >= 10] {
-    polygon-fill: @railway;
-    [zoom >= 16][name != ''] {
+    polygon-fill: @built-up-lowzoom;
+    [zoom >= 13] { polygon-fill: @railway; }
+    [zoom >= 16][feature = 'landuse_railway'][[name != ''] {
       line-width: 0.7;
       line-color: @railway-line;
     }
@@ -431,7 +489,10 @@
   [feature = 'power_generator'][zoom >= 10],
   [feature = 'power_sub_station'][zoom >= 13],
   [feature = 'power_substation'][zoom >= 13] {
-    polygon-fill: @industrial;
+    polygon-fill: @built-up-lowzoom;
+    [zoom >= 13] {
+      polygon-fill: @industrial;
+    }
     [zoom >= 15] {
       polygon-fill: @power;
     }
@@ -448,7 +509,6 @@
 
   [feature = 'landuse_commercial'][zoom >= 8] {
     polygon-fill: @built-up-lowzoom;
-    [zoom >= 12] { polygon-fill: @built-up-z12; }
     [zoom >= 13] { polygon-fill: @commercial; }
     [zoom >= 16] {
       line-width: 0.5;
@@ -464,23 +524,32 @@
   [feature = 'landuse_brownfield'],
   [feature = 'landuse_construction'] {
     [zoom >= 10] {
-      polygon-fill: @construction;
+      polygon-fill: @built-up-lowzoom;
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [zoom >= 13] {
+        polygon-fill: @construction;
+      }
     }
   }
 
   [feature = 'landuse_landfill'] {
     [zoom >= 10] {
-      polygon-fill: #b6b592;
+      polygon-fill: @bare_ground-lowzoom;
+      [zoom >= 11] {
+        polygon-fill: #b6b592;
+      }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
   }
 
   [feature = 'natural_bare_rock'][zoom >= 5] {
-    polygon-fill: @bare_ground;
+    polygon-fill: @bare_ground-lowzoom;
     polygon-pattern-file: url('symbols/rock_overlay.png');
+    [zoom >= 12] {
+      polygon-fill: @bare_ground;
+    }
     [way_pixels >= 4] {
       polygon-gamma: 0.75;
       polygon-pattern-gamma: 0.75;
@@ -494,7 +563,10 @@
   [feature = 'natural_scree'],
   [feature = 'natural_shingle'] {
     [zoom >= 5] {
-      polygon-fill: @bare_ground;
+      polygon-fill: @bare_ground-lowzoom;
+      [zoom >= 12] {
+        polygon-fill: @bare_ground;
+      }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
       [zoom >= 13] {
@@ -506,25 +578,37 @@
   }
 
   [feature = 'natural_sand'][zoom >= 5] {
-    polygon-fill: @sand;
+    polygon-fill: @bare_ground-lowzoom;
+    [zoom >= 12] {
+      polygon-fill: @sand;
+    }
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 
   [feature = 'natural_heath'][zoom >= 5] {
-    polygon-fill: @heath;
+    polygon-fill: @vegetation-low-lowzoom;
+    [zoom >= 12] {
+      polygon-fill: @heath;
+    }
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 
   [feature = 'natural_scrub'][zoom >= 5] {
-    polygon-fill: @scrub;
+    polygon-fill: @vegetation-tall-lowzoom;
+    [zoom >= 12] {
+      polygon-fill: @scrub;
+    }
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 
   [feature = 'wetland_swamp'][zoom >= 5] {
-    polygon-fill: @forest;
+    polygon-fill: @vegetation-tall-lowzoom;
+    [zoom >= 12] {
+      polygon-fill: @forest;
+    }
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
@@ -544,7 +628,10 @@
   [feature = 'wetland_bog'],
   [feature = 'wetland_string_bog'] {
     [zoom >= 5] {
-      polygon-fill: @heath;
+      polygon-fill: @vegetation-low-lowzoom;
+      [zoom >= 12] {
+        polygon-fill: @heath;
+      }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
@@ -555,12 +642,15 @@
   [feature = 'wetland_saltmarsh'],
   [feature = 'wetland_marsh'] {
     [zoom >= 5] {
-      polygon-fill: @grass;
-      [feature = 'wetland_saltmarsh'][zoom >= 13] {
-        polygon-pattern-file: url('symbols/salt-dots-2.png');
-        polygon-pattern-alignment: global;
-        [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-        [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
+      polygon-fill: @vegetation-low-lowzoom;
+      [zoom >= 12] {
+        polygon-fill: @grass;
+        [feature = 'wetland_saltmarsh'][zoom >= 13] {
+          polygon-pattern-file: url('symbols/salt-dots-2.png');
+          polygon-pattern-alignment: global;
+          [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
+          [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
+        }
       }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
@@ -578,31 +668,31 @@
   [feature = 'amenity_arts_centre'] {
     [zoom >= 10] {
       polygon-fill: @built-up-lowzoom;
+      [zoom >= 13] {
+        polygon-fill: @societal_amenities;
+        line-width: 0.3;
+        line-color: darken(@societal_amenities, 35%);
+      }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
-    [zoom >= 12] {
-      polygon-fill: @built-up-z12;
-    }
-    [zoom >= 13] {
-      polygon-fill: @societal_amenities;
-      line-width: 0.3;
-      line-color: darken(@societal_amenities, 35%);
-    }
   }
 
-  [feature = 'amenity_fire_station'][zoom >= 8][way_pixels > 900],
-  [feature = 'amenity_police'][zoom >= 8][way_pixels > 900],
-  [feature = 'amenity_fire_station'][zoom >= 13],
-  [feature = 'amenity_police'][zoom >= 13] {
-    polygon-fill: #F3E3DD;
-    line-color: @military;
-    line-opacity: 0.24;
-    line-width: 1.0;
-    line-offset: -0.5;
-    [zoom >= 15] {
-      line-width: 2;
-      line-offset: -1.0;
+  [feature = 'amenity_fire_station'],
+  [feature = 'amenity_police'] {
+    [zoom >= 10] {
+      polygon-fill: @built-up-lowzoom;
+      [zoom >= 12] {
+        polygon-fill: #F3E3DD;
+        line-color: @military;
+        line-opacity: 0.24;
+        line-width: 1.0;
+        line-offset: -0.5;
+        [zoom >= 15] {
+          line-width: 2;
+          line-offset: -1.0;
+        }
+      }
     }
   }
 
@@ -627,7 +717,9 @@
   }
 
   [feature = 'aeroway_apron'][zoom >= 10] {
-    polygon-fill: @apron;
+    polygon-fill: @built-up-lowzoom;
+    [zoom >= 11] { polygon-fill: @transportation-area; }
+    [zoom >= 12] { polygon-fill: @apron; }
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
@@ -635,16 +727,24 @@
   [feature = 'aeroway_aerodrome'][zoom >= 10],
   [feature = 'amenity_ferry_terminal'][zoom >= 15],
   [feature = 'amenity_bus_station'][zoom >= 15] {
-    polygon-fill: @transportation-area;
-    line-width: 0.2;
-    line-color: saturate(darken(@transportation-area, 40%), 20%);
+    polygon-fill: @built-up-lowzoom;
+    [zoom >= 11] {
+      polygon-fill: @transportation-area;
+      [zoom >= 13] {
+        line-width: 0.2;
+        line-color: saturate(darken(@transportation-area, 40%), 20%);
+      }
+    }
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 
   [feature = 'natural_beach'][zoom >= 10],
   [feature = 'natural_shoal'][zoom >= 10] {
-    polygon-fill: @beach;
+    polygon-fill: @bare_ground-lowzoom;
+    [zoom >= 11] {
+      polygon-fill: @beach;
+    }
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
@@ -652,50 +752,55 @@
   [feature = 'highway_services'],
   [feature = 'highway_rest_area'] {
     [zoom >= 10] {
-      polygon-fill: @rest_area;
+      polygon-fill: @built-up-lowzoom;
+      [zoom >= 12] {
+        polygon-fill: @rest_area;
+      }
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
   }
 
-  [feature = 'railway_station'][zoom >= 10] {
-    polygon-fill: @railway;
-  }
-
   [feature = 'leisure_sports_centre'],
   [feature = 'leisure_stadium'] {
     [zoom >= 10] {
-      polygon-fill: @stadium;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      polygon-fill: @built-up-lowzoom;
       [zoom >= 13] {
+        polygon-fill: @stadium;
         line-width: 0.3;
         line-color: darken(@stadium, 35%);
       }
+      [way_pixels >= 4]  { polygon-gamma: 0.75; }
+      [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
   }
 
   [feature = 'leisure_track'][zoom >= 10] {
-    polygon-fill: @track;
-    [zoom >= 15] {
-      line-width: 0.5;
-      line-color: desaturate(darken(@track, 20%), 10%);
+    polygon-fill: @built-up-lowzoom;
+    [zoom >= 13] {
+      polygon-fill: @track;
+      [zoom >= 15] {
+        line-width: 0.5;
+        line-color: desaturate(darken(@track, 20%), 10%);
+      }
     }
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 
   [feature = 'leisure_pitch'][zoom >= 10] {
-    polygon-fill: @pitch;
-    [zoom >= 15] {
-      line-width: 0.5;
-      line-color: desaturate(darken(@pitch, 20%), 10%);
+    polygon-fill: @built-up-lowzoom;
+    [zoom >= 13] {
+      polygon-fill: @pitch;
+      [zoom >= 15] {
+        line-width: 0.5;
+        line-color: desaturate(darken(@pitch, 20%), 10%);
+      }
     }
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 }
-}
 
 /* man_made=cutline */
 #landcover-line {

From c3af0f6cf65f31574293cca78227fc559fc1ddd9 Mon Sep 17 00:00:00 2001
From: jeisenbe <joseph.eisenberg@gmail.com>
Date: Tue, 5 Feb 2019 13:21:53 +0900
Subject: [PATCH 2/5] Change river-color to #8fcadd, water-color to #a2d1e0

---
 project.mml     |  1 +
 style/style.mss |  5 ++++-
 style/water.mss | 54 ++++++++++++++++++++++++++++++++++++++-----------
 3 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/project.mml b/project.mml
index b28aa64052..64881285e0 100644
--- a/project.mml
+++ b/project.mml
@@ -229,6 +229,7 @@ Layer:
             way,
             "natural",
             waterway,
+            water,
             landuse,
             way_area/NULLIF(POW(!scale_denominator!*0.001*0.28,2),0) AS way_pixels,
             CASE WHEN tags->'intermittent' IN ('yes')
diff --git a/style/style.mss b/style/style.mss
index 6bb5b6aee5..c7acf5602d 100644
--- a/style/style.mss
+++ b/style/style.mss
@@ -2,8 +2,11 @@ Map {
   background-color: @land-color;
 }
 
-@water-color: #aad3df;
+@water-color: #a2d1e0;     // Lch(81,17,227)
+@river-color: #8fcadd;     // Lch(78,21,227)
+
 @land-color: #f2efe9;
 
+
 @standard-halo-radius: 1;
 @standard-halo-fill: rgba(255,255,255,0.6);
diff --git a/style/water.mss b/style/water.mss
index 84829eda3d..65ca8b43d3 100644
--- a/style/water.mss
+++ b/style/water.mss
@@ -17,20 +17,50 @@
     }
   }
 
-  [waterway = 'dock'],
-  [landuse = 'basin'],
-  [natural = 'water'],
-  [landuse = 'reservoir'],
-  [waterway = 'riverbank'] {
+  [natural = 'water'][water != 'river'][water != 'canal'][waterway != 'riverbank']::natural,
+  [waterway = 'dock'][zoom >= 9],
+  [landuse = 'basin'][zoom >= 7],
+  [landuse = 'reservoir']::landuse {
     [int_intermittent = 'no'] {
       polygon-fill: @water-color;
-      [way_pixels >= 4] { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.6; }
     }
     [int_intermittent = 'yes'] {
       polygon-pattern-file: url('symbols/intermittent_water.png');
-      [way_pixels >= 4] { polygon-pattern-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-pattern-gamma: 0.6; }
+      [way_pixels >= 4] {
+        polygon-pattern-gamma: 0.75;
+      }
+      [way_pixels >= 64] {
+        polygon-pattern-gamma: 0.6;
+      }
+    }
+    [way_pixels >= 4] {
+      polygon-gamma: 0.75;
+    }
+    [way_pixels >= 64] {
+      polygon-gamma: 0.6;
+    }
+  }
+
+  [natural = 'water'][water = 'river']::natural,
+  [natural = 'water'][water = 'canal']::natural,
+  [waterway = 'riverbank']::waterway {
+    [int_intermittent = 'no'] {
+      polygon-fill: @river-color;
+      [way_pixels >= 4] {
+        polygon-gamma: 0.75;
+      }
+      [way_pixels >= 64] {
+        polygon-gamma: 0.6;
+      }
+    }
+    [int_intermittent = 'yes'] {
+      polygon-pattern-file: url('symbols/intermittent_water.png');
+      [way_pixels >= 4] {
+        polygon-pattern-gamma: 0.75;
+      }
+      [way_pixels >= 64] {
+        polygon-pattern-gamma: 0.6;
+      }
     }
   }
 }
@@ -66,7 +96,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; }
@@ -96,7 +126,7 @@
       }
     }
 
-    water/line-color: @water-color;
+    water/line-color: @river-color;
     water/line-width: 2;
     water/line-cap: round;
     water/line-join: round;
@@ -154,7 +184,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;

From 708595739d8b639fa590fc4ac3b6b62afd5f3b9a Mon Sep 17 00:00:00 2001
From: jeisenbe <joseph.eisenberg@gmail.com>
Date: Tue, 5 Feb 2019 19:32:03 +0900
Subject: [PATCH 3/5] Change to ocean polygons, move ocean and water above
 water-lines

---
 style/shapefiles.mss | 2 +-
 style/style.mss      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/style/shapefiles.mss b/style/shapefiles.mss
index 585cda6512..eca07f4287 100644
--- a/style/shapefiles.mss
+++ b/style/shapefiles.mss
@@ -13,7 +13,7 @@
 
 #ocean-lz,
 #ocean {
-  polygon-fill: @water-color;
+  polygon-fill: @ocean-color;
 }
 
 #icesheet-poly {
diff --git a/style/style.mss b/style/style.mss
index c7acf5602d..26d3821e9f 100644
--- a/style/style.mss
+++ b/style/style.mss
@@ -2,11 +2,12 @@ Map {
   background-color: @land-color;
 }
 
+@land-color: #f2efe9;
+
 @water-color: #a2d1e0;     // Lch(81,17,227)
+@ocean-color: @water-color;
 @river-color: #8fcadd;     // Lch(78,21,227)
 
-@land-color: #f2efe9;
-
 
 @standard-halo-radius: 1;
 @standard-halo-fill: rgba(255,255,255,0.6);

From ab38107807c0a500ba149913298d5f9fca86d4f1 Mon Sep 17 00:00:00 2001
From: jeisenbe <joseph.eisenberg@gmail.com>
Date: Mon, 7 Oct 2019 10:28:36 +0900
Subject: [PATCH 4/5] Change ocean-color to #b5d7e3 Lch(84,13,227)

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

diff --git a/style/style.mss b/style/style.mss
index 26d3821e9f..f90fff2fae 100644
--- a/style/style.mss
+++ b/style/style.mss
@@ -5,7 +5,7 @@ Map {
 @land-color: #f2efe9;
 
 @water-color: #a2d1e0;     // Lch(81,17,227)
-@ocean-color: @water-color;
+@ocean-color: #b5d7e3;     // Lch(84,13,227)
 @river-color: #8fcadd;     // Lch(78,21,227)
 
 

From ec2f0a26a2bf6677ae20a7897419f4084f570e12 Mon Sep 17 00:00:00 2001
From: jeisenbe <joseph.eisenberg@gmail.com>
Date: Sun, 22 Mar 2020 12:43:32 +0900
Subject: [PATCH 5/5] Fix intermittent river pattern

---
 style/water.mss | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/style/water.mss b/style/water.mss
index 65ca8b43d3..c7ce28269c 100644
--- a/style/water.mss
+++ b/style/water.mss
@@ -5,7 +5,7 @@
 @waterway-text-repeat-distance: 200;
 
 #water-areas {
-  [natural = 'glacier']::natural {
+  [natural = 'glacier'] {
     [zoom >= 5] {
       line-width: 1.0;
       line-color: @glacier-line;
@@ -17,10 +17,10 @@
     }
   }
 
-  [natural = 'water'][water != 'river'][water != 'canal'][waterway != 'riverbank']::natural,
+  [natural = 'water'][water != 'river'][water != 'canal'][waterway != 'riverbank'],
   [waterway = 'dock'][zoom >= 9],
   [landuse = 'basin'][zoom >= 7],
-  [landuse = 'reservoir']::landuse {
+  [landuse = 'reservoir'] {
     [int_intermittent = 'no'] {
       polygon-fill: @water-color;
     }
@@ -41,8 +41,8 @@
     }
   }
 
-  [natural = 'water'][water = 'river']::natural,
-  [natural = 'water'][water = 'canal']::natural,
+  [natural = 'water'][water = 'river'],
+  [natural = 'water'][water = 'canal'],
   [waterway = 'riverbank']::waterway {
     [int_intermittent = 'no'] {
       polygon-fill: @river-color;
@@ -54,7 +54,7 @@
       }
     }
     [int_intermittent = 'yes'] {
-      polygon-pattern-file: url('symbols/intermittent_water.png');
+      polygon-pattern-file: url('symbols/intermittent_river.png');
       [way_pixels >= 4] {
         polygon-pattern-gamma: 0.75;
       }