Revert "imagery: add missing quotes"

[chef.git] / cookbooks / imagery / templates / default / imagery.js.erb

diff --git a/cookbooks/imagery/templates/default/imagery.js.erb b/cookbooks/imagery/templates/default/imagery.js.erb
index 58e9b0fea89a195ace8b1d179ffcc90af75add0b..35168e4bb2d9f738e684e3361f5082159e196037 100644 (file)
--- a/cookbooks/imagery/templates/default/imagery.js.erb
+++ b/cookbooks/imagery/templates/default/imagery.js.erb
@@ -1,44 +1,51 @@
 function createMap(divName) {
   // Create a map
-  var map = L.map(divName);
+  var map = L.map(divName).fitBounds(<%= @bbox.to_json %>);
 
-  // Create a layer switcher
-  var layers = L.control.layers();
+  // Create layer and overlays variables
+  var leaflet_layers = {}
+  var leaflet_overlays = {}
 
   // Add OpenStreetMap layer
-  layers.addBaseLayer(L.tileLayer("http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
+  leaflet_layers["OpenStreetMap"] = L.tileLayer("http://{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| -%>
-  // Create <%= layer[:name] %> layer
-  var <%= layer[:name] %> = L.tileLayer(<%= layer[:url].to_json %>, {
+
+  <% if layer[:overlay] -%>
+  // Create <%= layer[:name] %> overlay
+  var leaflet_overlays[<%= layer[:name] %>] = L.tileLayer(<%= layer[:url].to_json %>, {
     attribution: <%= layer[:attribution].to_json %>,
     maxZoom: <%= layer[:maxZoom].to_json %>
   });
 
-  // Add <%= layer[:name] %> to layer switcher
-  layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:title].to_json %>);
-
   <% if layer[:default] -%>
   // Add <%= layer[:name] %> to map
-  <%= layer[:name] %>.addTo(map);
+  leaflet_overlays[<%= layer[:name] %>].addTo(map);
   <% end -%>
-  <% end -%>
-  <% @overlays.sort_by { |layer| layer[:name] }.each do |layer| -%>
-  // Add <%= layer[:name] %> to layer switcher
-  layers.addOverlay(L.tileLayer(<%= layer[:url].to_json %>, {
+
+  <% else %>
+  // Create <%= layer[:name] %> layer
+  var leaflet_layers[<%= layer[:name] %>] = L.tileLayer(<%= layer[:url].to_json %>, {
     attribution: <%= layer[:attribution].to_json %>,
     maxZoom: <%= layer[:maxZoom].to_json %>
-  }), <%= layer[:title].to_json %>);
+  });
 
+  <% if layer[:default] -%>
+  // Add <%= layer[:name] %> to map
+  leaflet_layers[<%= layer[:name] %>].addTo(map);
   <% end -%>
-  // Add the layer switch to the mao
-  layers.addTo(map);
 
-  // Zoom to specified bounds
-  map.fitBounds(<%= @bbox.to_json %>);
+  <% end -%>
+  <% end -%>
 
+  // Create a layer switcher
+  var layers = L.control.layers(leaflet_layers, leaflet_overlays, {collapsed:false});
+
+  // Add the layer switch to the mao
+  layers.addTo(map);
+  map.addControl(new L.Control.Permalink({text: 'Permalink', layers: leaflet_layers, overlays: leaflet_overlays}));
   return map;
 }