Add layer switcher as soon as it is created

Without this we get an error if we add a layer that is in the
layer switcher to the map before the switcher is added.

diff --git a/cookbooks/imagery/templates/default/imagery.js.erb b/cookbooks/imagery/templates/default/imagery.js.erb
index 698c8926fde477f9ae507f7c2cd9fe18cf6647b5..e1ed53515d11cfa15cad589054a6bd39247975bc 100644 (file)
--- a/cookbooks/imagery/templates/default/imagery.js.erb
+++ b/cookbooks/imagery/templates/default/imagery.js.erb
@@ -3,15 +3,15 @@ function createMap(divName) {
   var map = L.map(divName).fitBounds(<%= @bbox.to_json %>);
 
   // Create a layer switcher
   var map = L.map(divName).fitBounds(<%= @bbox.to_json %>);
 
   // Create a layer switcher

-  var layers = L.control.layers(null, null, {collapsed:false});
+  var layers = L.control.layers(null, null, {collapsed:false}).addTo(map);

 
   // Add OpenStreetMap layer
   layers.addBaseLayer(L.tileLayer("//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
     attribution: "© <a target=\"_parent\" href=\"http://www.openstreetmap.org\">OpenStreetMap</a> and contributors, under an <a target=\"_parent\" href=\"http://www.openstreetmap.org/copyright\">open license</a>",
     maxZoom: 19
   }), "OpenStreetMap");
 
   // Add OpenStreetMap layer
   layers.addBaseLayer(L.tileLayer("//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
     attribution: "© <a target=\"_parent\" href=\"http://www.openstreetmap.org\">OpenStreetMap</a> and contributors, under an <a target=\"_parent\" href=\"http://www.openstreetmap.org/copyright\">open license</a>",
     maxZoom: 19
   }), "OpenStreetMap");

-

   <% @layers.sort_by { |layer| layer[:name] }.each do |layer| -%>
   <% @layers.sort_by { |layer| layer[:name] }.each do |layer| -%>

+

   // Create <%= layer[:name] %> layer
   var <%= layer[:name] %> = L.tileLayer(<%= layer[:url].to_json %>, {
     attribution: <%= layer[:attribution].to_json %>,
   // Create <%= layer[:name] %> layer
   var <%= layer[:name] %> = L.tileLayer(<%= layer[:url].to_json %>, {
     attribution: <%= layer[:attribution].to_json %>,


@@ -31,8 +31,8 @@ function createMap(divName) {
   <% end -%>
   <% end -%>
 
   <% end -%>
   <% end -%>
 

-  // Add the layer switch to the mao
-  layers.addTo(map);
+  // Add the permalink control

   map.addControl(new L.Control.Permalink());
   map.addControl(new L.Control.Permalink());

+

   return map;
 }
   return map;
 }