Navigation changes to the GPX traces page

[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 39906af0833925c8098555e331f972bb9b77d80f..d20813d6205f7a883a95a08d65923b7166c6c060 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,20 +28,20 @@
 
     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() {
+  $(document).ready(function () {

     var map = createMap("changeset_list_map", {
       controls: [
         new OpenLayers.Control.Navigation(),
     var map = createMap("changeset_list_map", {
       controls: [
         new OpenLayers.Control.Navigation(),

-        new OpenLayers.Control.PanZoom(),
+        new OpenLayers.Control.Zoom(),

         new OpenLayers.Control.PanZoomBar()
       ]
     });
         new OpenLayers.Control.PanZoomBar()
       ]
     });


@@ -50,16 +49,19 @@
     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);
 
     addBoxToMap(bbox, "<%= edit.id %>", true);
     <% end %>
     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) {
 
     vectors.events.on({
       "featureselected": function(feature) {


@@ -78,11 +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 %>

-  }
-
-  Event.observe(window, "load", init);
+  });

 </script>
 </script>