From: Tom Hughes Date: Thu, 17 Aug 2023 21:45:24 +0000 (+0100) Subject: Merge remote-tracking branch 'github/pull/602' X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/e0561daeb2ceeb25a6be1c228f4bd0901197f53a?hp=060a21023355a513182229acdfcd94f92b02b43e Merge remote-tracking branch 'github/pull/602' --- diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb index 9ab18f93b..96aa8dafc 100644 --- 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 5ce9180cc..0cb24ce4d 100644 --- 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}"