From 02f9c7cf05f1cd0d0f07ccb88135059581531dde Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 31 May 2017 11:39:11 +0100 Subject: [PATCH] Add support for carto v4 to replication command --- cookbooks/tile/templates/default/replicate.erb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 -- 2.43.2