Improved rendering of various areas.

asciipip · Dec 11, 2011 · 068b14e · 068b14e
1 parent e99bde3
commit 068b14e
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 0 deletions.
diff --git a/areas.py b/areas.py
@@ -27,6 +27,7 @@
 
 ca = Box2d(-124.9, 32.3, -113.9, 42.1)
 cadetail = Box2d(-123, 37, -119.0, 38.0)
+sfo = Box2d(-122.6, 37.6, -122.2, 37.9)
 oakland = Box2d(-122.34, 37.75, -122.12, 37.89)
 yosdetail = Box2d(-119.67, 37.70, -119.52, 37.76)
 

diff --git a/custom-symbols/hatch-red-10.png b/custom-symbols/hatch-red-10.png
diff --git a/custom-symbols/hatch-red-13.png b/custom-symbols/hatch-red-13.png
diff --git a/custom-symbols/hatch-red-16.png b/custom-symbols/hatch-red-16.png
diff --git a/templates/features.xml.templ b/templates/features.xml.templ
@@ -82,6 +82,46 @@
     -->
 </Style>
 
+<Style name="misc-areas">
+
+  <!-- Military areas -->
+  <Rule>
+    &minz6; &maxz13;
+    <Filter>[landuse] = 'military'</Filter>
+    <PolygonPatternSymbolizer file="&customsymbolsdir;/hatch-red-10.png" />
+    <LineSymbolizer stroke="#f00" stroke-width="1" stroke-opacity="1.0" />
+  </Rule>
+  <Rule>
+    &minz14;
+    <Filter>[landuse] = 'military'</Filter>
+    <PolygonPatternSymbolizer file="&customsymbolsdir;/hatch-red-16.png" />
+    <LineSymbolizer stroke="#f00" stroke-width="1.5" stroke-opacity="1.0" />
+  </Rule>
+
+  <Rule>
+      &minz10;
+      <Filter>  
+        [landuse] = 'cemetary' or
+        [amenity] = 'grave_yard'
+      </Filter>
+      <PolygonSymbolizer fill="#8b8" fill-opacity="&areaopacity;" />
+      <LineSymbolizer stroke="#8b8" stroke-width="1" />
+  </Rule>
+  <Rule>
+      &minz10;
+      <Filter>[landuse] = 'construction'</Filter>
+      <PolygonSymbolizer fill="#bb3" fill-opacity="&areaopacity;" />
+      <LineSymbolizer stroke="#bb3" stroke-width="1" />
+  </Rule>
+  <Rule>
+      &minz10;
+      <Filter>[natural] = 'beach'</Filter>
+      <PolygonSymbolizer fill="#fec" fill-opacity="&areaopacity;" />
+      <LineSymbolizer stroke="#fec" stroke-width="1" />
+  </Rule>
+
+</Style>
+
 <!-- adapted from OSM mapnik stylesheet -->
 <Style name="ferry-routes">
     <Rule>
@@ -286,6 +326,19 @@
     </Datasource>
 </Layer>
 
+<Layer name="misc-areas" status="on">
+  <StyleName>misc-areas</StyleName>
+    <Datasource>
+      &dbsettings; &extents;
+      <Parameter name="table">
+      (SELECT way, way_area, name, landuse, "natural", amenity
+      FROM ${DB_PREFIX}_polygon
+      WHERE landuse IS NOT NULL OR "natural" IS NOT NULL or amenity IS NOT NULL)
+      AS areas
+      </Parameter>
+    </Datasource>
+</Layer>
+
 <Layer name="ferry-routes" status="on">
     <StyleName>ferry-routes</StyleName>
     <Datasource>