Add option to include marker in permalinks

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index 0b60778d63493666ab4a63b8e7f493b06e735d91..023dc878dd705aef120279676f8f48b099692e6e 100644 (file)
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -1,42 +1,18 @@
 $(document).ready(function () {
 $(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?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;
-  }

 
   var map = L.map("small_map", {
     attributionControl: false,
     zoomControl: false
   }).addLayer(new L.OSM.Mapnik());
 
 
   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);
 
     .addTo(map);
 

-  $("#small_map").on("resized", function () {
-    map.invalidateSize();
-  });
-

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

+  var object, bbox;

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

-    var bbox = L.latLngBounds([params.minlat, params.minlon],
-                              [params.maxlat, params.maxlon]);
+    bbox = L.latLngBounds([params.minlat, params.minlon],
+        [params.maxlat, params.maxlon]);

 
     map.fitBounds(bbox);
 
 
     map.fitBounds(bbox);
 


@@ -53,16 +29,16 @@ $(document).ready(function () {
       return remoteEditHandler(bbox);
     });
 
       return remoteEditHandler(bbox);
     });
 

-    var centre = bbox.getCenter();
-    updatelinks(centre.lng, centre.lat, 16, null, params.minlon, params.minlat, params.maxlon, params.maxlat);
+    updatelinks(map.getCenter(), 16, null, [[params.minlat, params.minlon],
+        [params.maxlat, params.maxlon]]);

   } else if (params.type == "note") {
   } else if (params.type == "note") {

-    var object = {type: params.type, id: params.id};
+    object = {type: params.type, id: params.id};

 
     map.setView([params.lat, params.lon], 16);
 
     L.marker([params.lat, params.lon], { icon: getUserIcon() }).addTo(map);
 
 
     map.setView([params.lat, params.lon], 16);
 
     L.marker([params.lat, params.lon], { icon: getUserIcon() }).addTo(map);
 

-    var bbox = map.getBounds();
+    bbox = map.getBounds();

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


@@ -71,15 +47,11 @@ $(document).ready(function () {
       return remoteEditHandler(bbox);
     });
 
       return remoteEditHandler(bbox);
     });
 

-    updatelinks(params.lon, params.lat, 16, null,
-                bbox.getWest(), bbox.getSouth(),
-                bbox.getEast(), bbox.getNorth(),
-                object);
+    updatelinks(params, 16, null, bbox, object);

   } else {
   } else {

-    $("#object_larger_map").hide();
-    $("#object_edit").hide();
+    $("#object_larger_map, #object_edit").hide();

 
 

-    var object = {type: params.type, id: params.id};
+    object = {type: params.type, id: params.id};

 
     if (!params.visible) {
       object.version = params.version - 1;
 
     if (!params.visible) {
       object.version = params.version - 1;


@@ -103,15 +75,7 @@ $(document).ready(function () {
           $("#object_larger_map").show();
           $("#object_edit").show();
 
           $("#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);
+          updatelinks(map.getCenter(), 16, null, extent, object);

         } else {
           $("#small_map").hide();
         }
         } else {
           $("#small_map").hide();
         }