From: Tom Hughes <tom@compton.nu>
Date: Thu, 5 May 2011 17:58:05 +0000 (+0100)
Subject: Improve highlighting of changesets in the changeset list
X-Git-Tag: live~6286^2~21
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bdee581d440ba0d88e7e07355ffa3175ea9691d3

Improve highlighting of changesets in the changeset list
---

diff --git a/app/views/changeset/_map.html.erb b/app/views/changeset/_map.html.erb
index fe934bbc7..6d7aa96c0 100644
--- a/app/views/changeset/_map.html.erb
+++ b/app/views/changeset/_map.html.erb
@@ -8,23 +8,31 @@
 <script type="text/javascript">
   OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 
+  var highlight;
+
   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");
-  } 
+  }
 
   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");
-  }      
+  }
 
   function init() {
     var map = createMap("changeset_list_map", {
@@ -34,7 +42,7 @@
         new OpenLayers.Control.PanZoomBar()
       ]
     });
-    
+
     var bounds = new OpenLayers.Bounds();
 
     <% @edits.each do |edit| %>
@@ -47,7 +55,7 @@
     bounds.extend(bbox);
     box = addBoxToMap(bbox, "<%= edit.id %>", true);
     <% end %>
-     
+
     vectors.events.on({
       "featureselected": function(feature) {
         highlightChangeset(feature.feature.fid);
@@ -58,7 +66,7 @@
     });
 
     var selectControl = new OpenLayers.Control.SelectFeature(vectors, {
-      multiple: false, 
+      multiple: false,
       hover: true
     });
     map.addControl(selectControl);
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index a6a71de0d..65b430418 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -623,7 +623,8 @@ hr {
 }
 
 #changeset_list .selected {
-  background-color: #ffff55;
+  background-color: rgb(255, 255, 160);
+  background-color: rgba(255, 255, 85, 0.5);
 }
 
 #changeset_list_map {