Revert to using project-osrm.org for OSRM routing

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 907b1ae8810386b65a2d2abe206ae8a5f3192e60..4bc8717cd2dfb3491add5867f90bda5f8c668cb3 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -23,7 +23,6 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["9.1"],

     :settings => {
       :defaults => {
         :temp_buffers => "32MB",
     :settings => {
       :defaults => {
         :temp_buffers => "32MB",


@@ -51,9 +50,6 @@ default_attributes(
     }
   },
   :tile => {
     }
   },
   :tile => {

-    :database => {
-      :cluster => "9.1/main"
-    },

     :data => {
       :world_boundaries => {
         :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"
     :data => {
       :world_boundaries => {
         :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"


@@ -75,12 +71,20 @@ default_attributes(
       :land_polygons => {
         :url => "http://data.openstreetmapdata.com/land-polygons-split-3857.zip",
         :refresh => true
       :land_polygons => {
         :url => "http://data.openstreetmapdata.com/land-polygons-split-3857.zip",
         :refresh => true

+      },
+      :antarctica_icesheet_polygons => {
+        :url => "http://data.openstreetmapdata.com/antarctica-icesheet-polygons-3857.zip",
+        :refresh => true
+      },
+      :antarctica_icesheet_outlines => {
+        :url => "http://data.openstreetmapdata.com/antarctica-icesheet-outlines-3857.zip",
+        :refresh => true

       }
     },
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
       }
     },
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",

-        :revision => "v2.29.1",
+        :revision => "v2.37.1",

         :max_zoom => 19
       }
     }
         :max_zoom => 19
       }
     }