kiwix/kiwix-js
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js.git synced 2025-09-22 20:13:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add the cardinal direction to articles (nearby article search). Fixes #83

Browse Source
This commit is contained in:
mossroy 2014-04-10 14:17:54 +02:00
parent 8bff5cd843
commit 5d354dbd71
3 changed files with 688 additions and 643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/tests.js
View File

@ -283,6 +283,21 @@ define(function(require) {
ok(rect1.contains(rect6), "rect1 should contain rect6");
ok(rect1.contains(rect7), "rect1 should contain rect7");
});
test("check bearing algorithm", function() {
var point1 = new geometry.point(0,0);
var point2 = new geometry.point(2,0);
var line1 = new geometry.line(point1, point2);
equal(line1.bearing(), "N", "Bearing of line1 should be N");
var pointLondon = new geometry.point(51.50777816772461, -0.12805555760860443);
var pointParis = new geometry.point(48.856614, 2.3522219000000177);
var pointAmsterdam = new geometry.point(52.326947, 4.741287);
var lineLondonParis = new geometry.line(pointLondon, pointParis);
var lineParisLondon = new geometry.line(pointParis, pointLondon);
var lineLondonAmsterdam = new geometry.line(pointLondon, pointAmsterdam);
equal(lineLondonParis.bearing(), "SE", "Bearing from London to Paris sould be SE");
equal(lineParisLondon.bearing(), "NW", "Bearing from Paris to London sould be NW");
equal(lineLondonAmsterdam.bearing(), "E", "Bearing from London to Amsterdam sould be E");
});
module("utils");
test("check reading an IEEE_754 float from 4 bytes" ,function() {

5
www/js/app.js
View File

@ -416,9 +416,10 @@ define(function(require) {
var distanceFromHereHtml = "";
if (title._geolocation && currentCoordinates) {
// If we know the current position and the title position, we display the distance
// If we know the current position and the title position, we display the distance and cardinal direction
var distanceKm = (currentCoordinates.distance(title._geolocation) * 6371 / 60).toFixed(1);
distanceFromHereHtml = " (" + distanceKm + " km)";
var cardinalDirection = currentCoordinates.bearing(title._geolocation);
distanceFromHereHtml = " (" + distanceKm + " km " + cardinalDirection + ")";
}
titleListDivHtml += "<a href='#' titleid='" + title.toStringId()

1311
www/js/lib/geometry.js
View File

File diff suppressed because it is too large Load Diff