Skip to content
Browse files

Path to tagstats program now in main config

  • Loading branch information...
1 parent 244f354 commit 7cc9439c8801147fee0dd554efb0d32403a7d4bc @joto committed Jan 23, 2012
Showing with 11 additions and 4 deletions.
  1. +8 −4 sources/db/update.sh
  2. +3 −0 taginfo-config-example.json
View
12 sources/db/update.sh
@@ -36,17 +36,21 @@ sqlite3 $DATABASE <../init.sql
echo "`$DATECMD` Running pre.sql..."
sqlite3 $DATABASE <pre.sql
-echo "`$DATECMD` Running count... "
-
+echo "`$DATECMD` Running tagstats... "
top=`../../bin/taginfo-config.rb geodistribution.top`
right=`../../bin/taginfo-config.rb geodistribution.right`
bottom=`../../bin/taginfo-config.rb geodistribution.bottom`
left=`../../bin/taginfo-config.rb geodistribution.left`
width=`../../bin/taginfo-config.rb geodistribution.width`
height=`../../bin/taginfo-config.rb geodistribution.height`
-#valgrind --leak-check=full --show-reachable=yes ./tagstats $PLANETFILE $DATABASE >valgrind.log 2>&1
-./tagstats -T $DIR/interesting_tags.lst --left=$left --bottom=$bottom --top=$top --right=$right --width=$width --height=$height $PLANETFILE $DATABASE
+TAGSTATS=`../../bin/taginfo-config.rb sources.db.tagstats`
+if [ "x" = "x$TAGSTATS" ]; then
+ TAGSTATS="./tagstats"
+fi
+
+#TAGSTATS="valgrind --leak-check=full --show-reachable=yes $TAGSTATS"
+$TAGSTATS -T $DIR/interesting_tags.lst --left=$left --bottom=$bottom --top=$top --right=$right --width=$width --height=$height $PLANETFILE $DATABASE
echo "`$DATECMD` Running update_characters... "
./update_characters.pl $DIR
View
3 taginfo-config-example.json
@@ -48,6 +48,9 @@
// These sources will be created from the actual sources.
"create": "db",
"db": {
+ // Path to the 'tagstats' program (absolute path or relative to sources/db directory).
+ "tagstats": "./tagstats",
+ // The OSM planet file or extract where we read the OSM data from.
"planetfile": "/osm/planet/var/current-planet.osm.pbf"
}
}

0 comments on commit 7cc9439

Please sign in to comment.
Something went wrong with that request. Please try again.