some changes for v4 of openstreetmap-carto (add LUA transform script)

[osmrrze.git] / scripts / doosmupdate.sh

diff --git a/scripts/doosmupdate.sh b/scripts/doosmupdate.sh
index e7a447f2db9cc72bc39df952dee5073aa2201ef9..786734e1c5ba0bd6eeb38fe7068ce5eebdd86411 100755 (executable)
--- a/scripts/doosmupdate.sh
+++ b/scripts/doosmupdate.sh
@@ -9,10 +9,17 @@ WEBSTATEFILE=/var/www/lastdbupdate.txt
 # Note: set the expire-tiles to 3 less than the real maximum,
 # as this makes the tilelist MUCH shorter, and the tiles get rerendered
 # 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 --multi-geometry \
+#           --expire-tiles=17-17 --expire-output=$EXPIRYFILE \
+#           $CHANGESFILE"
 UPDATECMD="/usr/bin/osm2pgsql --slim --cache=8000 --append --database=osm \
-           --style=/home.local/osm/dbstyle/osm2pgsql-new.style \
+           --style=/home.local/osm/dbstyle/openstreetmap-carto.style \
+           --tag-transform-script /home.local/osm/dbstyle/openstreetmap-carto.lua \
            --flat-nodes=/mnt/database/flatnodes/flatnodes.db \
-           --hstore --multi-geometry \
+           --hstore --multi-geometry --number-processes 4 \
            --expire-tiles=17-17 --expire-output=$EXPIRYFILE \
            $CHANGESFILE"
 
@@ -73,7 +80,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 +92,16 @@ 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
+               cat $EXPIRYFILE | sudo -u tirex /home.local/osm/bin/osmtilecleanup.pl \
+                                   --action touchexpiredlist --zoom 15-20 \
+                                   /var/lib/tirex/tiles/osmdehd
+               # 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
+               tirex-batch --prio=31 --expire=+3600 --filter='exists;older(1450000000)' map=osmdehd bbox=10.93,49.37,11.14,49.63 z=15-20
        else
                echo "Expiryfile exists but rerendering is disabled."
        fi