Update tests so coordinates of geometries under test don't start with (0, 0).

dekichan · dekichan · commit 057e4cc76fa1 · 2017-09-15T14:22:42.000+02:00
diff --git a/tests/Geometries/GeometryCollectionTest.php b/tests/Geometries/GeometryCollectionTest.php
@@ -15,11 +15,11 @@ protected function setUp()
     {
         $collection = new LineString(
             [
-                new Point(0, 0),
-                new Point(0, 1),
                 new Point(1, 1),
-                new Point(1, 0),
-                new Point(0, 0)
+                new Point(1, 2),
+                new Point(2, 2),
+                new Point(2, 1),
+                new Point(1, 1)
             ]
         );
 
@@ -45,7 +45,7 @@ public function testFromWKT()
     public function testToWKT()
     {
         $this->assertEquals(
-            'GEOMETRYCOLLECTION(LINESTRING(0 0,1 0,1 1,0 1,0 0),POINT(200 100))',
+            'GEOMETRYCOLLECTION(LINESTRING(1 1,2 1,2 2,1 2,1 1),POINT(200 100))',
             $this->collection->toWKT()
         );
     }
@@ -58,7 +58,7 @@ public function testJsonSerialize()
         );
 
         $this->assertSame(
-            '{"type":"GeometryCollection","geometries":[{"type":"LineString","coordinates":[[0,0],[1,0],[1,1],[0,1],[0,0]]},{"type":"Point","coordinates":[200,100]}]}',
+            '{"type":"GeometryCollection","geometries":[{"type":"LineString","coordinates":[[1,1],[2,1],[2,2],[1,2],[1,1]]},{"type":"Point","coordinates":[200,100]}]}',
             json_encode($this->collection->jsonSerialize())
         );
 
diff --git a/tests/Geometries/GeometryTest.php b/tests/Geometries/GeometryTest.php
@@ -14,28 +14,28 @@ class GeometryTest extends BaseTestCase
     public function testGetWKTArgument()
     {
         $this->assertEquals(
-            '0 0',
-            Geometry::getWKTArgument('POINT(0 0)')
+            '1 1',
+            Geometry::getWKTArgument('POINT(1 1)')
         );
         $this->assertEquals(
-            '0 0,1 1,1 2',
-            Geometry::getWKTArgument('LINESTRING(0 0,1 1,1 2)')
+            '1 1,1 2,2 2',
+            Geometry::getWKTArgument('LINESTRING(1 1,1 2,2 2)')
         );
         $this->assertEquals(
-            '(0 0,4 0,4 4,0 4,0 0),(1 1, 2 1, 2 2, 1 2,1 1)',
-            Geometry::getWKTArgument('POLYGON((0 0,4 0,4 4,0 4,0 0),(1 1, 2 1, 2 2, 1 2,1 1))')
+            '(1 1,4 1,4 4,1 4,1 1),(1 1, 2 1, 2 2, 1 2,1 1)',
+            Geometry::getWKTArgument('POLYGON((1 1,4 1,4 4,1 4,1 1),(1 1, 2 1, 2 2, 1 2,1 1))')
         );
         $this->assertEquals(
-            '(0 0),(1 2)',
-            Geometry::getWKTArgument('MULTIPOINT((0 0),(1 2))')
+            '(1 1),(1 2)',
+            Geometry::getWKTArgument('MULTIPOINT((1 1),(1 2))')
         );
         $this->assertEquals(
-            '(0 0,1 1,1 2),(2 3,3 2,5 4)',
-            Geometry::getWKTArgument('MULTILINESTRING((0 0,1 1,1 2),(2 3,3 2,5 4))')
+            '(1 1,1 2,2 2),(2 3,3 2,5 4)',
+            Geometry::getWKTArgument('MULTILINESTRING((1 1,1 2,2 2),(2 3,3 2,5 4))')
         );
         $this->assertEquals(
-            '((0 0,4 0,4 4,0 4,0 0),(1 1,2 1,2 2,1 2,1 1)), ((-1 -1,-1 -2,-2 -2,-2 -1,-1 -1))',
-            Geometry::getWKTArgument('MULTIPOLYGON(((0 0,4 0,4 4,0 4,0 0),(1 1,2 1,2 2,1 2,1 1)), ((-1 -1,-1 -2,-2 -2,-2 -1,-1 -1)))')
+            '((1 1,4 1,4 4,1 4,1 1),(1 1,2 1,2 2,1 2,1 1)), ((-1 -1,-1 -2,-2 -2,-2 -1,-1 -1))',
+            Geometry::getWKTArgument('MULTIPOLYGON(((1 1,4 1,4 4,1 4,1 1),(1 1,2 1,2 2,1 2,1 1)), ((-1 -1,-1 -2,-2 -2,-2 -1,-1 -1)))')
         );
         $this->assertEquals(
             'POINT(2 3),LINESTRING(2 3,3 4)',
diff --git a/tests/Geometries/LineStringTest.php b/tests/Geometries/LineStringTest.php
@@ -9,19 +9,19 @@ class LineStringTest extends BaseTestCase
 
     protected function setUp()
     {
-        $this->points = [new Point(0, 0), new Point(1, 1), new Point(2, 2)];
+        $this->points = [new Point(1, 1), new Point(2, 2), new Point(3, 3)];
     }
 
     public function testToWKT()
     {
         $linestring = new LineString($this->points);
 
-        $this->assertEquals('LINESTRING(0 0,1 1,2 2)', $linestring->toWKT());
+        $this->assertEquals('LINESTRING(1 1,2 2,3 3)', $linestring->toWKT());
     }
 
     public function testFromWKT()
     {
-        $linestring = LineString::fromWkt('LINESTRING(0 0, 1 1, 2 2)');
+        $linestring = LineString::fromWKT('LINESTRING(1 1, 2 2,3 3)');
         $this->assertInstanceOf(LineString::class, $linestring);
 
         $this->assertEquals(3, $linestring->count());
@@ -31,14 +31,14 @@ public function testToString()
     {
         $linestring = new LineString($this->points);
 
-        $this->assertEquals('0 0,1 1,2 2', (string)$linestring);
+        $this->assertEquals('1 1,2 2,3 3', (string)$linestring);
     }
 
     public function testJsonSerialize()
     {
         $lineString = new LineString($this->points);
 
         $this->assertInstanceOf(\GeoJson\Geometry\LineString::class, $lineString->jsonSerialize());
-        $this->assertSame('{"type":"LineString","coordinates":[[0,0],[1,1],[2,2]]}', json_encode($lineString));
+        $this->assertSame('{"type":"LineString","coordinates":[[1,1],[2,2],[3,3]]}', json_encode($lineString));
     }
 }
diff --git a/tests/Geometries/MultiLineStringTest.php b/tests/Geometries/MultiLineStringTest.php
@@ -8,7 +8,7 @@ class MultiLineStringTest extends BaseTestCase
 {
     public function testFromWKT()
     {
-        $multilinestring = MultiLineString::fromWKT('MULTILINESTRING((0 0,1 1,1 2),(2 3,3 2,5 4))');
+        $multilinestring = MultiLineString::fromWKT('MULTILINESTRING((1 1,2 2,2 3),(3 4,4 3,6 5))');
         $this->assertInstanceOf(MultiLineString::class, $multilinestring);
 
         $this->assertSame(2, $multilinestring->count());
@@ -18,26 +18,26 @@ public function testToWKT()
     {
         $collection = new LineString(
             [
-                new Point(0, 0),
-                new Point(0, 1),
                 new Point(1, 1),
-                new Point(1, 0),
-                new Point(0, 0)
+                new Point(1, 2),
+                new Point(2, 2),
+                new Point(2, 1),
+                new Point(1, 1)
             ]
         );
 
         $multilinestring = new MultiLineString([$collection]);
 
-        $this->assertSame('MULTILINESTRING((0 0,1 0,1 1,0 1,0 0))', $multilinestring->toWKT());
+        $this->assertSame('MULTILINESTRING((1 1,2 1,2 2,1 2,1 1))', $multilinestring->toWKT());
     }
 
     public function testJsonSerialize()
     {
-        $multilinestring = MultiLineString::fromWKT('MULTILINESTRING((0 0,1 1,1 2),(2 3,3 2,5 4))');
+        $multilinestring = MultiLineString::fromWKT('MULTILINESTRING((1 1,2 2,2 3),(3 4,4 3,6 5))');
 
         $this->assertInstanceOf(\GeoJson\Geometry\MultiLineString::class, $multilinestring->jsonSerialize());
         $this->assertSame(
-            '{"type":"MultiLineString","coordinates":[[[0,0],[1,1],[1,2]],[[2,3],[3,2],[5,4]]]}',
+            '{"type":"MultiLineString","coordinates":[[[1,1],[2,2],[2,3]],[[3,4],[4,3],[6,5]]]}',
             json_encode($multilinestring)
         );
     }
diff --git a/tests/Geometries/MultiPointTest.php b/tests/Geometries/MultiPointTest.php
@@ -7,28 +7,28 @@ class MultiPointTest extends BaseTestCase
 {
     public function testFromWKT()
     {
-        $multipoint = MultiPoint::fromWkt('MULTIPOINT((0 0),(1 0),(1 1))');
+        $multipoint = MultiPoint::fromWkt('MULTIPOINT((1 1),(2 1),(2 2))');
         $this->assertInstanceOf(MultiPoint::class, $multipoint);
 
         $this->assertEquals(3, $multipoint->count());
     }
 
     public function testToWKT()
     {
-        $collection = [new Point(0, 0), new Point(0, 1), new Point(1, 1)];
+        $collection = [new Point(1, 1), new Point(1, 2), new Point(2, 2)];
 
         $multipoint = new MultiPoint($collection);
 
-        $this->assertEquals('MULTIPOINT((0 0),(1 0),(1 1))', $multipoint->toWKT());
+        $this->assertEquals('MULTIPOINT((1 1),(2 1),(2 2))', $multipoint->toWKT());
     }
 
     public function testJsonSerialize()
     {
-        $collection = [new Point(0, 0), new Point(0, 1), new Point(1, 1)];
+        $collection = [new Point(1, 1), new Point(1, 2), new Point(2, 2)];
 
         $multipoint = new MultiPoint($collection);
 
         $this->assertInstanceOf(\GeoJson\Geometry\MultiPoint::class, $multipoint->jsonSerialize());
-        $this->assertSame('{"type":"MultiPoint","coordinates":[[0,0],[1,0],[1,1]]}', json_encode($multipoint));
+        $this->assertSame('{"type":"MultiPoint","coordinates":[[1,1],[2,1],[2,2]]}', json_encode($multipoint));
     }
 }
diff --git a/tests/Geometries/MultiPolygonTest.php b/tests/Geometries/MultiPolygonTest.php
@@ -16,11 +16,11 @@ protected function setUp()
     {
         $collection1 = new LineString(
             [
-                new Point(0, 0),
-                new Point(0, 1),
                 new Point(1, 1),
-                new Point(1, 0),
-                new Point(0, 0)
+                new Point(1, 2),
+                new Point(2, 2),
+                new Point(2, 1),
+                new Point(1, 1)
             ]
         );
 
@@ -54,19 +54,19 @@ protected function setUp()
 
     public function testFromWKT()
     {
-        $polygon = MultiPolygon::fromWKT(
-            'MULTIPOLYGON(((0 0,4 0,4 4,0 4,0 0),(1 1,2 1,2 2,1 2,1 1)), ((-1 -1,-1 -2,-2 -2,-2 -1,-1 -1)))'
-        );
+        $wkt = 'MULTIPOLYGON(((1 1,2 1,2 2,1 2,1 1),(1 1,2 1,2 2,1 2,1 1)),((-1 -1,-1 -2,-2 -2,-2 -1,-1 -1)))';
+        $polygon = MultiPolygon::fromWKT($wkt);
+        
         $this->assertInstanceOf(MultiPolygon::class, $polygon);
-
         $this->assertEquals(2, $polygon->count());
+        $this->assertEquals($wkt, $polygon->toWKT());
     }
 
 
     public function testToWKT()
     {
         $this->assertEquals(
-            'MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0),(10 10,20 10,20 20,10 20,10 10)),((100 100,200 100,200 200,100 200,100 100)))',
+            'MULTIPOLYGON(((1 1,2 1,2 2,1 2,1 1),(10 10,20 10,20 20,10 20,10 10)),((100 100,200 100,200 200,100 200,100 100)))',
             $this->multiPolygon->toWKT()
         );
     }
@@ -93,7 +93,7 @@ public function testJsonSerialize()
     {
         $this->assertInstanceOf(\GeoJson\Geometry\MultiPolygon::class, $this->multiPolygon->jsonSerialize());
         $this->assertSame(
-            '{"type":"MultiPolygon","coordinates":[[[[0,0],[1,0],[1,1],[0,1],[0,0]],[[10,10],[20,10],[20,20],[10,20],[10,10]]],[[[100,100],[200,100],[200,200],[100,200],[100,100]]]]}',
+            '{"type":"MultiPolygon","coordinates":[[[[1,1],[2,1],[2,2],[1,2],[1,1]],[[10,10],[20,10],[20,20],[10,20],[10,10]]],[[[100,100],[200,100],[200,200],[100,200],[100,100]]]]}',
             json_encode($this->multiPolygon)
         );
     }
diff --git a/tests/Geometries/PolygonTest.php b/tests/Geometries/PolygonTest.php
@@ -12,11 +12,11 @@ protected function setUp()
     {
         $collection = new LineString(
             [
-                new Point(0, 0),
-                new Point(0, 1),
                 new Point(1, 1),
-                new Point(1, 0),
-                new Point(0, 0)
+                new Point(1, 2),
+                new Point(2, 2),
+                new Point(2, 1),
+                new Point(1, 1)
             ]
         );
 
@@ -26,22 +26,24 @@ protected function setUp()
 
     public function testFromWKT()
     {
-        $polygon = Polygon::fromWKT('POLYGON((0 0,4 0,4 4,0 4,0 0),(1 1, 2 1, 2 2, 1 2,1 1))');
+        $wkt = 'POLYGON((1 1,5 1,5 5,1 5,1 1),(2 2,3 2,3 3,2 3,2 2))';
+        $polygon = Polygon::fromWKT($wkt);
         $this->assertInstanceOf(Polygon::class, $polygon);
 
         $this->assertEquals(2, $polygon->count());
+        $this->assertEquals($wkt, $polygon->toWKT());
     }
 
     public function testToWKT()
     {
-        $this->assertEquals('POLYGON((0 0,1 0,1 1,0 1,0 0))', $this->polygon->toWKT());
+        $this->assertEquals('POLYGON((1 1,2 1,2 2,1 2,1 1))', $this->polygon->toWKT());
     }
 
     public function testJsonSerialize()
     {
         $this->assertInstanceOf(\GeoJson\Geometry\Polygon::class, $this->polygon->jsonSerialize());
         $this->assertSame(
-            '{"type":"Polygon","coordinates":[[[0,0],[1,0],[1,1],[0,1],[0,0]]]}',
+            '{"type":"Polygon","coordinates":[[[1,1],[2,1],[2,2],[1,2],[1,1]]]}',
             json_encode($this->polygon)
         );
 

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@ protected function setUp()`
`15`	`15`	`{`
`16`	`16`	`$collection = new LineString(`
`17`	`17`	`[`
`18`		`- new Point(0, 0),`
`19`		`- new Point(0, 1),`
`20`	`18`	`new Point(1, 1),`
`21`		`- new Point(1, 0),`
`22`		`- new Point(0, 0)`
	`19`	`+ new Point(1, 2),`
	`20`	`+ new Point(2, 2),`
	`21`	`+ new Point(2, 1),`
	`22`	`+ new Point(1, 1)`
`23`	`23`	`]`
`24`	`24`	`);`
`25`	`25`
`@@ -45,7 +45,7 @@ public function testFromWKT()`
`45`	`45`	`public function testToWKT()`
`46`	`46`	`{`
`47`	`47`	`$this->assertEquals(`
`48`		`- 'GEOMETRYCOLLECTION(LINESTRING(0 0,1 0,1 1,0 1,0 0),POINT(200 100))',`
	`48`	`+ 'GEOMETRYCOLLECTION(LINESTRING(1 1,2 1,2 2,1 2,1 1),POINT(200 100))',`
`49`	`49`	`$this->collection->toWKT()`
`50`	`50`	`);`
`51`	`51`	`}`
`@@ -58,7 +58,7 @@ public function testJsonSerialize()`
`58`	`58`	`);`
`59`	`59`
`60`	`60`	`$this->assertSame(`
`61`		`- '{"type":"GeometryCollection","geometries":[{"type":"LineString","coordinates":[[0,0],[1,0],[1,1],[0,1],[0,0]]},{"type":"Point","coordinates":[200,100]}]}',`
	`61`	`+ '{"type":"GeometryCollection","geometries":[{"type":"LineString","coordinates":[[1,1],[2,1],[2,2],[1,2],[1,1]]},{"type":"Point","coordinates":[200,100]}]}',`
`62`	`62`	`json_encode($this->collection->jsonSerialize())`
`63`	`63`	`);`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -9,19 +9,19 @@ class LineStringTest extends BaseTestCase`
`9`	`9`
`10`	`10`	`protected function setUp()`
`11`	`11`	`{`
`12`		`- $this->points = [new Point(0, 0), new Point(1, 1), new Point(2, 2)];`
	`12`	`+ $this->points = [new Point(1, 1), new Point(2, 2), new Point(3, 3)];`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public function testToWKT()`
`16`	`16`	`{`
`17`	`17`	`$linestring = new LineString($this->points);`
`18`	`18`
`19`		`- $this->assertEquals('LINESTRING(0 0,1 1,2 2)', $linestring->toWKT());`
	`19`	`+ $this->assertEquals('LINESTRING(1 1,2 2,3 3)', $linestring->toWKT());`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public function testFromWKT()`
`23`	`23`	`{`
`24`		`- $linestring = LineString::fromWkt('LINESTRING(0 0, 1 1, 2 2)');`
	`24`	`+ $linestring = LineString::fromWKT('LINESTRING(1 1, 2 2,3 3)');`
`25`	`25`	`$this->assertInstanceOf(LineString::class, $linestring);`
`26`	`26`
`27`	`27`	`$this->assertEquals(3, $linestring->count());`
`@@ -31,14 +31,14 @@ public function testToString()`
`31`	`31`	`{`
`32`	`32`	`$linestring = new LineString($this->points);`
`33`	`33`
`34`		`- $this->assertEquals('0 0,1 1,2 2', (string)$linestring);`
	`34`	`+ $this->assertEquals('1 1,2 2,3 3', (string)$linestring);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function testJsonSerialize()`
`38`	`38`	`{`
`39`	`39`	`$lineString = new LineString($this->points);`
`40`	`40`
`41`	`41`	`$this->assertInstanceOf(\GeoJson\Geometry\LineString::class, $lineString->jsonSerialize());`
`42`		`- $this->assertSame('{"type":"LineString","coordinates":[[0,0],[1,1],[2,2]]}', json_encode($lineString));`
	`42`	`+ $this->assertSame('{"type":"LineString","coordinates":[[1,1],[2,2],[3,3]]}', json_encode($lineString));`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class MultiLineStringTest extends BaseTestCase`
`8`	`8`	`{`
`9`	`9`	`public function testFromWKT()`
`10`	`10`	`{`
`11`		`- $multilinestring = MultiLineString::fromWKT('MULTILINESTRING((0 0,1 1,1 2),(2 3,3 2,5 4))');`
	`11`	`+ $multilinestring = MultiLineString::fromWKT('MULTILINESTRING((1 1,2 2,2 3),(3 4,4 3,6 5))');`
`12`	`12`	`$this->assertInstanceOf(MultiLineString::class, $multilinestring);`
`13`	`13`
`14`	`14`	`$this->assertSame(2, $multilinestring->count());`
`@@ -18,26 +18,26 @@ public function testToWKT()`
`18`	`18`	`{`
`19`	`19`	`$collection = new LineString(`
`20`	`20`	`[`
`21`		`- new Point(0, 0),`
`22`		`- new Point(0, 1),`
`23`	`21`	`new Point(1, 1),`
`24`		`- new Point(1, 0),`
`25`		`- new Point(0, 0)`
	`22`	`+ new Point(1, 2),`
	`23`	`+ new Point(2, 2),`
	`24`	`+ new Point(2, 1),`
	`25`	`+ new Point(1, 1)`
`26`	`26`	`]`
`27`	`27`	`);`
`28`	`28`
`29`	`29`	`$multilinestring = new MultiLineString([$collection]);`
`30`	`30`
`31`		`- $this->assertSame('MULTILINESTRING((0 0,1 0,1 1,0 1,0 0))', $multilinestring->toWKT());`
	`31`	`+ $this->assertSame('MULTILINESTRING((1 1,2 1,2 2,1 2,1 1))', $multilinestring->toWKT());`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public function testJsonSerialize()`
`35`	`35`	`{`
`36`		`- $multilinestring = MultiLineString::fromWKT('MULTILINESTRING((0 0,1 1,1 2),(2 3,3 2,5 4))');`
	`36`	`+ $multilinestring = MultiLineString::fromWKT('MULTILINESTRING((1 1,2 2,2 3),(3 4,4 3,6 5))');`
`37`	`37`
`38`	`38`	`$this->assertInstanceOf(\GeoJson\Geometry\MultiLineString::class, $multilinestring->jsonSerialize());`
`39`	`39`	`$this->assertSame(`
`40`		`- '{"type":"MultiLineString","coordinates":[[[0,0],[1,1],[1,2]],[[2,3],[3,2],[5,4]]]}',`
	`40`	`+ '{"type":"MultiLineString","coordinates":[[[1,1],[2,2],[2,3]],[[3,4],[4,3],[6,5]]]}',`
`41`	`41`	`json_encode($multilinestring)`
`42`	`42`	`);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,28 +7,28 @@ class MultiPointTest extends BaseTestCase`
`7`	`7`	`{`
`8`	`8`	`public function testFromWKT()`
`9`	`9`	`{`
`10`		`- $multipoint = MultiPoint::fromWkt('MULTIPOINT((0 0),(1 0),(1 1))');`
	`10`	`+ $multipoint = MultiPoint::fromWkt('MULTIPOINT((1 1),(2 1),(2 2))');`
`11`	`11`	`$this->assertInstanceOf(MultiPoint::class, $multipoint);`
`12`	`12`
`13`	`13`	`$this->assertEquals(3, $multipoint->count());`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public function testToWKT()`
`17`	`17`	`{`
`18`		`- $collection = [new Point(0, 0), new Point(0, 1), new Point(1, 1)];`
	`18`	`+ $collection = [new Point(1, 1), new Point(1, 2), new Point(2, 2)];`
`19`	`19`
`20`	`20`	`$multipoint = new MultiPoint($collection);`
`21`	`21`
`22`		`- $this->assertEquals('MULTIPOINT((0 0),(1 0),(1 1))', $multipoint->toWKT());`
	`22`	`+ $this->assertEquals('MULTIPOINT((1 1),(2 1),(2 2))', $multipoint->toWKT());`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public function testJsonSerialize()`
`26`	`26`	`{`
`27`		`- $collection = [new Point(0, 0), new Point(0, 1), new Point(1, 1)];`
	`27`	`+ $collection = [new Point(1, 1), new Point(1, 2), new Point(2, 2)];`
`28`	`28`
`29`	`29`	`$multipoint = new MultiPoint($collection);`
`30`	`30`
`31`	`31`	`$this->assertInstanceOf(\GeoJson\Geometry\MultiPoint::class, $multipoint->jsonSerialize());`
`32`		`- $this->assertSame('{"type":"MultiPoint","coordinates":[[0,0],[1,0],[1,1]]}', json_encode($multipoint));`
	`32`	`+ $this->assertSame('{"type":"MultiPoint","coordinates":[[1,1],[2,1],[2,2]]}', json_encode($multipoint));`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ protected function setUp()`
`16`	`16`	`{`
`17`	`17`	`$collection1 = new LineString(`
`18`	`18`	`[`
`19`		`- new Point(0, 0),`
`20`		`- new Point(0, 1),`
`21`	`19`	`new Point(1, 1),`
`22`		`- new Point(1, 0),`
`23`		`- new Point(0, 0)`
	`20`	`+ new Point(1, 2),`
	`21`	`+ new Point(2, 2),`
	`22`	`+ new Point(2, 1),`
	`23`	`+ new Point(1, 1)`
`24`	`24`	`]`
`25`	`25`	`);`
`26`	`26`
`@@ -54,19 +54,19 @@ protected function setUp()`
`54`	`54`
`55`	`55`	`public function testFromWKT()`
`56`	`56`	`{`
`57`		`- $polygon = MultiPolygon::fromWKT(`
`58`		`- 'MULTIPOLYGON(((0 0,4 0,4 4,0 4,0 0),(1 1,2 1,2 2,1 2,1 1)), ((-1 -1,-1 -2,-2 -2,-2 -1,-1 -1)))'`
`59`		`- );`
	`57`	`+ $wkt = 'MULTIPOLYGON(((1 1,2 1,2 2,1 2,1 1),(1 1,2 1,2 2,1 2,1 1)),((-1 -1,-1 -2,-2 -2,-2 -1,-1 -1)))';`
	`58`	`+ $polygon = MultiPolygon::fromWKT($wkt);`
	`59`	`+`
`60`	`60`	`$this->assertInstanceOf(MultiPolygon::class, $polygon);`
`61`		`-`
`62`	`61`	`$this->assertEquals(2, $polygon->count());`
	`62`	`+ $this->assertEquals($wkt, $polygon->toWKT());`
`63`	`63`	`}`
`64`	`64`
`65`	`65`
`66`	`66`	`public function testToWKT()`
`67`	`67`	`{`
`68`	`68`	`$this->assertEquals(`
`69`		`- 'MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0),(10 10,20 10,20 20,10 20,10 10)),((100 100,200 100,200 200,100 200,100 100)))',`
	`69`	`+ 'MULTIPOLYGON(((1 1,2 1,2 2,1 2,1 1),(10 10,20 10,20 20,10 20,10 10)),((100 100,200 100,200 200,100 200,100 100)))',`
`70`	`70`	`$this->multiPolygon->toWKT()`
`71`	`71`	`);`
`72`	`72`	`}`
`@@ -93,7 +93,7 @@ public function testJsonSerialize()`
`93`	`93`	`{`
`94`	`94`	`$this->assertInstanceOf(\GeoJson\Geometry\MultiPolygon::class, $this->multiPolygon->jsonSerialize());`
`95`	`95`	`$this->assertSame(`
`96`		`- '{"type":"MultiPolygon","coordinates":[[[[0,0],[1,0],[1,1],[0,1],[0,0]],[[10,10],[20,10],[20,20],[10,20],[10,10]]],[[[100,100],[200,100],[200,200],[100,200],[100,100]]]]}',`
	`96`	`+ '{"type":"MultiPolygon","coordinates":[[[[1,1],[2,1],[2,2],[1,2],[1,1]],[[10,10],[20,10],[20,20],[10,20],[10,10]]],[[[100,100],[200,100],[200,200],[100,200],[100,100]]]]}',`
`97`	`97`	`json_encode($this->multiPolygon)`
`98`	`98`	`);`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@ protected function setUp()`
`12`	`12`	`{`
`13`	`13`	`$collection = new LineString(`
`14`	`14`	`[`
`15`		`- new Point(0, 0),`
`16`		`- new Point(0, 1),`
`17`	`15`	`new Point(1, 1),`
`18`		`- new Point(1, 0),`
`19`		`- new Point(0, 0)`
	`16`	`+ new Point(1, 2),`
	`17`	`+ new Point(2, 2),`
	`18`	`+ new Point(2, 1),`
	`19`	`+ new Point(1, 1)`
`20`	`20`	`]`
`21`	`21`	`);`
`22`	`22`
`@@ -26,22 +26,24 @@ protected function setUp()`
`26`	`26`
`27`	`27`	`public function testFromWKT()`
`28`	`28`	`{`
`29`		`- $polygon = Polygon::fromWKT('POLYGON((0 0,4 0,4 4,0 4,0 0),(1 1, 2 1, 2 2, 1 2,1 1))');`
	`29`	`+ $wkt = 'POLYGON((1 1,5 1,5 5,1 5,1 1),(2 2,3 2,3 3,2 3,2 2))';`
	`30`	`+ $polygon = Polygon::fromWKT($wkt);`
`30`	`31`	`$this->assertInstanceOf(Polygon::class, $polygon);`
`31`	`32`
`32`	`33`	`$this->assertEquals(2, $polygon->count());`
	`34`	`+ $this->assertEquals($wkt, $polygon->toWKT());`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`public function testToWKT()`
`36`	`38`	`{`
`37`		`- $this->assertEquals('POLYGON((0 0,1 0,1 1,0 1,0 0))', $this->polygon->toWKT());`
	`39`	`+ $this->assertEquals('POLYGON((1 1,2 1,2 2,1 2,1 1))', $this->polygon->toWKT());`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`public function testJsonSerialize()`
`41`	`43`	`{`
`42`	`44`	`$this->assertInstanceOf(\GeoJson\Geometry\Polygon::class, $this->polygon->jsonSerialize());`
`43`	`45`	`$this->assertSame(`
`44`		`- '{"type":"Polygon","coordinates":[[[0,0],[1,0],[1,1],[0,1],[0,0]]]}',`
	`46`	`+ '{"type":"Polygon","coordinates":[[[1,1],[2,1],[2,2],[1,2],[1,1]]]}',`
`45`	`47`	`json_encode($this->polygon)`
`46`	`48`	`);`
`47`	`49`