Added SRID to GeometryInterface and Geometry models. Updated query builder.

grimzy · grimzy · commit cb05acf58c0c · 2019-02-07T01:13:00.000-05:00
diff --git a/src/Eloquent/BaseBuilder.php b/src/Eloquent/BaseBuilder.php
@@ -8,10 +8,16 @@ class BaseBuilder extends QueryBuilder
 {
     protected function cleanBindings(array $bindings)
     {
-        $bindings = array_map(function ($binding) {
-            return $binding instanceof SpatialExpression ? $binding->getSpatialValue() : $binding;
-        }, $bindings);
+        $spatialBindings = [];
+        foreach ($bindings as &$binding) {
+            if ($binding instanceof SpatialExpression) {
+                $spatialBindings[] = $binding->getSpatialValue();
+                $spatialBindings[] = $binding->getSrid();
+            } else {
+                $spatialBindings[] = $binding;
+            }
+        }
 
-        return parent::cleanBindings($bindings);
+        return parent::cleanBindings($spatialBindings);
     }
 }
diff --git a/src/Eloquent/SpatialExpression.php b/src/Eloquent/SpatialExpression.php
@@ -8,11 +8,16 @@ class SpatialExpression extends Expression
 {
     public function getValue()
     {
-        return 'ST_GeomFromText(?)';
+        return 'ST_GeomFromText(?, ?)';
     }
 
     public function getSpatialValue()
     {
         return $this->value->toWkt();
     }
+
+    public function getSrid()
+    {
+        return $this->value->getSrid();
+    }
 }
diff --git a/src/Types/Factory.php b/src/Types/Factory.php
@@ -6,41 +6,41 @@ class Factory implements \GeoIO\Factory
 {
     public function createPoint($dimension, array $coordinates, $srid = null)
     {
-        return new Point($coordinates['y'], $coordinates['x']);
+        return new Point($coordinates['y'], $coordinates['x'], $srid);
     }
 
     public function createLineString($dimension, array $points, $srid = null)
     {
-        return new LineString($points);
+        return new LineString($points, $srid);
     }
 
     public function createLinearRing($dimension, array $points, $srid = null)
     {
-        return new LineString($points);
+        return new LineString($points, $srid);
     }
 
     public function createPolygon($dimension, array $lineStrings, $srid = null)
     {
-        return new Polygon($lineStrings);
+        return new Polygon($lineStrings, $srid);
     }
 
     public function createMultiPoint($dimension, array $points, $srid = null)
     {
-        return new MultiPoint($points);
+        return new MultiPoint($points, $srid);
     }
 
     public function createMultiLineString($dimension, array $lineStrings, $srid = null)
     {
-        return new MultiLineString($lineStrings);
+        return new MultiLineString($lineStrings, $srid);
     }
 
     public function createMultiPolygon($dimension, array $polygons, $srid = null)
     {
-        return new MultiPolygon($polygons);
+        return new MultiPolygon($polygons, $srid);
     }
 
     public function createGeometryCollection($dimension, array $geometries, $srid = null)
     {
-        return new GeometryCollection($geometries);
+        return new GeometryCollection($geometries, $srid);
     }
 }
diff --git a/src/Types/Geometry.php b/src/Types/Geometry.php
@@ -19,6 +19,22 @@ abstract class Geometry implements GeometryInterface, Jsonable, \JsonSerializabl
         7 => GeometryCollection::class,
     ];
 
+    protected $srid;
+
+    public function __construct($srid = 0)
+    {
+        $this->srid = (int) $srid;
+    }
+
+    public function getSrid() {
+        return $this->srid;
+    }
+
+    public function setSrid($srid)
+    {
+        $this->srid = (int) $srid;
+    }
+
     public static function getWKTArgument($value)
     {
         $left = strpos($value, '(');
@@ -61,11 +77,11 @@ public static function fromWKB($wkb)
         return $parser->parse($wkb);
     }
 
-    public static function fromWKT($wkt)
+    public static function fromWKT($wkt, $srid = 0)
     {
         $wktArgument = static::getWKTArgument($wkt);
 
-        return static::fromString($wktArgument);
+        return static::fromString($wktArgument, $srid);
     }
 
     public static function fromJson($geoJson)
diff --git a/src/Types/GeometryCollection.php b/src/Types/GeometryCollection.php
@@ -23,11 +23,14 @@ class GeometryCollection extends Geometry implements IteratorAggregate, ArrayAcc
 
     /**
      * @param GeometryInterface[] $geometries
+     * @param int $srid
      *
      * @throws InvalidArgumentException
      */
-    public function __construct(array $geometries)
+    public function __construct(array $geometries, $srid = 0)
     {
+        parent::__construct($srid);
+
         $validated = array_filter($geometries, function ($value) {
             return $value instanceof GeometryInterface;
         });
@@ -56,15 +59,15 @@ public function __toString()
         }, $this->items));
     }
 
-    public static function fromString($wktArgument)
+    public static function fromString($wktArgument, $srid = 0)
     {
         $geometry_strings = preg_split('/,\s*(?=[A-Za-z])/', $wktArgument);
 
         return new static(array_map(function ($geometry_string) {
             $klass = Geometry::getWKTClass($geometry_string);
 
             return call_user_func($klass.'::fromWKT', $geometry_string);
-        }, $geometry_strings));
+        }, $geometry_strings), $srid);
     }
 
     public function toArray()
diff --git a/src/Types/GeometryInterface.php b/src/Types/GeometryInterface.php
@@ -6,11 +6,11 @@ interface GeometryInterface
 {
     public function toWKT();
 
-    public static function fromWKT($wkt);
+    public static function fromWKT($wkt, $srid = 0);
 
     public function __toString();
 
-    public static function fromString($wktArgument);
+    public static function fromString($wktArgument, $srid = 0);
 
     public static function fromJson($geoJson);
 }
diff --git a/src/Types/LineString.php b/src/Types/LineString.php
@@ -13,21 +13,21 @@ public function toWKT()
         return sprintf('LINESTRING(%s)', $this->toPairList());
     }
 
-    public static function fromWkt($wkt)
+    public static function fromWkt($wkt, $srid = 0)
     {
         $wktArgument = Geometry::getWKTArgument($wkt);
 
-        return static::fromString($wktArgument);
+        return static::fromString($wktArgument, $srid);
     }
 
-    public static function fromString($wktArgument)
+    public static function fromString($wktArgument, $srid = 0)
     {
         $pairs = explode(',', trim($wktArgument));
         $points = array_map(function ($pair) {
             return Point::fromPair($pair);
         }, $pairs);
 
-        return new static($points);
+        return new static($points, $srid);
     }
 
     public function __toString()
diff --git a/src/Types/MultiLineString.php b/src/Types/MultiLineString.php
@@ -11,8 +11,9 @@ class MultiLineString extends GeometryCollection
 {
     /**
      * @param LineString[] $lineStrings
+     * @param int $srid
      */
-    public function __construct(array $lineStrings)
+    public function __construct(array $lineStrings, $srid = 0)
     {
         if (count($lineStrings) < 1) {
             throw new InvalidArgumentException('$lineStrings must contain at least one entry');
@@ -26,7 +27,7 @@ public function __construct(array $lineStrings)
             throw new InvalidArgumentException('$lineStrings must be an array of LineString');
         }
 
-        parent::__construct($lineStrings);
+        parent::__construct($lineStrings, $srid);
     }
 
     public function getLineStrings()
@@ -39,14 +40,14 @@ public function toWKT()
         return sprintf('MULTILINESTRING(%s)', (string) $this);
     }
 
-    public static function fromString($wktArgument)
+    public static function fromString($wktArgument, $srid = 0)
     {
         $str = preg_split('/\)\s*,\s*\(/', substr(trim($wktArgument), 1, -1));
         $lineStrings = array_map(function ($data) {
             return LineString::fromString($data);
         }, $str);
 
-        return new static($lineStrings);
+        return new static($lineStrings, $srid);
     }
 
     public function __toString()
diff --git a/src/Types/MultiPoint.php b/src/Types/MultiPoint.php
@@ -13,14 +13,14 @@ public function toWKT()
         return sprintf('MULTIPOINT(%s)', (string) $this);
     }
 
-    public static function fromWkt($wkt)
+    public static function fromWkt($wkt, $srid = 0)
     {
         $wktArgument = Geometry::getWKTArgument($wkt);
 
-        return static::fromString($wktArgument);
+        return static::fromString($wktArgument, $srid);
     }
 
-    public static function fromString($wktArgument)
+    public static function fromString($wktArgument, $srid = 0)
     {
         $matches = [];
         preg_match_all('/\(\s*(\d+\s+\d+)\s*\)/', trim($wktArgument), $matches);
@@ -29,7 +29,7 @@ public static function fromString($wktArgument)
             return Point::fromPair($pair);
         }, $matches[1]);
 
-        return new static($points);
+        return new static($points, $srid);
     }
 
     public function __toString()
diff --git a/src/Types/MultiPolygon.php b/src/Types/MultiPolygon.php
@@ -11,8 +11,9 @@ class MultiPolygon extends GeometryCollection
 {
     /**
      * @param Polygon[] $polygons
+     * @param int $srid
      */
-    public function __construct(array $polygons)
+    public function __construct(array $polygons, $srid = 0)
     {
         $validated = array_filter($polygons, function ($value) {
             return $value instanceof Polygon;
@@ -21,7 +22,7 @@ public function __construct(array $polygons)
         if (count($polygons) !== count($validated)) {
             throw new InvalidArgumentException('$polygons must be an array of Polygon');
         }
-        parent::__construct($polygons);
+        parent::__construct($polygons, $srid);
     }
 
     public function toWKT()
@@ -36,14 +37,14 @@ public function __toString()
         }, $this->items));
     }
 
-    public static function fromString($wktArgument)
+    public static function fromString($wktArgument, $srid = 0)
     {
         $parts = preg_split('/(\)\s*\)\s*,\s*\(\s*\()/', $wktArgument, -1, PREG_SPLIT_DELIM_CAPTURE);
         $polygons = static::assembleParts($parts);
 
         return new static(array_map(function ($polygonString) {
             return Polygon::fromString($polygonString);
-        }, $polygons));
+        }, $polygons), $srid);
     }
 
     /**
diff --git a/src/Types/Point.php b/src/Types/Point.php
@@ -12,8 +12,10 @@ class Point extends Geometry
 
     protected $lng;
 
-    public function __construct($lat, $lng)
+    public function __construct($lat, $lng, $srid = 0)
     {
+        parent::__construct($srid);
+
         $this->lat = (float) $lat;
         $this->lng = (float) $lng;
     }
@@ -43,21 +45,21 @@ public function toPair()
         return $this->getLng().' '.$this->getLat();
     }
 
-    public static function fromPair($pair)
+    public static function fromPair($pair, $srid = 0)
     {
         list($lng, $lat) = explode(' ', trim($pair, "\t\n\r \x0B()"));
 
-        return new static((float) $lat, (float) $lng);
+        return new static((float) $lat, (float) $lng, (int)$srid);
     }
 
     public function toWKT()
     {
         return sprintf('POINT(%s)', (string) $this);
     }
 
-    public static function fromString($wktArgument)
+    public static function fromString($wktArgument, $srid = 0)
     {
-        return static::fromPair($wktArgument);
+        return static::fromPair($wktArgument, $srid);
     }
 
     public function __toString()
diff --git a/src/Types/PointCollection.php b/src/Types/PointCollection.php
@@ -9,8 +9,9 @@ abstract class PointCollection extends GeometryCollection
 {
     /**
      * @param Point[] $points
+     * @param int $srid
      */
-    public function __construct(array $points)
+    public function __construct(array $points, $srid = 0)
     {
         if (count($points) < 2) {
             throw new InvalidArgumentException('$points must contain at least two entries');
@@ -24,7 +25,7 @@ public function __construct(array $points)
             throw new InvalidArgumentException('$points must be an array of Points');
         }
 
-        parent::__construct($points);
+        parent::__construct($points, $srid);
     }
 
     public function toPairList()
diff --git a/tests/Integration/IntegrationBaseTestCase.php b/tests/Integration/IntegrationBaseTestCase.php
@@ -22,7 +22,7 @@ public function createApplication()
         $app->make('Illuminate\Contracts\Console\Kernel')->bootstrap();
 
         /**
-         * @param \Illuminate\Config\Repository $config
+         * @param \Illuminate\Contracts\Config\Repository $config
          */
         $config = $app->config;
         $config->set('database.default', 'mysql');
@@ -89,12 +89,15 @@ protected function assertDatabaseHas($table, array $data, $connection = null)
         }
     }
 
-    protected function assertException($exceptionName)
+    protected function assertException($exceptionName, $exceptionMessage = null)
     {
         if (method_exists(parent::class, 'expectException')) {
             parent::expectException($exceptionName);
+            if (!is_null($exceptionMessage)) {
+                $this->expectExceptionMessage($exceptionMessage);
+            }
         } else {
-            $this->setExpectedException($exceptionName);
+            $this->setExpectedException($exceptionName, $exceptionMessage);
         }
     }
 
diff --git a/tests/Integration/Models/GeometryModel.php b/tests/Integration/Models/GeometryModel.php
diff --git a/tests/Integration/Models/NoSpatialFieldsModel.php b/tests/Integration/Models/NoSpatialFieldsModel.php
diff --git a/tests/Integration/Models/WithSridModel.php b/tests/Integration/Models/WithSridModel.php
diff --git a/tests/Integration/SridSpatialTest.php b/tests/Integration/SridSpatialTest.php

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,16 @@ class BaseBuilder extends QueryBuilder`
`8`	`8`	`{`
`9`	`9`	`protected function cleanBindings(array $bindings)`
`10`	`10`	`{`
`11`		`- $bindings = array_map(function ($binding) {`
`12`		`- return $binding instanceof SpatialExpression ? $binding->getSpatialValue() : $binding;`
`13`		`- }, $bindings);`
	`11`	`+ $spatialBindings = [];`
	`12`	`+ foreach ($bindings as &$binding) {`
	`13`	`+ if ($binding instanceof SpatialExpression) {`
	`14`	`+ $spatialBindings[] = $binding->getSpatialValue();`
	`15`	`+ $spatialBindings[] = $binding->getSrid();`
	`16`	`+ } else {`
	`17`	`+ $spatialBindings[] = $binding;`
	`18`	`+ }`
	`19`	`+ }`
`14`	`20`
`15`		`- return parent::cleanBindings($bindings);`
	`21`	`+ return parent::cleanBindings($spatialBindings);`
`16`	`22`	`}`
`17`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,16 @@ class SpatialExpression extends Expression`
`8`	`8`	`{`
`9`	`9`	`public function getValue()`
`10`	`10`	`{`
`11`		`- return 'ST_GeomFromText(?)';`
	`11`	`+ return 'ST_GeomFromText(?, ?)';`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public function getSpatialValue()`
`15`	`15`	`{`
`16`	`16`	`return $this->value->toWkt();`
`17`	`17`	`}`
	`18`	`+`
	`19`	`+ public function getSrid()`
	`20`	`+ {`
	`21`	`+ return $this->value->getSrid();`
	`22`	`+ }`
`18`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,41 +6,41 @@ class Factory implements \GeoIO\Factory`
`6`	`6`	`{`
`7`	`7`	`public function createPoint($dimension, array $coordinates, $srid = null)`
`8`	`8`	`{`
`9`		`- return new Point($coordinates['y'], $coordinates['x']);`
	`9`	`+ return new Point($coordinates['y'], $coordinates['x'], $srid);`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`public function createLineString($dimension, array $points, $srid = null)`
`13`	`13`	`{`
`14`		`- return new LineString($points);`
	`14`	`+ return new LineString($points, $srid);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public function createLinearRing($dimension, array $points, $srid = null)`
`18`	`18`	`{`
`19`		`- return new LineString($points);`
	`19`	`+ return new LineString($points, $srid);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public function createPolygon($dimension, array $lineStrings, $srid = null)`
`23`	`23`	`{`
`24`		`- return new Polygon($lineStrings);`
	`24`	`+ return new Polygon($lineStrings, $srid);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public function createMultiPoint($dimension, array $points, $srid = null)`
`28`	`28`	`{`
`29`		`- return new MultiPoint($points);`
	`29`	`+ return new MultiPoint($points, $srid);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public function createMultiLineString($dimension, array $lineStrings, $srid = null)`
`33`	`33`	`{`
`34`		`- return new MultiLineString($lineStrings);`
	`34`	`+ return new MultiLineString($lineStrings, $srid);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function createMultiPolygon($dimension, array $polygons, $srid = null)`
`38`	`38`	`{`
`39`		`- return new MultiPolygon($polygons);`
	`39`	`+ return new MultiPolygon($polygons, $srid);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public function createGeometryCollection($dimension, array $geometries, $srid = null)`
`43`	`43`	`{`
`44`		`- return new GeometryCollection($geometries);`
	`44`	`+ return new GeometryCollection($geometries, $srid);`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,14 @@ class GeometryCollection extends Geometry implements IteratorAggregate, ArrayAcc`
`23`	`23`
`24`	`24`	`/**`
`25`	`25`	`* @param GeometryInterface[] $geometries`
	`26`	`+ * @param int $srid`
`26`	`27`	`*`
`27`	`28`	`* @throws InvalidArgumentException`
`28`	`29`	`*/`
`29`		`- public function __construct(array $geometries)`
	`30`	`+ public function __construct(array $geometries, $srid = 0)`
`30`	`31`	`{`
	`32`	`+ parent::__construct($srid);`
	`33`	`+`
`31`	`34`	`$validated = array_filter($geometries, function ($value) {`
`32`	`35`	`return $value instanceof GeometryInterface;`
`33`	`36`	`});`
`@@ -56,15 +59,15 @@ public function __toString()`
`56`	`59`	`}, $this->items));`
`57`	`60`	`}`
`58`	`61`
`59`		`- public static function fromString($wktArgument)`
	`62`	`+ public static function fromString($wktArgument, $srid = 0)`
`60`	`63`	`{`
`61`	`64`	`$geometry_strings = preg_split('/,\s*(?=[A-Za-z])/', $wktArgument);`
`62`	`65`
`63`	`66`	`return new static(array_map(function ($geometry_string) {`
`64`	`67`	`$klass = Geometry::getWKTClass($geometry_string);`
`65`	`68`
`66`	`69`	`return call_user_func($klass.'::fromWKT', $geometry_string);`
`67`		`- }, $geometry_strings));`
	`70`	`+ }, $geometry_strings), $srid);`
`68`	`71`	`}`
`69`	`72`
`70`	`73`	`public function toArray()`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@ interface GeometryInterface`
`6`	`6`	`{`
`7`	`7`	`public function toWKT();`
`8`	`8`
`9`		`- public static function fromWKT($wkt);`
	`9`	`+ public static function fromWKT($wkt, $srid = 0);`
`10`	`10`
`11`	`11`	`public function __toString();`
`12`	`12`
`13`		`- public static function fromString($wktArgument);`
	`13`	`+ public static function fromString($wktArgument, $srid = 0);`
`14`	`14`
`15`	`15`	`public static function fromJson($geoJson);`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,21 +13,21 @@ public function toWKT()`
`13`	`13`	`return sprintf('LINESTRING(%s)', $this->toPairList());`
`14`	`14`	`}`
`15`	`15`
`16`		`- public static function fromWkt($wkt)`
	`16`	`+ public static function fromWkt($wkt, $srid = 0)`
`17`	`17`	`{`
`18`	`18`	`$wktArgument = Geometry::getWKTArgument($wkt);`
`19`	`19`
`20`		`- return static::fromString($wktArgument);`
	`20`	`+ return static::fromString($wktArgument, $srid);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public static function fromString($wktArgument)`
	`23`	`+ public static function fromString($wktArgument, $srid = 0)`
`24`	`24`	`{`
`25`	`25`	`$pairs = explode(',', trim($wktArgument));`
`26`	`26`	`$points = array_map(function ($pair) {`
`27`	`27`	`return Point::fromPair($pair);`
`28`	`28`	`}, $pairs);`
`29`	`29`
`30`		`- return new static($points);`
	`30`	`+ return new static($points, $srid);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public function __toString()`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,9 @@ class MultiLineString extends GeometryCollection`
`11`	`11`	`{`
`12`	`12`	`/**`
`13`	`13`	`* @param LineString[] $lineStrings`
	`14`	`+ * @param int $srid`
`14`	`15`	`*/`
`15`		`- public function __construct(array $lineStrings)`
	`16`	`+ public function __construct(array $lineStrings, $srid = 0)`
`16`	`17`	`{`
`17`	`18`	`if (count($lineStrings) < 1) {`
`18`	`19`	`throw new InvalidArgumentException('$lineStrings must contain at least one entry');`
`@@ -26,7 +27,7 @@ public function __construct(array $lineStrings)`
`26`	`27`	`throw new InvalidArgumentException('$lineStrings must be an array of LineString');`
`27`	`28`	`}`
`28`	`29`
`29`		`- parent::__construct($lineStrings);`
	`30`	`+ parent::__construct($lineStrings, $srid);`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`public function getLineStrings()`
`@@ -39,14 +40,14 @@ public function toWKT()`
`39`	`40`	`return sprintf('MULTILINESTRING(%s)', (string) $this);`
`40`	`41`	`}`
`41`	`42`
`42`		`- public static function fromString($wktArgument)`
	`43`	`+ public static function fromString($wktArgument, $srid = 0)`
`43`	`44`	`{`
`44`	`45`	`$str = preg_split('/\)\s,\s\(/', substr(trim($wktArgument), 1, -1));`
`45`	`46`	`$lineStrings = array_map(function ($data) {`
`46`	`47`	`return LineString::fromString($data);`
`47`	`48`	`}, $str);`
`48`	`49`
`49`		`- return new static($lineStrings);`
	`50`	`+ return new static($lineStrings, $srid);`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`public function __toString()`
Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,14 @@ public function toWKT()`
`13`	`13`	`return sprintf('MULTIPOINT(%s)', (string) $this);`
`14`	`14`	`}`
`15`	`15`
`16`		`- public static function fromWkt($wkt)`
	`16`	`+ public static function fromWkt($wkt, $srid = 0)`
`17`	`17`	`{`
`18`	`18`	`$wktArgument = Geometry::getWKTArgument($wkt);`
`19`	`19`
`20`		`- return static::fromString($wktArgument);`
	`20`	`+ return static::fromString($wktArgument, $srid);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public static function fromString($wktArgument)`
	`23`	`+ public static function fromString($wktArgument, $srid = 0)`
`24`	`24`	`{`
`25`	`25`	`$matches = [];`
`26`	`26`	`preg_match_all('/\(\s(\d+\s+\d+)\s\)/', trim($wktArgument), $matches);`
`@@ -29,7 +29,7 @@ public static function fromString($wktArgument)`
`29`	`29`	`return Point::fromPair($pair);`
`30`	`30`	`}, $matches[1]);`
`31`	`31`
`32`		`- return new static($points);`
	`32`	`+ return new static($points, $srid);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public function __toString()`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,9 @@ class MultiPolygon extends GeometryCollection`
`11`	`11`	`{`
`12`	`12`	`/**`
`13`	`13`	`* @param Polygon[] $polygons`
	`14`	`+ * @param int $srid`
`14`	`15`	`*/`
`15`		`- public function __construct(array $polygons)`
	`16`	`+ public function __construct(array $polygons, $srid = 0)`
`16`	`17`	`{`
`17`	`18`	`$validated = array_filter($polygons, function ($value) {`
`18`	`19`	`return $value instanceof Polygon;`
`@@ -21,7 +22,7 @@ public function __construct(array $polygons)`
`21`	`22`	`if (count($polygons) !== count($validated)) {`
`22`	`23`	`throw new InvalidArgumentException('$polygons must be an array of Polygon');`
`23`	`24`	`}`
`24`		`- parent::__construct($polygons);`
	`25`	`+ parent::__construct($polygons, $srid);`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`public function toWKT()`
`@@ -36,14 +37,14 @@ public function __toString()`
`36`	`37`	`}, $this->items));`
`37`	`38`	`}`
`38`	`39`
`39`		`- public static function fromString($wktArgument)`
	`40`	`+ public static function fromString($wktArgument, $srid = 0)`
`40`	`41`	`{`
`41`	`42`	`$parts = preg_split('/(\)\s\)\s,\s\(\s\()/', $wktArgument, -1, PREG_SPLIT_DELIM_CAPTURE);`
`42`	`43`	`$polygons = static::assembleParts($parts);`
`43`	`44`
`44`	`45`	`return new static(array_map(function ($polygonString) {`
`45`	`46`	`return Polygon::fromString($polygonString);`
`46`		`- }, $polygons));`
	`47`	`+ }, $polygons), $srid);`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`/**`