Suppress latency warnings for an unused disk on cmok

[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 fa70ed457f785ee95188adf59faa672c402f3854..0f277444b45b0c9f23d16be14bb8718dfd22d394 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 layers = L.control.layers();
+  var layers = L.control.layers(null, null, {collapsed:false}).addTo(map);
 
   // 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");
-
   <% @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 %>,
@@ -20,9 +20,9 @@ function createMap(divName) {
 
   // Add <%= layer[:name] %> to layer switcher
   <% if layer[:overlay] -%>
-  layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:title].to_json %>);
-  <% else %>
   layers.addOverlay(<%= layer[:name] %>, <%= layer[:title].to_json %>);
+  <% else %>
+  layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:title].to_json %>);
   <% end -%>
 
   <% if layer[:default] -%>
@@ -31,8 +31,8 @@ function createMap(divName) {
   <% end -%>
   <% end -%>
 
-  // Add the layer switch to the mao
-  layers.addTo(map);
+  // Add the permalink control
+  map.addControl(new L.Control.Permalink());
 
   return map;
 }