Merge pull request #141 from DataValues/2.1.x-backport

Fix parsing of lowercase S/W directions
DataValues · Aug 1, 2018 · d283ebf · d283ebf
2 parents 8fd8829 + 4725bdd
commit d283ebf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/Geo.php b/Geo.php
@@ -15,7 +15,7 @@
 	return 1;
 }
 
-define( 'DATAVALUES_GEO_VERSION', '2.1.1' );
+define( 'DATAVALUES_GEO_VERSION', '2.1.2' );
 
 // Aliases introduced in 1.0
 class_alias( DataValues\Geo\Values\LatLongValue::class, 'DataValues\LatLongValue' );

diff --git a/README.md b/README.md
@@ -93,6 +93,10 @@ It is based upon and contains a lot of code written by [Jeroen De Dauw]
 
 ## Release notes
 
+### 2.1.2 (2018-08-01)
+
+* Fixed parsing of coordinates with lowercase S/W directions
+
 ### 2.1.1 (2017-08-09)
 
 * Allow use with ~0.4.0 of DataValues/Common

diff --git a/src/Parsers/LatLongParserBase.php b/src/Parsers/LatLongParserBase.php
@@ -213,7 +213,7 @@ protected function resolveDirection( $coordinateSegment ) {
 				$matches
 			);
 
-			if ( $matches[1] === $direction || $matches[3] === $direction ) {
+			if ( $matches[1] !== '' || $matches[3] !== '' ) {
 				$coordinateSegment = $matches[2];
 
 				if ( in_array( $direction, [ $s, $w ] ) ) {

diff --git a/tests/unit/Parsers/LatLongParserTest.php b/tests/unit/Parsers/LatLongParserTest.php
@@ -99,6 +99,14 @@ public function validInputProvider() {
 			'0° 0.3\' S 0° 0.3\' W' => [ -0.005, -0.005 ],
 			'-55° 30′ -37° 30′' => [ -55.5, -37.5 ],
 			'S 0° 0.3\' W 0° 0.3\'' => [ -0.005, -0.005 ],
+
+			// case insensitive
+			'55 s, 37.6176330 w' => [ -55, -37.6176330 ],
+			'5.5s,37w ' => [ -5.5, -37 ],
+			'5.5s 37w ' => [ -5.5, -37 ],
+			's5.5 w37 ' => [ -5.5, -37 ],
+			'5.5S 37w ' => [ -5.5, -37 ],
+			'5.5s 37W ' => [ -5.5, -37 ],
 		];
 
 		foreach ( $valid as $value => $expected ) {