Abort any existing load before starting a new one

[rails.git] / app / assets / javascripts / browse.js

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index 995f0d12d07c7af1d74c85dd672af69e1332da53..2934b8bd92593c28fa45a2287c896f5e65d71fb3 100644 (file)
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -1,9 +1,9 @@
 $(document).ready(function () {
   function remoteEditHandler(bbox, select) {
 $(document).ready(function () {
   function remoteEditHandler(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 left = bbox.getWestLng() - 0.0001;
+    var top = bbox.getNorthLat() + 0.0001;
+    var right = bbox.getEastLng() + 0.0001;
+    var bottom = bbox.getSouthLat() - 0.0001;

     var loaded = false;
 
     $("#linkloader").load(function () { loaded = true; });
     var loaded = false;
 
     $("#linkloader").load(function () { loaded = true; });


@@ -21,7 +21,11 @@ $(document).ready(function () {
     return false;
   }
 
     return false;
   }
 

-  var map = createMap("small_map");
+  var map = createMap("small_map", {
+    layerControl: false,
+    panZoomControl: false,
+    attributionControl: false
+  });

 
   var params = $("#small_map").data();
   if (params.type == "changeset") {
 
   var params = $("#small_map").data();
   if (params.type == "changeset") {


@@ -39,7 +43,24 @@ $(document).ready(function () {
     });
 
     var centre = bbox.getCenter();
     });
 
     var centre = bbox.getCenter();

-    updatelinks(centre.lng, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
+    updatelinks(centre.lon, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
+  } else if (params.type == "note") {
+    map.setView([params.lat, params.lon], 16);
+
+    L.marker([params.lat, params.lon], { icon: getUserIcon() }).addTo(map);
+
+    var bbox = map.getBounds();
+
+    $("#loading").hide();
+    $("#browse_map .geolink").show();
+
+    $("a[data-editor=remote]").click(function () {
+      return remoteEditHandler(bbox);
+    });
+
+    updatelinks(params.lon, params.lat, 16, null, 
+                bbox.getWestLng(), bbox.getSouthLat(),
+                bbox.getEastLng(), bbox.getNorthLat());

   } else {
     $("#object_larger_map").hide();
     $("#object_edit").hide();
   } else {
     $("#object_larger_map").hide();
     $("#object_edit").hide();


@@ -67,7 +88,14 @@ $(document).ready(function () {
         $("#object_edit").show();
 
         var centre = extent.getCenter();
         $("#object_edit").show();
 
         var centre = extent.getCenter();

-        updatelinks(centre.lng, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, object);
+        updatelinks(centre.lng,
+                    centre.lat,
+                    16, null,
+                    extent.getWestLng(),
+                    extent.getSouthLat(),
+                    extent.getEastLng(),
+                    extent.getNorthLat(),
+                    object);

       } else {
         $("#small_map").hide();
       }
       } else {
         $("#small_map").hide();
       }