imagery: do not cache mapserver errors

[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 d3ad6545839b138d06af574c744021b0484f2882..a728ef60e2ca6fb6833cb63def759725b6656c9d 100644 (file)
--- a/cookbooks/imagery/templates/default/imagery.js.erb
+++ b/cookbooks/imagery/templates/default/imagery.js.erb
@@ -1,9 +1,9 @@
 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();
+  var layers = L.control.layers(null, null, {collapsed:false});
 
   // Add OpenStreetMap layer
   layers.addBaseLayer(L.tileLayer("http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
@@ -19,26 +19,20 @@ function createMap(divName) {
   });
 
   // Add <%= layer[:name] %> to layer switcher
-  layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:name].to_json %>);
+  <% if layer[:overlay] -%>
+  layers.addOverlay(<%= layer[:name] %>, <%= layer[:title].to_json %>);
+  <% else %>
+  layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:title].to_json %>);
+  <% end -%>
 
   <% 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 layer switcher
-  layers.addOverlay(L.tileLayer(<%= layer[:url].to_json %>, {
-    attribution: <%= layer[:attribution].to_json %>,
-    maxZoom: <%= layer[:maxZoom].to_json %>
-  }), <%= layer[:name].to_json %>);
 
-  <% end -%>
   // Add the layer switch to the mao
   layers.addTo(map);
 
-  // Zoom to specified bounds
-  map.fitBounds(<%= @bbox.to_json %>);
-
   return map;
 }