From 402c7f3b5f8c4d751c1496ba1379315c55f851d6 Mon Sep 17 00:00:00 2001 From: Paul Norman Date: Mon, 1 Dec 2025 15:02:05 -0800 Subject: [PATCH] vector: update spirit, expire all layers --- cookbooks/vectortile/attributes/default.rb | 4 ++-- cookbooks/vectortile/recipes/default.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbooks/vectortile/attributes/default.rb b/cookbooks/vectortile/attributes/default.rb index 351cf75ce..34e4c5a1e 100644 --- a/cookbooks/vectortile/attributes/default.rb +++ b/cookbooks/vectortile/attributes/default.rb @@ -15,8 +15,8 @@ default[:vectortile][:ocean][:threads] = [0.5 * node.cpu_cores, 2].max.ceil default[:vectortile][:ocean][:tileupdate] = true default[:vectortile][:tilekiln][:version] = "0.8.1" -default[:vectortile][:spirit][:version] = "808f5567f07a483ade328bfef3ed822dfe7c2bd3" -default[:vectortile][:themepark][:version] = "beb454cc56e88533fb398ab293489c4e91f4d42b" +default[:vectortile][:spirit][:version] = "b4168097384be34da31c41bc616114cceaec24dd" +default[:vectortile][:themepark][:version] = "84818f89f7b763b3b153acce7737abe4a9fe1fc4" default[:postgresql][:versions] |= [node[:vectortile][:database][:cluster].split("/").first] default[:postgresql][:monitor_database] = "tiles" diff --git a/cookbooks/vectortile/recipes/default.rb b/cookbooks/vectortile/recipes/default.rb index 257b76777..fe1833dc7 100644 --- a/cookbooks/vectortile/recipes/default.rb +++ b/cookbooks/vectortile/recipes/default.rb @@ -289,7 +289,7 @@ template "/usr/local/bin/vector-update" do variables :tilekiln_bin => "#{tilekiln_directory}/bin/tilekiln", :source_database => "spirit", :config_path => shortbread_config, :diff_size => "1000", :expiry_dir => "/srv/vector.openstreetmap.org/data/", :post_processing => "/usr/local/bin/tiles-rerender" end -rerender_layers = %w[addresses boundaries bridges buildings land pois public_transport sites street_polygons streets water_lines_labels water_lines water_polygons].join(" ") +rerender_layers = %w[water_polygons water_polygons_labels water_lines_labels water_lines dam_lines dam_polygons pier_lines pier_polygons boundaries boundary_labels place_labels land sites buildings addresses streets street_polygons street_labels streets_polygons_labels street_labels_points bridges aerialways ferries public_transport pois].join(" ") template "/usr/local/bin/tiles-rerender" do source "tiles-rerender.erb" -- 2.39.5