Added colorrelief test layer for VRT and overviews.

bnordgren · Sep 17, 2011 · a7a630a · a7a630a
1 parent e42c466
commit a7a630a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/generate_colorrelief_include b/generate_colorrelief_include
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 #DATADIR="./geodata/us/hillshade"
-DATADIR="./geodata/colorrelief"
+#DATADIR="./geodata/colorrelief"
+DATADIR="$HILLSHADE_DIR"
 
 #SRS="+proj=latlong +datum=NAD83 +ellps=GRS80 +no_defs"
 
@@ -18,7 +19,7 @@ for X in `seq $EAST $WEST`; do for Y in `seq $SOUTH $NORTH`; do
 #    TOP=$Y
 #    BOTTOM=$((Y-1))
 
-    TILENAME="$DATADIR/$TILE.png"
+    TILENAME="$DATADIR/$TILE.tif"
     if [ -f "$TILENAME" ] ; then
 	#echo "<Layer name=\"${TILE}_cr\" status=\"on\" srs=\"$SRS\">"
 	echo "<Layer name=\"${TILE}_cr\" status=\"on\" srs=\"&srs900913;\">"

diff --git a/set-toposm-env b/set-toposm-env
@@ -66,5 +66,5 @@ export TOPOSM_ENV_SET=1
 # Use a local, patched mapnik2:
 LOCAL_MAPNIK_PREFIX="$HOME"
 export LD_LIBRARY_PATH="$LOCAL_MAPNIK_PREFIX/lib"
-export PYTHONPATH="$LOCAL_MAPNIK_PREFIX/lib/python2.6/site-packages"
+export PYTHONPATH="$LOCAL_MAPNIK_PREFIX/lib/python2.7/site-packages"
 
diff --git a/templates/colorrelief.xml.templ b/templates/colorrelief.xml.templ
@@ -12,6 +12,14 @@
 
 <Map background-color="&landcolor;" srs="&srs900913;">
 
+<!-- TEST STYLE -->
+<Style name="hillshade">
+  <Rule>
+    <RasterSymbolizer scaling="bilinear" />
+  </Rule>
+</Style>
+
+
 <!-- Full-resolution color relief -->
 <Style name="colorrelief">
   <Rule>
@@ -44,8 +52,18 @@
   </Rule>
 </Style>
 
-
+<!--
 &colorrelieflayers;
+-->
+
+<Layer name="hillshade" status="on">
+    <StyleName>hillshade</StyleName>
+    <Datasource>
+      <Parameter name="type">gdal</Parameter>
+      <Parameter name="file">geodata/hillshade-overviews/hillshade.vrt</Parameter>
+      <Parameter name="format">vrt</Parameter>
+    </Datasource>
+</Layer>
 
 </Map>