From c84db50ae8e794cc3a70fb75405c5b1e48f09a60 Mon Sep 17 00:00:00 2001
From: kaylesk <kayle.sk@gmail.com>
Date: Fri, 2 Nov 2018 09:28:57 +0100
Subject: [PATCH] * SAC scale * no tracktype (OSM mapper)

---
 client/freemap_slovakia/freemap_slovakia.xslt |  1 +
 client/freemap_slovakia/marked_trails.xslt    | 14 +++++++++
 client/freemap_slovakia/menu.xslt             |  6 ++++
 client/freemap_slovakia/osmmapper.xslt        |  5 ++++
 generator/tag-mapping-fm.xml                  | 30 ++++++++++++++++++-
 5 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/client/freemap_slovakia/freemap_slovakia.xslt b/client/freemap_slovakia/freemap_slovakia.xslt
index 44dd187..f1ca4ef 100644
--- a/client/freemap_slovakia/freemap_slovakia.xslt
+++ b/client/freemap_slovakia/freemap_slovakia.xslt
@@ -367,6 +367,7 @@
 
             <xsl:call-template name="markedTrailsAll"/>
             <xsl:call-template name="markedTrailsAllNew"/>
+            <xsl:call-template name="sac-scale" />
             <xsl:call-template name="fixme_node"/>
         </rendertheme>
     </xsl:template>
diff --git a/client/freemap_slovakia/marked_trails.xslt b/client/freemap_slovakia/marked_trails.xslt
index 3f3c03a..1fa031b 100644
--- a/client/freemap_slovakia/marked_trails.xslt
+++ b/client/freemap_slovakia/marked_trails.xslt
@@ -658,4 +658,18 @@
         </rule>
 
     </xsl:template>
+
+<xsl:template name="sac-scale">
+  <rule cat="sac-scale" e="way" k="sac_scale" v="*" zoom-min="13">
+    <rule e="way" k="sac_scale" v="hiking">
+      <line stroke="#50FFFF00" stroke-width="4dp" stroke-linecap="butt" />
+    </rule>
+    <rule e="way" k="sac_scale" v="mountain_hiking|demanding_mountain_hiking">
+      <line stroke="#50FF0000" stroke-width="4dp" stroke-linecap="butt" />
+    </rule>
+    <rule e="way" k="sac_scale" v="alpine_hiking|demandig_alpine_hiking">
+      <line stroke="#500000FF" stroke-width="4dp" stroke-linecap="butt" />
+    </rule>
+  </rule>
+</xsl:template>
 </xsl:stylesheet>
diff --git a/client/freemap_slovakia/menu.xslt b/client/freemap_slovakia/menu.xslt
index 4ee16ff..9377a33 100644
--- a/client/freemap_slovakia/menu.xslt
+++ b/client/freemap_slovakia/menu.xslt
@@ -31,6 +31,11 @@
             <name lang="sk" value="Lyžiarske značky" />
             <cat id="ski" />
         </layer>
+        <layer id="sac-scale" enabled="false" visible="false">
+            <name lang="en" value="SAC scale" />
+            <name lang="sk" value="SAC" />
+            <cat id="sac-scale" />
+        </layer>
         <layer id="topo" visible="true">
             <name lang="en" value="Topo" />
             <name lang="sk" value="Topo" />
@@ -38,6 +43,7 @@
             <cat id="topo_common" />
             <overlay id="contours" />
             <overlay id="hiking" />
+            <overlay id="sac-scale" />
             <overlay id="cycle" />
             <overlay id="ski" />
             <overlay id="osmmapper" />
diff --git a/client/freemap_slovakia/osmmapper.xslt b/client/freemap_slovakia/osmmapper.xslt
index 336571c..586043d 100644
--- a/client/freemap_slovakia/osmmapper.xslt
+++ b/client/freemap_slovakia/osmmapper.xslt
@@ -6,6 +6,11 @@
         <rule cat="osmmapper" e="node" k="fixme" v="*">
             <symbol src="file:/symbols/fixme.svg" symbol-width="16"  force-draw="1" />
         </rule>
+        <rule cat="osmmapper" e="way" k="highway" v="track">
+           <rule e="way" k="tracktype" v="~">
+              <line stroke="#FF0000" stroke-width="1.6dp" stroke-dasharray="1,4" stroke-linecap="butt" />
+           </rule> 
+        </rule>
     </xsl:template>
 
 
diff --git a/generator/tag-mapping-fm.xml b/generator/tag-mapping-fm.xml
index b8303a9..3052705 100644
--- a/generator/tag-mapping-fm.xml
+++ b/generator/tag-mapping-fm.xml
@@ -705,7 +705,35 @@
 
 		<osm-tag key="fmrelskiref" value="x" zoom-appear="8" />
 	</ways>
-	
+
+	<ways>
+		<osm-tag key="sac_scale" value="hiking" />
+		<osm-tag key="sac_scale" value="mountain_hiking" />
+		<osm-tag key="sac_scale" value="demanding_mountain_hiking" />
+		<osm-tag key="sac_scale" value="alpine_hiking" />
+		<osm-tag key="sac_scale" value="demanding_alpine_hiking" />
+		<osm-tag key="sac_scale" value="difficult_alpine_hiking" /> 
+	</ways>
+
+	<ways>
+		<osm-tag key="mtb:scale" value="0" />
+		<osm-tag key="mtb:scale" value="1" />
+		<osm-tag key="mtb:scale" value="2" />
+		<osm-tag key="mtb:scale" value="3" />
+		<osm-tag key="mtb:scale" value="4" />
+		<osm-tag key="mtb:scale" value="5" />
+		<osm-tag key="mtb:scale" value="6" />
+	</ways>
+
+	<ways>
+		<osm-tag key="mtb:scale:uphill" value="0" />
+		<osm-tag key="mtb:scale:uphill" value="1" />
+		<osm-tag key="mtb:scale:uphill" value="2" />
+		<osm-tag key="mtb:scale:uphill" value="3" />
+		<osm-tag key="mtb:scale:uphill" value="4" />
+		<osm-tag key="mtb:scale:uphill" value="5" />
+	</ways>
+
 	<ways>
 		<osm-tag key="power" value="line" zoom-appear="13" />
 		<osm-tag key="power" value="minor_line" zoom-appear="16" />