Merge pull request #4458 from pitdicker/vectorize_hatches

Vectorize hatches
gravitystorm · Sep 12, 2021 · 6a4cd4b · 6a4cd4b
2 parents 871804d + 6a3c6fb
commit 6a4cd4b
Show file tree

Hide file tree

Showing 34 changed files with 94 additions and 226 deletions.
diff --git a/patterns/allotments.svg b/patterns/allotments.svg
diff --git a/patterns/danger_red_hatch.svg b/patterns/danger_red_hatch.svg
diff --git a/patterns/dog_park.svg b/patterns/dog_park.svg
diff --git a/patterns/grave_yard_christian.svg b/patterns/grave_yard_christian.svg
diff --git a/patterns/grave_yard_generic.svg b/patterns/grave_yard_generic.svg
diff --git a/patterns/grave_yard_jewish.svg b/patterns/grave_yard_jewish.svg
diff --git a/patterns/grave_yard_muslim.svg b/patterns/grave_yard_muslim.svg
diff --git a/patterns/grey_vertical_hatch.svg b/patterns/grey_vertical_hatch.svg
diff --git a/patterns/intermittent_water.svg b/patterns/intermittent_water.svg
diff --git a/patterns/military_red_hatch.svg b/patterns/military_red_hatch.svg
diff --git a/patterns/orchard.svg b/patterns/orchard.svg
diff --git a/patterns/plant_nursery.svg b/patterns/plant_nursery.svg
diff --git a/patterns/vineyard.svg b/patterns/vineyard.svg
diff --git a/style/landcover.mss b/style/landcover.mss
@@ -133,7 +133,7 @@
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
     [zoom >= 13] {
-      polygon-pattern-file: url('symbols/vineyard.png');
+      polygon-pattern-file: url('patterns/vineyard.svg');
       polygon-pattern-alignment: global;
       [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
       [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
@@ -147,7 +147,7 @@
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
     [zoom >= 13] {
-      polygon-pattern-file: url('symbols/orchard.png');
+      polygon-pattern-file: url('patterns/orchard.svg');
       polygon-pattern-alignment: global;
       [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
       [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
@@ -161,7 +161,7 @@
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
     [zoom >= 13] {
-      polygon-pattern-file: url('symbols/plant_nursery.png');
+      polygon-pattern-file: url('patterns/plant_nursery.svg');
       polygon-pattern-opacity: 0.6;
       polygon-pattern-alignment: global;
       [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
@@ -176,7 +176,7 @@
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
     [zoom >= 13] {
-      polygon-pattern-file: url('symbols/plant_nursery.png');
+      polygon-pattern-file: url('patterns/plant_nursery.svg');
       polygon-pattern-alignment: global;
       [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
       [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
@@ -191,10 +191,10 @@
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
     [zoom >= 13] {
-      [religion = 'jewish'] { polygon-pattern-file: url('symbols/grave_yard_jewish.svg'); }
-      [religion = 'christian'] { polygon-pattern-file: url('symbols/grave_yard_christian.svg'); }
-      [religion = 'muslim'] { polygon-pattern-file: url('symbols/grave_yard_muslim.svg'); }
-      [religion = 'INT-generic'] { polygon-pattern-file: url('symbols/grave_yard_generic.svg'); }
+      [religion = 'jewish'] { polygon-pattern-file: url('patterns/grave_yard_jewish.svg'); }
+      [religion = 'christian'] { polygon-pattern-file: url('patterns/grave_yard_christian.svg'); }
+      [religion = 'muslim'] { polygon-pattern-file: url('patterns/grave_yard_muslim.svg'); }
+      [religion = 'INT-generic'] { polygon-pattern-file: url('patterns/grave_yard_generic.svg'); }
       [religion = 'jewish'],
       [religion = 'christian'],
       [religion = 'muslim'],
@@ -217,7 +217,9 @@
   }
 
   [feature = 'amenity_prison'][zoom >= 10][way_pixels > 75] {
-    polygon-pattern-file: url('symbols/grey_vertical_hatch.png');
+    polygon-fill: #8e8e8e;
+    polygon-opacity: 0.14;
+    polygon-pattern-file: url('patterns/grey_vertical_hatch.svg');
     polygon-pattern-alignment: global;
     line-color: #888;
     line-width: 3;
@@ -270,7 +272,7 @@
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
     [zoom >= 16] {
-      polygon-pattern-file: url('symbols/dog_park.png');
+      polygon-pattern-file: url('patterns/dog_park.svg');
       polygon-pattern-alignment: global;
       [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
       [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
@@ -291,7 +293,7 @@
       [way_pixels >= 64] { polygon-gamma: 0.3;  }
     }
     [zoom >= 13] {
-      polygon-pattern-file: url('symbols/allotments.png');
+      polygon-pattern-file: url('patterns/allotments.svg');
       polygon-pattern-alignment: global;
       [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
       [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
@@ -806,23 +808,31 @@
 
 #landuse-overlay {
   [landuse = 'military'][zoom >= 8][way_pixels > 900],
-  [landuse = 'military'][zoom >= 13],
-  [military = 'danger_area'][zoom >= 9] {
-    polygon-pattern-file: url('symbols/military_red_hatch.png');
+  [landuse = 'military'][zoom >= 13] {
+    polygon-fill: #ff5555;
+    polygon-opacity: 0.08;
+    polygon-pattern-file: url('patterns/military_red_hatch.svg');
     polygon-pattern-alignment: global;
     line-color: @military;
     line-opacity: 0.24;
     line-width: 1.0;
     line-offset: -0.5;
     [zoom >= 15] {
-      [military = 'danger_area'][zoom >= 9] {
-        polygon-pattern-file: url('symbols/danger_red_hatch.png');
-        line-opacity: 0.2;
-      }
       line-width: 2;
       line-offset: -1.0;
     }
   }
+
+  [military = 'danger_area'][zoom >= 9] {
+    polygon-fill: #ff5555;
+    polygon-opacity: 0.1;
+    polygon-pattern-file: url('patterns/danger_red_hatch.svg');
+    polygon-pattern-alignment: global;
+    line-color: @military;
+    line-opacity: 0.2;
+    line-width: 2;
+    line-offset: -1.0;
+  }
 }
 
 #cliffs {

diff --git a/style/water.mss b/style/water.mss
@@ -28,7 +28,7 @@
       [way_pixels >= 64] { polygon-gamma: 0.6; }
     }
     [int_intermittent = 'yes'] {
-      polygon-pattern-file: url('symbols/intermittent_water.png');
+      polygon-pattern-file: url('patterns/intermittent_water.svg');
       [way_pixels >= 4] { polygon-pattern-gamma: 0.75; }
       [way_pixels >= 64] { polygon-pattern-gamma: 0.6; }
     }

diff --git a/symbols/allotments.png b/symbols/allotments.png
diff --git a/symbols/danger_red_hatch.png b/symbols/danger_red_hatch.png
diff --git a/symbols/dog_park.png b/symbols/dog_park.png
diff --git a/symbols/generating_patterns/allotments.md b/symbols/generating_patterns/allotments.md
diff --git a/symbols/generating_patterns/allotments.svg b/symbols/generating_patterns/allotments.svg
diff --git a/symbols/generating_patterns/plant_nursery.md b/symbols/generating_patterns/plant_nursery.md
diff --git a/symbols/generating_patterns/plant_nursery.svg b/symbols/generating_patterns/plant_nursery.svg
diff --git a/symbols/grave_yard_christian.svg b/symbols/grave_yard_christian.svg
diff --git a/symbols/grave_yard_generic.svg b/symbols/grave_yard_generic.svg
diff --git a/symbols/grave_yard_jewish.svg b/symbols/grave_yard_jewish.svg
diff --git a/symbols/grave_yard_muslim.svg b/symbols/grave_yard_muslim.svg
diff --git a/symbols/grey_vertical_hatch.png b/symbols/grey_vertical_hatch.png
diff --git a/symbols/intermittent_river.png b/symbols/intermittent_river.png
diff --git a/symbols/intermittent_water.png b/symbols/intermittent_water.png
diff --git a/symbols/military_red_hatch.png b/symbols/military_red_hatch.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/plant_nursery.png b/symbols/plant_nursery.png
diff --git a/symbols/vineyard.png b/symbols/vineyard.png