Merge remote-tracking branch 'jfirebaugh/legacy-params'

diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js
index 4a2b96be4066bfd0e62dd145162b23242dd240c4..04f7c0731e613e03849963548eb2fd7e894d774a 100644 (file)
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -44,10 +44,10 @@ OSM.History = function(map) {
   }
 
   function loadData() {
-    var data = {};
+    var data = {list: '1'};
 
     if (window.location.pathname === '/history') {
-      data = {bbox: map.getBounds().wrap().toBBoxString()};
+      data.bbox = map.getBounds().wrap().toBBoxString();
     }
 
     $.ajax({

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index d350b28969ccc020e3e403fd259da648c1bdebcf..7b5df18655ec9255678e1c281b578fe8f6a971fc 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -62,6 +62,15 @@ OSM = {
       mapParams.lon = hash.center.lng;
       mapParams.lat = hash.center.lat;
       mapParams.zoom = hash.zoom;
+    } else if (params.bbox) {
+      var bbox = params.bbox.split(',');
+      mapParams.bounds = L.latLngBounds(
+        [parseFloat(bbox[1]), parseFloat(bbox[0])],
+        [parseFloat(bbox[3]), parseFloat(bbox[2])]);
+    } else if (params.minlon && params.minlat && params.maxlon && params.maxlat) {
+      mapParams.bounds = L.latLngBounds(
+        [parseFloat(params.minlat), parseFloat(params.minlon)],
+        [parseFloat(params.maxlat), parseFloat(params.maxlon)]);
     } else if (params.lon && params.lat) {
       mapParams.lon = parseFloat(params.lon);
       mapParams.lat = parseFloat(params.lat);

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 5cd59c780ef8ab04dfb37cd66781970e9630b30d..d34eb873938f648bbb1e59b7575f283bf3aa6011 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -268,7 +268,7 @@ class ChangesetController < ApplicationController
       return
     end
 
-    if request.format == :html and !params[:bbox]
+    if request.format == :html and !params[:list]
       require_oauth
       render :action => :history, :layout => map_layout
     else

diff --git a/test/functional/changeset_controller_test.rb b/test/functional/changeset_controller_test.rb
index 0db84a90b86e1abfd989afa43920c1bb192f9de1..09c31615205184ce3a230b65db39f0f8f67cb440 100644 (file)
--- a/test/functional/changeset_controller_test.rb
+++ b/test/functional/changeset_controller_test.rb
@@ -1721,7 +1721,7 @@ EOF
     assert_template "changeset/history"
     assert_select "h2", :text => "Changesets", :count => 1
 
-    get :list, {:format => "html", :bbox => '-180,-90,90,180'}
+    get :list, {:format => "html", :list => '1', :bbox => '-180,-90,90,180'}
     assert_response :success
     assert_template "list"