Merge remote-tracking branch 'osmlab/user-display'

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index 424940130069b31a43755efff6b9c7f7591e04b3..11818a1712c513421221455c2c3f209c488b7c01 100644 (file)
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -1,88 +1,85 @@
-function remoteEditHandler(event, 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 loaded = false;
+$(document).ready(function () {

 
 

-  $("#linkloader").load(function () { loaded = true; });
+  var map = L.map("small_map", {
+    attributionControl: false,
+    zoomControl: false
+  }).addLayer(new L.OSM.Mapnik());

 
 

-  if (select) {
-    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select);
-  } else {
-    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom);
-  }
-
-  setTimeout(function () {
-    if (!loaded) alert(I18n.t('site.index.remote_failed'));
-  }, 1000);
-
-  return false;
-}
-
-function init() {
-  var map = createMap("small_map", {
-    controls: [ new OpenLayers.Control.Navigation() ]
-  });
+  L.OSM.zoom()
+    .addTo(map);

 
   var params = $("#small_map").data();
 
   var params = $("#small_map").data();

+  var object, bbox;

   if (params.type == "changeset") {
   if (params.type == "changeset") {

-    var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
-    var centre = bbox.getCenterLonLat();
+    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();
 
     $("#loading").hide();

-    $("#browse_map .geolink").show();
+    $("#browse_map .secondary-actions").show();

 
 

-    $("a[data-editor=remote]").click(function (event) {
-      return remoteEditHandler(event, bbox);
+    $("a[data-editor=remote]").click(function () {
+      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;
+    updatelinks(map.getCenter(), 16, null, [[params.minlat, params.minlon],
+        [params.maxlat, params.maxlon]]);
+  } else if (params.type == "note") {
+    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);
+
+    L.marker([params.lat, params.lon], { icon: getUserIcon() }).addTo(map);

 
 

-    $("#object_larger_map").hide();
-    $("#object_edit").hide();
+    bbox = map.getBounds();

 
 

-    addObjectToMap(url, true, function(extent) {
-      $("#loading").hide();
-      $("#browse_map .geolink").show();
+    $("#loading").hide();
+    $("#browse_map .secondary-actions").show();

 
 

-      if (extent) {
-        extent.transform(map.getProjectionObject(), map.displayProjection);
+    $("a[data-editor=remote]").click(function () {
+      return remoteEditHandler(bbox);
+    });

 
 

-        var centre = extent.getCenterLonLat();
+    updatelinks(params, 16, null, bbox, object);
+  } else {
+    $("#object_larger_map, #object_edit").hide();

 
 

-        $("a.bbox[data-editor=remote]").click(function (event) {
-          return remoteEditHandler(event, extent);
-        });
+    object = {type: params.type, id: params.id};
+
+    if (!params.visible) {
+      object.version = params.version - 1;
+    }

 
 

-        $("a.object[data-editor=remote]").click(function (event) {
-          return remoteEditHandler(event, extent, params.type + params.id);
-        });
+    map.addObject(object, {
+      zoom: true,
+      callback: function(extent) {
+        $("#loading").hide();
+        $("#browse_map .secondary-actions").show();

 
 

-        $("#object_larger_map").show();
-        $("#object_edit").show();
+        if (extent) {
+          $("a.bbox[data-editor=remote]").click(function () {
+            return remoteEditHandler(extent);
+          });

 
 

-        updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, params.type, params.id);
-      } else {
-        $("#small_map").hide();
+          $("a.object[data-editor=remote]").click(function () {
+            return remoteEditHandler(extent, params.type + params.id);
+          });
+
+          $("#object_larger_map").show();
+          $("#object_edit").show();
+
+          updatelinks(map.getCenter(), 16, null, extent, object);
+        } else {
+          $("#small_map").hide();
+        }

       }
     });
   }
       }
     });
   }

-
-  createMenu("area_edit", "area_edit_menu", "right");
-  createMenu("object_edit", "object_edit_menu", "right");
-}
-
-window.onload = init;
+});