Remove unused sphere.cosineDistance() method
This commit is contained in:
@@ -40,23 +40,6 @@ ol.Sphere = function(radius) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the distance from c1 to c2 using the spherical law of cosines.
|
|
||||||
*
|
|
||||||
* @param {ol.Coordinate} c1 Coordinate 1.
|
|
||||||
* @param {ol.Coordinate} c2 Coordinate 2.
|
|
||||||
* @return {number} Spherical law of cosines distance.
|
|
||||||
*/
|
|
||||||
ol.Sphere.prototype.cosineDistance = function(c1, c2) {
|
|
||||||
var lat1 = goog.math.toRadians(c1[1]);
|
|
||||||
var lat2 = goog.math.toRadians(c2[1]);
|
|
||||||
var deltaLon = goog.math.toRadians(c2[0] - c1[0]);
|
|
||||||
return this.radius * Math.acos(
|
|
||||||
Math.sin(lat1) * Math.sin(lat2) +
|
|
||||||
Math.cos(lat1) * Math.cos(lat2) * Math.cos(deltaLon));
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the geodesic area for a list of coordinates.
|
* Returns the geodesic area for a list of coordinates.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [0, 0],
|
c1: [0, 0],
|
||||||
c2: [0, 0],
|
c2: [0, 0],
|
||||||
cosineDistance: 0,
|
|
||||||
equirectangularDistance: 0,
|
equirectangularDistance: 0,
|
||||||
finalBearing: 180,
|
finalBearing: 180,
|
||||||
haversineDistance: 0,
|
haversineDistance: 0,
|
||||||
@@ -22,7 +21,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [0, 0],
|
c1: [0, 0],
|
||||||
c2: [45, 45],
|
c2: [45, 45],
|
||||||
cosineDistance: 6671.695598673524,
|
|
||||||
equirectangularDistance: 6812.398372654371,
|
equirectangularDistance: 6812.398372654371,
|
||||||
finalBearing: 54.735610317245346,
|
finalBearing: 54.735610317245346,
|
||||||
haversineDistance: 6671.695598673525,
|
haversineDistance: 6671.695598673525,
|
||||||
@@ -32,7 +30,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [0, 0],
|
c1: [0, 0],
|
||||||
c2: [-45, 45],
|
c2: [-45, 45],
|
||||||
cosineDistance: 6671.695598673524,
|
|
||||||
equirectangularDistance: 6812.398372654371,
|
equirectangularDistance: 6812.398372654371,
|
||||||
finalBearing: 305.26438968275465,
|
finalBearing: 305.26438968275465,
|
||||||
haversineDistance: 6671.695598673525,
|
haversineDistance: 6671.695598673525,
|
||||||
@@ -42,7 +39,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [0, 0],
|
c1: [0, 0],
|
||||||
c2: [-45, -45],
|
c2: [-45, -45],
|
||||||
cosineDistance: 6671.695598673524,
|
|
||||||
equirectangularDistance: 6812.398372654371,
|
equirectangularDistance: 6812.398372654371,
|
||||||
finalBearing: 234.73561031724535,
|
finalBearing: 234.73561031724535,
|
||||||
haversineDistance: 6671.695598673525,
|
haversineDistance: 6671.695598673525,
|
||||||
@@ -52,7 +48,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [0, 0],
|
c1: [0, 0],
|
||||||
c2: [45, -45],
|
c2: [45, -45],
|
||||||
cosineDistance: 6671.695598673524,
|
|
||||||
equirectangularDistance: 6812.398372654371,
|
equirectangularDistance: 6812.398372654371,
|
||||||
finalBearing: 125.26438968275465,
|
finalBearing: 125.26438968275465,
|
||||||
haversineDistance: 6671.695598673525,
|
haversineDistance: 6671.695598673525,
|
||||||
@@ -62,7 +57,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [45, 45],
|
c1: [45, 45],
|
||||||
c2: [45, 45],
|
c2: [45, 45],
|
||||||
cosineDistance: 0,
|
|
||||||
equirectangularDistance: 0,
|
equirectangularDistance: 0,
|
||||||
finalBearing: 180,
|
finalBearing: 180,
|
||||||
haversineDistance: 0,
|
haversineDistance: 0,
|
||||||
@@ -72,7 +66,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [45, 45],
|
c1: [45, 45],
|
||||||
c2: [-45, 45],
|
c2: [-45, 45],
|
||||||
cosineDistance: 6671.695598673525,
|
|
||||||
equirectangularDistance: 7076.401799751738,
|
equirectangularDistance: 7076.401799751738,
|
||||||
finalBearing: 234.73561031724535,
|
finalBearing: 234.73561031724535,
|
||||||
haversineDistance: 6671.695598673525,
|
haversineDistance: 6671.695598673525,
|
||||||
@@ -82,7 +75,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [45, 45],
|
c1: [45, 45],
|
||||||
c2: [-45, -45],
|
c2: [-45, -45],
|
||||||
cosineDistance: 13343.391197347048,
|
|
||||||
equirectangularDistance: 14152.803599503475,
|
equirectangularDistance: 14152.803599503475,
|
||||||
finalBearing: 234.73561031724535,
|
finalBearing: 234.73561031724535,
|
||||||
haversineDistance: 13343.391197347048,
|
haversineDistance: 13343.391197347048,
|
||||||
@@ -92,7 +84,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [45, 45],
|
c1: [45, 45],
|
||||||
c2: [45, -45],
|
c2: [45, -45],
|
||||||
cosineDistance: 10007.543398010284,
|
|
||||||
equirectangularDistance: 10007.543398010286,
|
equirectangularDistance: 10007.543398010286,
|
||||||
finalBearing: 180,
|
finalBearing: 180,
|
||||||
haversineDistance: 10007.543398010286,
|
haversineDistance: 10007.543398010286,
|
||||||
@@ -102,7 +93,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [-45, 45],
|
c1: [-45, 45],
|
||||||
c2: [-45, 45],
|
c2: [-45, 45],
|
||||||
cosineDistance: 0,
|
|
||||||
equirectangularDistance: 0,
|
equirectangularDistance: 0,
|
||||||
finalBearing: 180,
|
finalBearing: 180,
|
||||||
haversineDistance: 0,
|
haversineDistance: 0,
|
||||||
@@ -112,7 +102,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [-45, 45],
|
c1: [-45, 45],
|
||||||
c2: [-45, -45],
|
c2: [-45, -45],
|
||||||
cosineDistance: 10007.543398010284,
|
|
||||||
equirectangularDistance: 10007.543398010286,
|
equirectangularDistance: 10007.543398010286,
|
||||||
finalBearing: 180,
|
finalBearing: 180,
|
||||||
haversineDistance: 10007.543398010286,
|
haversineDistance: 10007.543398010286,
|
||||||
@@ -122,7 +111,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [-45, 45],
|
c1: [-45, 45],
|
||||||
c2: [45, -45],
|
c2: [45, -45],
|
||||||
cosineDistance: 13343.391197347048,
|
|
||||||
equirectangularDistance: 14152.803599503475,
|
equirectangularDistance: 14152.803599503475,
|
||||||
finalBearing: 125.26438968275465,
|
finalBearing: 125.26438968275465,
|
||||||
haversineDistance: 13343.391197347048,
|
haversineDistance: 13343.391197347048,
|
||||||
@@ -132,7 +120,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [-45, -45],
|
c1: [-45, -45],
|
||||||
c2: [-45, -45],
|
c2: [-45, -45],
|
||||||
cosineDistance: 0,
|
|
||||||
equirectangularDistance: 0,
|
equirectangularDistance: 0,
|
||||||
finalBearing: 180,
|
finalBearing: 180,
|
||||||
haversineDistance: 0,
|
haversineDistance: 0,
|
||||||
@@ -142,7 +129,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [-45, -45],
|
c1: [-45, -45],
|
||||||
c2: [45, -45],
|
c2: [45, -45],
|
||||||
cosineDistance: 6671.695598673525,
|
|
||||||
equirectangularDistance: 7076.401799751738,
|
equirectangularDistance: 7076.401799751738,
|
||||||
finalBearing: 54.735610317245346,
|
finalBearing: 54.735610317245346,
|
||||||
haversineDistance: 6671.695598673525,
|
haversineDistance: 6671.695598673525,
|
||||||
@@ -152,7 +138,6 @@ describe('ol.Sphere', function() {
|
|||||||
{
|
{
|
||||||
c1: [45, -45],
|
c1: [45, -45],
|
||||||
c2: [45, -45],
|
c2: [45, -45],
|
||||||
cosineDistance: 0,
|
|
||||||
equirectangularDistance: 0,
|
equirectangularDistance: 0,
|
||||||
finalBearing: 180,
|
finalBearing: 180,
|
||||||
haversineDistance: 0,
|
haversineDistance: 0,
|
||||||
@@ -161,19 +146,6 @@ describe('ol.Sphere', function() {
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
describe('cosineDistance', function() {
|
|
||||||
|
|
||||||
it('results match Chris Veness\'s reference implementation', function() {
|
|
||||||
var e, i;
|
|
||||||
for (i = 0; i < expected.length; ++i) {
|
|
||||||
e = expected[i];
|
|
||||||
expect(sphere.cosineDistance(e.c1, e.c2)).to.roughlyEqual(
|
|
||||||
e.cosineDistance, 1e-3);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('equirectangularDistance', function() {
|
describe('equirectangularDistance', function() {
|
||||||
|
|
||||||
it('results match Chris Veness\'s reference implementation', function() {
|
it('results match Chris Veness\'s reference implementation', function() {
|
||||||
|
|||||||
Reference in New Issue
Block a user