From: Tom Hughes <tom@compton.nu>
Date: Tue, 31 May 2016 17:49:34 +0000 (+0100)
Subject: Allow imagery layers to be show by default
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/a0858dce1ce11c24de0103a341bc0ea8f75154ea?ds=sidebyside

Allow imagery layers to be show by default
---

diff --git a/cookbooks/imagery/recipes/au_agri.rb b/cookbooks/imagery/recipes/au_agri.rb
index 35740d3b6..4eb10ea80 100644
--- a/cookbooks/imagery/recipes/au_agri.rb
+++ b/cookbooks/imagery/recipes/au_agri.rb
@@ -28,6 +28,7 @@ end
 imagery_layer "au_ga_agri" do
   site "agri.openstreetmap.org"
   root_layer true
+  default_layer true
   text "AGRI: The Australian Geographic Reference Image"
   copyright "Commonwealth of Australia (Geoscience Australia) - Creative Commons Attribution 4.0 International Licence"
   background_colour "0 0 0" # Black
diff --git a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
index 548910384..9cee51ec5 100644
--- a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
@@ -28,6 +28,7 @@ end
 imagery_layer "gb_hampshire_aerial_rgb" do
   site "hampshire.aerial.openstreetmap.org.uk"
   root_layer true
+  default_layer true
   text "Hampshire Aerial - Summer 2013"
   source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-RGB.tif"
   projection "EPSG:27700"
diff --git a/cookbooks/imagery/recipes/gb_os_sv.rb b/cookbooks/imagery/recipes/gb_os_sv.rb
index 9de3456ff..1bbd084f8 100644
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -171,6 +171,7 @@ end
 imagery_layer "gb_os_sv_2016_04" do
   site "os.openstreetmap.org"
   root_layer true
+  default_layer true
   projection "EPSG:27700"
   source "/data/imagery/gb/os-sv/ossv-2016-04-combined.vrt"
   copyright "Contains Ordnance Survey data &copy; Crown copyright and database right 2016"
diff --git a/cookbooks/imagery/recipes/gb_surrey_aerial.rb b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
index 65451dc08..487e87595 100644
--- a/cookbooks/imagery/recipes/gb_surrey_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
@@ -28,6 +28,7 @@ end
 imagery_layer "gb_surrey_aerial" do
   site "surrey.aerial.openstreetmap.org.uk"
   root_layer true
+  default_layer true
   projection "EPSG:27700"
   source "/data/imagery/gb/surrey-aerial/SurreyMosaicECW.tif"
   text "Surrey Air Survey - 2008/2009"
diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index b9ffd6772..96a57ea93 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -38,6 +38,7 @@ property :max_zoom, Fixnum, :default => 23
 property :url_aliases, [String, Array], :default => []
 property :revision, Fixnum, :default => 1
 property :overlay, [TrueClass, FalseClass], :default => false
+property :default_layer, [TrueClass, FalseClass], :default => false
 
 action :create do
   file "create layer yaml definition" do
@@ -52,6 +53,7 @@ action :create do
     content YAML.dump(:name => layer,
                       :url => "http://#{site}/layer/#{layer}/{z}/{x}/{y}.png",
                       :attribution => copyright,
+                      :default => default_layer,
                       :maxZoom => max_zoom)
   end
 
diff --git a/cookbooks/imagery/templates/default/imagery.js.erb b/cookbooks/imagery/templates/default/imagery.js.erb
index 44e8bd218..d3ad65458 100644
--- a/cookbooks/imagery/templates/default/imagery.js.erb
+++ b/cookbooks/imagery/templates/default/imagery.js.erb
@@ -12,15 +12,22 @@ function createMap(divName) {
   }), "OpenStreetMap");
 
   <% @layers.sort_by { |layer| layer[:name] }.each do |layer| -%>
-  // Add <%= layer[:name].to_json %> layer
-  layers.addBaseLayer(L.tileLayer(<%= layer[:url].to_json %>, {
+  // Create <%= layer[:name] %> layer
+  var <%= layer[:name] %> = L.tileLayer(<%= layer[:url].to_json %>, {
     attribution: <%= layer[:attribution].to_json %>,
     maxZoom: <%= layer[:maxZoom].to_json %>
-  }), <%= layer[:name].to_json %>);
+  });
+
+  // Add <%= layer[:name] %> to layer switcher
+  layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:name].to_json %>);
 
+  <% if layer[:default] -%>
+  // Add <%= layer[:name] %> to map
+  <%= layer[:name] %>.addTo(map);
+  <% end -%>
   <% end -%>
   <% @overlays.sort_by { |layer| layer[:name] }.each do |layer| -%>
-  // Add <%= layer[:name].to_json %> layer
+  // Add <%= layer[:name] %> to layer switcher
   layers.addOverlay(L.tileLayer(<%= layer[:url].to_json %>, {
     attribution: <%= layer[:attribution].to_json %>,
     maxZoom: <%= layer[:maxZoom].to_json %>