ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add precision parameter for HDMS coordinate

Browse Source
This commit is contained in:
pfanguin
2016-02-04 09:31:15 +01:00
parent c621f8606b
commit b584a9aeb5
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/ol/coordinate.js
View File

@@ -124,14 +124,17 @@ ol.coordinate.createStringXY = function(opt_fractionDigits) {
* @private * @private
* @param {number} degrees Degrees. * @param {number} degrees Degrees.
* @param {string} hemispheres Hemispheres. * @param {string} hemispheres Hemispheres.
* @param {number=} opt_fractionDigits The number of digits to include
* after the decimal point. Default is `0`.
* @return {string} String. * @return {string} String.
*/ */
ol.coordinate.degreesToStringHDMS_ = function(degrees, hemispheres) { ol.coordinate.degreesToStringHDMS_ = function(degrees, hemispheres, opt_fractionDigits) {
var normalizedDegrees = goog.math.modulo(degrees + 180, 360) - 180; var normalizedDegrees = goog.math.modulo(degrees + 180, 360) - 180;
var x = Math.abs(Math.round(3600 * normalizedDegrees)); var x = Math.abs(3600 * normalizedDegrees);
var dflPrecision = opt_fractionDigits || 0;
return Math.floor(x / 3600) + '\u00b0 ' + return Math.floor(x / 3600) + '\u00b0 ' +
goog.string.padNumber(Math.floor((x / 60) % 60), 2) + '\u2032 ' + goog.string.padNumber(Math.floor((x / 60) % 60), 2) + '\u2032 ' +
goog.string.padNumber(Math.floor(x % 60), 2) + '\u2033 ' + goog.string.padNumber((x % 60), 2, dflPrecision) + '\u2033 ' +
hemispheres.charAt(normalizedDegrees < 0 ? 1 : 0); hemispheres.charAt(normalizedDegrees < 0 ? 1 : 0);
}; };
@@ -284,20 +287,28 @@ ol.coordinate.squaredDistanceToSegment = function(coordinate, segment) {
* Format a geographic coordinate with the hemisphere, degrees, minutes, and * Format a geographic coordinate with the hemisphere, degrees, minutes, and
* seconds. * seconds.
* *
* Example: * Example without specifying fractional digits:
* *
* var coord = [7.85, 47.983333]; * var coord = [7.85, 47.983333];
* var out = ol.coordinate.toStringHDMS(coord); * var out = ol.coordinate.toStringHDMS(coord);
* // out is now '47° 59′ 0″ N 7° 51′ 0″ E' * // out is now '47° 58′ 60″ N 7° 50′ 60″ E'
*
* Example explicitly specifying 1 fractional digit:
*
* var coord = [7.85, 47.983333];
* var out = ol.coordinate.toStringHDMS(coord, 1);
* // out is now '47° 58′ 60.0″ N 7° 50′ 60.0″ E'
* *
* @param {ol.Coordinate|undefined} coordinate Coordinate. * @param {ol.Coordinate|undefined} coordinate Coordinate.
* @param {number=} opt_fractionDigits The number of digits to include
* after the decimal point. Default is `0`.
* @return {string} Hemisphere, degrees, minutes and seconds. * @return {string} Hemisphere, degrees, minutes and seconds.
* @api stable * @api stable
*/ */
ol.coordinate.toStringHDMS = function(coordinate) { ol.coordinate.toStringHDMS = function(coordinate, opt_fractionDigits) {
if (coordinate) { if (coordinate) {
return ol.coordinate.degreesToStringHDMS_(coordinate[1], 'NS') + ' ' + return ol.coordinate.degreesToStringHDMS_(coordinate[1], 'NS', opt_fractionDigits) + ' ' +
ol.coordinate.degreesToStringHDMS_(coordinate[0], 'EW'); ol.coordinate.degreesToStringHDMS_(coordinate[0], 'EW', opt_fractionDigits);
} else { } else {
return ''; return '';
} }

10
test/spec/ol/coordinate.test.js
View File

@@ -200,10 +200,16 @@ describe('ol.coordinate', function() {
var expected = ''; var expected = '';
expect(got).to.be(expected); expect(got).to.be(expected);
}); });
it('formats a coord as expected', function() { it('formats with zero fractional digits as default', function() {
var coord = [7.85, 47.983333]; var coord = [7.85, 47.983333];
var got = ol.coordinate.toStringHDMS(coord); var got = ol.coordinate.toStringHDMS(coord);
var expected = '47° 59′ 00″ N 7° 51′ 00″ E'; var expected = '47° 58′ 60″ N 7° 50′ 60″ E';
expect(got).to.be(expected);
});
it('formats with given fractional digits, if passed', function() {
var coord = [7.85, 47.983333];
var got = ol.coordinate.toStringHDMS(coord, 3);
var expected = '47° 58′ 59.999″ N 7° 50′ 60.000″ E';
expect(got).to.be(expected); expect(got).to.be(expected);
}); });
}); });