X-Git-Url: http://git.rrze.uni-erlangen.de/gitweb/?p=osmrrze.git;a=blobdiff_plain;f=scripts%2Fdoosmupdate.sh;h=3a8fc11ed9d4a45cf7c696066caa08add34d5282;hp=9491349eb7b0435b15744713a4a167e9be738c6e;hb=1ef97ffe70261c8edae52bfaaf009d43e6472fab;hpb=cc9b12f07d2758e066868f4cb313003167e09464

diff --git a/scripts/doosmupdate.sh b/scripts/doosmupdate.sh
index 9491349..3a8fc11 100755
--- a/scripts/doosmupdate.sh
+++ b/scripts/doosmupdate.sh
@@ -11,7 +11,7 @@ WEBSTATEFILE=/var/www/lastdbupdate.txt
 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 \
+           --hstore --multi-geometry --expire-tiles=17-17 \
            --expire-output=$EXPIRYFILE  $CHANGESFILE"
 
 cleanup()
@@ -68,16 +68,17 @@ 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
+#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`"
+	# Used to be zoom 13-20 but that causes too much load. Reduced to 15-20.
 	cat $EXPIRYFILE | /home.local/osm/bin/osmtilecleanup.pl \
-                                   --action rerenderexpiredlist --zoom 13-20 \
+                                   --action rerenderexpiredlist --zoom 15-20 \
                                    --rrs /home.local/osm/bin/osmrerenderwrapper.sh \
                                    /var/lib/tirex/tiles/osm
 	cat $EXPIRYFILE | /home.local/osm/bin/osmtilecleanup.pl \
-                                   --action rerenderexpiredlist --zoom 13-20 \
+                                   --action rerenderexpiredlist --zoom 15-20 \
                                    --rrs /home.local/osm/bin/osmrerenderwrapper-osmde.sh \
                                    /var/lib/tirex/tiles/osmde
 	rm $EXPIRYFILE