From 0de6885a91e1740e3e2740287cb2d576de827844 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 16 Mar 2014 12:55:43 +0000 Subject: [PATCH] Drop client side parsing of lat/lon parameters The server always redirects these to a new style link with the position in the hash, so we don't need to do it client side --- app/assets/javascripts/osm.js.erb | 4 ---- test/javascripts/osm_test.js | 14 ++------------ 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 033b2de81..103110f7e 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -71,10 +71,6 @@ OSM = { 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); - mapParams.zoom = parseInt(params.zoom || 5); } else if (params.mlon && params.mlat) { mapParams.lon = parseFloat(params.mlon); mapParams.lat = parseFloat(params.mlat); diff --git a/test/javascripts/osm_test.js b/test/javascripts/osm_test.js index d7fe4a2fd..f26f08c9f 100644 --- a/test/javascripts/osm_test.js +++ b/test/javascripts/osm_test.js @@ -73,18 +73,8 @@ describe("OSM", function () { expect(params).to.have.property("bounds").deep.equal(expected); }); - it("parses lat/lon/zoom params", function () { - var params = OSM.mapParams("?lat=57.6247&lon=-3.6845"); - expect(params).to.have.property("lat", 57.6247); - expect(params).to.have.property("lon", -3.6845); - expect(params).to.have.property("zoom", 5); - - params = OSM.mapParams("?lat=57.6247&lon=-3.6845&zoom=10"); - expect(params).to.have.property("lat", 57.6247); - expect(params).to.have.property("lon", -3.6845); - expect(params).to.have.property("zoom", 10); - - params = OSM.mapParams("?mlat=57.6247&mlon=-3.6845"); + it("parses mlat/mlon/zoom params", function () { + var params = OSM.mapParams("?mlat=57.6247&mlon=-3.6845"); expect(params).to.have.property("lat", 57.6247); expect(params).to.have.property("lon", -3.6845); expect(params).to.have.property("zoom", 12); -- 2.43.2