Generate hash-based permalinks

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 18b1515c59b121c6bd4cc06d0f91e488456bffb6..256ab8e481295c4c36f49699271830a17767aa02 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -59,40 +59,21 @@ function remoteEditHandler(bbox, select) {
  * view tab and various other links
  */
 function updatelinks(loc, zoom, layers, bounds, object) {
  * view tab and various other links
  */
 function updatelinks(loc, zoom, layers, bounds, object) {

-  var precision = zoomPrecision(zoom);
-  bounds = normalBounds(bounds);
-
-  var lat = loc.lat.toFixed(precision),
-      lon = (loc.lon || loc.lng).toFixed(precision);
-
-  if (bounds) {
-    var minlon = bounds.getWest().toFixed(precision),
-        minlat = bounds.getSouth().toFixed(precision),
-        maxlon = bounds.getEast().toFixed(precision),
-        maxlat = bounds.getNorth().toFixed(precision);
-  }
+  $(".geolink").each(function(index, link) {
+    var base = link.href.split('?')[0],
+        args = querystring.parse(link.search.substring(1));

 
 

-  $(".geolink").each(setGeolink);
+    if (bounds && $(link).hasClass("bbox")) args.bbox = normalBounds(bounds).toBBoxString();
+    if (layers && $(link).hasClass("layers")) args.layers = layers;
+    if (object && $(link).hasClass("object")) args[object.type] = object.id;

 
 

-  function setGeolink(index, link) {
-    var base = link.href.split('?')[0],
-        qs = link.href.split('?')[1],
-        args = querystring.parse(qs);
+    var href = base + '?' + querystring.stringify(args);

 
     if ($(link).hasClass("llz")) {
 
     if ($(link).hasClass("llz")) {

-      $.extend(args, {
-          lat: lat,
-          lon: lon,
-          zoom: zoom
-      });
-    } else if (minlon && $(link).hasClass("bbox")) {
-      $.extend(args, {
-          bbox: minlon + "," + minlat + "," + maxlon + "," + maxlat
-      });
+      href += OSM.formatHash({lat: loc.lat, lon: loc.lon || loc.lng, zoom: zoom});

     }
 
     }
 

-    if (layers && $(link).hasClass("layers")) args.layers = layers;
-    if (object && $(link).hasClass("object")) args[object.type] = object.id;
+    link.href = href;

 
     var minzoom = $(link).data("minzoom");
     if (minzoom) {
 
     var minzoom = $(link).data("minzoom");
     if (minzoom) {


@@ -112,8 +93,7 @@ function updatelinks(loc, zoom, layers, bounds, object) {
           });
       }
     }
           });
       }
     }

-    link.href = base + '?' + querystring.stringify(args);
-  }
+  });

 }
 
 // generate a cookie-safe string of map state
 }
 
 // generate a cookie-safe string of map state