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 906bb0baeb9f9749bbfda2eeccf2d12c0cf152b7..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) {
 $(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.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; });
     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,14 +42,16 @@ $(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") {
   } else if (params.type == "note") {

-    var centre = new OpenLayers.LonLat(params.lon, params.lat);
+    var object = {type: params.type, id: params.id};
+
+    map.setView([params.lat, params.lon], 16);

 
 

-    setMapCenter(centre, 16);
-    addMarkerToMap(centre);
+    L.marker([params.lat, params.lon], { icon: getUserIcon() }).addTo(map);

 
 

-    var bbox = unproj(map.getExtent());
+    var bbox = map.getBounds();

 
     $("#loading").hide();
     $("#browse_map .geolink").show();
 
     $("#loading").hide();
     $("#browse_map .geolink").show();


@@ -56,7 +60,10 @@ $(document).ready(function () {
       return remoteEditHandler(bbox);
     });
 
       return remoteEditHandler(bbox);
     });
 

-    updatelinks(centre.lon, centre.lat, 16, null, bbox.left, bbox.bottom, bbox.right, bbox.top)
+    updatelinks(params.lon, params.lat, 16, null,
+                bbox.getWest(), bbox.getSouth(),
+                bbox.getEast(), bbox.getNorth(),
+                object);

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


@@ -67,29 +74,36 @@ $(document).ready(function () {
       object.version = params.version - 1;
     }
 
       object.version = params.version - 1;
     }
 

-    addObjectToMap(object, true, function(extent) {
-      $("#loading").hide();
-      $("#browse_map .geolink").show();
-
-      if (extent) {
-        extent = unproj(extent);
-
-        var centre = extent.getCenterLonLat();
-
-        $("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();
-
-        updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, 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();
+        }

       }
     });
   }
       }
     });
   }