Drop populated_places from tile data sources
authorTom Hughes <tom@compton.nu>
Thu, 18 Feb 2016 19:37:27 +0000 (19:37 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 18 Feb 2016 19:37:27 +0000 (19:37 +0000)
Closes #58

cookbooks/tile/recipes/default.rb
roles/tile.rb

index 4ab6b8bbda23489c4760aaaecb3ed2a284e0891e..89489f5bd49c6b2fe4acc45eb955c7bc26eb4357 100644 (file)
@@ -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"
index 8663399852ef899381e0c5592f16740ceb2f5758..6cb803482746c444f88e980b3b2da903464d05cb 100644 (file)
@@ -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