Merge pull request #88 from max-dn/pier

distinguish piers as areas from piers as curved lines
der-stefan · Mar 30, 2017 · 2af3d9f · 2af3d9f
2 parents e1204d1 + fa9daf4
commit 2af3d9f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/mapnik/opentopomap.xml b/mapnik/opentopomap.xml
@@ -262,15 +262,15 @@
 	<Layer name="cliffs-lines">
 		<StyleName>cliffs</StyleName>
 		<Datasource>
-			<Parameter name="table">(SELECT way,"natural","man_made",highway,barrier FROM planet_osm_line) AS cliff </Parameter>
+			<Parameter name="table">(SELECT way,"natural","man_made",highway,barrier,'no' as area FROM planet_osm_line) AS cliff </Parameter>
 			<Parameter name="dbname">gis</Parameter>
 			&postgis-settings;
 		</Datasource>
 	</Layer>
 	<Layer name="cliffs-polygons">
 		<StyleName>cliffs</StyleName>
 		<Datasource>
-			<Parameter name="table">(SELECT way,"natural","man_made",highway,barrier FROM planet_osm_polygon) AS cliff </Parameter>
+			<Parameter name="table">(SELECT way,"natural","man_made",highway,barrier,'yes' as area FROM planet_osm_polygon) AS cliff </Parameter>
 			<Parameter name="dbname">gis</Parameter>
 			&postgis-settings;
 		</Datasource>

diff --git a/mapnik/styles-otm/cliffs.xml b/mapnik/styles-otm/cliffs.xml
@@ -76,7 +76,13 @@
 	<Rule>
 		&maxscale_zoom13;
 		&minscale_zoom17;
-		<Filter>([man_made] = 'pier')</Filter>
+		<Filter>(([man_made] = 'pier') and ([area] = 'no'))</Filter>
+		<LineSymbolizer stroke="#505050" stroke-width="1"/>
+	</Rule>
+	<Rule>
+		&maxscale_zoom13;
+		&minscale_zoom17;
+		<Filter>(([man_made] = 'pier') and ([area] = 'yes'))</Filter>
 		<PolygonSymbolizer fill="white" />
 		<LineSymbolizer stroke="#505050" stroke-width="1"/>
 	</Rule>