Quarters

data/style/style.xml

@@ -569,9 +569,17 @@
             </rule>
         </rule>
     </rule>
-    <rule e="node" k="place" v="suburb" zoom-min="15" zoom-max="17">
+    <rule e="node" k="place" v="suburb">
+        <rule e="node" k="*" v="*" zoom-min="12" zoom-max="13">
+            <caption fill="#000000" font-size="14" k="name" priority="25" stroke="#FFFFFF" stroke-width="2"/>
+        </rule>
+        <rule e="node" k="*" v="*" zoom-min="14" zoom-max="17">
             <caption fill="#000000" font-size="16" k="name" priority="25" stroke="#FFFFFF" stroke-width="2"/>
         </rule>
+    </rule>
+    <rule e="node" k="place" v="quarter" zoom-min="14" zoom-max="17">
+        <caption fill="#000000" font-size="14" k="name" priority="20" stroke="#FFFFFF" stroke-width="2"/>
+    </rule>
 
     <!-- Nature POIs -->
     <rule e="node" k="natural" v="peak" zoom-min="13">
@@ -1023,4 +1031,10 @@
         </rule>
     </rule>
 
+    <rule e="any" k="military" v="bunker|bunker_disused" zoom-min="17">
+        <symbol id="bunker" src=":/symbols/bunker.svg" symbol-width="11" symbol-height="9" priority="-5"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="bunker"/>
+        </rule>
+    </rule>
 </rendertheme>

gpxsee.qrc

@@ -6,6 +6,7 @@
 
 	<!-- Common map stuff -->
 	<qresource prefix="/symbols">
+		<file alias="bunker.svg">icons/map/symbols/bunker.svg</file>
 		<file alias="cliff.svg">icons/map/symbols/cliff.svg</file>
 		<file alias="exit.svg">icons/map/symbols/exit.svg</file>
 		<file alias="flow.svg">icons/map/symbols/flow.svg</file>

icons/map/symbols/bunker.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 11 9" height="9" width="11" version="1.1">
+	<g stroke-width="1.5" stroke="#000000" fill="none">
+		<rect x="2" y="2" width="7" height="5"/>
+		<line x1="0" y1="0" x2="2" y2="2"/>
+		<line x1="11" y1="0" x2="9" y2="2"/>
+		<line x1="0" y1="9" x2="2" y2="7"/>
+		<line x1="11" y1="9" x2="9" y2="7"/>
+	</g>
+</svg>

icons/map/symbols/cliff.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 4 5" height="5" width="4" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 4 5" height="5" width="4" version="1.1">
-  <g>
+	<g stroke-width="1.0" stroke="#666666">
-    <path d="M 0.5,0 V 5" stroke-width="1.0" stroke="#666666"/>
+		<path d="M 0.5,0 V 5"/>
-    <path d="M 0,0.5 H 4" stroke-width="1.0" stroke="#666666"/>
+		<path d="M 0,0.5 H 4"/>
 	</g>
 </svg>

icons/map/symbols/saddle.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg viewBox="0 0 9 11" height="11" width="9" version="1.1">
-	<g>
+	<g stroke-width="1" stroke="#000000" fill="none">
-		<path d="M 1.5,1.5 L3,3 L 3,8 L 1.5,9.5" stroke-width="1" stroke="#000000" fill="none"/>
+		<path d="M 1.5,1.5 L3,3 L 3,8 L 1.5,9.5"/>
-		<path d="M 7.5,1.5 L6,3 L 6,8 L 7.5,9.5" stroke-width="1" stroke="#000000" fill="none"/>
+		<path d="M 7.5,1.5 L6,3 L 6,8 L 7.5,9.5"/>
 	</g>
 </svg>