Multiple changes

* Improved and cleaned up source import scripts
* Improved some reports and report overview
* New osmium version that uses a better hash function
* Some experimental magic to include Javascipt in an easier way (tested in keys.erb)

1 files changed, 11 insertions, 6 deletions

diff --git a/sources/db/update.sh b/sources/db/update.sh
index 4ab2856..56a7652 100755
--- a/sources/db/update.sh
+++ b/sources/db/update.sh
@@ -9,32 +9,37 @@ set -e
 
 DIR=$1
 
+DATECMD='date +%Y-%m-%dT%H:%M:%S'
+
 if [ "x" = "x$DIR" ]; then
     echo "Usage: update.sh DIR"
     exit 1
 fi
 
-echo -n "Start db: "; date
+echo "`$DATECMD` Start db..."
 
 DATABASE=$DIR/taginfo-db.db
 
 rm -f $DATABASE
 rm -f $DIR/count.db
 
-echo "Running pre.sql..."
+echo "`$DATECMD` Running init.sql..."
+sqlite3 $DATABASE <../init.sql
+
+echo "`$DATECMD` Running pre.sql..."
 sqlite3 $DATABASE <pre.sql
 
-echo -n "Running count... "; date
+echo "`$DATECMD` Running count... "
 HERE=`pwd`
 cd $DIR
 bzcat $DIR/planet.osm.bz2 | $HERE/osmium_tagstats -
 cd $HERE
 
-echo -n "Running update_characters... "; date
+echo "`$DATECMD` Running update_characters... "
 ./update_characters.pl $DIR
 
-echo -n "Running post.sql... "; date
+echo "`$DATECMD` Running post.sql... "
 perl -pe "s|__DIR__|$DIR|" post.sql | sqlite3 $DATABASE
 
-echo -n "Done db: "; date
+echo "`$DATECMD` Done db."