Merge remote-tracking branch 'github/pull/602'

diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb
index 9ab18f93b1159023aaacf00cd7f79a5bdd1aae36..96aa8dafc23f24aceb0bfcaa5eb4b811f096e65c 100644 (file)
--- a/cookbooks/tilelog/recipes/default.rb
+++ b/cookbooks/tilelog/recipes/default.rb
@@ -31,7 +31,7 @@ end
 python_package "tilelog" do
   python_virtualenv tilelog_directory
   python_version "3"
-  version "1.5.0"
+  version "1.6.0"
 end
 
 directory tilelog_output_directory do

diff --git a/cookbooks/tilelog/templates/default/tilelog.erb b/cookbooks/tilelog/templates/default/tilelog.erb
index 5ce9180cc07ebe0283e9fa42f6968aa8402cd2b3..0cb24ce4d75f9260c0059c492e8a1dcbf44a4fed 100644 (file)
--- a/cookbooks/tilelog/templates/default/tilelog.erb
+++ b/cookbooks/tilelog/templates/default/tilelog.erb
@@ -20,7 +20,8 @@ HOSTFILE="hosts-${DATE}.csv"
 APPFILE="apps-${DATE}.csv"
 COUNTRYFILE="countries-${DATE}.csv"
 
-nice -n 19 /opt/tilelog/bin/tilelog --date "${DATE}" --generate-success \
+nice -n 19 /opt/tilelog/bin/tilelog --date "${DATE}" \
+  --generate-success --generate-minimise --generate-location \
   --tile "${TILEFILE}" --host "${HOSTFILE}" --app "${APPFILE}" --country "${COUNTRYFILE}"
 
 mv "${TILEFILE}" "${HOSTFILE}" "${APPFILE}" "${COUNTRYFILE}" "${OUTDIR}"