cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop client side parsing of lat/lon parameters

Browse source 
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
This commit is contained in:
Tom Hughes 2014-03-16 12:55:43 +00:00
parent 8c82be0537
commit 0de6885a91
2 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/osm.js.erb
View file

@ -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);

14
test/javascripts/osm_test.js
View file

@ -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);