Style the map div correctly when editing an existing diary entry

[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 fe934bbc754969bdb228524c919fb7cdd5c2de28..69d32b2c2357439c9058576e1d16e6ec418d1724 100644 (file)
--- a/app/views/changeset/_map.html.erb
+++ b/app/views/changeset/_map.html.erb
@@ -8,23 +8,35 @@
 <script type="text/javascript">
   OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 
 <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 (bounds.containsBounds(map.getExtent())) {
+      bounds = map.getExtent().scale(1.1);
+    }
+
+    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() {
     var map = createMap("changeset_list_map", {
 
   function init() {
     var map = createMap("changeset_list_map", {


@@ -34,10 +46,11 @@
         new OpenLayers.Control.PanZoomBar()
       ]
     });
         new OpenLayers.Control.PanZoomBar()
       ]
     });

-    
+

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

+    <% if edit.has_valid_bbox? %>

     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 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 %>;


@@ -45,9 +58,11 @@
     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 %>
     <% end %>

-     
+

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


@@ -58,7 +73,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);