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 3128108d915a9bd19d9d813c927b381558630b03..d972104ba9d9c40cf08f5928575ca2e72766d09b 100644 (file)
--- a/app/views/browse/_map.rhtml
+++ b/app/views/browse/_map.rhtml
@@ -1,32 +1,80 @@
 <%= javascript_include_tag '/openlayers/OpenLayers.js' %>
 <%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
 <%= javascript_include_tag '/openlayers/OpenLayers.js' %>
 <%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>

-<div style="float:right">
-<div id="small_map" style="width:250px; height: 300px; border: solid 1px black">
-</div>
+<td align="right">
+  <% 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>
+    <a id="larger_map" href=""></a>
+  <% else %>
+    Deleted
+  <% end %>
+</td>

 <script type="text/javascript">
   function init() {
 <script type="text/javascript">
   function init() {

-  var obj_type = '<%= type %>';
-  var obj_id = <%= id %>;
-  var url = "/api/<%= "#{API_VERSION}" %>/<%= type %>/<%= id %>";
-  if (obj_type == "way") {
-    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")});
-  osm_layer.events.register("loadend", osm_layer, function() {
-    $("loading").innerHTML = ""; 
-    this.map.zoomToExtent( this.features[0].geometry.getBounds());
-    var center = map.getCenter().clone().transform(this.map.getProjectionObject(), new OpenLayers.Projection("EPSG:4326"));
-    $("larger_map").href = '/?lat='+center.lat+'&lon='+center.lon+'&zoom='+this.map.getZoom();
+    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";
     $("larger_map").innerHTML = "View Larger Map";

-  })   
-  map.addLayer(osm_layer);
-  osm_layer.loadGML();
-  osm_layer.loaded = true;
-}
-window.onload = init;
+    <% else %>
+    var obj_type = "<%= map.class.name.downcase %>";
+    var obj_id = <%= map.id %>;
+    var url = "/api/<%= "#{API_VERSION}" %>/<%= map.class.name.downcase %>/<%= map.id %>";
+
+    if (obj_type != "node") {
+      url += "/full";
+    }
+
+    var osm_layer = new OpenLayers.Layer.GML("OSM", url, {
+      format: OpenLayers.Format.OSM,
+      projection: new OpenLayers.Projection("EPSG:4326")
+    });
+
+    osm_layer.events.register("loadend", osm_layer, function() {
+      $("loading").innerHTML = "";
+
+      if (this.features.length) { 
+        var extent =  this.features[0].geometry.getBounds();
+
+        for (var i = 1; i < this.features.length; i++) {
+          extent.extend(this.features[i].geometry.getBounds());
+        }
+
+        if (extent) {
+          this.map.zoomToExtent(extent);
+        } else {
+          this.map.zoomToMaxExtent();
+       }
+
+       var center = getMapCenter();
+        $("larger_map").href = '/?lat='+center.lat+'&lon='+center.lon+'&zoom='+this.map.getZoom();
+        $("larger_map").innerHTML = "View Larger Map";
+      } else {
+        $("small_map").style.display = "none";
+      }
+    });
+
+    map.addLayer(osm_layer);
+
+    osm_layer.loadGML();
+    osm_layer.loaded = true;
+    <% end %>
+  }
+
+  window.onload = init;

 </script>
 </script>

-<span id="loading">Loading...</span>
-<a id="larger_map" href=""></a>
-</div>