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 906bb0baeb9f9749bbfda2eeccf2d12c0cf152b7..7149b3481a3ab2e4890c5ac7bf8bd293284a9e6a 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; });
@@ -22,15 +22,17 @@ $(document).ready(function () {
   }
 
   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 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();
@@ -40,14 +42,16 @@ $(document).ready(function () {
       return remoteEditHandler(bbox);
     });
 
+    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();
@@ -56,7 +60,10 @@ $(document).ready(function () {
       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();
@@ -72,10 +79,6 @@ $(document).ready(function () {
       $("#browse_map .geolink").show();
 
       if (extent) {
-        extent = unproj(extent);
-
-        var centre = extent.getCenterLonLat();
-
         $("a.bbox[data-editor=remote]").click(function () {
           return remoteEditHandler(extent);
         });
@@ -87,7 +90,15 @@ $(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, object);
+        var centre = extent.getCenter();
+        updatelinks(centre.lng,
+                    centre.lat,
+                    16, null,
+                    extent.getWestLng(),
+                    extent.getSouthLat(),
+                    extent.getEastLng(),
+                    extent.getNorthLat(),
+                    object);
       } else {
         $("#small_map").hide();
       }