X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/dd0e5ed990bcb50caf278ac6017971c5977bb25f..18424e9038b5f06d815167da8f0c10bed5d5d211:/cookbooks/tile/templates/default/replicate.erb diff --git a/cookbooks/tile/templates/default/replicate.erb b/cookbooks/tile/templates/default/replicate.erb index 9d86d9534..aa69177ec 100644 --- a/cookbooks/tile/templates/default/replicate.erb +++ b/cookbooks/tile/templates/default/replicate.erb @@ -67,11 +67,16 @@ do echo "Fetched new data from ${prevSequenceNumber} to ${sequenceNumber} into ${file}" # Apply the changes to the database + osm2pgsql --database gis --slim --append --number-processes=1 \ <% if node[:tile][:node_file] -%> - osm2pgsql --database gis --slim --append --number-processes=1 --flat-nodes=<%= node[:tile][:node_file] %> ${file} -<% else -%> - osm2pgsql --database gis --slim --append --number-processes=1 ${file} + --flat-nodes=<%= node[:tile][:node_file] %> \ <% end -%> +<% if node[:tile][:styles][:default][:revision] >= "v4.0.0" -%> + --multi-geometry --hstore \ + --style=/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.style \ + --tag-transform-script=/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.lua \ +<% end -%> + ${file} # No need to rollback now rm state-prev.txt