From: Tom Hughes <tom@compton.nu>
Date: Thu, 18 Feb 2016 19:37:27 +0000 (+0000)
Subject: Drop populated_places from tile data sources
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/bed7db240ce3f7e9dcd7c3532f3a0e5a0afdf015

Drop populated_places from tile data sources

Closes #58
---

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 4ab6b8bbd..89489f5bd 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -188,21 +188,6 @@ node[:tile][:data].each_value do |data|
     end
   end
 
-  if data[:processed]
-    original = "#{directory}/#{data[:original]}"
-    processed = "#{directory}/#{data[:processed]}"
-
-    package "gdal-bin"
-
-    execute processed do
-      action :nothing
-      command "ogr2ogr #{processed} #{original}"
-      user "tile"
-      group "tile"
-      subscribes :run, "execute[#{file}]", :immediately
-    end
-  end
-
   execute "#{file}_shapeindex" do
     action :nothing
     command "find #{directory} -type f -iname '*.shp' -print0 | xargs -0 --no-run-if-empty shapeindex --shape_files"
diff --git a/roles/tile.rb b/roles/tile.rb
index 866339985..6cb803482 100644
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -62,12 +62,6 @@ default_attributes(
         :url => "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip",
         :directory => "ne_110m_admin_0_boundary_lines_land"
       },
-      :populated_places => {
-        :url => "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_populated_places.zip",
-        :directory => "ne_10m_populated_places",
-        :original => "ne_10m_populated_places.shp",
-        :processed => "ne_10m_populated_places_fixed.shp"
-      },
       :land_polygons => {
         :url => "http://data.openstreetmapdata.com/land-polygons-split-3857.zip",
         :refresh => true