Merge pull request #180 from DataValues/fix-multi-parse

Fix multi parse regression in GlobeCoordinateParser

README.md

@@ -104,6 +104,10 @@ employees for the [Wikidata project](https://wikidata.org/).
 
 ## Release notes
 
+### 4.2.1 (2019-12-18)
+
+* Fixed `GlobeCoordinateParser` not being able to parse multiple values (4.2.0 regression)
+
 ### 4.2.0 (2019-09-20)
 
 * Added `GlobeCoordinateValue::withPrecision`

src/PackagePrivate/LatLongPrecisionParser.php

@@ -40,17 +40,19 @@ public function parse( string $coordinate ): PreciseLatLong {
 	 */
 	private function getParsers(): iterable {
 		if ( $this->parsers === null ) {
-			$this->parsers = new \CachingIterator( $this->getNewParsers(), \CachingIterator::FULL_CACHE );
+			$this->parsers = $this->getNewParsers();
 		}
 
 		return $this->parsers;
 	}
 
-	private function getNewParsers(): \Generator {
-		yield new PrecisionParser( new FloatCoordinateParser( $this->options ), new FloatPrecisionDetector() );
-		yield new PrecisionParser( new DmsCoordinateParser( $this->options ), new DmsPrecisionDetector() );
-		yield new PrecisionParser( new DmCoordinateParser( $this->options ), new DmPrecisionDetector() );
-		yield new PrecisionParser( new DdCoordinateParser( $this->options ), new FloatPrecisionDetector() );
+	private function getNewParsers(): array {
+		return [
+			new PrecisionParser( new FloatCoordinateParser( $this->options ), new FloatPrecisionDetector() ),
+			new PrecisionParser( new DmsCoordinateParser( $this->options ), new DmsPrecisionDetector() ),
+			new PrecisionParser( new DmCoordinateParser( $this->options ), new DmPrecisionDetector() ),
+			new PrecisionParser( new DdCoordinateParser( $this->options ), new FloatPrecisionDetector() )
+		];
 	}
 
 }

tests/unit/PackagePrivate/LatLongPrecisionParserTest.php

@@ -0,0 +1,34 @@
+<?php
+
+declare( strict_types = 1 );
+
+namespace Tests\DataValues\Geo\PackagePrivate;
+
+use DataValues\Geo\PackagePrivate\LatLongPrecisionParser;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @covers \DataValues\Geo\PackagePrivate\LatLongPrecisionParser
+ * @license GPL-2.0-or-later
+ */
+class LatLongPrecisionParserTest extends TestCase {
+
+	public function testSuccessiveFloatParses() {
+		$parser = new LatLongPrecisionParser();
+
+		$this->assertEquals(
+			$parser->parse( 'S5.5 W37' ),
+			$parser->parse( 'S5.5 W37' )
+		);
+	}
+
+	public function testSuccessiveDmsParses() {
+		$parser = new LatLongPrecisionParser();
+
+		$this->assertEquals(
+			$parser->parse( '55° 0\' 0", 37° 0\' 0"' ),
+			$parser->parse( '55° 0\' 0", 37° 0\' 0"' )
+		);
+	}
+
+}

tests/unit/Parsers/GlobeCoordinateParserTest.php

@@ -259,4 +259,18 @@ public function precisionDetectionProvider() {
 		];
 	}
 
+	public function testCanParseSuccessiveValues() {
+		$parser = new GlobeCoordinateParser();
+
+		$this->assertEquals(
+			$parser->parse( 'S5.5 W37' ),
+			$parser->parse( 'S5.5 W37' )
+		);
+
+		$this->assertEquals(
+			$parser->parse( '55° 0\' 0", 37° 0\' 0"' ),
+			$parser->parse( '55° 0\' 0", 37° 0\' 0"' )
+		);
+	}
+
 }