Metro lines

data/style/style.xml

@@ -9,31 +9,7 @@
         <area fill="#f1f0e5"/>
     </rule>
 
-    <!-- Landuse & natural areas -->
+    <!-- Natural areas -->
-    <rule e="way" closed="yes" k="leisure" v="park" zoom-min="10">
-        <area fill="#cadfaf"/>
-    </rule>
-
-    <rule e="way" closed="yes" k="landuse" v="construction|quarry|industrial|farm|farmyard" zoom-min="10">
-        <area fill="#d6d4ce"/>
-    </rule>
-
-    <rule e="way" closed="yes" k="landuse" v="comercial|residential|retail" zoom-min="10">
-        <area fill="#e6e2d9"/>
-    </rule>
-    <rule e="way" closed="yes" k="landuse" v="forest|wood|village_green" zoom-min="10">
-        <area fill="#cadfaf"/>
-    </rule>
-    <rule e="way" closed="yes" k="landuse" v="meadow|grass|greenfield" zoom-min="10">
-        <area fill="#e4efcf"/>
-    </rule>
-    <rule e="way" closed="yes" k="landuse" v="orchard" zoom-min="10">
-        <area src=":/patterns/orchard.svg" symbol-width="28"/>
-    </rule>
-    <rule e="way" closed="yes" k="landuse" v="vineyard" zoom-min="10">
-        <area src=":/patterns/vineyard.svg" symbol-width="28" symbol-height="32"/>
-    </rule>
-
     <rule e="way" closed="yes" k="natural" v="wood" zoom-min="10">
         <area fill="#cadfaf"/>
     </rule>
@@ -51,8 +27,36 @@
         <area fill="#ddf1fd"/>
     </rule>
 
+    <!-- Landuse -->
+    <rule e="way" closed="yes" k="leisure" v="park|garden" zoom-min="10">
+        <area fill="#e4efcf"/>
+    </rule>
+
+    <rule e="way" closed="yes" k="landuse" v="construction|quarry|industrial|farm|farmyard" zoom-min="10">
+        <area fill="#d6d4ce"/>
+    </rule>
+    <rule e="way" closed="yes" k="landuse" v="allotments" zoom-min="10">
+        <area fill="#f0e7d5"/>
+    </rule>
+
+    <rule e="way" closed="yes" k="landuse" v="comercial|residential|retail" zoom-min="10">
+        <area fill="#e6e2d9"/>
+    </rule>
+    <rule e="way" closed="yes" k="landuse" v="forest|wood" zoom-min="10">
+        <area fill="#cadfaf"/>
+    </rule>
+    <rule e="way" closed="yes" k="landuse" v="meadow|grass|greenfield|village_green" zoom-min="10">
+        <area fill="#e4efcf"/>
+    </rule>
+    <rule e="way" closed="yes" k="landuse" v="orchard" zoom-min="10">
+        <area src=":/patterns/orchard.svg" symbol-width="28"/>
+    </rule>
+    <rule e="way" closed="yes" k="landuse" v="vineyard" zoom-min="10">
+        <area src=":/patterns/vineyard.svg" symbol-width="28" symbol-height="32"/>
+    </rule>
+
     <!-- Hillshading -->
-    <hillshading zoom-min="10" zoom-max="16"/>
+    <hillshading zoom-min="10" zoom-max="15"/>
 
     <!-- Contour lines -->
     <rule e="way" k="contour_ext" v="*">
@@ -167,6 +171,9 @@
     <rule e="way" closed="yes" k="leisure" v="swimming_pool" zoom-min="10">
         <area fill="#9fc4e1" stroke="#4398d9" stroke-width="1" scale="none"/>
     </rule>
+    <rule e="way" k="leisure" v="track" zoom-min="10">
+        <line stroke="#e3edc6" stroke-width="1"/>
+    </rule>
 
     <!-- Area overlays -->
     <rule e="way" k="landuse" v="military" zoom-min="10">
@@ -198,7 +205,7 @@
     </rule>
 
     <rule e="any" k="addr:housenumber" v="*" zoom-min="19">
-        <caption fill="#aaaaaa" font-size="9" k="addr:housenumber"/>
+        <caption fill="#aaaaaa" font-size="9" k="addr:housenumber" priority="-100"/>
     </rule>
 
     <!-- Walls and fences -->
@@ -236,8 +243,50 @@
         </rule>
     </rule>
 
+    <!-- Bridges -->
+    <rule e="way" k="bridge" v="yes|true|viaduct|aqueduct|suspension|culvert|swing" zoom-min="14">
+        <rule e="way" k="highway" v="footway|path">
+            <line stroke="#666666" stroke-linecap="butt" stroke-width="0.3"/>
+        </rule>
+        <rule e="way" k="highway" v="pedestrian">
+            <line stroke="#666666" stroke-linecap="butt" stroke-width="0.8"/>
+        </rule>
+        <rule e="way" k="highway" v="unclassified|service|cycleway">
+            <rule e="way" k="*" v="*" zoom-max="15">
+                <line stroke="#666666" stroke-linecap="butt" stroke-width="1.0"/>
+            </rule>
+            <rule e="way" k="*" v="*" zoom-min="16">
+                <line stroke="#666666" stroke-linecap="butt" stroke-width="0.6"/>
+            </rule>
+        </rule>
+        <rule e="way" k="highway" v="tertiary|tertiary_link|residential|living_street">
+            <rule e="way" k="*" v="*" zoom-min="13" zoom-max="13">
+                <line stroke="#666666" stroke-linecap="butt" stroke-width="1.7"/>
+            </rule>
+            <rule e="way" k="*" v="*" zoom-min="14">
+                <line stroke="#666666" stroke-linecap="butt" stroke-width="1.2"/>
+            </rule>
+        </rule>
+        <rule e="way" k="highway" v="primary|primary_link|secondary|secondary_link">
+            <rule e="way" k="*" v="*" zoom-min="9" zoom-max="13">
+                <line stroke="#666666" stroke-linecap="butt" stroke-width="3.8"/>
+            </rule>
+            <rule e="way" k="*" v="*" zoom-min="14">
+                <line stroke="#666666" stroke-linecap="butt" stroke-width="2.0"/>
+            </rule>
+        </rule>
+        <rule e="way" k="highway" v="trunk|trunk_link|motorway|motorway_link">
+            <rule e="way" k="*" v="*" zoom-max="13">
+                <line stroke="#666666" stroke-linecap="butt" stroke-width="4.2"/>
+            </rule>
+            <rule e="way" k="*" v="*" zoom-min="14">
+                <line stroke="#666666" stroke-linecap="butt" stroke-width="2.2"/>
+            </rule>
+        </rule>
+    </rule>
+
     <!-- Roads & tracks -->
-    <rule e="way" k="highway" v="footway" zoom-min="16">
+    <rule e="way" k="highway" v="footway|path" zoom-min="16">
         <line stroke="#aba083" stroke-dasharray="2,1" stroke-linecap="butt" stroke-width="0.1"/>
     </rule>
 
@@ -420,6 +469,9 @@
             <line stroke="#717171" stroke-width="0.2" stroke-linecap="butt" stroke-dasharray="12,4"/>
         </rule>
     </rule>
+    <rule e="way" k="railway" v="subway" zoom-min="15">
+        <line stroke="#777777" stroke-width="0.15" stroke-linecap="butt" stroke-dasharray="2,1" scale="all"/>
+    </rule>
 
     <!-- Aerialways -->
     <rule e="way" closed="no" k="aerialway" v="*">
@@ -479,11 +531,17 @@
     </rule>
     <rule e="node" k="waterway" v="waterfall" zoom-min="15">
         <symbol id="waterfall" src=":/POI/waterfall-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="1" symbol-id="waterfall"/>
+        <rule e="any" k="*" v="*" zoom-min="16">
+            <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="1" symbol-id="waterfall"/>
+        </rule>
     </rule>
     <rule e="node" k="natural" v="spring" zoom-min="15">
-        <symbol id="spring" src=":/POI/water-11.svg" symbol-width="11"/>
+        <rule e="any" k="name" v="*">
-        <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="1" symbol-id="spring"/>
+            <symbol id="spring" src=":/POI/water-11.svg" symbol-width="11"/>
+            <rule e="any" k="*" v="*" zoom-min="16">
+                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="1" symbol-id="spring"/>
+            </rule>
+        </rule>
     </rule>
     <rule e="node" k="tourism" v="viewpoint" zoom-min="15">
         <rule e="node" k="name" v="*">
@@ -493,28 +551,36 @@
     </rule>
 
     <!-- City POIs -->
-    <rule e="any" k="amenity|building" v="hospital" zoom-min="13">
+    <rule e="any" k="amenity|building" v="hospital" zoom-min="14">
-        <symbol id="hospital" src=":/POI/hospital-11.svg" symbol-width="11" priority="20"/>
+        <rule e="any" k="name" v="*">
-        <rule e="any" k="*" v="*" zoom-min="15">
+            <symbol id="hospital" src=":/POI/hospital-11.svg" symbol-width="11" priority="20"/>
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="hospital"/>
+            <rule e="any" k="*" v="*" zoom-min="15">
+                <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="hospital"/>
+            </rule>
         </rule>
     </rule>
+    <rule e="any" k="amenity" v="doctors" zoom-min="16">
+        <symbol id="doctor" src=":/POI/doctor-11.svg" symbol-width="11"/>
+        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="doctor"/>
+    </rule>
     <rule e="any" k="amenity|building" v="police" zoom-min="14">
         <symbol id="police" src=":/POI/police-11.svg" symbol-width="11" priority="19"/>
-        <rule e="any" k="*" v="*" zoom-min="16">
+        <rule e="any" k="*" v="*" zoom-min="17">
             <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="police"/>
         </rule>
     </rule>
     <rule e="any" k="amenity|building" v="fire_station" zoom-min="14">
         <symbol id="fire-station" src=":/POI/fire-station-11.svg" symbol-width="11" priority="18"/>
-        <rule e="any" k="*" v="*" zoom-min="16">
+        <rule e="any" k="*" v="*" zoom-min="17">
             <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="fire-station"/>
         </rule>
     </rule>
 
     <rule e="any" k="aeroway" v="helipad" zoom-min="14">
         <symbol id="heliport" src=":/POI/heliport-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="heliport"/>
+        <rule e="any" k="*" v="*" zoom-min="16">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="heliport"/>
+        </rule>
     </rule>
     <rule e="any" k="aeroway" v="aerodrome" zoom-min="12">
         <symbol id="airport" src=":/POI/airport-11.svg" symbol-width="11"/>
@@ -555,7 +621,9 @@
 
     <rule e="any" k="amenity" v="ferry_terminal" zoom-min="16">
         <symbol id="ferry" src=":/POI/ferry-11.svg" symbol-width="11" priority="10"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="ferry"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="ferry"/>
+        </rule>
     </rule>
 
     <rule e="any" k="amenity" v="fuel" zoom-min="15">
@@ -567,24 +635,34 @@
 
     <rule e="any" k="amenity" v="shelter" zoom-min="16">
         <symbol id="shelter" src=":/POI/shelter-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="shelter"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="shelter"/>
+        </rule>
     </rule>
     <rule e="any" k="tourism|building" v="alpine_hut|hotel|hostel|guest_house|chalet|motel" zoom-min="16">
         <symbol id="lodging" src=":/POI/lodging-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="lodging"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="lodging"/>
+        </rule>
     </rule>
     <rule e="any" k="tourism|accommodation" v="camp_site|caravan_site" zoom-min="16">
         <symbol id="camp" src=":/POI/campsite-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="camp"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="camp"/>
+        </rule>
     </rule>
 
     <rule e="any" k="man_made" v="lighthouse" zoom-min="16">
         <symbol id="lighthouse" src=":/POI/lighthouse-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="lighthouse"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="lighthouse"/>
+        </rule>
     </rule>
     <rule e="any" k="tower" v="communication" zoom-min="16">
         <symbol id="com-tower" src=":/POI/communications-tower-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="com-tower"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="com-tower"/>
+        </rule>
     </rule>
 
     <rule e="any" k="amenity" v="theatre" zoom-min="16">
@@ -597,52 +675,102 @@
     </rule>
     <rule e="any" k="tourism" v="museum" zoom-min="16">
         <symbol id="museum" src=":/POI/museum-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="museum"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="museum"/>
+        </rule>
     </rule>
     <rule e="any" k="amenity|building" v="library" zoom-min="16">
         <symbol id="library" src=":/POI/lbrary-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="library"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="library"/>
+        </rule>
     </rule>
     <rule e="any" k="amenity" v="post_office" zoom-min="16">
         <symbol id="post" src=":/POI/post-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="post"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="post"/>
+        </rule>
     </rule>
-    <rule e="any" k="historic" v="memorial" zoom-min="16">
+    <rule e="any" k="historic" v="memorial" zoom-min="17">
         <symbol id="memorial" src=":/POI/monument-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="memorial"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="memorial"/>
+        </rule>
     </rule>
     <rule e="any" k="amenity" v="bank" zoom-min="16">
         <symbol id="bank" src=":/POI/bank-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="bank"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="bank"/>
+        </rule>
     </rule>
     <rule e="any" k="amenity" v="toilets" zoom-min="16">
         <symbol id="toilets" src=":/POI/toilet-11.svg" symbol-width="11"/>
     </rule>
+    <rule e="any" k="information" v="visitor_centre|office" zoom-min="16">
+        <symbol id="information" src=":/POI/information-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="information"/>
+        </rule>
+    </rule>
 
     <rule e="any" k="sport" v="swimming" zoom-min="16">
         <symbol id="swimming" src=":/POI/swimming-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="swimming"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="swimming"/>
+        </rule>
+    </rule>
+    <rule e="any" k="sport" v="golf" zoom-min="16">
+        <symbol id="golf" src=":/POI/golf-11.svg" symbol-width="11"/>
+        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="golf"/>
+    </rule>
+    <rule e="any" k="sport" v="soccer" zoom-min="16">
+        <symbol id="soccer" src=":/POI/soccer-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="soccer"/>
+        </rule>
+    </rule>
+    <rule e="any" k="sport" v="tennis" zoom-min="16">
+        <symbol id="tennis" src=":/POI/tennis-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="tennis"/>
+        </rule>
+    </rule>
+    <rule e="any" k="sport" v="skateboard" zoom-min="16">
+        <symbol id="skateboard" src=":/POI/skateboard-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="skateboard"/>
+        </rule>
     </rule>
 
     <rule e="any" k="amenity" v="restaurant" zoom-min="16">
         <symbol id="restaurant" src=":/POI/restaurant-11.svg" symbol-width="11" priority="-5"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="restaurant"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="restaurant"/>
+        </rule>
     </rule>
     <rule e="any" k="amenity" v="fast_food" zoom-min="16">
         <symbol id="fast-food" src=":/POI/fast-food-11.svg" symbol-width="11" priority="-5"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="fast-food"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="fast-food"/>
+        </rule>
     </rule>
     <rule e="any" k="amenity" v="cafe" zoom-min="16">
         <symbol id="cafe" src=":/POI/cafe-11.svg" symbol-width="11" priority="-5"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="cafe"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="cafe"/>
+        </rule>
     </rule>
     <rule e="any" k="amenity" v="bar" zoom-min="17">
         <symbol id="bar" src=":/POI/bar-11.svg" symbol-width="11" priority="-5"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="bar"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="bar"/>
+        </rule>
     </rule>
     <rule e="any" k="amenity" v="pub" zoom-min="16">
         <symbol id="pub" src=":/POI/beer-11.svg" symbol-width="11" priority="-5"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="pub"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="pub"/>
+        </rule>
     </rule>
 
     <rule e="any" k="shop" v="car|car_repair|car_parts" zoom-min="16">
@@ -651,23 +779,33 @@
     </rule>
     <rule e="any" k="shop" v="supermarket" zoom-min="16">
         <symbol id="supermarket" src=":/POI/grocery-11.svg" symbol-width="11" priority="-5"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="supermarket"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="supermarket"/>
+        </rule>
     </rule>
-    <rule e="any" k="shop" v="convenience" zoom-min="17">
+    <rule e="any" k="shop" v="convenience" zoom-min="16">
         <symbol id="convenience" src=":/POI/shop-11.svg" symbol-width="11" priority="-5"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="convenience"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="convenience"/>
+        </rule>
     </rule>
     <rule e="any" k="shop" v="doityourself|hardware" zoom-min="16">
         <symbol id="hardware" src=":/POI/hardware-11.svg" symbol-width="11" priority="-5"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="hardware"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="hardware"/>
+        </rule>
     </rule>
-    <rule e="any" k="shop" v="bakery" zoom-min="17">
+    <rule e="any" k="shop" v="bakery" zoom-min="16">
         <symbol id="bakery" src=":/POI/bakery-11.svg" symbol-width="11" priority="-5"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="bakery"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="bakery"/>
+        </rule>
     </rule>
     <rule e="any" k="amenity" v="pharmacy" zoom-min="16">
         <symbol id="pharmacy" src=":/POI/pharmacy-11.svg" symbol-width="11" priority="-5"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="pharmacy"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="pharmacy"/>
+        </rule>
     </rule>
 
 </rendertheme>

gpxsee.qrc

@@ -42,6 +42,7 @@
 		<file alias="convenience-11.svg">icons/map/POI/convenience-11.svg</file>
 		<file alias="dam-11.svg">icons/map/POI/dam-11.svg</file>
 		<file alias="danger-11.svg">icons/map/POI/danger-11.svg</file>
+		<file alias="doctor-11.svg">icons/map/POI/doctor-11.svg</file>
 		<file alias="drinking-water-11.svg">icons/map/POI/drinking-water-11.svg</file>
 		<file alias="fast-food-11.svg">icons/map/POI/fast-food-11.svg</file>
 		<file alias="entrance-alt1-11.svg">icons/map/POI/entrance-alt1-11.svg</file>
@@ -88,11 +89,13 @@
 		<file alias="school-11.svg">icons/map/POI/school-11.svg</file>
 		<file alias="shelter-11.svg">icons/map/POI/shelter-11.svg</file>
 		<file alias="shop-11.svg">icons/map/POI/shop-11.svg</file>
+		<file alias="skateboard-11.svg">icons/map/POI/skateboard-11.svg</file>
 		<file alias="skiing-11.svg">icons/map/POI/skiing-11.svg</file>
 		<file alias="soccer-11.svg">icons/map/POI/soccer-11.svg</file>
 		<file alias="swimming-11.svg">icons/map/POI/swimming-11.svg</file>
-		<file alias="theatre-11.svg">icons/map/POI/theatre-11.svg</file>
 		<file alias="telephone-11.svg">icons/map/POI/telephone-11.svg</file>
+		<file alias="tennis-11.svg">icons/map/POI/tennis-11.svg</file>
+		<file alias="theatre-11.svg">icons/map/POI/theatre-11.svg</file>
 		<file alias="toilet-11.svg">icons/map/POI/toilet-11.svg</file>
 		<file alias="town-hall-11.svg">icons/map/POI/town-hall-11.svg</file>
 		<file alias="viewpoint-11.svg">icons/map/POI/viewpoint-11.svg</file>

icons/map/POI/doctor-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="doctor-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M9.5,5.87c0.0017-0.8174-0.6596-1.4813-1.477-1.483S6.5417,5.0466,6.54,5.864C6.5386,6.54,6.9955,7.131,7.65,7.3v0.42&#xA;&#x9;c0,1.0245-0.8305,1.855-1.855,1.855S3.94,8.7445,3.94,7.72l0,0C3.9776,6.8275,4.3787,5.9893,5.05,5.4H5&#xA;&#x9;c0.718-0.4684,1.1564-1.2628,1.17-2.12V1.79c0-0.613-0.4969-1.11-1.11-1.11c-0.0033,0-0.0067,0-0.01,0H4.5&#xA;&#x9;c-0.2043,0-0.37,0.1657-0.37,0.37S4.2957,1.42,4.5,1.42h0.55c0.2043,0,0.37,0.1657,0.37,0.37v1.49l0,0&#xA;&#x9;c0,1.0178-0.8222,1.8445-1.84,1.85V5.4l0,0V5.13C2.5583,5.1355,1.7255,4.3117,1.72,3.29c0-0.0033,0-0.0067,0-0.01l0,0V1.79&#xA;&#x9;c0-0.2043,0.1657-0.37,0.37-0.37l0,0h0.52c0.2043,0,0.37-0.1657,0.3699-0.3701C2.9799,0.8456,2.8143,0.68,2.61,0.68H2.09&#xA;&#x9;C1.4848,0.6909,0.9999,1.1847,1,1.79v1.49C0.9978,4.1241,1.4086,4.9158,2.1,5.4l0,0c0.6676,0.591,1.065,1.429,1.1,2.32&#xA;&#x9;c0,1.4332,1.1618,2.595,2.595,2.595S8.39,9.1532,8.39,7.72V7.3C9.0424,7.1316,9.4986,6.5438,9.5,5.87z M8,6.61&#xA;&#x9;c-0.4087,0-0.74-0.3313-0.74-0.74S7.5913,5.13,8,5.13s0.74,0.3313,0.74,0.74l0,0C8.74,6.2787,8.4087,6.61,8,6.61z"/>
+</svg>

icons/map/POI/skateboard-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="skateboard-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <path id="icon_concepts:_sports_leisure" d="M8,6H3A2.0024,2.0024,0,0,1,1,4H2A1.001,1.001,0,0,0,3,5H8A1.001,1.001,0,0,0,9,4h1A2.0024,2.0024,0,0,1,8,6ZM8,7A1,1,0,1,0,9,8,1,1,0,0,0,8,7ZM3,7A1,1,0,1,0,4,8,1,1,0,0,0,3,7Z"/>
+</svg>

icons/map/POI/tennis-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="tennis-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <path d="M9.38,1.63C8.5569.7765,6.6118.8078,5.24,2.24A4.26,4.26,0,0,0,4.05,5a4.1491,4.1491,0,0,1-.5,2.07.62.62,0,0,0-.67.12L1.19,8.88a.61.61,0,0,0,0,.85l.09.09a.5941.5941,0,0,0,.84.01l.01-.01L3.82,8.13a.5994.5994,0,0,0,.12-.67,5.8237,5.8237,0,0,1,2.21-.49A3.9655,3.9655,0,0,0,8.77,5.78C10.09,4.46,10.3421,2.6276,9.38,1.63ZM6.15,6.47a1.6589,1.6589,0,0,1-1.17-.44,1.923,1.923,0,0,1-.31-1.98L6.95,6.33A2.5434,2.5434,0,0,1,6.15,6.47Zm1.06-.23L4.77,3.8a3.72,3.72,0,0,1,.7-1.07L8.28,5.55A3.5558,3.5558,0,0,1,7.21,6.24Zm1.25-.87L5.64,2.54a3.9241,3.9241,0,0,1,1.04-.71h.01l2.5,2.5A3.578,3.578,0,0,1,8.46,5.37Zm.83-1.29L6.94,1.72a2.76,2.76,0,0,1,.92-.17,1.6156,1.6156,0,0,1,1.17.44,1.7156,1.7156,0,0,1,.41,1.52A3,3,0,0,1,9.29,4.08Z"/>
+</svg>