Refactor layer persistence

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index 1db89ad0ad08ffe5ca7ad2c360b264fabba14467..9caaa3714516a9c38e7be80ca1b985e7d3a43035 100644 (file)
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -1,18 +1,24 @@
 $(document).ready(function () {
-  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;
+  function remoteEditHandler(bbox, select) {
+    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; });
 
-    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);
-    }
+    var query = {
+        left: left,
+        top: top,
+        right: right,
+        bottom: bottom,
+        select: select
+    };
+
+    if (select) query.select = select;
+    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?" +
+      querystring.stringify(query));
 
     setTimeout(function () {
       if (!loaded) alert(I18n.t('site.index.remote_failed'));
@@ -21,62 +27,92 @@ $(document).ready(function () {
     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();
+  var object, bbox;
   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();
     $("#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);
-  } 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 .geolink").show();
+
+    $("a[data-editor=remote]").click(function () {
+      return remoteEditHandler(bbox);
+    });
 
-      if (extent) {
-        extent.transform(map.getProjectionObject(), map.displayProjection);
+    updatelinks(params, 16, null,
+                bbox.getWest(), bbox.getSouth(),
+                bbox.getEast(), bbox.getNorth(),
+                object);
+  } else {
+    $("#object_larger_map, #object_edit").hide();
+
+    object = {type: params.type, id: params.id};
+
+    if (!params.visible) {
+      object.version = params.version - 1;
+    }
 
-        var centre = extent.getCenterLonLat();
+    addObjectToMap(object, map, {
+      zoom: true, 
+      callback: function(extent) {
+        $("#loading").hide();
+        $("#browse_map .geolink").show();
 
-        $("a.bbox[data-editor=remote]").click(function (event) {
-          return remoteEditHandler(event, extent);
-        });
+        if (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();
+          $("#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);
-      } else {
-        $("#small_map").hide();
+          updatelinks(map.getCenter(), 16, null, extent, object);
+        } else {
+          $("#small_map").hide();
+        }
       }
     });
   }