Remove unused ellipsoid.vincentyFinalBearing() method
This commit is contained in:
@@ -151,19 +151,3 @@ ol.Ellipsoid.prototype.vincentyDistance =
|
|||||||
var vincenty = this.vincenty(c1, c2, opt_minDeltaLambda, opt_maxIterations);
|
var vincenty = this.vincenty(c1, c2, opt_minDeltaLambda, opt_maxIterations);
|
||||||
return vincenty.distance;
|
return vincenty.distance;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the final bearing from c1 to c2 using Vincenty.
|
|
||||||
*
|
|
||||||
* @param {ol.Coordinate} c1 Coordinate 1.
|
|
||||||
* @param {ol.Coordinate} c2 Coordinate 1.
|
|
||||||
* @param {number=} opt_minDeltaLambda Minimum delta lambda for convergence.
|
|
||||||
* @param {number=} opt_maxIterations Maximum iterations.
|
|
||||||
* @return {number} Initial bearing.
|
|
||||||
*/
|
|
||||||
ol.Ellipsoid.prototype.vincentyFinalBearing =
|
|
||||||
function(c1, c2, opt_minDeltaLambda, opt_maxIterations) {
|
|
||||||
var vincenty = this.vincenty(c1, c2, opt_minDeltaLambda, opt_maxIterations);
|
|
||||||
return vincenty.finalBearing;
|
|
||||||
};
|
|
||||||
|
|||||||
@@ -7,241 +7,201 @@ describe('ol.Ellipsoid', function() {
|
|||||||
{
|
{
|
||||||
c1: [0, 0],
|
c1: [0, 0],
|
||||||
c2: [0, 0],
|
c2: [0, 0],
|
||||||
vincentyFinalBearing: 0,
|
|
||||||
vincentyDistance: 0
|
vincentyDistance: 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [0, 0],
|
c1: [0, 0],
|
||||||
c2: [45, 45],
|
c2: [45, 45],
|
||||||
vincentyFinalBearing: 54.890773827979565,
|
|
||||||
vincentyDistance: 6662472.718217184
|
vincentyDistance: 6662472.718217184
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [0, 0],
|
c1: [0, 0],
|
||||||
c2: [45, -45],
|
c2: [45, -45],
|
||||||
vincentyFinalBearing: 125.10922617202044,
|
|
||||||
vincentyDistance: 6662472.718217184
|
vincentyDistance: 6662472.718217184
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [0, 0],
|
c1: [0, 0],
|
||||||
c2: [-45, -45],
|
c2: [-45, -45],
|
||||||
vincentyFinalBearing: -125.10922617202044,
|
|
||||||
vincentyDistance: 6662472.718217184
|
vincentyDistance: 6662472.718217184
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [0, 0],
|
c1: [0, 0],
|
||||||
c2: [-45, 45],
|
c2: [-45, 45],
|
||||||
vincentyFinalBearing: -54.890773827979565,
|
|
||||||
vincentyDistance: 6662472.718217184
|
vincentyDistance: 6662472.718217184
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [0, 0],
|
c1: [0, 0],
|
||||||
c2: [180, 90],
|
c2: [180, 90],
|
||||||
vincentyFinalBearing: 180,
|
|
||||||
vincentyDistance: 10001965.729311794
|
vincentyDistance: 10001965.729311794
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [0, 0],
|
c1: [0, 0],
|
||||||
c2: [180, -90],
|
c2: [180, -90],
|
||||||
vincentyFinalBearing: 7.0164775638926606e-15,
|
|
||||||
vincentyDistance: 10001965.729311794
|
vincentyDistance: 10001965.729311794
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [0, 0],
|
c1: [0, 0],
|
||||||
c2: [-180, 90],
|
c2: [-180, 90],
|
||||||
vincentyFinalBearing: -180,
|
|
||||||
vincentyDistance: 10001965.729311794
|
vincentyDistance: 10001965.729311794
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [0, 0],
|
c1: [0, 0],
|
||||||
c2: [-180, 90],
|
c2: [-180, 90],
|
||||||
vincentyFinalBearing: -180,
|
|
||||||
vincentyDistance: 10001965.729311794
|
vincentyDistance: 10001965.729311794
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, 45],
|
c1: [45, 45],
|
||||||
c2: [45, 45],
|
c2: [45, 45],
|
||||||
vincentyFinalBearing: 0,
|
|
||||||
vincentyDistance: 0
|
vincentyDistance: 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, 45],
|
c1: [45, 45],
|
||||||
c2: [45, -45],
|
c2: [45, -45],
|
||||||
vincentyFinalBearing: 180,
|
|
||||||
vincentyDistance: 9969888.755957305
|
vincentyDistance: 9969888.755957305
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, 45],
|
c1: [45, 45],
|
||||||
c2: [-45, -45],
|
c2: [-45, -45],
|
||||||
vincentyFinalBearing: -125.10922617202044,
|
|
||||||
vincentyDistance: 13324945.436434371
|
vincentyDistance: 13324945.436434371
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, 45],
|
c1: [45, 45],
|
||||||
c2: [-45, 45],
|
c2: [-45, 45],
|
||||||
vincentyFinalBearing: -125.27390277185786,
|
|
||||||
vincentyDistance: 6690232.932559058
|
vincentyDistance: 6690232.932559058
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, 45],
|
c1: [45, 45],
|
||||||
c2: [180, 90],
|
c2: [180, 90],
|
||||||
vincentyFinalBearing: 135,
|
|
||||||
vincentyDistance: 5017021.35133314
|
vincentyDistance: 5017021.35133314
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, 45],
|
c1: [45, 45],
|
||||||
c2: [180, -90],
|
c2: [180, -90],
|
||||||
vincentyFinalBearing: 45.00000000000001,
|
|
||||||
vincentyDistance: 14986910.107290443
|
vincentyDistance: 14986910.107290443
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, 45],
|
c1: [45, 45],
|
||||||
c2: [-180, 90],
|
c2: [-180, 90],
|
||||||
vincentyFinalBearing: 135.00000000000003,
|
|
||||||
vincentyDistance: 5017021.35133314
|
vincentyDistance: 5017021.35133314
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, 45],
|
c1: [45, 45],
|
||||||
c2: [-180, 90],
|
c2: [-180, 90],
|
||||||
vincentyFinalBearing: 135.00000000000003,
|
|
||||||
vincentyDistance: 5017021.35133314
|
vincentyDistance: 5017021.35133314
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, -45],
|
c1: [45, -45],
|
||||||
c2: [45, -45],
|
c2: [45, -45],
|
||||||
vincentyFinalBearing: 0,
|
|
||||||
vincentyDistance: 0
|
vincentyDistance: 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, -45],
|
c1: [45, -45],
|
||||||
c2: [-45, -45],
|
c2: [-45, -45],
|
||||||
vincentyFinalBearing: -54.726097228142166,
|
|
||||||
vincentyDistance: 6690232.932559058
|
vincentyDistance: 6690232.932559058
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, -45],
|
c1: [45, -45],
|
||||||
c2: [-45, 45],
|
c2: [-45, 45],
|
||||||
vincentyFinalBearing: -54.890773827979565,
|
|
||||||
vincentyDistance: 13324945.436434371
|
vincentyDistance: 13324945.436434371
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, -45],
|
c1: [45, -45],
|
||||||
c2: [180, 90],
|
c2: [180, 90],
|
||||||
vincentyFinalBearing: 135,
|
|
||||||
vincentyDistance: 14986910.107290443
|
vincentyDistance: 14986910.107290443
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, -45],
|
c1: [45, -45],
|
||||||
c2: [180, -90],
|
c2: [180, -90],
|
||||||
vincentyFinalBearing: 45.00000000000001,
|
|
||||||
vincentyDistance: 5017021.35133314
|
vincentyDistance: 5017021.35133314
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, -45],
|
c1: [45, -45],
|
||||||
c2: [-180, 90],
|
c2: [-180, 90],
|
||||||
vincentyFinalBearing: 135.00000000000003,
|
|
||||||
vincentyDistance: 14986910.107290443
|
vincentyDistance: 14986910.107290443
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [45, -45],
|
c1: [45, -45],
|
||||||
c2: [-180, 90],
|
c2: [-180, 90],
|
||||||
vincentyFinalBearing: 135.00000000000003,
|
|
||||||
vincentyDistance: 14986910.107290443
|
vincentyDistance: 14986910.107290443
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [-45, -45],
|
c1: [-45, -45],
|
||||||
c2: [-45, -45],
|
c2: [-45, -45],
|
||||||
vincentyFinalBearing: 0,
|
|
||||||
vincentyDistance: 0
|
vincentyDistance: 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [-45, -45],
|
c1: [-45, -45],
|
||||||
c2: [-45, 45],
|
c2: [-45, 45],
|
||||||
vincentyFinalBearing: 0,
|
|
||||||
vincentyDistance: 9969888.755957305
|
vincentyDistance: 9969888.755957305
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [-45, -45],
|
c1: [-45, -45],
|
||||||
c2: [180, 90],
|
c2: [180, 90],
|
||||||
vincentyFinalBearing: -135.00000000000003,
|
|
||||||
vincentyDistance: 14986910.107290443
|
vincentyDistance: 14986910.107290443
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [-45, -45],
|
c1: [-45, -45],
|
||||||
c2: [180, -90],
|
c2: [180, -90],
|
||||||
vincentyFinalBearing: -44.999999999999986,
|
|
||||||
vincentyDistance: 5017021.35133314
|
vincentyDistance: 5017021.35133314
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [-45, -45],
|
c1: [-45, -45],
|
||||||
c2: [-180, 90],
|
c2: [-180, 90],
|
||||||
vincentyFinalBearing: -135,
|
|
||||||
vincentyDistance: 14986910.107290443
|
vincentyDistance: 14986910.107290443
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [-45, -45],
|
c1: [-45, -45],
|
||||||
c2: [-180, 90],
|
c2: [-180, 90],
|
||||||
vincentyFinalBearing: -135,
|
|
||||||
vincentyDistance: 14986910.107290443
|
vincentyDistance: 14986910.107290443
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [-45, 45],
|
c1: [-45, 45],
|
||||||
c2: [-45, 45],
|
c2: [-45, 45],
|
||||||
vincentyFinalBearing: 0,
|
|
||||||
vincentyDistance: 0
|
vincentyDistance: 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [-45, 45],
|
c1: [-45, 45],
|
||||||
c2: [180, 90],
|
c2: [180, 90],
|
||||||
vincentyFinalBearing: -135.00000000000003,
|
|
||||||
vincentyDistance: 5017021.35133314
|
vincentyDistance: 5017021.35133314
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [-45, 45],
|
c1: [-45, 45],
|
||||||
c2: [180, -90],
|
c2: [180, -90],
|
||||||
vincentyFinalBearing: -44.999999999999986,
|
|
||||||
vincentyDistance: 14986910.107290443
|
vincentyDistance: 14986910.107290443
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [-45, 45],
|
c1: [-45, 45],
|
||||||
c2: [-180, 90],
|
c2: [-180, 90],
|
||||||
vincentyFinalBearing: -135,
|
|
||||||
vincentyDistance: 5017021.35133314
|
vincentyDistance: 5017021.35133314
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [-45, 45],
|
c1: [-45, 45],
|
||||||
c2: [-180, 90],
|
c2: [-180, 90],
|
||||||
vincentyFinalBearing: -135,
|
|
||||||
vincentyDistance: 5017021.35133314
|
vincentyDistance: 5017021.35133314
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [180, 90],
|
c1: [180, 90],
|
||||||
c2: [180, 90],
|
c2: [180, 90],
|
||||||
vincentyFinalBearing: 0,
|
|
||||||
vincentyDistance: 0
|
vincentyDistance: 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [180, -90],
|
c1: [180, -90],
|
||||||
c2: [180, -90],
|
c2: [180, -90],
|
||||||
vincentyFinalBearing: 0,
|
|
||||||
vincentyDistance: 0
|
vincentyDistance: 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [-180, 90],
|
c1: [-180, 90],
|
||||||
c2: [-180, 90],
|
c2: [-180, 90],
|
||||||
vincentyFinalBearing: 0,
|
|
||||||
vincentyDistance: 0
|
vincentyDistance: 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [-180, 90],
|
c1: [-180, 90],
|
||||||
c2: [-180, 90],
|
c2: [-180, 90],
|
||||||
vincentyFinalBearing: 0,
|
|
||||||
vincentyDistance: 0
|
vincentyDistance: 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
c1: [-180, 90],
|
c1: [-180, 90],
|
||||||
c2: [-180, 90],
|
c2: [-180, 90],
|
||||||
vincentyFinalBearing: 0,
|
|
||||||
vincentyDistance: 0
|
vincentyDistance: 0
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
@@ -255,8 +215,6 @@ describe('ol.Ellipsoid', function() {
|
|||||||
e = expected[i];
|
e = expected[i];
|
||||||
v = ol.ellipsoid.WGS84.vincenty(e.c1, e.c2, 1e-12, 100);
|
v = ol.ellipsoid.WGS84.vincenty(e.c1, e.c2, 1e-12, 100);
|
||||||
expect(v.distance).to.roughlyEqual(e.vincentyDistance, 1e-8);
|
expect(v.distance).to.roughlyEqual(e.vincentyDistance, 1e-8);
|
||||||
expect(v.finalBearing).to.roughlyEqual(
|
|
||||||
e.vincentyFinalBearing, 1e-9);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -277,22 +235,6 @@ describe('ol.Ellipsoid', function() {
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('vincentyFinalBearing', function() {
|
|
||||||
|
|
||||||
it('returns the same distances as Chris Veness\'s reference implementation',
|
|
||||||
function() {
|
|
||||||
var e, i, vincentyFinalBearing;
|
|
||||||
for (i = 0; i < expected.length; ++i) {
|
|
||||||
e = expected[i];
|
|
||||||
vincentyFinalBearing =
|
|
||||||
ol.ellipsoid.WGS84.vincentyFinalBearing(e.c1, e.c2, 1e-12, 100);
|
|
||||||
expect(vincentyFinalBearing).to.roughlyEqual(
|
|
||||||
e.vincentyFinalBearing, 1e-9);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user