Allow notes to be reopened from the web interface

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index e98aa2ed682f2b5aa6b97f783618bffa5f8a4b68..f911783b58792da7639d5e73b01ee2721e6e19dc 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; });


@@ -22,15 +22,17 @@ $(document).ready(function () {
   }
 
   var map = createMap("small_map", {
   }
 
   var map = createMap("small_map", {

-    controls: [ new OpenLayers.Control.Navigation() ]
+    layerControl: false,
+    panZoomControl: false,
+    attributionControl: false

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

-    var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
-    var centre = bbox.getCenterLonLat();
+    var bbox = L.latLngBounds([params.minlat, params.minlon],
+                              [params.maxlat, params.maxlon]);

 
 

-    map.zoomToExtent(proj(bbox));
+    map.fitBounds(bbox);

     addBoxToMap(bbox);
 
     $("#loading").hide();
     addBoxToMap(bbox);
 
     $("#loading").hide();


@@ -40,7 +42,28 @@ $(document).ready(function () {
       return remoteEditHandler(bbox);
     });
 
       return remoteEditHandler(bbox);
     });
 

-    updatelinks(centre.lon, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
+    var centre = bbox.getCenter();
+    updatelinks(centre.lng, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
+  } else if (params.type == "note") {
+    var object = {type: params.type, id: params.id};
+
+    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(),
+                object);

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


@@ -56,10 +79,6 @@ $(document).ready(function () {
       $("#browse_map .geolink").show();
 
       if (extent) {
       $("#browse_map .geolink").show();
 
       if (extent) {

-        extent.transform(map.getProjectionObject(), map.displayProjection);
-
-        var centre = extent.getCenterLonLat();
-

         $("a.bbox[data-editor=remote]").click(function () {
           return remoteEditHandler(extent);
         });
         $("a.bbox[data-editor=remote]").click(function () {
           return remoteEditHandler(extent);
         });


@@ -71,7 +90,15 @@ $(document).ready(function () {
         $("#object_larger_map").show();
         $("#object_edit").show();
 
         $("#object_larger_map").show();
         $("#object_edit").show();
 

-        updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, params.type, params.id);
+        var centre = extent.getCenter();
+        updatelinks(centre.lng,
+                    centre.lat,
+                    16, null,
+                    extent.getWestLng(),
+                    extent.getSouthLat(),
+                    extent.getEastLng(),
+                    extent.getNorthLat(),
+                    object);

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