X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fa98753614cc511d64561d3ac7e460d689dda44b..0caaf54de5b85070548381a814106a07f366b11a:/app/views/browse/_map.html.erb

diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index 4f61be047..0b7f76f23 100644
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -1,16 +1,20 @@
 <%= javascript_include_tag '/openlayers/OpenLayers.js' %>
 <%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
-<td align="right">
+<div id="browse_map">
   <% 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>
+  <div id="small_map">
+  </div>
+  <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>
+  <% end %>
   <% else %>
     <%= t 'browse.map.deleted' %>
   <% end %>
-</td>
+</div>
 <% if map.instance_of? Changeset or map.visible %>
   <script type="text/javascript">
     OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
@@ -32,8 +36,16 @@
 
         $("loading").innerHTML = "";
 
-        $("larger_map").href = '/?minlon='+minlon+'&minlat='+minlat+'&maxlon='+maxlon+'&maxlat='+maxlat+'&box=yes';
-        $("larger_map").innerHTML = "<%= t 'browse.map.view_larger_map' %>";
+        $("area_larger_map").href = '/?minlon='+minlon+'&minlat='+minlat+'&maxlon='+maxlon+'&maxlat='+maxlat+'&box=yes';
+        $("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";
+      <% else if map.instance_of? MapBug %>
+		$("loading").innerHTML = "";
+		var centre = new OpenLayers.LonLat(<%= map.lon %>, <%= map.lat %>);
+        var zoom = 16;
+        setMapCenter(centre, zoom);
+		marker = addMarkerToMap(centre);
+		$("area_larger_map").href = '/?mlon=<%= map.lon %>&mlat=<%=map.lat %>';
+        $("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";
       <% else %>
         var obj_type = "<%= map.class.name.downcase %>";
         var obj_id = <%= map.id %>;
@@ -43,40 +55,24 @@
           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 = "";
 
-          if (this.features.length) {
-            var extent =  this.features[0].geometry.getBounds();
+          if (extent) {
+            extent.transform(map.getProjectionObject(), map.displayProjection);
 
-            for (var i = 1; i < this.features.length; i++) {
-              extent.extend(this.features[i].geometry.getBounds());
-            }
+            $("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' %>";
 
-            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 = "<%= t 'browse.map.view_larger_map' %>";
+            <% 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) %>";
+            <% end %>
           } else {
             $("small_map").style.display = "none";
           }
         });
-
-        map.addLayer(osm_layer);
-
-        osm_layer.loadGML();
-        osm_layer.loaded = true;
-      <% end %>
+      <% end end %>
     }
 
     window.onload = init;