X-Git-Url: http://git.rrze.uni-erlangen.de/gitweb/?p=osmrrze.git;a=blobdiff_plain;f=scripts%2Fdoosmupdate.sh;fp=scripts%2Fdoosmupdate.sh;h=bd36b57fdd477910b38d11cf4db28e239c5e1867;hp=e7a447f2db9cc72bc39df952dee5073aa2201ef9;hb=e6723fa6793602205e1951bc85f70a26565cbb08;hpb=714ac31b1c100a7fd8df08426a969823dc5d748f

diff --git a/scripts/doosmupdate.sh b/scripts/doosmupdate.sh
index e7a447f..bd36b57 100755
--- a/scripts/doosmupdate.sh
+++ b/scripts/doosmupdate.sh
@@ -73,7 +73,7 @@ cat $WEBSTATEFILE
 #touch /var/lib/tirex/tiles/planet-import-complete
 if [ -e $EXPIRYFILE ] ; then
 	if [ -e $RERENDEREXPIREDTRIGGERFILE ] ; then
-		echo "Expiryfile and triggerfile  exists. Telling tirex to rerender the tiles mentioned there..."
+		echo "Expiryfile and triggerfile  exists. Marking the tiles mentioned there as expired..."
 		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 | sudo -u tirex /home.local/osm/bin/osmtilecleanup.pl \
@@ -85,6 +85,12 @@ if [ -e $EXPIRYFILE ] ; then
 		cat $EXPIRYFILE | sudo -u tirex /home.local/osm/bin/osmtilecleanup.pl \
                                    --action touchexpiredlist --zoom 15-20 \
                                    /var/lib/tirex/tiles/osmhd
+		# Now immediately rerender all the tiles there that are in our area.
+		# The rest gets done on demand by mod_tile.
+		echo "Triggering rerendering of expired tiles in our area..."
+		tirex-batch --prio=31 --expire=+3600 --filter='exists;older(1450000000)' map=osm   bbox=10.93,49.37,11.14,49.63 z=15-20
+		tirex-batch --prio=31 --expire=+3600 --filter='exists;older(1450000000)' map=osmde bbox=10.93,49.37,11.14,49.63 z=15-20
+		tirex-batch --prio=31 --expire=+3600 --filter='exists;older(1450000000)' map=osmhd bbox=10.93,49.37,11.14,49.63 z=15-20
 	else
 		echo "Expiryfile exists but rerendering is disabled."
 	fi