Merge pull request #91 from max-dn/master

Show sac_scale and via_ferrata
der-stefan · Apr 2, 2017 · 438a6c8 · 438a6c8
2 parents 33c34d4 + e21b184
commit 438a6c8
Show file tree

Hide file tree

Showing 2 changed files with 163 additions and 8 deletions.
diff --git a/mapnik/opentopomap.xml b/mapnik/opentopomap.xml
@@ -382,7 +382,7 @@
 		<StyleName>roads-fill</StyleName>
 		<StyleName>trams</StyleName>
 		<Datasource>
-			<Parameter name="table">(SELECT way,ST_Length(way) AS length,highway,name,service,surface,tracktype,lanes,embankment,oneway,railway FROM planet_osm_line WHERE (!scale_denominator! &gt; 300000) OR ((bridge IS NULL OR bridge = 'no') AND (tunnel IS NULL OR tunnel != 'yes')) AND (highway IS NOT NULL OR railway='tram') ORDER BY (CASE WHEN highway IN ('motorway','trunk') THEN 5 WHEN highway='primary' THEN 1 WHEN highway='secondary' THEN 2 WHEN highway='tertiary' THEN 3 ELSE 4 END) DESC ) AS roads</Parameter>
+			<Parameter name="table">(SELECT way,ST_Length(way) AS length,highway,name,sac_scale,trail_visibility,via_ferrata_scale,service,surface,tracktype,lanes,embankment,oneway,railway FROM planet_osm_line WHERE (!scale_denominator! &gt; 300000) OR ((bridge IS NULL OR bridge = 'no') AND (tunnel IS NULL OR tunnel != 'yes')) AND (highway IS NOT NULL OR railway='tram') ORDER BY (CASE WHEN highway IN ('motorway','trunk') THEN 5 WHEN highway='primary' THEN 1 WHEN highway='secondary' THEN 2 WHEN highway='tertiary' THEN 3 ELSE 4 END) DESC ) AS roads</Parameter>
 			<Parameter name="dbname">gis</Parameter>
 			&postgis-settings;
 		</Datasource>

diff --git a/mapnik/styles-otm/roads-casing.xml b/mapnik/styles-otm/roads-casing.xml
@@ -293,12 +293,7 @@
 		<Filter>[highway] = 'track' and [tracktype] = 'grade5'</Filter>
 		<LineSymbolizer stroke="black" stroke-width="0.5" stroke-dasharray="3,3" />
 	</Rule>
-	<Rule>
-		&maxscale_zoom14;
-		&minscale_zoom14;
-		<Filter>([highway] = 'path' and [surface] != 'asphalt') or [highway] = 'footway' or [highway] = 'bridleway'</Filter>
-		<LineSymbolizer stroke="black" stroke-width="0.6" stroke-dasharray="1.6,1.6"/>
-	</Rule>
+
 	<Rule>
 		&maxscale_zoom14;
 		&minscale_zoom14;
@@ -313,6 +308,89 @@
 	</Rule>
 
 
+<!-- pathes -->
+
+<!-- a tiny line for alle pathes to connect the dots -->
+
+	<Rule>
+		&maxscale_zoom14;
+		&minscale_zoom14;
+		<Filter>([highway] = 'path' and [surface] != 'asphalt') or [highway] = 'footway' or [highway] = 'via_ferrata'</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-opacity="0.1"/>
+	</Rule>
+
+<!-- visible path, sac_scale=T1-2, no ferrata, "normal way" -->
+
+	<Rule>
+		&maxscale_zoom14;
+		&minscale_zoom14;		
+                <Filter>([trail_visibility] is null or ([trail_visibility]!='no' and [trail_visibility]!='horrible' and [trail_visibility]!='bad')) and ([via_ferrata_scale] is null or [via_ferrata_scale] = '0') and ([sac_scale] is null or [sac_scale] = 'hiking' or [sac_scale] = 'mountain_hiking') and (([highway] = 'path' and [surface] != 'asphalt') or [highway] = 'footway' or [highway] = 'bridleway')</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-dasharray="1.6,1.6"/>
+	</Rule>
+
+
+<!-- visible path, sac_scale=T3-4, no ferrata -->
+
+	<Rule>
+		&maxscale_zoom14;
+		&minscale_zoom14;
+		<Filter>([trail_visibility] is null or ([trail_visibility]!='no' and [trail_visibility]!='horrible' and [trail_visibility]!='bad')) and ([via_ferrata_scale] is null or [via_ferrata_scale] = '0') and ([sac_scale] = 'demanding_mountain_hiking' or [sac_scale] = 'alpine_hiking') and ([highway] = 'path' or [highway] = 'footway')</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-dasharray="1.6,1.6,1.6,1.6,1.6,4.5"/>
+	</Rule>
+
+<!-- visible path, sac_scale=T5-6, no ferrata -->
+
+	<Rule>
+		&maxscale_zoom14;
+		&minscale_zoom14;
+		<Filter>([trail_visibility] is null or ([trail_visibility]!='no' and [trail_visibility]!='horrible' and [trail_visibility]!='bad')) and ([via_ferrata_scale] is null or [via_ferrata_scale] = '0') and ([sac_scale] = 'demanding_alpine_hiking' or [sac_scale] = 'difficult_alpine_hiking') and ([highway] = 'path' or [highway] = 'footway')</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-dasharray="1.6,1.6,1.6,5"/>
+	</Rule>
+
+<!-- invisible path, sac_scale=T1-2, no ferrata, "normal hidden way" -->
+
+	<Rule>
+		&maxscale_zoom14;
+		&minscale_zoom14;
+		<Filter>([trail_visibility]='no' or [trail_visibility]='horrible' or [trail_visibility]='bad') and ([via_ferrata_scale] is null or [via_ferrata_scale] = '0') and ([sac_scale] is null or [sac_scale] = 'hiking' or [sac_scale] = 'mountain_hiking') and (([highway] = 'path' and [surface] != 'asphalt') or [highway] = 'footway' or [highway] = 'bridleway')</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-dasharray="1.6,1.6" stroke-opacity="0.5"/>
+	</Rule>
+
+
+<!-- invisible path, sac_scale=T3-4, no ferrata -->
+
+	<Rule>
+		&maxscale_zoom14;
+		&minscale_zoom14;
+		<Filter>([trail_visibility]='no' or [trail_visibility]='horrible' or [trail_visibility]='bad') and ([via_ferrata_scale] is null or [via_ferrata_scale] = '0') and ([sac_scale] = 'demanding_mountain_hiking' or [sac_scale] = 'alpine_hiking') and ([highway] = 'path' or [highway] = 'footway')</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-dasharray="1.6,1.6,1.6,1.6,1.6,4.5" stroke-opacity="0.6"/>
+	</Rule>
+
+<!-- invisible path, sac_scale=T5-6, no ferrata -->
+
+	<Rule>
+		&maxscale_zoom14;
+		&minscale_zoom14;
+		<Filter>([trail_visibility]='no' or [trail_visibility]='horrible' or [trail_visibility]='bad') and ([via_ferrata_scale] is null or [via_ferrata_scale] = '0') and ([sac_scale] = 'demanding_alpine_hiking' or [sac_scale] = 'difficult_alpine_hiking') and ([highway] = 'path' or [highway] = 'footway')</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-dasharray="1.6,1.6,1.6,5" stroke-opacity="0.6"/>
+	</Rule>
+
+
+
+<!-- ferratas are rendered like visible T5-6 -->
+
+	<Rule>
+		&maxscale_zoom14;
+		&minscale_zoom14;
+		<Filter>([highway] = 'via_ferrata') or (([via_ferrata_scale] != null and [via_ferrata_scale] != '0') and ([highway] = 'path' or [highway] = 'footway'))</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-dasharray="1.6,1.6,1.6,5"/>
+	</Rule>
+
+
+<!-- end of pathes -->
+
+
+
 <!-- zoom 15 -->
 	<Rule>
 		&maxscale_zoom15;
@@ -368,12 +446,89 @@
 		<Filter>[highway] = 'track' and [tracktype] = 'grade5'</Filter>
 		<LineSymbolizer stroke="black" stroke-width="0.9" stroke-dasharray="4,4" />
 	</Rule>
+
+<!-- pathes -->
+
+<!-- a tiny line for alle pathes to connect the dots -->
+
 	<Rule>
 		&maxscale_zoom15;
 		&minscale_zoom17;
-		<Filter>([highway] = 'path' and [surface] != 'asphalt') or [highway] = 'footway' or [highway] = 'bridleway'</Filter>
+		<Filter>([highway] = 'path' and [surface] != 'asphalt') or [highway] = 'footway' or [highway] = 'via_ferrata'</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-opacity="0.05"/>
+	</Rule>
+
+<!-- visible path, sac_scale=T1-2, no ferrata, "normal way" -->
+
+	<Rule>
+		&maxscale_zoom15;
+		&minscale_zoom17;
+		<Filter>([trail_visibility] is null or ([trail_visibility]!='no' and [trail_visibility]!='horrible' and [trail_visibility]!='bad')) and ([via_ferrata_scale] is null or [via_ferrata_scale] = '0') and ([sac_scale] is null or [sac_scale] = 'hiking' or [sac_scale] = 'mountain_hiking') and (([highway] = 'path' and [surface] != 'asphalt') or [highway] = 'footway' or [highway] = 'bridleway')</Filter>
 		<LineSymbolizer stroke="black" stroke-width="1" stroke-dasharray="1.1,2"/>
 	</Rule>
+
+
+<!-- visible path, sac_scale=T3-4, no ferrata -->
+
+	<Rule>
+		&maxscale_zoom15;
+		&minscale_zoom17;
+		<Filter>([trail_visibility] is null or ([trail_visibility]!='no' and [trail_visibility]!='horrible' and [trail_visibility]!='bad')) and ([via_ferrata_scale] is null or [via_ferrata_scale] = '0') and ([sac_scale] = 'demanding_mountain_hiking' or [sac_scale] = 'alpine_hiking') and ([highway] = 'path' or [highway] = 'footway')</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-dasharray="1.1,2,1.1,2,1.1,6"/>
+	</Rule>
+
+<!-- visible path, sac_scale=T5-6, no ferrata -->
+
+	<Rule>
+		&maxscale_zoom15;
+		&minscale_zoom17;
+		<Filter>([trail_visibility] is null or ([trail_visibility]!='no' and [trail_visibility]!='horrible' and [trail_visibility]!='bad')) and ([via_ferrata_scale] is null or [via_ferrata_scale] = '0') and ([sac_scale] = 'demanding_alpine_hiking' or [sac_scale] = 'difficult_alpine_hiking') and ([highway] = 'path' or [highway] = 'footway')</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-dasharray="1.1,2,1.1,8"/>
+	</Rule>
+
+<!-- invisible path, sac_scale=T1-2, no ferrata, "normal hidden way" -->
+
+	<Rule>
+		&maxscale_zoom15;
+		&minscale_zoom17;
+		<Filter>([trail_visibility]='no' or [trail_visibility]='horrible' or [trail_visibility]='bad') and ([via_ferrata_scale] is null or [via_ferrata_scale] = '0') and ([sac_scale] is null or [sac_scale] = 'hiking' or [sac_scale] = 'mountain_hiking') and (([highway] = 'path' and [surface] != 'asphalt') or [highway] = 'footway' or [highway] = 'bridleway')</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-dasharray="1.1,2" stroke-opacity="0.5"/>
+	</Rule>
+
+
+<!-- invisible path, sac_scale=T3-4, no ferrata -->
+
+	<Rule>
+		&maxscale_zoom15;
+		&minscale_zoom17;
+		<Filter>([trail_visibility]='no' or [trail_visibility]='horrible' or [trail_visibility]='bad') and ([via_ferrata_scale] is null or [via_ferrata_scale] = '0') and ([sac_scale] = 'demanding_mountain_hiking' or [sac_scale] = 'alpine_hiking') and ([highway] = 'path' or [highway] = 'footway')</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-dasharray="1.1,2,1.1,2,1.1,6" stroke-opacity="0.6"/>
+	</Rule>
+
+<!-- invisible path, sac_scale=T5-6, no ferrata -->
+
+	<Rule>
+		&maxscale_zoom15;
+		&minscale_zoom17;
+		<Filter>([trail_visibility]='no' or [trail_visibility]='horrible' or [trail_visibility]='bad') and ([via_ferrata_scale] is null or [via_ferrata_scale] = '0') and ([sac_scale] = 'demanding_alpine_hiking' or [sac_scale] = 'difficult_alpine_hiking') and ([highway] = 'path' or [highway] = 'footway')</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-dasharray="1.1,2,1.1,8" stroke-opacity="0.6"/>
+	</Rule>
+
+
+
+<!-- ferratas are rendered like visible T5-6 -->
+
+	<Rule>
+		&maxscale_zoom15;
+		&minscale_zoom17;
+		<Filter>([highway] = 'via_ferrata') or (([via_ferrata_scale] != null and [via_ferrata_scale] != '0') and ([highway] = 'path' or [highway] = 'footway'))</Filter>
+		<LineSymbolizer stroke="black" stroke-width="1" stroke-dasharray="1.1,2,1.1,8"/>
+	</Rule>
+
+
+<!-- end of pathes -->
+
+
 	<Rule>
 		&maxscale_zoom15;
 		&minscale_zoom15;