Merge branch 'master' into notes

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index e98aa2ed682f2b5aa6b97f783618bffa5f8a4b68..08b35599163c731aec488d71f36344d0d8a6a024 100644 (file)
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -41,6 +41,22 @@ $(document).ready(function () {
     });
 
     updatelinks(centre.lon, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
+  } else if (params.type == "note") {
+    var centre = new OpenLayers.LonLat(params.lon, params.lat);
+
+    setMapCenter(centre, 16);
+    addMarkerToMap(centre);
+
+    var bbox = getMapExtent();
+
+    $("#loading").hide();
+    $("#browse_map .geolink").show();
+
+    $("a[data-editor=remote]").click(function () {
+      return remoteEditHandler(bbox);
+    });
+
+    updatelinks(centre.lon, centre.lat, 16, null, bbox.left, bbox.bottom, bbox.right, bbox.top)
   } else {
     $("#object_larger_map").hide();
     $("#object_edit").hide();
@@ -56,7 +72,7 @@ $(document).ready(function () {
       $("#browse_map .geolink").show();
 
       if (extent) {
-        extent.transform(map.getProjectionObject(), map.displayProjection);
+        extent = unproj(extent);
 
         var centre = extent.getCenterLonLat();
 
@@ -71,7 +87,7 @@ $(document).ready(function () {
         $("#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);
+        updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, object);
       } else {
         $("#small_map").hide();
       }