From: Thomas Wood <grand.edgemaster@gmail.com>
Date: Fri, 26 Jun 2009 14:25:29 +0000 (+0000)
Subject: Only try to load the map if changeset or feature not deleted.
X-Git-Tag: live~6955
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fa98753614cc511d64561d3ac7e460d689dda44b

Only try to load the map if changeset or feature not deleted.
---

diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index 248cf27dd..4f61be047 100644
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -11,72 +11,74 @@
     <%= t 'browse.map.deleted' %>
   <% end %>
 </td>
-<script type="text/javascript">
-  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
+<% if map.instance_of? Changeset or map.visible %>
+  <script type="text/javascript">
+    OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 
-  function init() {
-    var map = createMap("small_map", {
-      controls: [ new OpenLayers.Control.Navigation() ]
-    });
+    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);
+      <% 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);
+        setMapExtent(bbox);
+        addBoxToMap(bbox);
 
-    $("loading").innerHTML = "";
+        $("loading").innerHTML = "";
 
-    $("larger_map").href = '/?minlon='+minlon+'&minlat='+minlat+'&maxlon='+maxlon+'&maxlat='+maxlat+'&box=yes';
-    $("larger_map").innerHTML = "<%= t 'browse.map.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 %>";
-
-    if (obj_type != "node") {
-      url += "/full";
-    }
+        $("larger_map").href = '/?minlon='+minlon+'&minlat='+minlat+'&maxlon='+maxlon+'&maxlat='+maxlat+'&box=yes';
+        $("larger_map").innerHTML = "<%= t 'browse.map.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 %>";
 
-    var osm_layer = new OpenLayers.Layer.GML("OSM", url, {
-      format: OpenLayers.Format.OSM,
-      projection: new OpenLayers.Projection("EPSG:4326")
-    });
+        if (obj_type != "node") {
+          url += "/full";
+        }
 
-    osm_layer.events.register("loadend", osm_layer, function() {
-      $("loading").innerHTML = "";
+        var osm_layer = new OpenLayers.Layer.GML("OSM", url, {
+          format: OpenLayers.Format.OSM,
+          projection: new OpenLayers.Projection("EPSG:4326")
+        });
 
-      if (this.features.length) { 
-        var extent =  this.features[0].geometry.getBounds();
+        osm_layer.events.register("loadend", osm_layer, function() {
+          $("loading").innerHTML = "";
 
-        for (var i = 1; i < this.features.length; i++) {
-          extent.extend(this.features[i].geometry.getBounds());
-        }
+          if (this.features.length) {
+            var extent =  this.features[0].geometry.getBounds();
 
-        if (extent) {
-          this.map.zoomToExtent(extent);
-        } else {
-          this.map.zoomToMaxExtent();
-	}
+            for (var i = 1; i < this.features.length; i++) {
+              extent.extend(this.features[i].geometry.getBounds());
+            }
 
-	var center = getMapCenter();
-        $("larger_map").href = '/?lat='+center.lat+'&lon='+center.lon+'&zoom='+this.map.getZoom();
-        $("larger_map").innerHTML = "<%= t 'browse.map.view_larger_map' %>";
-      } else {
-        $("small_map").style.display = "none";
+            if (extent) {
+              this.map.zoomToExtent(extent);
+            } else {
+              this.map.zoomToMaxExtent();
       }
-    });
 
-    map.addLayer(osm_layer);
+      var center = getMapCenter();
+            $("larger_map").href = '/?lat='+center.lat+'&lon='+center.lon+'&zoom='+this.map.getZoom();
+            $("larger_map").innerHTML = "<%= t 'browse.map.view_larger_map' %>";
+          } else {
+            $("small_map").style.display = "none";
+          }
+        });
 
-    osm_layer.loadGML();
-    osm_layer.loaded = true;
-    <% end %>
-  }
+        map.addLayer(osm_layer);
+
+        osm_layer.loadGML();
+        osm_layer.loaded = true;
+      <% end %>
+    }
 
-  window.onload = init;
-</script>
+    window.onload = init;
+  </script>
+<% end %>