generate short link kind of

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index c3d67e57e215be0c7017ddc65fdb0114863f95d1..24fe5171e50968d2b3f6e78e567974375d0e5843 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.getWestLng() - 0.0001;
-    var top = bbox.getNorthLat() + 0.0001;
-    var right = bbox.getEastLng() + 0.0001;
-    var bottom = bbox.getSouthLat() - 0.0001;
+    var left = bbox.getWest() - 0.0001;
+    var top = bbox.getNorth() + 0.0001;
+    var right = bbox.getEast() + 0.0001;
+    var bottom = bbox.getSouth() - 0.0001;
     var loaded = false;
 
     $("#linkloader").load(function () { loaded = true; });
@@ -44,6 +44,26 @@ $(document).ready(function () {
 
     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.getWest(), bbox.getSouth(),
+                bbox.getEast(), bbox.getNorth(),
+                object);
   } else {
     $("#object_larger_map").hide();
     $("#object_edit").hide();
@@ -54,33 +74,36 @@ $(document).ready(function () {
       object.version = params.version - 1;
     }
 
-    addObjectToMap(object, true, function(extent) {
-      $("#loading").hide();
-      $("#browse_map .geolink").show();
-
-      if (extent) {
-        $("a.bbox[data-editor=remote]").click(function () {
-          return remoteEditHandler(extent);
-        });
-
-        $("a.object[data-editor=remote]").click(function () {
-          return remoteEditHandler(extent, params.type + params.id);
-        });
-
-        $("#object_larger_map").show();
-        $("#object_edit").show();
-
-        var centre = extent.getCenter();
-        updatelinks(centre.lng,
-                    centre.lat,
-                    16, null,
-                    extent.getWestLng(),
-                    extent.getSouthLat(),
-                    extent.getEastLng(),
-                    extent.getNorthLat(),
-                    object);
-      } else {
-        $("#small_map").hide();
+    addObjectToMap(object, {
+      zoom: true, 
+      callback: function(extent) {
+        $("#loading").hide();
+        $("#browse_map .geolink").show();
+
+        if (extent) {
+          $("a.bbox[data-editor=remote]").click(function () {
+            return remoteEditHandler(extent);
+          });
+
+          $("a.object[data-editor=remote]").click(function () {
+            return remoteEditHandler(extent, params.type + params.id);
+          });
+
+          $("#object_larger_map").show();
+          $("#object_edit").show();
+
+          var centre = extent.getCenter();
+          updatelinks(centre.lng,
+                      centre.lat,
+                      16, null,
+                      extent.getWest(),
+                      extent.getSouth(),
+                      extent.getEast(),
+                      extent.getNorth(),
+                      object);
+        } else {
+          $("#small_map").hide();
+        }
       }
     });
   }