X-Git-Url: http://git.rrze.uni-erlangen.de/gitweb/?p=osmrrze.git;a=blobdiff_plain;f=scripts%2Fdoosmupdate.sh;h=786734e1c5ba0bd6eeb38fe7068ce5eebdd86411;hp=bd36b57fdd477910b38d11cf4db28e239c5e1867;hb=407cdf50bf089a90e3bd46e0a07cfc486a51b18c;hpb=0eb5dce25188e3346b64698092243d2215ec314a

diff --git a/scripts/doosmupdate.sh b/scripts/doosmupdate.sh
index bd36b57..786734e 100755
--- 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"
 
@@ -85,12 +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