From a0842358d5344e873aae5874d77f8231348cae70 Mon Sep 17 00:00:00 2001
From: Tapio <9607631+TapioOfTapiola@users.noreply.github.com>
Date: Sun, 21 Jan 2024 11:50:00 +0100
Subject: [PATCH] Add files via upload

---
 Tapiola.xml | 136 ++++++++++++++++++++++++++++------------------------
 1 file changed, 73 insertions(+), 63 deletions(-)

diff --git a/Tapiola.xml b/Tapiola.xml
index 357902b..acf5502 100644
--- a/Tapiola.xml
+++ b/Tapiola.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mapsforge.org/renderTheme https://raw.githubusercontent.com/mapsforge/mapsforge/master/resources/renderTheme.xsd" version="5" base-stroke-width="0.9" map-background="#F8F8F8" map-background-outside="#EEEEEE">
 <!--
 
-Tapiola 1.3.9 - 2024-01-01 - Mapsforge Rendertheme for Apps with Mapsforge support and Openandromaps
+Tapiola 1.3.9 - 2024-01-21 - Mapsforge Rendertheme for Apps with Mapsforge support and Openandromaps
 
 Tapio is the god of forest in finnish mythology.
 Tapiola is his realm.
@@ -65,9 +65,20 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 			<name lang="de" value="┗ 🔤 Straßennamen" />
 			<cat id="road_captions" />
 		</layer>
+		<layer id="L_buildings" enabled="true" visible="false">
+			<name lang="de" value="🏠 Gebäude" />
+			<name lang="en" value="🏠 Buildings" />
+			<cat id="buildings" />
+		</layer>
+		<layer id="L_building_type" enabled="true" visible="false">
+			<name lang="ru" value="┗ 🈴 Выделять разные типы зданий цветом (школы, больницы и т.п.)" />
+			<name lang="de" value="┗ 🈴 Farbige Schulen, KKH, etc." />
+			<name lang="en" value="┗ 🈴 Colored schools, hospitals..." />
+			<cat id="building_type" />
+		</layer>
 		<layer id="L_house_nr" enabled="false" visible="false">
-			<name lang="en" value="🔢 Display house numbers earlier" />
-			<name lang="de" value="🔢 Hausnummern früher anzeigen" />
+			<name lang="en" value="┗ 🔢 House numbers earlier" />
+			<name lang="de" value="┗ 🔢 Hausnummern eher.." />
 			<cat id="house_nr" />
 		</layer>
 		<layer id="L_barriers" enabled="true" visible="false">
@@ -248,12 +259,6 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 			<name lang="en" value="⚡ Electricity" />
 			<cat id="electricity" />
 		</layer>
-		<layer id="L_building_type" enabled="true" visible="false">
-			<name lang="ru" value="🈴 Выделять разные типы зданий цветом (школы, больницы и т.п.)" />
-			<name lang="de" value="🈴 Farbige Schulen, KKH, etc." />
-			<name lang="en" value="🈴 Colored schools, hospitals, etc." />
-			<cat id="building_type" />
-		</layer>
 		
 		<!-- Combined settings follow -->
 		<!-- layer id="L_barriers_access" enabled="true" visible="false">
@@ -266,6 +271,8 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 		    <cat id="cities_towns"/>
 		    <cat id="cities_towns_sub"/>
 		    <cat id="road_captions"/>
+			<cat id="buildings"/>
+			<cat id="building_type"/>
 			<cat id="grades"/>
 			<cat id="barriers"/>
 		    <cat id="access"/>
@@ -295,6 +302,7 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 			<cat id="grades"/>
 			<!-- cat id="barriers"/>
 		    <cat id="access"/-->
+			<cat id="buildings"/>
 			<cat id="building_type"/>
 		</layer>
 		<layer id="parent_all">
@@ -342,12 +350,14 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 			<overlay id="L_cycling" />
 			<overlay id="L_mtb_trails" />
 			<overlay id="L_winter_sports" />
+			<overlay id="L_railway" />
 			<overlay id="L_highway" />
 			<overlay id="L_road_captions" />
-			<overlay id="L_railway" />
+			<overlay id="L_buildings" />
+			<overlay id="L_building_type" />
+			<overlay id="L_house_nr" />
 			<overlay id="L_cities_towns" />
 			<overlay id="L_cities_towns_sub" />
-			<overlay id="L_house_nr" />
 			<overlay id="L_barriers" />
 			<overlay id="L_access" />
 			<overlay id="L_grades" />
@@ -363,7 +373,6 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 			<overlay id="L_emergency" />
 			<overlay id="L_architecture" />
 			<overlay id="L_attractions" />
-			<overlay id="L_building_type" />
 			<overlay id="L_playground" />
 			<overlay id="L_toilets" />
 			<overlay id="L_benches" />
@@ -542,7 +551,7 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 			<rule e="way" k="*" v="*" zoom-min="18">
 				<area symbol-height="64" src="file:patterns/fill.svg" />
 			</rule>
-			<rule e="way" k="landuse" v="construction" zoom-min="16">
+			<rule e="way" cat="misc" k="landuse" v="construction" zoom-min="16">
 				<symbol id="construction" src="file:symbols/construction-excavator.svg" symbol-height="18" />
 			</rule>
 		</rule>
@@ -1475,55 +1484,56 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 	</rule>
 
 	<!-- Building coloring -->
-	<rule e="any" k="building" v="*" zoom-min="14">
-		<rule e="any" k="*" v="*" zoom-max="15" >
-			<area fill="#f2c8c8" stroke="#595959" stroke-width="0.06" />
-		</rule>
-		<rule e="any" k="*" v="*" zoom-min="16" zoom-max="16" >
-			<area fill="#eec4c4" stroke="#444444" stroke-width="0.1" />
-		</rule>
-		<rule e="any" k="*" v="*" zoom-min="17">
-			<area fill="#ffbbbb" stroke="#444444" stroke-width="0.1" />
-		</rule>
-		<!-- Special colored buildings -->
-		<rule cat="building_type" e="way" k="*" v="*">
-			<rule e="way" k="*" v="hospital">
-				<area fill="#5cb885" stroke="#444444" stroke-width="0.1" />
+	<rule e="any" cat="buildings" k="*" v="*" >
+		<rule e="any" k="building" v="*" zoom-min="14">
+			<rule e="any" k="*" v="*" zoom-max="15" >
+				<area fill="#f2c8c8" stroke="#595959" stroke-width="0.06" />
 			</rule>
-			<rule e="way" k="*" v="university|school|college|kindergarten|gymnasium">
-				<area fill="#78a3c4" stroke="#444444" stroke-width="0.1" />
+			<rule e="any" k="*" v="*" zoom-min="16" zoom-max="16" >
+				<area fill="#eec4c4" stroke="#444444" stroke-width="0.1" />
 			</rule>
+			<rule e="any" k="*" v="*" zoom-min="17">
+				<area fill="#ffbbbb" stroke="#444444" stroke-width="0.1" />
+			</rule>
+			<!-- Special colored buildings -->
+			<rule cat="building_type" e="way" k="*" v="*">
+				<rule e="way" k="*" v="hospital">
+					<area fill="#5cb885" stroke="#444444" stroke-width="0.1" />
+				</rule>
+				<rule e="way" k="*" v="university|school|college|kindergarten|gymnasium">
+					<area fill="#78a3c4" stroke="#444444" stroke-width="0.1" />
+				</rule>
+			</rule>
+			<rule e="way" k="building" v="*" zoom-min="14" zoom-max="15">
+				<area src="file:patterns/building.svg" symbol-height="6" />
+			</rule>
+			<rule e="way" k="building" v="*" zoom-min="16">
+				<area src="file:patterns/building.svg" symbol-height="7" />
+			</rule>
+		</rule >
+		<rule e="way" k="building" v="construction" zoom-min="15">
+			<area fill="#c7c7c7" stroke="#b0b0b0" stroke-width="0.2" />
+			<line stroke="#C0F8F8F8" stroke-width="0.3" stroke-dasharray="2,2" />
 		</rule>
-		<rule e="way" k="building" v="*" zoom-min="14" zoom-max="15">
-			<area src="file:patterns/building.svg" symbol-height="6" />
-		</rule>
-		<rule e="way" k="building" v="*" zoom-min="16">
-			<area src="file:patterns/building.svg" symbol-height="7" />
-		</rule>
-	</rule>
-	<rule e="way" k="building" v="construction" zoom-min="15">
-		<area fill="#c7c7c7" stroke="#b0b0b0" stroke-width="0.2" />
-		<line stroke="#C0F8F8F8" stroke-width="0.3" stroke-dasharray="2,2" />
-	</rule>
-	<!-- Building captions -->
-	<rule e="way" k="building" v="*" zoom-min="18">
-		<rule e="any" k="amenity|aerialway" v="~">
-			<caption k="name" position="below" dy="8" font-style="bold" font-family="sans_serif" font-size="12" fill="#333333" stroke="#ffffff" stroke-width="1.8" text-wrap-width="120" />
+		<!-- Building captions -->
+		<rule e="way" k="building" v="*" zoom-min="18">
+			<rule e="any" k="amenity|aerialway" v="~">
+				<caption k="name" position="below" dy="8" font-style="bold" font-family="sans_serif" font-size="12" fill="#333333" stroke="#ffffff" stroke-width="1.8" text-wrap-width="120" />
+			</rule>
 		</rule>
-	</rule>
-	<!-- House numbers earlier ZL -->
-	<rule e="any" cat="house_nr" k="*" v="*" zoom-min="16" zoom-max="17" >
-		<rule e="any" k="highway" v="~">
-			<caption k="addr:housenumber" font-style="normal" font-size="6" fill="#000000" priority="10" />
+		<!-- House numbers earlier ZL -->
+		<rule e="any" cat="house_nr" k="*" v="*" zoom-min="16" zoom-max="17" >
+			<rule e="any" k="highway" v="~">
+				<caption k="addr:housenumber" font-style="normal" font-size="6" fill="#000000" priority="10" />
+			</rule>
 		</rule>
-	</rule>
-	<!-- House numbers -->
-	<rule e="any" k="*" v="*" zoom-min="18">
-		<rule e="any" k="highway" v="~">
-			<caption k="addr:housenumber" font-style="bold" font-size="10" fill="#000000" stroke="#ffffff" stroke-width="1.4" display="always" />
+		<!-- House numbers -->
+		<rule e="any" k="*" v="*" zoom-min="18">
+			<rule e="any" k="highway" v="~">
+				<caption k="addr:housenumber" font-style="bold" font-size="10" fill="#000000" stroke="#ffffff" stroke-width="1.4" display="always" />
+			</rule>
 		</rule>
 	</rule>
-
 	<rule e="any" k="highway|railway" v="*">
 		<rule e="any" k="area" v="~|no|false">
 			<rule e="way" k="tunnel" v="yes">
@@ -1565,7 +1575,7 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 					<line stroke="#707070" dy="1.3" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
 					<line stroke="#707070" dy="-1.3" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
 				</rule>
-				<rule e="way" cat="c_highway" k="highway" v="motorway_link" zoom-min="11" cat="c_roads">
+				<rule e="way" cat="c_highway" k="highway" v="motorway_link" zoom-min="11" >
 					<line stroke="#502f8bd6" stroke-width="1.4" stroke-linecap="butt" />
 					<line stroke="#707070" dy="0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
 					<line stroke="#707070" dy="-0.7" stroke-width="0.1" stroke-dasharray="3,3" stroke-linecap="butt" />
@@ -2598,12 +2608,12 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 			<symbol src="file:symbols/railway-crossing.svg" symbol-height="32" />
 		</rule>
 	</rule>
-	<rule e="node" cat="c_railway" k="railway" v="*" zoom-min="12" cat="pub_transp">
+	<rule e="node" cat="pub_transp" k="railway" v="*" zoom-min="12" >
 		<rule e="node" cat="c_railway" k="railway" v="subway_entrance" zoom-min="14">
-			<rule e="node" cat="c_railway" k="railway" v="subway_entrance" zoom-min="14" zoom-max="14">
+			<rule e="node" k="railway" v="subway_entrance" zoom-min="14" zoom-max="14">
 				<symbol id="id_station_metro" src="file:symbols/metro_logo.svg" symbol-percent="55" priority="50" />
 			</rule>
-			<rule e="node" cat="c_railway" k="railway" v="subway_entrance" zoom-min="15">
+			<rule e="node" k="railway" v="subway_entrance" zoom-min="15">
 				<symbol id="id_station_metro" src="file:symbols/metro_logo.svg" symbol-percent="70" display="always" priority="50" />
 			</rule>
 			<rule e="node" k="*" v="*" zoom-min="15">
@@ -3277,11 +3287,11 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 				</rule>
 				<!-- Name/Elevation -->
 				<rule e="node" k="*" v="*" zoom-min="12" zoom-max="14">
-					<caption symbol-id="id_peak" position="above" dy="3" k="name" font-family="sans_serif" font-style="bold_italic" font-size="12" fill="#303030" stroke="#ffffff" stroke-width="2.5" priority="415" text-transform="capitalize" text-wrap-width="120" priority="500" />
+					<caption symbol-id="id_peak" position="above" dy="3" k="name" font-family="sans_serif" font-style="bold_italic" font-size="12" fill="#303030" stroke="#ffffff" stroke-width="2.5" text-transform="capitalize" text-wrap-width="120" priority="500" />
 					<caption symbol-id="id_peak" k="ele" dy="-3" position="below" font-family="sans_serif" font-size="11" fill="#303030" stroke="#ffffff" stroke-width="3" priority="414" />
 				</rule>
 				<rule e="node" k="*" v="*" zoom-min="15">
-					<caption symbol-id="id_peak" position="above" dy="3" k="name" font-family="sans_serif" font-style="bold_italic" font-size="13" fill="#303030" stroke="#ffffff" stroke-width="2.5" priority="415" text-transform="capitalize" text-wrap-width="120" priority="500" />
+					<caption symbol-id="id_peak" position="above" dy="3" k="name" font-family="sans_serif" font-style="bold_italic" font-size="13" fill="#303030" stroke="#ffffff" stroke-width="2.5" text-transform="capitalize" text-wrap-width="120" priority="500" />
 					<caption symbol-id="id_peak" k="ele" dy="-3" position="below" font-family="sans_serif" font-size="11" fill="#303030" stroke="#ffffff" stroke-width="3" priority="414" />
 				</rule>
 			</rule>
@@ -3566,7 +3576,7 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 				</rule>
 			</rule>
 		</rule>
-		<rule e="any" cat="pub_transp" k="amenity" v="bus_station" zoom-min="12" cat="pub_transp">
+		<rule e="any" cat="pub_transp" k="amenity" v="bus_station" zoom-min="12" >
 			<symbol id="id_bus_station" src="file:symbols/bus_station.svg" symbol-percent="75" />
 			<rule e="any" k="amenity" v="*" zoom-min="16" cat="pub_transp">
 				<caption symbol-id="id_bus_station" k="name" font-style="normal" font-family="sans_serif" font-size="10" fill="#333333" stroke="#ffffff" stroke-width="1.5" />
@@ -3834,7 +3844,7 @@ Settler is based on: active RT5 (active RenderTheme Version 5)" - https://github
 		</rule>
 	</rule>
 
-	<rule e="node" cat="pub_transp" k="highway" v="bus_stop" zoom-min="14" cat="pub_transp">
+	<rule e="node" cat="pub_transp" k="highway" v="bus_stop" zoom-min="14" >
 		<symbol id="id_bus_stop" src="file:symbols/bus_stop.svg" symbol-percent="70" />
 		<rule e="node" k="highway" v="*" zoom-min="17">
 			<caption symbol-id="id_bus_stop" k="name" dy="-4" font-style="bold" font-family="sans_serif" font-size="11" fill="#333333" stroke="#ffffff" stroke-width="1.5" text-wrap-width="120" />