Make "all traces" and "your traces" links more consistent

[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 605eacf153613c44b2dda77fb92a875707621fec..6d7aa96c04fafbafcf95f971e7373b16eb524391 100644 (file)
--- a/app/views/changeset/_map.html.erb
+++ b/app/views/changeset/_map.html.erb
@@ -2,42 +2,47 @@
 <%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
 
 <%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
 

-<div id="browse_map_changeset">
-  <div id="small_map">
-  </div>
-  <span id="loading"><%= t 'browse.map.loading' %></span>
+<div id="changeset_list_map">

 </div>
 
 <script type="text/javascript">
   OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 
 </div>
 
 <script type="text/javascript">
   OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 

+  var highlight;
+

   function highlightChangeset(id) {
     var feature = vectors.getFeatureByFid(id);
   function highlightChangeset(id) {
     var feature = vectors.getFeatureByFid(id);

-    feature.style.strokeColor = "#ffff55";
-    feature.style.strokeWidth = 4;
-    vectors.redraw(); 
+    var bounds = feature.geometry.getBounds();
+
+    if ( highlight ) vectors.removeFeatures(highlight);
+
+    highlight = new OpenLayers.Feature.Vector(bounds.toGeometry(), {}, {
+      strokeWidth: 2,
+      strokeColor: "#ee9900",
+      fillColor: "#ffff55",
+      fillOpacity: 0.5
+    });
+
+    vectors.addFeatures(highlight);

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

-  } 
+  }

 
   function unHighlightChangeset(id) {
 
   function unHighlightChangeset(id) {

-    var feature = vectors.getFeatureByFid(id);
-    feature.style.strokeColor = "#ee9900";
-    feature.style.strokeWidth = 2;
-    vectors.redraw(); 
+    vectors.removeFeatures(highlight);

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

-  }      
+  }

 
   function init() {
 
   function init() {

-    var map = createMap("small_map", {
+    var map = createMap("changeset_list_map", {

       controls: [
         new OpenLayers.Control.Navigation(),
         new OpenLayers.Control.PanZoom(),
         new OpenLayers.Control.PanZoomBar()
       ]
     });
       controls: [
         new OpenLayers.Control.Navigation(),
         new OpenLayers.Control.PanZoom(),
         new OpenLayers.Control.PanZoomBar()
       ]
     });

-    
+

     var bounds = new OpenLayers.Bounds();
 
     <% @edits.each do |edit| %>
     var bounds = new OpenLayers.Bounds();
 
     <% @edits.each do |edit| %>


@@ -50,7 +55,7 @@
     bounds.extend(bbox);
     box = addBoxToMap(bbox, "<%= edit.id %>", true);
     <% end %>
     bounds.extend(bbox);
     box = addBoxToMap(bbox, "<%= edit.id %>", true);
     <% end %>

-     
+

     vectors.events.on({
       "featureselected": function(feature) {
         highlightChangeset(feature.feature.fid);
     vectors.events.on({
       "featureselected": function(feature) {
         highlightChangeset(feature.feature.fid);


@@ -61,7 +66,7 @@
     });
 
     var selectControl = new OpenLayers.Control.SelectFeature(vectors, {
     });
 
     var selectControl = new OpenLayers.Control.SelectFeature(vectors, {

-      multiple: false, 
+      multiple: false,

       hover: true
     });
     map.addControl(selectControl);
       hover: true
     });
     map.addControl(selectControl);


@@ -72,8 +77,6 @@
     <% else %>
       setMapExtent(bounds);
     <% end %>
     <% else %>
       setMapExtent(bounds);
     <% end %>

-
-    $("loading").innerHTML = "";

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