Merge remote-tracking branch 'upstream/pull/3125'

[rails.git] / test / javascripts / osm_test.js

diff --git a/test/javascripts/osm_test.js b/test/javascripts/osm_test.js
index d7fe4a2fd87ab41451f4dc139554a08f2cc3d4fd..ad4cc7b9f283a57114e096a899988e36f5eff51d 100644 (file)
--- a/test/javascripts/osm_test.js
+++ b/test/javascripts/osm_test.js
@@ -1,13 +1,11 @@
 //= require jquery
-//= require jquery.cookie
+//= require jquery.cookie/jquery.cookie
 //= require osm
-//= require leaflet
+//= require leaflet/dist/leaflet-src
 //= require leaflet.osm
 //= require leaflet.map
 //= require i18n/translations
-//= require querystring
-
-var querystring = require('querystring-component');
+//= require qs/dist/qs
 
 describe("OSM", function () {
   describe(".apiUrl", function () {
@@ -73,18 +71,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);
@@ -249,4 +237,14 @@ describe("OSM", function () {
       expect(OSM.locationCookie(map)).to.eq("-3.685|57.625|5|M");
     });
   });
+
+  describe(".distance", function () {
+    it("computes distance between points", function () {
+      var latlng1 = L.latLng(51.76712,-0.00484),
+        latlng2 = L.latLng(51.7675159, -0.0078329);
+
+      expect(OSM.distance(latlng1, latlng2)).to.be.closeTo(210.664, 0.005);
+      expect(OSM.distance(latlng2, latlng1)).to.be.closeTo(210.664, 0.005);
+    });
+  });
 });