Prefer using _html locale keys to the raw function

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

diff --git a/app/views/changeset/_map.html.erb b/app/views/changeset/_map.html.erb
index 5f5f4aa5d158fbec6239feb233f2491eb09bf697..88dd53c99a8e7847ee51119148bca318ea72405a 100644 (file)
--- a/app/views/changeset/_map.html.erb
+++ b/app/views/changeset/_map.html.erb
@@ -1,5 +1,4 @@
-<%= 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">
 <%= javascript_include_tag 'map.js' %>
 
 <div id="changeset_list_map">


@@ -29,13 +28,13 @@
 
     vectors.addFeatures(highlight);
 
 
     vectors.addFeatures(highlight);
 

-    $("tr-changeset-" + id).addClassName("selected");
+    $("#tr-changeset-" + id).addClass("selected");

   }
 
   function unHighlightChangeset(id) {
     vectors.removeFeatures(highlight);
 
   }
 
   function unHighlightChangeset(id) {
     vectors.removeFeatures(highlight);
 

-    $("tr-changeset-" + id).removeClassName("selected");
+    $("#tr-changeset-" + id).removeClass("selected");

   }
 
   function init() {
   }
 
   function init() {


@@ -50,14 +49,18 @@
     var bounds = new OpenLayers.Bounds();
 
     <% @edits.each do |edit| %>
     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);
     var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat);
 
     bounds.extend(bbox);

-    box = addBoxToMap(bbox, "<%= edit.id %>", true);
+
+    addBoxToMap(bbox, "<%= edit.id %>", true);
+    <% end %>

     <% end %>
 
     vectors.events.on({
     <% end %>
 
     vectors.events.on({


@@ -77,9 +80,9 @@
     selectControl.activate();
 
     <% if ! @bbox.nil? %>
     selectControl.activate();
 
     <% if ! @bbox.nil? %>

-      setMapExtent(new OpenLayers.Bounds(<%= @bbox %>));
+      map.zoomToExtent(proj(new OpenLayers.Bounds(<%= @bbox %>)));

     <% else %>
     <% else %>

-      setMapExtent(bounds);
+      map.zoomToExtent(proj(bounds));

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