Destroy OL objects which use the dataLayer before we destroy the layer

[rails.git] / app / views / browse / _map.rhtml

diff --git a/app/views/browse/_map.rhtml b/app/views/browse/_map.rhtml
index ad2d2d3071b309d3236d8b7257f2a5503070ab6c..d972104ba9d9c40cf08f5928575ca2e72766d09b 100644 (file)
--- a/app/views/browse/_map.rhtml
+++ b/app/views/browse/_map.rhtml
@@ -2,7 +2,7 @@
 <%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
 <td align="right">
-  <% if map.visible %>
+  <% if map.instance_of? Changeset or map.visible %>
     <div id="small_map" style="width:250px; height: 300px; border: solid 1px black">
     </div>
     <span id="loading">Loading...</span>
@@ -13,6 +13,25 @@
 </td>
 <script type="text/javascript">
   function init() {
+    var map = createMap("small_map", {
+      controls: [ new OpenLayers.Control.Navigation() ]
+    });
+
+    <% if map.instance_of? Changeset %>
+    var minlon = <%= map.min_lon / GeoRecord::SCALE.to_f %>;
+    var minlat = <%= map.min_lat / GeoRecord::SCALE.to_f %>;
+    var maxlon = <%= map.max_lon / GeoRecord::SCALE.to_f %>;
+    var maxlat = <%= map.max_lat / GeoRecord::SCALE.to_f %>;
+    var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat);
+
+    setMapExtent(bbox);
+    addBoxToMap(bbox);
+
+    $("loading").innerHTML = "";
+
+    $("larger_map").href = '/?minlon='+minlon+'&minlat='+minlat+'&maxlon='+maxlon+'&maxlat='+maxlat+'&box=yes';
+    $("larger_map").innerHTML = "View Larger Map";
+    <% else %>
     var obj_type = "<%= map.class.name.downcase %>";
     var obj_id = <%= map.id %>;
     var url = "/api/<%= "#{API_VERSION}" %>/<%= map.class.name.downcase %>/<%= map.id %>";
@@ -21,10 +40,6 @@
       url += "/full";
     }
 
-    var map = createMap("small_map", {
-      controls: [ new OpenLayers.Control.Navigation() ]
-    });
-
     var osm_layer = new OpenLayers.Layer.GML("OSM", url, {
       format: OpenLayers.Format.OSM,
       projection: new OpenLayers.Projection("EPSG:4326")
@@ -58,6 +73,7 @@
 
     osm_layer.loadGML();
     osm_layer.loaded = true;
+    <% end %>
   }
 
   window.onload = init;