Improve behaviour of browse pages when no bounding box is available

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index 4edee5952664d3fd1ab6adef034275e2c568a5c2..565af41afc9ff1723b45b8c3b9921b05e721be9e 100644 (file)
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -1,50 +1,13 @@
 $(document).ready(function () {
-  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?" +
-        querystring.stringify({
-            left: left,
-            top: top,
-            right: right,
-            bottom: bottom,
-            select: select
-        }));
-    } else {
-      $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?" + querystring.stringify({
-            left: left,
-            top: top,
-            right: right,
-            bottom: bottom
-        }));
-    }
-
-    setTimeout(function () {
-      if (!loaded) alert(I18n.t('site.index.remote_failed'));
-    }, 1000);
-
-    return false;
-  }
 
   var map = L.map("small_map", {
     attributionControl: false,
     zoomControl: false
   }).addLayer(new L.OSM.Mapnik());
 
-  L.control.zoom({position: 'topright'})
+  L.OSM.zoom()
     .addTo(map);
 
-  $("#small_map").on("resized", function () {
-    map.invalidateSize();
-  });
-
   var params = $("#small_map").data();
   var object, bbox;
   if (params.type == "changeset") {
@@ -60,7 +23,7 @@ $(document).ready(function () {
     }).addTo(map);
 
     $("#loading").hide();
-    $("#browse_map .geolink").show();
+    $("#browse_map .secondary-actions").show();
 
     $("a[data-editor=remote]").click(function () {
       return remoteEditHandler(bbox);
@@ -78,16 +41,13 @@ $(document).ready(function () {
     bbox = map.getBounds();
 
     $("#loading").hide();
-    $("#browse_map .geolink").show();
+    $("#browse_map .secondary-actions").show();
 
     $("a[data-editor=remote]").click(function () {
       return remoteEditHandler(bbox);
     });
 
-    updatelinks(params, 16, null,
-                bbox.getWest(), bbox.getSouth(),
-                bbox.getEast(), bbox.getNorth(),
-                object);
+    updatelinks(params, 16, null, bbox, object);
   } else {
     $("#object_larger_map, #object_edit").hide();
 
@@ -97,13 +57,14 @@ $(document).ready(function () {
       object.version = params.version - 1;
     }
 
-    addObjectToMap(object, map, {
-      zoom: true, 
+    map.addObject(object, {
+      zoom: true,
       callback: function(extent) {
         $("#loading").hide();
-        $("#browse_map .geolink").show();
 
-        if (extent) {
+        if (extent && extent.isValid()) {
+          $("#browse_map .secondary-actions").show();
+
           $("a.bbox[data-editor=remote]").click(function () {
             return remoteEditHandler(extent);
           });
@@ -116,13 +77,8 @@ $(document).ready(function () {
           $("#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");
 });