Uni-Gebaeudenummern zeigen - da die Daten manuell gepflegt werden muessen, gerade...

[osmrrze.git] / scripts / doosmupdate.sh

diff --git a/scripts/doosmupdate.sh b/scripts/doosmupdate.sh
index 3ebe00b355c132e22f62e91aa14b527714591c13..bd36b57fdd477910b38d11cf4db28e239c5e1867 100755 (executable)
--- a/scripts/doosmupdate.sh
+++ b/scripts/doosmupdate.sh
@@ -73,18 +73,24 @@ 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.
-               # 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 \
+               cat $EXPIRYFILE | sudo -u tirex /home.local/osm/bin/osmtilecleanup.pl \
+                                   --action touchexpiredlist --zoom 15-20 \
                                    /var/lib/tirex/tiles/osm
-               cat $EXPIRYFILE | /home.local/osm/bin/osmtilecleanup.pl \
-                                   --action rerenderexpiredlist --zoom 15-20 \
-                                   --rrs /home.local/osm/bin/osmrerenderwrapper-osmde.sh \
+               cat $EXPIRYFILE | sudo -u tirex /home.local/osm/bin/osmtilecleanup.pl \
+                                   --action touchexpiredlist --zoom 15-20 \
                                    /var/lib/tirex/tiles/osmde
+               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