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 fb6d2d304e01383dd45da85ea188e7256370ccdd..7149b3481a3ab2e4890c5ac7bf8bd293284a9e6a 100644 (file)
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -45,12 +45,13 @@ $(document).ready(function () {
     var centre = bbox.getCenter();
     updatelinks(centre.lon, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
   } else if (params.type == "note") {
     var centre = bbox.getCenter();
     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);
+    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();


@@ -59,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.getWestLng(), bbox.getSouthLat(),
+                bbox.getEastLng(), bbox.getNorthLat(),
+                object);

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