Tidy up some recent commits:

[rails.git] / app / views / browse / _map.html.erb

diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index ac6f32fc6dbea253fc2165995a7365b2fb11708d..f84a2ec9f3d034d3bd7ebc0b1f58ca0d71f89d73 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -8,8 +8,8 @@
     <span id="loading"><%= t 'browse.map.loading' %></span>
     <a id="area_larger_map" href=""></a>
     <% unless map.instance_of? Changeset %>
     <span id="loading"><%= t 'browse.map.loading' %></span>
     <a id="area_larger_map" href=""></a>
     <% unless map.instance_of? Changeset %>

-    <br />
-    <a id="object_larger_map" href=""></a>
+      <br />
+      <a id="object_larger_map" href=""></a>

     <% end %>
   <% else %>
     <%= t 'browse.map.deleted' %>
     <% end %>
   <% else %>
     <%= t 'browse.map.deleted' %>


@@ -47,43 +47,23 @@
           url += "/full";
         }
 
           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() {
+        addObjectToMap(url, true, function(extent) {

           $("loading").innerHTML = "";
 
           $("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();
-            }
+          if (extent) {
+            extent.transform(map.getProjectionObject(), map.displayProjection);

 
 

-            var center = getMapCenter();
-            $("area_larger_map").href = '/?lat='+center.lat+'&lon='+center.lon+'&zoom='+this.map.getZoom();
+            $("area_larger_map").href = '/?minlon='+extent.left+'&minlat='+extent.bottom+'&maxlon='+extent.right+'&maxlat='+extent.top;

             $("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";
             $("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";

+

             <% unless map.instance_of? Changeset %>
             <% unless map.instance_of? Changeset %>

-            $("object_larger_map").href = '/?<%= map.class.to_s.downcase %>=<%= map.id %>';
-            $("object_larger_map").innerHTML = "<%= t('browse.map.larger.' + map.class.to_s.downcase) %>";
+              $("object_larger_map").href = '/?<%= map.class.to_s.downcase %>=<%= map.id %>';
+              $("object_larger_map").innerHTML = "<%= t('browse.map.larger.' + map.class.to_s.downcase) %>";

             <% end %>
           } else {
             $("small_map").style.display = "none";
           }
         });
             <% end %>
           } else {
             $("small_map").style.display = "none";
           }
         });

-
-        map.addLayer(osm_layer);
-
-        osm_layer.loadGML();
-        osm_layer.loaded = true;

       <% end %>
     }
 
       <% end %>
     }