Don't reset the session when the token refers to an invalid user

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

diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index e6409cc825ac47e0d1f2b91a9283b28d730bf393..4b2093e3f06ce061533fc97995145d3a3561446b 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -45,14 +45,18 @@
     OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 
     function remoteEditHandler(event, bbox, select) {
+      var left = bbox.left - 0.0001;
+      var top = bbox.top + 0.0001;
+      var right = bbox.right + 0.0001;
+      var bottom = bbox.bottom - 0.0001;
       var loaded = false;
 
       $("linkloader").observe("load", function () { loaded = true; });
 
       if (select) {
-        $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + bbox.left + "&top=" + bbox.top + "&right=" + bbox.right + "&bottom=" + bbox.bottom + "&select=" + select;
+        $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select;
       } else {
-        $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + bbox.left + "&top=" + bbox.top + "&right=" + bbox.right + "&bottom=" + bbox.bottom;
+        $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom;
       }
 
       setTimeout(function () {
@@ -68,10 +72,11 @@
       });
 
       <% if map.instance_of? Changeset %>
-        var minlon = <%= map.min_lon / GeoRecord::SCALE.to_f %>;
-        var minlat = <%= map.min_lat / GeoRecord::SCALE.to_f %>;
-        var maxlon = <%= map.max_lon / GeoRecord::SCALE.to_f %>;
-        var maxlat = <%= map.max_lat / GeoRecord::SCALE.to_f %>;
+        <% bbox = map.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);
         var centre = bbox.getCenterLonLat();
 
@@ -85,12 +90,12 @@
         });
 
         $("remote_area_edit").observe("click", function (event) {
-          remoteEditHandler(event, extent);
+          remoteEditHandler(event, bbox);
         });
 
         <% if preferred_editor == "remote" %>
           $("area_edit").observe("click", function (event) {
-            remoteEditHandler(event, extent);
+            remoteEditHandler(event, bbox);
           });
         <% end %>