From d24e93f9267cab5908d5d069340c12efe8d6446e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ko=C4=87?= <daniel@xn--ko-wla.pl>
Date: Sat, 3 Mar 2018 00:17:16 +0100
Subject: [PATCH] Adding tower:type=lighting rendering

---
 amenity-points.mss         | 26 ++++++++++++------
 symbols/mast_lighting.svg  | 55 ++++++++++++++++++++++++++++++++++++++
 symbols/tower_lighting.svg | 55 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 128 insertions(+), 8 deletions(-)
 create mode 100644 symbols/mast_lighting.svg
 create mode 100644 symbols/tower_lighting.svg

diff --git a/amenity-points.mss b/amenity-points.mss
index 12b736bd35..a486ee637f 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -358,10 +358,15 @@
     [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');
+      }      
       ["tower:type" = 'communication'] {
         marker-file: url('symbols/mast_communications.svg');
       }
@@ -373,16 +378,21 @@
     [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');
+      }      
       ["tower:construction" = 'lattice'] {
         marker-file: url('symbols/tower_lattice.svg');
       }
diff --git a/symbols/mast_lighting.svg b/symbols/mast_lighting.svg
new file mode 100644
index 0000000000..daf114a78c
--- /dev/null
+++ b/symbols/mast_lighting.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="visibility:hidden;fill:none;stroke:none" />
+  <path
+     id="path828"
+     d="m 2.7154464,1.5445623 c -0.167266,0.084188 -0.229367,0.3762768 0,0.46875 l 1.875,0.75 c 0.306429,0.1235421 0.493322,-0.3454524 0.1875,-0.46875 l -1.875,-0.75 c -0.07646,-0.030824 -0.131745,-0.028062 -0.1875,0 z" />
+  <path
+     id="path826"
+     d="m 10.875,1.5445623 -1.875,0.75 c -0.305822,0.1232976 -0.118929,0.5922921 0.1875,0.46875 l 1.875,-0.75 c 0.305823,-0.1232976 0.118322,-0.5920476 -0.1875,-0.46875 z" />
+  <path
+     id="path822"
+     d="m 2.7466964,3.3258123 c -0.329742,0 -0.329742,0.5 0,0.5 h 2 c 0.330396,0 0.329742,-0.5 0,-0.5 z" />
+  <path
+     id="path820"
+     d="m 9.03125,3.3258123 c -0.329742,0 -0.330396,0.5 0,0.5 h 2 c 0.329741,0 0.329741,-0.5 0,-0.5 z" />
+  <path
+     id="path818"
+     d="m 4.5904464,4.4508123 -1.875,0.75 c -0.305822,0.1232976 -0.118929,0.5922921 0.1875,0.46875 l 1.875,-0.75 c 0.305822,-0.1232976 0.118322,-0.5920476 -0.1875,-0.46875 z" />
+  <path
+     id="lighthouse"
+     d="m 9,4.4508123 c -0.167266,0.084187 -0.229367,0.3762768 0,0.46875 l 1.875,0.75 c 0.306429,0.1235421 0.493322,-0.3454524 0.1875,-0.46875 l -1.875,-0.75 c -0.07645,-0.030824 -0.131745,-0.028062 -0.1875,0 z" />
+  <path
+     id="mast"
+     d="M 7,1 C 6.4022075,1 6,1.4692172 6,2 V 9 L 3.1132812,14 H 4.2675781 L 6,11 v 3 h 2 v -3 l 1.7324219,3 H 10.886719 L 8,9 V 2 C 8,1.5039063 7.5977925,1 7,1 Z" />
+</svg>
diff --git a/symbols/tower_lighting.svg b/symbols/tower_lighting.svg
new file mode 100644
index 0000000000..9adc04b91d
--- /dev/null
+++ b/symbols/tower_lighting.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="visibility:hidden;fill:none;stroke:none" />
+  <path
+     id="path828"
+     d="m 2.7154464,1.5445623 c -0.167266,0.084188 -0.229367,0.3762768 0,0.46875 l 1.875,0.75 c 0.306429,0.1235421 0.493322,-0.3454524 0.1875,-0.46875 l -1.875,-0.75 c -0.07646,-0.030824 -0.131745,-0.028062 -0.1875,0 z" />
+  <path
+     id="path826"
+     d="m 10.875,1.5698331 -1.875,0.75 c -0.305822,0.1232976 -0.118929,0.5922921 0.1875,0.46875 l 1.875,-0.75 c 0.305823,-0.1232976 0.118322,-0.5920476 -0.1875,-0.46875 z" />
+  <path
+     id="path822"
+     d="m 2.7466964,3.3258123 c -0.329742,0 -0.329742,0.5 0,0.5 h 2 c 0.330396,0 0.329742,-0.5 0,-0.5 z" />
+  <path
+     id="path820"
+     d="m 9.03125,3.3510831 c -0.329742,0 -0.330396,0.5 0,0.5 h 2 c 0.329741,0 0.329741,-0.5 0,-0.5 z" />
+  <path
+     id="path818"
+     d="m 4.5904464,4.4508123 -1.875,0.75 c -0.305822,0.1232976 -0.118929,0.5922921 0.1875,0.46875 l 1.875,-0.75 c 0.305822,-0.1232976 0.118322,-0.5920476 -0.1875,-0.46875 z" />
+  <path
+     id="lighthouse"
+     d="m 9,4.4760831 c -0.167266,0.084187 -0.229367,0.3762768 0,0.46875 l 1.875,0.75 c 0.306429,0.1235421 0.493322,-0.3454524 0.1875,-0.46875 l -1.875,-0.75 c -0.07645,-0.030824 -0.131745,-0.028062 -0.1875,0 z" />
+  <path
+     id="tower-freestanding"
+     d="m 6,2 v 9 H 5 v 1 H 3 v 2 h 8 V 12 H 9 V 11 H 8 V 2 C 8,1.5039063 7.5977925,1 7,1 6.4022075,1 6,1.4692172 6,2 Z" />
+</svg>