Adding tower:type=lighting rendering

gravitystorm · Mar 2, 2018 · b41f31b · b41f31b
1 parent e481962
commit b41f31b
Show file tree

Hide file tree

Showing 3 changed files with 100 additions and 10 deletions.
diff --git a/amenity-points.mss b/amenity-points.mss
@@ -353,15 +353,23 @@
     marker-clip: false;
   }
 
-  [feature = 'man_made_mast']{
+  [feature = 'man_made_mast'] {
     [zoom >= 15][height > 80],
     [zoom >= 16][height > 40],
     [zoom >= 17][height > 20],
     [zoom >= 18] {
-      marker-file: url('symbols/mast.svg');
-      marker-fill: @man-made-icon;
-      marker-placement: interior;
-      marker-clip: false;
+      ["tower:type" != 'lighting'] {  
+        marker-file: url('symbols/mast.svg');
+        marker-fill: @man-made-icon;
+        marker-placement: interior;
+        marker-clip: false;
+      }
+      ["tower:type" = 'lighting'][zoom >= 18] {
+        marker-file: url('symbols/mast_lighting.svg');
+        marker-fill: @man-made-icon;
+        marker-placement: interior;
+        marker-clip: false;
+      }      
       ["tower:type" = 'communication'] {
         marker-file: url('symbols/mast_communications.svg');
       }
@@ -373,16 +381,24 @@
     [zoom >= 14][height > 50],
     [zoom >= 15][height > 30],
     [zoom >= 17] {
-      marker-file: url('symbols/tower_generic.svg');
-      marker-fill: @man-made-icon;
-      marker-placement: interior;
-      marker-clip: false;
+      ["tower:type" != 'lighting'] {
+        marker-file: url('symbols/tower_generic.svg');
+        marker-fill: @man-made-icon;
+        marker-placement: interior;
+        marker-clip: false;
+      }
       ["tower:type" = 'defensive'] {
         marker-file: url('symbols/tower_defensive.svg');  
       }
       ["tower:type" = 'observation'] {
         marker-file: url('symbols/tower_observation.svg');  
       }
+      ["tower:type" = 'lighting'][zoom >= 18] {
+        marker-file: url('symbols/tower_lighting.svg');
+        marker-fill: @man-made-icon;
+        marker-placement: interior;
+        marker-clip: false;        
+      }      
       ["tower:construction" = 'lattice'] {
         marker-file: url('symbols/tower_lattice.svg');
       }
@@ -393,7 +409,7 @@
         }
       }
     }
-   }
+  }
 
   [feature = 'tourism_museum'][zoom >= 16] {
     marker-file: url('symbols/museum.svg');

diff --git a/symbols/mast_lighting.svg b/symbols/mast_lighting.svg
diff --git a/symbols/tower_lighting.svg b/symbols/tower_lighting.svg