Update osm.js tests for changes and add some more

diff --git a/test/javascripts/osm_test.js b/test/javascripts/osm_test.js
index 84ef47cc4060544badad561a06a2836bc5ad8b30..5e982fc4d16dd078c8ffc322dbaa248f591affe7 100644 (file)
--- a/test/javascripts/osm_test.js
+++ b/test/javascripts/osm_test.js
@@ -1,6 +1,10 @@
 //= require jquery
 //= require jquery.cookie
 //= require osm
 //= require jquery
 //= require jquery.cookie
 //= require osm

+//= require leaflet
+//= require querystring
+
+var querystring = require('querystring-component');

 
 describe("OSM", function () {
   describe(".apiUrl", function () {
 
 describe("OSM", function () {
   describe(".apiUrl", function () {


@@ -17,10 +21,19 @@ describe("OSM", function () {
     });
   });
 
     });
   });
 

+  describe(".params", function () {
+    it("parses params", function () {
+      var params = OSM.params("?foo=a&bar=b");
+      expect(params).to.have.property("foo", "a");
+      expect(params).to.have.property("bar", "b");
+    });
+  });
+

   describe(".mapParams", function () {
     beforeEach(function () {
       delete OSM.home;
       delete OSM.location;
   describe(".mapParams", function () {
     beforeEach(function () {
       delete OSM.home;
       delete OSM.location;

+      document.location.hash = "";

       document.cookie = "_osm_location=; expires=Thu, 01 Jan 1970 00:00:00 GMT";
 
       // Test with another cookie set.
       document.cookie = "_osm_location=; expires=Thu, 01 Jan 1970 00:00:00 GMT";
 
       // Test with another cookie set.


@@ -37,62 +50,54 @@ describe("OSM", function () {
     it("parses object params", function () {
       var params = OSM.mapParams("?node=1");
       expect(params).to.have.property("object");
     it("parses object params", function () {
       var params = OSM.mapParams("?node=1");
       expect(params).to.have.property("object");

-      expect(params).to.have.property("object_zoom", true);

       expect(params.object).to.eql({type: "node", id: 1});
 
       params = OSM.mapParams("?way=1");
       expect(params).to.have.property("object");
       expect(params.object).to.eql({type: "node", id: 1});
 
       params = OSM.mapParams("?way=1");
       expect(params).to.have.property("object");

-      expect(params).to.have.property("object_zoom", true);

       expect(params.object).to.eql({type: "way", id: 1});
 
       params = OSM.mapParams("?relation=1");
       expect(params).to.have.property("object");
       expect(params.object).to.eql({type: "way", id: 1});
 
       params = OSM.mapParams("?relation=1");
       expect(params).to.have.property("object");

-      expect(params).to.have.property("object_zoom", true);

       expect(params.object).to.eql({type: "relation", id: 1});
     });
 
     it("parses bbox params", function () {
       expect(params.object).to.eql({type: "relation", id: 1});
     });
 
     it("parses bbox params", function () {

+      var expected = L.latLngBounds([57.6247, -3.6845], [57.7247, -3.7845]);

       var params = OSM.mapParams("?bbox=-3.6845,57.6247,-3.7845,57.7247");
       var params = OSM.mapParams("?bbox=-3.6845,57.6247,-3.7845,57.7247");

-      expect(params).to.have.property("bbox", true);
-      expect(params).to.have.property("minlon", -3.6845);
-      expect(params).to.have.property("minlat", 57.6247);
-      expect(params).to.have.property("maxlon", -3.7845);
-      expect(params).to.have.property("maxlat", 57.7247);
-      expect(params).to.have.property("box", false);
+      expect(params).to.have.property("bounds").deep.equal(expected);

 
       params = OSM.mapParams("?minlon=-3.6845&minlat=57.6247&maxlon=-3.7845&maxlat=57.7247");
 
       params = OSM.mapParams("?minlon=-3.6845&minlat=57.6247&maxlon=-3.7845&maxlat=57.7247");

-      expect(params).to.have.property("bbox", true);
-      expect(params).to.have.property("minlon", -3.6845);
-      expect(params).to.have.property("minlat", 57.6247);
-      expect(params).to.have.property("maxlon", -3.7845);
-      expect(params).to.have.property("maxlat", 57.7247);
-      expect(params).to.have.property("box", false);
-
-      params = OSM.mapParams("?bbox=-3.6845,57.6247,-3.7845,57.7247&box=yes");
-      expect(params).to.have.property("box", true);
-
-      params = OSM.mapParams("?minlon=-3.6845&minlat=57.6247&maxlon=-3.7845&maxlat=57.7247&box=yes");
-      expect(params).to.have.property("box", true);
+      expect(params).to.have.property("bounds").deep.equal(expected);

     });
 
     });
 

-    it("infers lat/long from bbox", function () {
-      var params = OSM.mapParams("?bbox=-3.6845,57.6247,-3.7845,57.7247");
-      expect(params).to.have.property("lat", 57.6747);
-      expect(params).to.have.property("lon", -3.7344999999999997);
-
-      params = OSM.mapParams("?minlon=-3.6845&minlat=57.6247&maxlon=-3.7845&maxlat=57.7247");
-      expect(params).to.have.property("lat", 57.6747);
-      expect(params).to.have.property("lon", -3.7344999999999997);
-    });
-
-    it("parses lat/lon params", function () {
+    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);
       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");
       expect(params).to.have.property("lat", 57.6247);
       expect(params).to.have.property("lon", -3.6845);
 
       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);
+
+      params = OSM.mapParams("?mlat=57.6247&mlon=-3.6845&zoom=16");
+      expect(params).to.have.property("lat", 57.6247);
+      expect(params).to.have.property("lon", -3.6845);
+      expect(params).to.have.property("zoom", 16);
+    });
+
+    it("parses lat/lon/zoom from the hash", function () {
+      document.location.hash = "#map=16/57.6247/-3.6845";
+      params = OSM.mapParams("?");
+      expect(params).to.have.property("lat", 57.6247);
+      expect(params).to.have.property("lon", -3.6845);
+      expect(params).to.have.property("zoom", 16);

     });
 
     it("sets lat/lon from OSM.home", function () {
     });
 
     it("sets lat/lon from OSM.home", function () {


@@ -104,12 +109,9 @@ describe("OSM", function () {
 
     it("sets bbox from OSM.location", function () {
       OSM.location = {minlon: -3.6845, minlat: 57.6247, maxlon: -3.7845, maxlat: 57.7247};
 
     it("sets bbox from OSM.location", function () {
       OSM.location = {minlon: -3.6845, minlat: 57.6247, maxlon: -3.7845, maxlat: 57.7247};

+      var expected = L.latLngBounds([57.6247, -3.6845], [57.7247, -3.7845]);

       var params = OSM.mapParams("?");
       var params = OSM.mapParams("?");

-      expect(params).to.have.property("bbox", true);
-      expect(params).to.have.property("minlon", -3.6845);
-      expect(params).to.have.property("minlat", 57.6247);
-      expect(params).to.have.property("maxlon", -3.7845);
-      expect(params).to.have.property("maxlat", 57.7247);
+      expect(params).to.have.property("bounds").deep.equal(expected);

     });
 
     it("parses params from the _osm_location cookie", function () {
     });
 
     it("parses params from the _osm_location cookie", function () {


@@ -125,11 +127,104 @@ describe("OSM", function () {
       var params = OSM.mapParams("?");
       expect(params).to.have.property("lat", 51.5);
       expect(params).to.have.property("lon", -0.1);
       var params = OSM.mapParams("?");
       expect(params).to.have.property("lat", 51.5);
       expect(params).to.have.property("lon", -0.1);

+      expect(params).to.have.property("zoom", 5);
+
+      params = OSM.mapParams("?zoom=10");
+      expect(params).to.have.property("lat", 51.5);
+      expect(params).to.have.property("lon", -0.1);
+      expect(params).to.have.property("zoom", 10);

     });
 
     it("parses layers param", function () {
     });
 
     it("parses layers param", function () {

-      var params = OSM.mapParams("?layers=M");
+      var params = OSM.mapParams("?");
+      expect(params).to.have.property("layers", "");
+
+      document.cookie = "_osm_location=-3.6845|57.6247|5|C";
+      params = OSM.mapParams("?");
+      expect(params).to.have.property("layers", "C");
+
+      document.location.hash = "#map=5/57.6247/-3.6845&layers=M"
+      params = OSM.mapParams("?");

       expect(params).to.have.property("layers", "M");
     });
   });
       expect(params).to.have.property("layers", "M");
     });
   });

+
+  describe(".parseHash", function () {
+    it("parses lat/lon/zoom params", function () {
+      var args = OSM.parseHash("#map=5/57.6247/-3.6845&layers=M");
+      expect(args).to.have.property("center").deep.equal(L.latLng(57.6247, -3.6845));
+      expect(args).to.have.property("zoom", 5);
+    });
+
+    it("parses layers params", function () {
+      var args = OSM.parseHash("#map=5/57.6247/-3.6845&layers=M");
+      expect(args).to.have.property("layers", "M");
+    });
+  });
+
+  describe(".formatHash", function () {
+    it("formats lat/lon/zoom params", function () {
+      var args = { center: L.latLng(57.6247, -3.6845), zoom: 9 };
+      expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845");
+    });
+
+    it("respects zoomPrecision", function () {
+      var args = { center: L.latLng(57.6247, -3.6845), zoom: 5 };
+      expect(OSM.formatHash(args)).to.eq("#map=5/57.625/-3.685");
+
+      args = { center: L.latLng(57.6247, -3.6845), zoom: 9 };
+      expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845");
+    });
+
+    it("formats layers params", function () {
+      var args = { center: L.latLng(57.6247, -3.6845), zoom: 9, layers: "C" };
+      expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845&layers=C");
+    });
+
+    it("ignores default layers", function () {
+      var args = { center: L.latLng(57.6247, -3.6845), zoom: 9, layers: "M" };
+      expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845");
+    });
+  });
+
+  describe(".zoomPrecision", function () {
+    it("suggests 0 digits for z0-1", function () {
+      expect(OSM.zoomPrecision(0)).to.eq(0);
+      expect(OSM.zoomPrecision(1)).to.eq(0);
+    });
+
+    it("suggests 1 digit for z2", function () {
+      expect(OSM.zoomPrecision(2)).to.eq(1);
+    });
+
+    it("suggests 2 digits for z3-4", function () {
+      expect(OSM.zoomPrecision(3)).to.eq(2);
+      expect(OSM.zoomPrecision(4)).to.eq(2);
+    });
+
+    it("suggests 3 digits for z5-8", function () {
+      expect(OSM.zoomPrecision(5)).to.eq(3);
+      expect(OSM.zoomPrecision(6)).to.eq(3);
+      expect(OSM.zoomPrecision(7)).to.eq(3);
+      expect(OSM.zoomPrecision(8)).to.eq(3);
+    });
+
+    it("suggests 4 digits for z9-16", function () {
+      expect(OSM.zoomPrecision(9)).to.eq(4);
+      expect(OSM.zoomPrecision(10)).to.eq(4);
+      expect(OSM.zoomPrecision(11)).to.eq(4);
+      expect(OSM.zoomPrecision(12)).to.eq(4);
+      expect(OSM.zoomPrecision(13)).to.eq(4);
+      expect(OSM.zoomPrecision(14)).to.eq(4);
+      expect(OSM.zoomPrecision(15)).to.eq(4);
+      expect(OSM.zoomPrecision(16)).to.eq(4);
+    });
+
+    it("suggests 5 digits for z17-20", function () {
+      expect(OSM.zoomPrecision(17)).to.eq(5);
+      expect(OSM.zoomPrecision(18)).to.eq(5);
+      expect(OSM.zoomPrecision(19)).to.eq(5);
+      expect(OSM.zoomPrecision(20)).to.eq(5);
+    });
+  });

 });
 });