Modified military danger area to match styling of the military area.

andrzej-r · Feb 10, 2018 · 92dff6e · 92dff6e
1 parent b81bc8f
commit 92dff6e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 54 deletions.
diff --git a/amenity-points.mss b/amenity-points.mss
@@ -1551,7 +1551,7 @@
         text-wrap-width: @landcover-wrap-width-size-bigger;
         text-line-spacing: @landcover-line-spacing-size-bigger;
       }
-      text-fill: darken(@danger_area, 40%);
+      text-fill: darken(@military, 40%);
       text-face-name: @bold-fonts;
       text-halo-radius: @standard-halo-radius;
       text-halo-fill: @standard-halo-fill;

diff --git a/landcover.mss b/landcover.mss
@@ -41,8 +41,6 @@
 @campsite: #def6c0; // also caravan_site, picnic_site
 @cemetery: #aacbaf; // also grave_yard
 @construction: #c7c7b4; // also brownfield
-@danger_area: pink;
-@danger_background: #fcd8db;
 @heath: #d6d99f;
 @mud: rgba(203,177,154,0.3); // produces #e6dcd1 over @land
 @place_of_worship: #cdccc9;
@@ -237,19 +235,13 @@
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 
-  [feature = 'military_danger_area'] {
-    [zoom >= 9][zoom < 11] {
-      polygon-fill: @danger_area;
-      polygon-opacity: 0.3;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
-    }
-    [zoom >= 11] {
-      polygon-fill: @danger_background;
-      polygon-pattern-file: url('symbols/danger.svg');
-      [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
-    }
+  [feature = 'military_danger_area'][zoom >= 9] {
+    polygon-pattern-file: url('symbols/danger_red_hatch.png');
+    polygon-pattern-alignment: global;
+    line-color: @military;
+    line-width: 2.0;
+    line-offset: -1.0;
+    line-opacity: 0.2;
   }
 
   [feature = 'leisure_park'],

diff --git a/symbols/danger.svg b/symbols/danger.svg
diff --git a/symbols/danger_red_hatch.png b/symbols/danger_red_hatch.png