projects
/
chef.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f82e681
)
Revert "imagery: add permalink support"
author
Grant Slater
<grant.slater@wearefriday.com>
Fri, 17 Jun 2016 16:57:18 +0000
(17:57 +0100)
committer
Grant Slater
<grant.slater@wearefriday.com>
Fri, 17 Jun 2016 16:57:18 +0000
(17:57 +0100)
This reverts commit
3e3fe7718ee69bb95908dbe474fb4b15d80d329a
.
cookbooks/imagery/files/default/imagery.css
patch
|
blob
|
history
cookbooks/imagery/templates/default/imagery.js.erb
patch
|
blob
|
history
cookbooks/imagery/templates/default/index.html.erb
patch
|
blob
|
history
diff --git
a/cookbooks/imagery/files/default/imagery.css
b/cookbooks/imagery/files/default/imagery.css
index 2a72162cbf2430515562fa445b138dfa0b334c4b..59fd9bb6635f731a210bca7e8cce77faa8d1f845 100644
(file)
--- a/
cookbooks/imagery/files/default/imagery.css
+++ b/
cookbooks/imagery/files/default/imagery.css
@@
-10,9
+10,3
@@
max-height: 700px;/*less than map height! */
overflow: auto;
}
max-height: 700px;/*less than map height! */
overflow: auto;
}
-
-@media print {
- .leaflet-control {
- display:none
- }
-}
diff --git
a/cookbooks/imagery/templates/default/imagery.js.erb
b/cookbooks/imagery/templates/default/imagery.js.erb
index 35168e4bb2d9f738e684e3361f5082159e196037..a728ef60e2ca6fb6833cb63def759725b6656c9d 100644
(file)
--- a/
cookbooks/imagery/templates/default/imagery.js.erb
+++ b/
cookbooks/imagery/templates/default/imagery.js.erb
@@
-2,50
+2,37
@@
function createMap(divName) {
// Create a map
var map = L.map(divName).fitBounds(<%= @bbox.to_json %>);
// Create a map
var map = L.map(divName).fitBounds(<%= @bbox.to_json %>);
- // Create layer and overlays variables
- var leaflet_layers = {}
- var leaflet_overlays = {}
+ // Create a layer switcher
+ var layers = L.control.layers(null, null, {collapsed:false});
// Add OpenStreetMap layer
// Add OpenStreetMap layer
- l
eaflet_layers["OpenStreetMap"] =
L.tileLayer("http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
+ l
ayers.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>",
maxZoom: 19
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| -%>
-
- <% if layer[:overlay] -%>
- // Create <%= layer[:name] %> overlay
- var leaflet_overlays[<%= layer[:name] %>] = 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 %>
});
- <% if layer[:default] -%>
- // Add <%= layer[:name] %> to map
- leaflet_overlays[<%= layer[:name] %>].addTo(map);
- <% end -%>
-
+ // Add <%= layer[:name] %> to layer switcher
+ <% if layer[:overlay] -%>
+ layers.addOverlay(<%= layer[:name] %>, <%= layer[:title].to_json %>);
<% else %>
<% 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 %>
- });
+ layers.addBaseLayer(<%= layer[:name] %>, <%= layer[:title].to_json %>);
+ <% end -%>
<% if layer[:default] -%>
// Add <%= layer[:name] %> to map
<% if layer[:default] -%>
// Add <%= layer[:name] %> to map
- leaflet_layers[<%= layer[:name] %>].addTo(map);
- <% end -%>
-
+ <%= layer[:name] %>.addTo(map);
<% end -%>
<% end -%>
<% 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);
// 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;
}
return map;
}
diff --git
a/cookbooks/imagery/templates/default/index.html.erb
b/cookbooks/imagery/templates/default/index.html.erb
index 951abe8c888f9316f93493648dd7918dbc2268e6..74b7d53d0192f3975f2f4d96d5f085bf527e696c 100644
(file)
--- a/
cookbooks/imagery/templates/default/index.html.erb
+++ b/
cookbooks/imagery/templates/default/index.html.erb
@@
-9,10
+9,12
@@
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.ie.css" />
<![endif]-->
<script type="text/javascript" src="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.js"></script>
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.ie.css" />
<![endif]-->
<script type="text/javascript" src="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.js"></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-plugins/1.6.1/control/Permalink.min.js"></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-plugins/1.6.1/control/Permalink.Layer.min.js"></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-plugins/1.6.1/control/Permalink.Overlay.js"></script>
<script type="text/javascript" src="imagery.js"></script>
<script type="text/javascript" src="imagery.js"></script>
+ <style type="text/css">
+ @media print {
+ .leaflet-control { display:none }
+ }
+ </style>
</head>
<body onload="createMap('map')">
<div id="map"></div>
</head>
<body onload="createMap('map')">
<div id="map"></div>