use flatnodes-mode of osm2pgsql

[osmrrze.git] / scripts / doosmupdate.sh

diff --git a/scripts/doosmupdate.sh b/scripts/doosmupdate.sh
index 53f63c68f084c66ea63877b782a31e1285093f11..9491349eb7b0435b15744713a4a167e9be738c6e 100755 (executable)
--- a/scripts/doosmupdate.sh
+++ b/scripts/doosmupdate.sh
@@ -10,6 +10,7 @@ WEBSTATEFILE=/var/www/lastdbupdate.txt
 # anyways due to the metatile-layout!
 UPDATECMD="/usr/bin/osm2pgsql --slim --cache=8000 --append --database=osm \
            --style=/home.local/osm/dbstyle/osm2pgsql-new.style \
+           --flat-nodes=/mnt/database/flatnodes/flatnodes.db \
            --hstore --expire-tiles=17-17 \
            --expire-output=$EXPIRYFILE  $CHANGESFILE"
 
@@ -65,6 +66,9 @@ if [ -e $CHANGESFILE ] ; then
 fi
 echo "Update seems to have been successful."
 grep timestamp $OSMOSISWORKDIR/state.txt | sed -e 's/timestamp=//g' -e 's/T/ /g' -e 's/\\:/:/g' > $WEBSTATEFILE
+echo -n "Updated database: now at upstream state of "
+cat $WEBSTATEFILE
+touch /var/lib/tirex/tiles/planet-import-complete
 if [ -e $EXPIRYFILE ] ; then
        echo "Expiryfile exists. Telling tirex to rerender the tiles mentioned there..."
        echo "Number of lines: `wc -l $EXPIRYFILE`"
@@ -74,7 +78,7 @@ if [ -e $EXPIRYFILE ] ; then
                                    /var/lib/tirex/tiles/osm
        cat $EXPIRYFILE | /home.local/osm/bin/osmtilecleanup.pl \
                                    --action rerenderexpiredlist --zoom 13-20 \
-                                   --rrs /home.local/osm/bin/osmrerenderwrapper.sh \
+                                   --rrs /home.local/osm/bin/osmrerenderwrapper-osmde.sh \
                                    /var/lib/tirex/tiles/osmde
        rm $EXPIRYFILE
 fi