Do fetching locally.

mysociety · Oct 22, 2012 · d54701f · d54701f
1 parent 477f4aa
commit d54701f
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/mapnik/setup_mapnik b/mapnik/setup_mapnik
@@ -3,11 +3,9 @@
 
 # 1. Get the external shapefile data for low level things
 
-BASE_DIR=/export/vhost/tilma.mysociety.org
-NAME=`hostname`
-HOST=$NAME.ukcod.org.uk
+BASE_DIR=/data/vhost/tilma.mysociety.org
+HOST=elephant.ukcod.org.uk
 
-cd $BASE_DIR
 mkdir -p tmp
 
 if [[ "$@" =~ 'boundaries' ]]
@@ -23,7 +21,7 @@ then
     tar xjf shoreline_300.tar.bz2 -C world_boundaries
     unzip 10m-populated-places.zip -d world_boundaries
     unzip 110m-admin-0-boundary-lines.zip -d world_boundaries
-    echo "Boundary files unzipped in $BASE_DIR/tmp/world_boundaries"
+    echo "Boundary files unzipped in tmp/world_boundaries"
     cd ..
 fi
 
@@ -33,7 +31,7 @@ if [[ "$@" =~ 'mapnik' ]]
 then
     cd tmp
     svn checkout -r 27279 http://svn.openstreetmap.org/applications/rendering/mapnik
-    echo "Mapnik OSM styling in $BASE_DIR/tmp/mapnik"
+    echo "Mapnik OSM styling in tmp/mapnik"
     cd ..
 fi
 
@@ -42,11 +40,13 @@ fi
 if [[ "$@" =~ 'xml' ]]
 then
     MYSOCIETY_DIR=$BASE_DIR/tilma/mapnik
-    cd mapnik
-    ./generate_xml.py $MYSOCIETY_DIR/osm-names.xml ../tmp/mapumental-names.xml --world_boundaries $BASE_DIR/world_boundaries --symbols $BASE_DIR/mapnik/symbols --dbname openstreetmap --user openstreetmap --host $HOST --port 5432 --accept-none
-    ./generate_xml.py $MYSOCIETY_DIR/osm-grey.xml ../tmp/mapumental-map.xml --world_boundaries $BASE_DIR/world_boundaries --symbols $BASE_DIR/mapnik/symbols --dbname openstreetmap --user openstreetmap --host $HOST --port 5432 --accept-none
-    ./generate_xml.py osm.xml ../tmp/osm.xml --world_boundaries $BASE_DIR/world_boundaries --symbols $BASE_DIR/mapnik/symbols --dbname openstreetmap --user openstreetmap --host $HOST --port 5432 --accept-none
-    echo "New XML files present in $BASE_DIR/tmp/"
-    cd ..
+    cd tmp
+    DIR=`pwd`
+    cd $BASE_DIR/mapnik
+    ./generate_xml.py $MYSOCIETY_DIR/osm-names.xml $DIR/mapumental-names.xml --world_boundaries $BASE_DIR/world_boundaries --symbols $BASE_DIR/mapnik/symbols --dbname openstreetmap --user openstreetmap --host $HOST --port 5432 --accept-none
+    ./generate_xml.py $MYSOCIETY_DIR/osm-grey.xml $DIR/mapumental-map.xml --world_boundaries $BASE_DIR/world_boundaries --symbols $BASE_DIR/mapnik/symbols --dbname openstreetmap --user openstreetmap --host $HOST --port 5432 --accept-none
+    ./generate_xml.py osm.xml $DIR/osm.xml --world_boundaries $BASE_DIR/world_boundaries --symbols $BASE_DIR/mapnik/symbols --dbname openstreetmap --user openstreetmap --host $HOST --port 5432 --accept-none
+    echo "New XML files present in tmp/"
+    cd $DIR/..
 fi