Add attrib

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index 7df6d67d68bd11dd769cfd8c74d3702d4751ea88..0b60778d63493666ab4a63b8e7f493b06e735d91 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; });


@@ -21,17 +21,30 @@ $(document).ready(function () {
     return false;
   }
 
     return false;
   }
 

-  var map = createMap("small_map", {
-    controls: [ new OpenLayers.Control.Navigation() ]
+  var map = L.map("small_map", {
+    attributionControl: false,
+    zoomControl: false
+  }).addLayer(new L.OSM.Mapnik());
+
+  L.control.zoom({position: 'topright'})
+    .addTo(map);
+
+  $("#small_map").on("resized", function () {
+    map.invalidateSize();

   });
 
   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));
-    addBoxToMap(bbox);
+    map.fitBounds(bbox);
+
+    L.rectangle(bbox, {
+      weight: 2,
+      color: '#e90',
+      fillOpacity: 0
+    }).addTo(map);

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


@@ -40,43 +53,68 @@ $(document).ready(function () {
       return remoteEditHandler(bbox);
     });
 
       return remoteEditHandler(bbox);
     });
 

-    updatelinks(centre.lon, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
-  } else {
-    var url = "/api/" + OSM.API_VERSION + "/" + params.type + "/" + params.id;
+    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};

 
 

-    if (params.type != "node") {
-      url += "/full";
-    } else if (!params.visible) {
-      var previous_version = params.version - 1;
-      url += "/" + previous_version;
-    }
+    map.setView([params.lat, params.lon], 16);

 
 

-    $("#object_larger_map").hide();
-    $("#object_edit").hide();
+    L.marker([params.lat, params.lon], { icon: getUserIcon() }).addTo(map);

 
 

-    addObjectToMap(url, true, function(extent) {
-      $("#loading").hide();
-      $("#browse_map .geolink").show();
+    var bbox = map.getBounds();

 
 

-      if (extent) {
-        extent.transform(map.getProjectionObject(), map.displayProjection);
+    $("#loading").hide();
+    $("#browse_map .geolink").show();

 
 

-        var centre = extent.getCenterLonLat();
+    $("a[data-editor=remote]").click(function () {
+      return remoteEditHandler(bbox);
+    });

 
 

-        $("a.bbox[data-editor=remote]").click(function () {
-          return remoteEditHandler(extent);
-        });
+    updatelinks(params.lon, params.lat, 16, null,
+                bbox.getWest(), bbox.getSouth(),
+                bbox.getEast(), bbox.getNorth(),
+                object);
+  } else {
+    $("#object_larger_map").hide();
+    $("#object_edit").hide();

 
 

-        $("a.object[data-editor=remote]").click(function () {
-          return remoteEditHandler(extent, params.type + params.id);
-        });
+    var object = {type: params.type, id: params.id};

 
 

-        $("#object_larger_map").show();
-        $("#object_edit").show();
+    if (!params.visible) {
+      object.version = params.version - 1;
+    }

 
 

-        updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, params.type, params.id);
-      } else {
-        $("#small_map").hide();
+    addObjectToMap(object, map, {
+      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();
+        }

       }
     });
   }
       }
     });
   }