Use querystring, stop manually building urls

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

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index c459b77a5a1b2532c6421d7d1167ad29d48e0e11..4edee5952664d3fd1ab6adef034275e2c568a5c2 100644 (file)
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -9,9 +9,21 @@ $(document).ready(function () {
     $("#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);
+      $("#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?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom);
+      $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?" + querystring.stringify({
+            left: left,
+            top: top,
+            right: right,
+            bottom: bottom
+        }));
     }
 
     setTimeout(function () {
@@ -34,9 +46,10 @@ $(document).ready(function () {
   });
 
   var params = $("#small_map").data();
+  var object, bbox;
   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);
 
@@ -53,15 +66,16 @@ $(document).ready(function () {
       return remoteEditHandler(bbox);
     });
 
-    updatelinks(map.getCenter(), 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") {
-    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);
 
-    var bbox = map.getBounds();
+    bbox = map.getBounds();
 
     $("#loading").hide();
     $("#browse_map .geolink").show();
@@ -75,10 +89,9 @@ $(document).ready(function () {
                 bbox.getEast(), bbox.getNorth(),
                 object);
   } 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;
@@ -102,13 +115,7 @@ $(document).ready(function () {
           $("#object_larger_map").show();
           $("#object_edit").show();
 
-          updatelinks(map.getCenter(),
-                      16, null,
-                      extent.getWest(),
-                      extent.getSouth(),
-                      extent.getEast(),
-                      extent.getNorth(),
-                      object);
+          updatelinks(map.getCenter(), 16, null, extent, object);
         } else {
           $("#small_map").hide();
         }