Remove https load test

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 25d68d0ea05d0bf608bdc05dc3b1fb1e99fc49a6..7072b7c6be8a40dce9a3262d541f780b07d82b17 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -24,7 +24,7 @@ function zoomPrecision(zoom) {
     return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
 }
 
-function remoteEditHandler(bbox, select) {
+function remoteEditHandler(bbox, object) {
   var loaded = false,
       query = {
           left: bbox.getWest() - 0.0001,
@@ -33,7 +33,7 @@ function remoteEditHandler(bbox, select) {
           bottom: bbox.getSouth() - 0.0001
       };
 
-  if (select) query.select = select;
+  if (object) query.select = object.type + object.id;
 
   var iframe = $('<iframe>')
     .hide()
@@ -58,16 +58,25 @@ function remoteEditHandler(bbox, select) {
  * Called as the user scrolls/zooms around to maniplate hrefs of the
  * view tab and various other links
  */
-function updatelinks(loc, zoom, layers, object) {
+function updateLinks(loc, zoom, layers, object) {
   $(".geolink").each(function(index, link) {
     var href = link.href.split(/[?#]/)[0],
+      args = querystring.parse(link.search.substring(1)),
       editlink = $(link).hasClass("editlink");
 
+    delete args['node'];
+    delete args['way'];
+    delete args['relation'];
+    delete args['changeset'];
+
     if (object && editlink) {
-      href += '?' + object.type + '=' + object.id;
+      args[object.type] = object.id;
     }
 
-    var args = {
+    var query = querystring.stringify(args);
+    if (query) href += '?' + query;
+
+    args = {
       lat: loc.lat,
       lon: loc.lon || loc.lng,
       zoom: zoom