remove background color from polygon-pattern files

gravitystorm · Nov 9, 2014 · 2bc9001 · 2bc9001
1 parent 739298d
commit 2bc9001
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 19 deletions.
diff --git a/landcover.mss b/landcover.mss
@@ -5,7 +5,7 @@
 @golf_course: #b5e3b5;
 @park: #cdf7c9; // also recreation_ground
 @wood: #aed1a0;
-@vineyard: #abdf96;
+@vineyard: #b3e2a8;
 @grassland: #c6e4b4;
 
 // --- sports ---
@@ -54,6 +54,7 @@
 @sand: #ffdf88;
 @school: #f0f0d8; // also university, college, hospital, kindergarten
 @scrub: #b5e3b5;
+@orchard: #9ed88f;
 @theme_park: #734a08;
 @quarry: #c5c3c3;
 @military: #f55;
@@ -96,27 +97,27 @@
   }
 
   [feature = 'landuse_quarry'][zoom >= 10] {
-    polygon-pattern-file: url('symbols/quarry2.png');
+    polygon-fill: @quarry;
+    polygon-pattern-file: url('symbols/quarry.png');
     line-width: 0.5;
     line-color: grey;
     [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
     [way_pixels >= 64] { polygon-pattern-gamma: 0.6;  }
   }
 
   [feature = 'landuse_vineyard'] {
-    [zoom >= 10][zoom < 13] {
+    [zoom >= 10] {
       polygon-fill: @vineyard;
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.6;  }
     }
     [zoom >= 13] {
       polygon-pattern-file: url('symbols/vineyard.png');
-      [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-pattern-gamma: 0.6;  }
     }
   }
 
   [feature = 'landuse_orchard'][zoom >= 10] {
+    polygon-fill: @orchard;
     polygon-pattern-file: url('symbols/orchard.png');
     polygon-pattern-alignment: global;
     [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
@@ -125,21 +126,15 @@
 
   [feature = 'landuse_cemetery'],
   [feature = 'amenity_grave_yard'] {
-    [zoom >= 10][zoom < 14] {
+    [zoom >= 10] {
       polygon-fill: @cemetery;
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.6;  }
     }
     [zoom >= 14] {
-      [religion = 'jewish'] { polygon-pattern-file: url('symbols/cemetery_jewish.18.png'); }
-      [religion = 'christian'] { polygon-pattern-file: url('symbols/grave_yard.png'); }
+      [religion = 'jewish'] { polygon-pattern-file: url('symbols/grave_yard_jewish.png'); }
+      [religion = 'christian'] { polygon-pattern-file: url('symbols/grave_yard_christian.png'); }
       [religion = 'INT-generic'] { polygon-pattern-file: url('symbols/grave_yard_generic.png'); }
-      [religion = 'jewish'],
-      [religion = 'christian'],
-      [religion = 'INT-generic'] {
-        [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-        [way_pixels >= 64] { polygon-pattern-gamma: 0.6;  }
-      }
     }
   }
 
@@ -214,6 +209,7 @@
   }
 
   [feature = 'tourism_zoo'][zoom >= 10] {
+    polygon-fill: @zoo;
     polygon-pattern-file: url('symbols/zoo.png');
     [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
     [way_pixels >= 64] { polygon-pattern-gamma: 0.6;  }
@@ -411,15 +407,13 @@
   }
 
   [feature = 'natural_scrub'] {
-    [zoom >= 10][zoom < 14] {
+    [zoom >= 10] {
       polygon-fill: @scrub;
       [way_pixels >= 4]  { polygon-gamma: 0.75; }
       [way_pixels >= 64] { polygon-gamma: 0.6;  }
     }
     [zoom >= 14] {
       polygon-pattern-file: url('symbols/scrub.png');
-      [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-pattern-gamma: 0.6;  }
     }
   }
 
@@ -464,6 +458,7 @@
   }
 
   [feature = 'natural_beach'][zoom >= 10] {
+    polygon-fill: @beach;
     polygon-pattern-file: url('symbols/beach.png');
     polygon-pattern-alignment: global;
     [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }

diff --git a/symbols/beach.png b/symbols/beach.png
diff --git a/symbols/cemetery_jewish.18.png b/symbols/cemetery_jewish.18.png
diff --git a/symbols/glacier.png b/symbols/glacier.png
diff --git a/symbols/glacier2.png b/symbols/glacier2.png
diff --git a/symbols/grave_yard.png b/symbols/grave_yard.png
diff --git a/symbols/grave_yard_christian.png b/symbols/grave_yard_christian.png
diff --git a/symbols/grave_yard_generic.png b/symbols/grave_yard_generic.png
diff --git a/symbols/grave_yard_jewish.png b/symbols/grave_yard_jewish.png
diff --git a/symbols/mud.png b/symbols/mud.png
diff --git a/symbols/orchard.png b/symbols/orchard.png
diff --git a/symbols/quarry.png b/symbols/quarry.png
diff --git a/symbols/quarry2.png b/symbols/quarry2.png
diff --git a/symbols/scrub.png b/symbols/scrub.png
diff --git a/symbols/vineyard.png b/symbols/vineyard.png
diff --git a/symbols/zoo.png b/symbols/zoo.png
diff --git a/water.mss b/water.mss
@@ -1,16 +1,17 @@
 @water-text: #6699cc;
 @glacier: #ddecec;
 @glacier-line: #9cf;
+@mud: #e6dcd1;
 
 #water-areas {
   [natural = 'glacier']::natural {
     [zoom >= 6] {
       line-dasharray: 4,2;
       line-width: 1.5;
       line-color: @glacier-line;
-      polygon-pattern-file: url('symbols/glacier.png');
+      polygon-fill: @glacier;
       [zoom >= 8] {
-        polygon-pattern-file: url('symbols/glacier2.png');
+        polygon-pattern-file: url('symbols/glacier.png');
       }
     }
   }
@@ -54,6 +55,7 @@
   }
 
   [natural = 'mud'][zoom >= 13]::natural {
+    polygon-fill: @mud;
     polygon-pattern-file: url('symbols/mud.png');
     polygon-pattern-alignment: global;
   }