Remove cmd line options on osmium call not needed for current version.

[chef.git] / cookbooks / taginfo / templates / default / update-planet.erb

diff --git a/cookbooks/taginfo/templates/default/update-planet.erb b/cookbooks/taginfo/templates/default/update-planet.erb
index 371369b07cc4a2cb50c159e0a8e51088364b9d6e..7f55c078ccb2ddb6d3a27da3215588f741b08721 100644 (file)
--- a/cookbooks/taginfo/templates/default/update-planet.erb
+++ b/cookbooks/taginfo/templates/default/update-planet.erb
@@ -17,6 +17,8 @@ STATEDIR="${PLANETDIR}/replication"
 OSCFILE="${PLANETDIR}/$(date +%Y%m%d-%H%M).osc"
 OSCFILEPREV="${PLANETDIR}/previous.osc"
 
+OSMIUM=<%= @directory %>/osmium-tool/build/src/osmium
+
 # start logging
 
 exec > "${LOGDIR}/$(date +%Y%m%d-%H%M).log" 2>&1
@@ -33,7 +35,8 @@ fi
 
 # osc file is ready, create new planet file
 
-osmosis --read-xml-change "$OSCFILE" --read-bin "$PLANETCURR" --buffer bufferCapacity=12000 --apply-change --buffer bufferCapacity=12000 --write-pbf file="$PLANETNEW"
+#osmosis --read-xml-change "$OSCFILE" --read-bin "$PLANETCURR" --buffer bufferCapacity=12000 --apply-change --buffer bufferCapacity=12000 --write-pbf file="$PLANETNEW"
+$OSMIUM apply-changes --verbose --fsync --output=$PLANETNEW $PLANETCURR $OSCFILE
 
 # cleanup