X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7c5d0fff3d8aab23b17e32aa65f1f9e0beb95d3c..d5841403c44a6b74ef2200c68b4fd08cd65dbbb7:/app/assets/javascripts/browse.js

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index 424940130..0a3762727 100644
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -1,80 +1,77 @@
-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 () {
+  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 loaded = false;
+
+    $("#linkloader").load(function () { loaded = true; });
+
+    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);
+    }
 
-  $("#linkloader").load(function () { loaded = true; });
+    setTimeout(function () {
+      if (!loaded) alert(I18n.t('site.index.remote_failed'));
+    }, 1000);
 
-  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);
+    return false;
   }
 
-  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() ]
+    layerControl: false,
+    zoomControl: 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();
     $("#browse_map .geolink").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);
+    var centre = bbox.getCenter();
+    updatelinks(centre.lng, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
   } else {
-    var url = "/api/" + OSM.API_VERSION + "/" + params.type + "/" + params.id;
-
-    if (params.type != "node") {
-      url += "/full";
-    } else if (!params.visible) {
-      var previous_version = params.version - 1;
-      url += "/" + previous_version;
-    }
-
     $("#object_larger_map").hide();
     $("#object_edit").hide();
 
-    addObjectToMap(url, true, function(extent) {
+    var object = {type: params.type, id: params.id};
+
+    if (!params.visible) {
+      object.version = params.version - 1;
+    }
+
+    addObjectToMap(object, true, function(extent) {
       $("#loading").hide();
       $("#browse_map .geolink").show();
 
       if (extent) {
-        extent.transform(map.getProjectionObject(), map.displayProjection);
-
-        var centre = extent.getCenterLonLat();
-
-        $("a.bbox[data-editor=remote]").click(function (event) {
-          return remoteEditHandler(event, extent);
+        $("a.bbox[data-editor=remote]").click(function () {
+          return remoteEditHandler(extent);
         });
 
-        $("a.object[data-editor=remote]").click(function (event) {
-          return remoteEditHandler(event, extent, params.type + params.id);
+        $("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, params.type, params.id);
+        var centre = extent.getCenter();
+        updatelinks(centre.lng, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, object);
       } else {
         $("#small_map").hide();
       }
@@ -83,6 +80,4 @@ function init() {
 
   createMenu("area_edit", "area_edit_menu", "right");
   createMenu("object_edit", "object_edit_menu", "right");
-}
-
-window.onload = init;
+});