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 0a37627273a82067e41b55bfdf8e03a4f8ec1806..fb6d2d304e01383dd45da85ea188e7256370ccdd 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) {
-    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; });
@@ -23,7 +23,7 @@ $(document).ready(function () {
 
   var map = createMap("small_map", {
     layerControl: false,
-    zoomControl: false,
+    panZoomControl: false,
     attributionControl: false
   });
 
@@ -43,7 +43,23 @@ $(document).ready(function () {
     });
 
     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") {
+    var centre = new OpenLayers.LonLat(params.lon, params.lat);
+
+    setMapCenter(centre, 16);
+    addMarkerToMap(centre);
+
+    var bbox = unproj(map.getExtent());
+
+    $("#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();
@@ -71,7 +87,14 @@ $(document).ready(function () {
         $("#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();
       }