X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7e4ceec192572936f5618d6e834bd5cea4f26b80..dcb25f0c07ef0252fb411be35030ead67f5da5d1:/app/views/changeset/_map.html.erb

diff --git a/app/views/changeset/_map.html.erb b/app/views/changeset/_map.html.erb
index 39906af08..3357057b1 100644
--- a/app/views/changeset/_map.html.erb
+++ b/app/views/changeset/_map.html.erb
@@ -1,13 +1,10 @@
-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'openlayers.js' %>
 <%= javascript_include_tag 'map.js' %>
 
 <div id="changeset_list_map">
 </div>
 
 <script type="text/javascript">
-  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
   var highlight;
 
   function highlightChangeset(id) {
@@ -29,37 +26,40 @@
 
     vectors.addFeatures(highlight);
 
-    $("tr-changeset-" + id).addClassName("selected");
+    $("#tr-changeset-" + id).addClass("selected");
   }
 
   function unHighlightChangeset(id) {
     vectors.removeFeatures(highlight);
 
-    $("tr-changeset-" + id).removeClassName("selected");
+    $("#tr-changeset-" + id).removeClass("selected");
   }
 
-  function init() {
+  $(document).ready(function () {
     var map = createMap("changeset_list_map", {
       controls: [
         new OpenLayers.Control.Navigation(),
-        new OpenLayers.Control.PanZoom(),
-        new OpenLayers.Control.PanZoomBar()
+        new OpenLayers.Control.Zoom(),
+        new OpenLayers.Control.SimplePanZoom()
       ]
     });
 
     var bounds = new OpenLayers.Bounds();
 
     <% @edits.each do |edit| %>
-    var minlon = <%= edit.min_lon / GeoRecord::SCALE.to_f %>;
-    var minlat = <%= edit.min_lat / GeoRecord::SCALE.to_f %>;
-    var maxlon = <%= edit.max_lon / GeoRecord::SCALE.to_f %>;
-    var maxlat = <%= edit.max_lat / GeoRecord::SCALE.to_f %>;
+    <% if edit.has_valid_bbox? %>
+    <% bbox = edit.bbox.to_unscaled %>
+    var minlon = <%= bbox.min_lon %>;
+    var minlat = <%= bbox.min_lat %>;
+    var maxlon = <%= bbox.max_lon %>;
+    var maxlat = <%= bbox.max_lat %>;
     var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat);
 
     bounds.extend(bbox);
 
     addBoxToMap(bbox, "<%= edit.id %>", true);
     <% end %>
+    <% end %>
 
     vectors.events.on({
       "featureselected": function(feature) {
@@ -78,11 +78,9 @@
     selectControl.activate();
 
     <% if ! @bbox.nil? %>
-      setMapExtent(new OpenLayers.Bounds(<%= @bbox %>));
+      map.zoomToExtent(proj(new OpenLayers.Bounds(<%= @bbox %>)));
     <% else %>
-      setMapExtent(bounds);
+      map.zoomToExtent(proj(bounds));
     <% end %>
-  }
-
-  Event.observe(window, "load", init);
+  });
 </script>