LOCKFILE=/home.local/osm/run/.osmupdate.lock
CHANGESFILE=/home.local/osm/run/osmosis-changes.osc.gz
EXPIRYFILE=/home.local/osm/run/expiredtiles.lst
+RERENDEREXPIREDTRIGGERFILE=/home.local/osm/run/rerenderexpiredtiles.setting
OSMOSISWORKDIR=/home.local/osm/.osmosis
WEBSTATEFILE=/var/www/lastdbupdate.txt
# Note: set the expire-tiles to 3 less than the real maximum,
# anyways due to the metatile-layout!
UPDATECMD="/usr/bin/osm2pgsql --slim --cache=8000 --append --database=osm \
--style=/home.local/osm/dbstyle/osm2pgsql-new.style \
- --hstore --expire-tiles=17-17 \
- --expire-output=$EXPIRYFILE $CHANGESFILE"
+ --flat-nodes=/mnt/database/flatnodes/flatnodes.db \
+ --hstore --multi-geometry \
+ --expire-tiles=17-17 --expire-output=$EXPIRYFILE \
+ $CHANGESFILE"
cleanup()
{
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`"
- cat $EXPIRYFILE | /home.local/osm/bin/osmtilecleanup.pl \
- --action rerenderexpiredlist --zoom 13-20 \
+ if [ -e $RERENDEREXPIREDTRIGGERFILE ] ; then
+ echo "Expiryfile and triggerfile 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.
+ # Trying completely without. Lots of load, way too many false positives. -unrz191 2015-09-04
+ cat $EXPIRYFILE | /home.local/osm/bin/osmtilecleanup.pl \
+ --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 \
- --rrs /home.local/osm/bin/osmrerenderwrapper.sh \
+ cat $EXPIRYFILE | /home.local/osm/bin/osmtilecleanup.pl \
+ --action rerenderexpiredlist --zoom 15-20 \
+ --rrs /home.local/osm/bin/osmrerenderwrapper-osmde.sh \
/var/lib/tirex/tiles/osmde
+ else
+ echo "Expiryfile exists but rerendering is disabled."
+ fi
rm $EXPIRYFILE
fi
echo "Ending update script cleanly: `date`"