Merge pull request #93 from DataValues/deltaFormatting

Round up in GeoCoordinateFormatter when close to a degree/minute

Author: Daniel Kinzler

src/Formatters/GeoCoordinateFormatter.php

@@ -254,6 +254,14 @@ private function formatCoordinate( $degrees, $precision ) {
 			return $this->getInFloatFormat( $degrees );
 		}
 
+		if ( $format !== self::TYPE_DD ) {
+			if ( $precision >= 1 - 1 / 60 && $precision < 1 ) {
+				$precision = 1;
+			} elseif ( $precision >= 1 / 60 - 1 / 3600 && $precision < 1 / 60 ) {
+				$precision = 1 / 60;
+			}
+		}
+
 		if ( $format === self::TYPE_DD || $precision >= 1 ) {
 			return $this->getInDecimalDegreeFormat( $degrees, $precision );
 		}
@@ -321,9 +329,11 @@ private function getInDecimalDegreeFormat( $floatDegrees, $precision ) {
 	private function getInDegreeMinuteSecondFormat( $floatDegrees, $precision ) {
 		$isNegative = $floatDegrees < 0;
 		$secondDigits = $this->getSignificantDigits( 3600, $precision );
+
 		$seconds = round( abs( $floatDegrees ) * 3600, max( 0, $secondDigits ) );
 		$minutes = (int)( $seconds / 60 );
 		$degrees = (int)( $minutes / 60 );
+
 		$seconds -= $minutes * 60;
 		$minutes -= $degrees * 60;
 
@@ -353,8 +363,10 @@ private function getInDegreeMinuteSecondFormat( $floatDegrees, $precision ) {
 	private function getInDecimalMinuteFormat( $floatDegrees, $precision ) {
 		$isNegative = $floatDegrees < 0;
 		$minuteDigits = $this->getSignificantDigits( 60, $precision );
+
 		$minutes = round( abs( $floatDegrees ) * 60, max( 0, $minuteDigits ) );
 		$degrees = (int)( $minutes / 60 );
+
 		$minutes -= $degrees * 60;
 
 		$space = $this->getSpacing( self::OPT_SPACE_COORDPARTS );

tests/unit/Formatters/GeoCoordinateFormatterTest.php

@@ -275,6 +275,16 @@ public function decimalMinuteNotationProvider() {
 				0.1 / 60,
 				'-0° 0.1\', 0° 0.1\''
 			),
+			'round to degree when it does not make a difference' => array(
+				new LatLongValue( 1.5, 2.5 ),
+				1 - 1 / 60,
+				'2°, 3°'
+			),
+			'round to minutes when it starts making a difference' => array(
+				new LatLongValue( 1.5, 2.5 ),
+				1 - 2 / 60,
+				'1° 56\', 2° 54\''
+			),
 			'precision option must support strings' => array(
 				new LatLongValue( -0.05, 0.05 ),
 				'0.1',
@@ -396,6 +406,26 @@ public function decimalMinuteSecondNotationProvider() {
 				0.1 / 3600,
 				'-0° 0\' 0.1", 0° 0\' 0.1"'
 			),
+			'round to degree when it does not make a difference' => array(
+				new LatLongValue( 1.5, 2.5 ),
+				1 - 1 / 60,
+				'2°, 3°'
+			),
+			'round to minutes when it starts making a difference' => array(
+				new LatLongValue( 1.5, 2.5 ),
+				1 - 2 / 60,
+				'1° 56\', 2° 54\''
+			),
+			'round to minutes when it does not make a difference' => array(
+				new LatLongValue( 1.926, 2.926 ),
+				1 / 60 - 1 / 3600,
+				'1° 56\', 2° 56\''
+			),
+			'round to seconds when it starts making a difference' => array(
+				new LatLongValue( 1.926, 2.926 ),
+				1 / 60 - 2 / 3600,
+				'1° 56\' 0", 2° 55\' 56"'
+			),
 			'unexpected rounding to 36°, 36°' => array(
 				new LatLongValue( 36.5867, 37.0458 ),
 				1.1187604885913,