fixed fatal error as a result of copy/paste programming

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

diff --git a/app/views/browse/_map.rhtml b/app/views/browse/_map.rhtml
index a0fcc06aae471aab057a6c73e89451058e23b275..6655afcc54db39a8d5c8ec2c528be6c7f85b9498 100644 (file)
--- a/app/views/browse/_map.rhtml
+++ b/app/views/browse/_map.rhtml
@@ -1,44 +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"><%= t 'browse.map.loading' %></span>
+    <a id="larger_map" href=""></a>
+  <% else %>
+    <%= t 'browse.map.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 != "node") {
-    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() {
+    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 = "";
     $("loading").innerHTML = "";

-    if (this.features.length) { 
+
+    $("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";
+    }
+
+    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();
         var extent =  this.features[0].geometry.getBounds();

+

         for (var i = 1; i < this.features.length; i++) {
         for (var i = 1; i < this.features.length; i++) {

-            extent.extend(this.features[i].geometry.getBounds());
+          extent.extend(this.features[i].geometry.getBounds());

         }
         }

+

         if (extent) {
         if (extent) {

-               this.map.zoomToExtent(extent);
+          this.map.zoomToExtent(extent);

         } else {
         } else {

-               this.map.zoomToMaxExtent();
+          this.map.zoomToMaxExtent();

        }
        }

+

        var center = getMapCenter();
         $("larger_map").href = '/?lat='+center.lat+'&lon='+center.lon+'&zoom='+this.map.getZoom();
        var center = getMapCenter();
         $("larger_map").href = '/?lat='+center.lat+'&lon='+center.lon+'&zoom='+this.map.getZoom();

-        $("larger_map").innerHTML = "View Larger Map";
-    } else {
+        $("larger_map").innerHTML = "<%= t 'browse.map.view_larger_map' %>";
+      } else {

         $("small_map").style.display = "none";
         $("small_map").style.display = "none";

-    }
-  })   
-  map.addLayer(osm_layer);
-  osm_layer.loadGML();
-  osm_layer.loaded = true;
-}
-window.onload = init;
+      }
+    });
+
+    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>