adjust area colours and patterns

diff --git a/base.mss b/base.mss
index 28325150e50364d90ef91b2f684816e03fb2499d..a1bb51165ccf2e790fb99e65dff3b43ffc4d0085 100644 (file)
--- a/base.mss
+++ b/base.mss
@@ -22,8 +22,6 @@
 #landuse_gen0[zoom>3][zoom<=9],
 #landuse_gen1[zoom>9][zoom<=12],
 #landuse[zoom>12] {
-  [type='cemetery']      { polygon-fill: @cemetery; }
-  [type='grave_yard']    { polygon-fill: @cemetery; }
   [type='college']       { polygon-fill: @school; }
   [type='commercial']    { polygon-fill: @industrial; }
   [type='common']        { polygon-fill: @park; }
@@ -38,30 +36,43 @@
   [type='pedestrian']    { polygon-fill: @pedestrian_case; }
   [type='residential']   { polygon-fill: @residential; }
   [type='retail']        { polygon-fill: @residential; }
-  [type='school']        { polygon-fill: @school; }
-  [type='education']     { polygon-fill: @school; }
-  [type='sports_centre'] { polygon-fill: @sports; }
-  [type='stadium']       { polygon-fill: @sports; }
-  [type='university']    { polygon-fill: @school; }
-  [type='pitch']         { polygon-fill: @sports; polygon-opacity: 0.8; }
-  [type='grass']         { polygon-fill: @grass; }
-  [type='grassland']     { polygon-fill: @grass; }
-  [type='park']          { polygon-fill: @park; }
-  [type='garden']        { polygon-fill: @park; }
-  [type='village_green'] { polygon-fill: @park; }
-  [type='recreation_ground'] { polygon-fill: @park; }
-  [type='picnic_site']   { polygon-fill: @park; }
-  [type='camp_site']   { polygon-fill: @park; }
-  [type='playground']    { polygon-fill: @park; }
-  [type='forest']        { polygon-fill: @wooded; }
-  [type='wood']          { polygon-fill: @wooded; }
+
+  [type='school'],
+  [type='education'],
+  [type='sports_centre'],
+  [type='university'] {
+      line-color: @building_edge;
+      polygon-fill: @building;
+      polygon-pattern-file: url(./patterns/stripe.png);
+      polygon-pattern-alignment: global;
+  }
+
+  [type='pitch'],
+  [type='stadium'],
+  [type='cemetery'],
+  [type='grave_yard'],
+  [type='grass'],
+  [type='grassland'],
+  [type='park'],
+  [type='garden'],
+  [type='village_green'],
+  [type='recreation_ground'],
+  [type='picnic_site'],
+  [type='camp_site'],
+  [type='forest'],
+  [type='wood'],
+  [type='farmland'],
+  [type='farm'],
+  [type='orchard'],
+  [type='allotments'],
+  [type='playground']    {
+      polygon-fill: #FFFFFF;
+      polygon-pattern-file: url(./patterns/halftone2.png);
+      polygon-pattern-alignment: global;
+  }
   [type='heath']         { polygon-fill: @heath; }
   [type='meadow']        { polygon-fill: @heath; }
   [type='scrub']         { polygon-fill: @heath; }
-  [type='farmland']      { polygon-fill: @agriculture; }
-  [type='farm']          { polygon-fill: @agriculture; }
-  [type='orchard']       { polygon-fill: @agriculture; }
-  [type='allotments']    { polygon-fill: @agriculture; }
   [type='beach']         { polygon-fill: @beach; }
   [type='basin']         { polygon-fill: @water; }
   [type='salt_pond']     {
@@ -215,7 +226,7 @@
 /* ================================================================== */
 
 Map {
-  background-color: @water;
+  background-color: #FFFFFF;
   buffer-size: 256;
 }
 

diff --git a/palette.mss b/palette.mss
index e7f2ab19d4d5a41504dd961b60434a5b028af5a6..294a8d0ab832b621ff38638616f8e04e4a341e28 100644 (file)
--- a/palette.mss
+++ b/palette.mss
@@ -71,8 +71,8 @@ Map { font-directory: url(./fonts); }
 /* LANDUSE & LANDCOVER COLORS
 /* ================================================================== */
 
-@land:              #F7F6F1;
-@water:             #90cccb; //#79c1c0
+@land:              #FFFFFF;
+@water:             #000000;
 @beach:             #EEE5B2;
 @cemetery:          #D6DED2;
 @military:          #D1BFAA;
@@ -84,19 +84,20 @@ Map { font-directory: url(./fonts); }
 @wooded:            #B2C29D; //#95ae79;
 @grass:             @park;
 @agriculture:       #DEDDBE; //#c7c78d; //#C3D9AD;
-@heath:             #E1E9D6;
+@heath:             @land;
 @sports:            @park;
 
-@residential:       darken(@land, 4%);
-@commercial:        @land * 0.97;
-@industrial:        #D7C8CB;
+@residential:       @land;
+@commercial:        @land;
+@industrial:         @land;
 
-@building:          #dcd7d7;
+@building:          #FFFFFF;
+@building_edge:     #000000;
 @building_hedge:    #dcd7d7;
 @collapsed:         #b25047;
 @damaged:           #c87c38;
-@hospital:          rgb(229,198,195);
-@school:            #E2D6CD;
+@hospital:          #FFFFFF;
+@school:            #FFFFFF;
 
 
 /* ================================================================== */

diff --git a/patterns/halftone2.png b/patterns/halftone2.png
new file mode 100644 (file)
index 0000000..59adb66
Binary files /dev/null and b/patterns/halftone2.png differ

diff --git a/patterns/stripe.png b/patterns/stripe.png
new file mode 100644 (file)
index 0000000..1edff64
Binary files /dev/null and b/patterns/stripe.png differ