rearange wood/forest landuse

add natural=bare_rock, screen, fell, heath
FreemapSlovakia · Feb 22, 2017 · 9473fac · 9473fac
1 parent 2031a8d
commit 9473fac
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 21 deletions.
diff --git a/client/freemap_slovakia/landuses.xslt b/client/freemap_slovakia/landuses.xslt
@@ -5,6 +5,25 @@
     <xsl:template name="landuses">
 
         <!-- landuse -->
+        <rule e="way" k="natural|landuse" v="forest|wood">
+            <rule e="way" k="wood|forest" v="*">
+                <rule e="way" k="wood|forest" v="coniferous">
+                    <area fill="#B6D9BE"/>
+                </rule>
+                <rule e="way" k="wood|forest" v="deciduous">
+                    <area fill="#D1E5C0"/>
+                </rule>
+                <rule e="way" k="wood|forest" v="mixed">
+                    <area fill="#BFDEBA"/>
+                </rule>
+            </rule>
+            <rule e="way" k="wood" v="~">
+                <area fill="#C7DBBB"/>
+            </rule>
+            <rule e="way" k="*" v="*" zoom-min="16">
+                <caption k="name" font-style="bold" font-size="10dp" fill="#40ff40" stroke="#ffffff" stroke-width="2.0dp"/>
+            </rule>
+        </rule>
         <rule e="way" k="landuse" v="*">
             <rule e="way" k="landuse" v="farmyard">
                 <area fill="#80DFCFBC"/>
@@ -60,27 +79,6 @@
                 <caption k="name" font-style="bold" font-size="10dp" fill="#808080" stroke="#ffffff" stroke-width="2.0dp"/>
             </rule>
         </rule>
-
-        <!-- landuse -->
-        <rule e="way" k="natural|landuse" v="forest|wood|scrub">
-            <rule e="way" k="wood|forest" v="*">
-                <rule e="way" k="wood|forest" v="coniferous">
-                    <area fill="#B6D9BE"/>
-                </rule>
-                <rule e="way" k="wood|forest" v="deciduous">
-                    <area fill="#D1E5C0"/>
-                </rule>
-                <rule e="way" k="wood|forest" v="mixed">
-                    <area fill="#BFDEBA"/>
-                </rule>
-            </rule>
-            <rule e="way" k="wood" v="~">
-                <area fill="#C7DBBB"/>
-            </rule>
-            <rule e="way" k="*" v="*" zoom-min="16">
-                <caption k="name" font-style="bold" font-size="10dp" fill="#40ff40" stroke="#ffffff" stroke-width="2.0dp"/>
-            </rule>
-        </rule>
         <rule e="way" k="landuse" v="military">
             <area src="file:/patterns/military.png"/>
         </rule>

diff --git a/client/freemap_slovakia/naturals.xslt b/client/freemap_slovakia/naturals.xslt
@@ -34,6 +34,21 @@
                     <area fill="#b5d6f1" stroke="#b5d6f1" stroke-width="0.4dp"/>
                 </rule>
             </rule>
+            <rule e="way" k="natural" v="bare_rock">
+                <area src="file:/patterns/barerock.png" fill="#d7d6d5" stroke-width="0"/>
+            </rule>
+             <rule e="way" k="natural" v="scree">
+                <area src="file:/patterns/scree.png" fill="#d7d6d5" stroke-width="0"/>
+            </rule>
+             <rule e="way" k="natural" v="fell">
+                <area fill="#e3e2a1" stroke-width="0"/>
+            </rule>
+             <rule e="way" k="natural" v="scrub">
+                <area fill="#d6e8b7" stroke-width="0"/>
+            </rule>
+             <rule e="way" k="natural" v="heath">
+                <area fill="#d6e8b7" stroke-width="0"/>
+            </rule>
             <rule e="way" k="natural" v="glacier">
                 <area fill="#fafaff" stroke="#add8e6" stroke-width="0.8dp"/>
             </rule>

diff --git a/client/freemap_slovakia/patterns/barerock.png b/client/freemap_slovakia/patterns/barerock.png
diff --git a/client/freemap_slovakia/patterns/scree.png b/client/freemap_slovakia/patterns/scree.png
diff --git a/generator/tag-mapping-fm.xml b/generator/tag-mapping-fm.xml
@@ -127,6 +127,7 @@
 		<osm-tag key="waterway" value="waterfall" zoom-appear="12" />
 		<osm-tag key="natural" value="volcano" zoom-appear="10" />
 		<osm-tag key="natural" value="saddle" zoom-appear="12" />
+		<osm-tag key="natural" value="fell" zoom-appear="11" />
 
 	</pois>
 
@@ -315,6 +316,9 @@
 		<osm-tag key="natural" value="land" zoom-appear="11" />
 		<osm-tag key="natural" value="marsh" zoom-appear="11" />
 		<osm-tag key="natural" value="scrub" zoom-appear="11" />
+		<osm-tag key="natural" value="bare_rock" zoom-appear="11" />
+		<osm-tag key="natural" value="fell" zoom-appear="11" />
+		<osm-tag key="natural" value="scree" zoom-appear="11" />
 		<osm-tag key="natural" value="water" zoom-appear="8" />
 		<osm-tag key="natural" value="wetland" zoom-appear="12" />
 		<osm-tag key="natural" value="wood" zoom-appear="8" />