imagery: nginx tweak for async stale background update

[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 a5ac8f42a6eca69df349deeafe99b30655ce4abe..0f277444b45b0c9f23d16be14bb8718dfd22d394 100644 (file)
--- a/cookbooks/imagery/templates/default/imagery.js.erb
+++ b/cookbooks/imagery/templates/default/imagery.js.erb
@@ -1,37 +1,38 @@
 function createMap(divName) {
   // Create a map
 function createMap(divName) {
   // Create a map

-  var map = L.map(divName);
+  var map = L.map(divName).fitBounds(<%= @bbox.to_json %>);

 
   // Create a layer switcher
 
   // Create a layer switcher

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

 
   // Add OpenStreetMap layer
 
   // Add OpenStreetMap layer

-  layers.addBaseLayer(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>",
+  layers.addBaseLayer(L.tileLayer("//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
+    attribution: "© <a target=\"_parent\" href=\"https://www.openstreetmap.org\">OpenStreetMap</a> and contributors, under an <a target=\"_parent\" href=\"https://www.openstreetmap.org/copyright\">open license</a>",

     maxZoom: 19
   }), "OpenStreetMap");
     maxZoom: 19
   }), "OpenStreetMap");

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

 
 

-  <% @layers.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 %>
     attribution: <%= layer[:attribution].to_json %>,
     maxZoom: <%= layer[:maxZoom].to_json %>

-  }), <%= layer[:name].to_json %>);
+  });

 
 

+  // Add <%= layer[:name] %> to layer switcher
+  <% if layer[:overlay] -%>
+  layers.addOverlay(<%= layer[:name] %>, <%= layer[:title].to_json %>);
+  <% else %>
+  layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:title].to_json %>);

   <% end -%>
   <% end -%>

-  <% @overlays.each do |layer| -%>
-  // Add <%= layer[:name].to_json %> layer
-  layers.addOverlay(L.tileLayer(<%= layer[:url].to_json %>, {
-    attribution: <%= layer[:attribution].to_json %>,
-    maxZoom: <%= layer[:maxZoom].to_json %>
-  }), <%= layer[:name].to_json %>);

 
 

+  <% if layer[:default] -%>
+  // Add <%= layer[:name] %> to map
+  <%= layer[:name] %>.addTo(map);
+  <% end -%>

   <% end -%>
   <% end -%>

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

 
 

-  // Zoom to specified bounds
-  map.fitBounds(<%= @bbox.to_json %>);
+  // Add the permalink control
+  map.addControl(new L.Control.Permalink());

 
   return map;
 }
 
   return map;
 }