Add Geometry::withSRID()

brick · Mar 30, 2019 · e778dc0 · e778dc0
1 parent 3f2bdde
commit e778dc0
Show file tree

Hide file tree

Showing 20 changed files with 256 additions and 1 deletion.
diff --git a/src/CoordinateSystem.php b/src/CoordinateSystem.php
@@ -8,6 +8,8 @@
 
 /**
  * Represents the dimensionality and spatial reference system of a geometry.
+ *
+ * This class is immutable.
  */
 class CoordinateSystem
 {
@@ -82,7 +84,6 @@ public static function xym(int $srid = 0) : CoordinateSystem
         return new self(false, true, $srid);
     }
 
-
     /**
      * Returns a CoordinateSystem with X, Y, Z and M coordinates, and an optional SRID.
      *
@@ -179,6 +180,25 @@ public function spatialDimension() : int
         return $this->hasZ ? 3 : 2;
     }
 
+    /**
+     * Returns a copy of this CoordinateSystem with the SRID altered.
+     *
+     * @param int $srid
+     *
+     * @return CoordinateSystem
+     */
+    public function withSRID(int $srid) : CoordinateSystem
+    {
+        if ($srid === $this->srid) {
+            return $this;
+        }
+
+        $that = clone $this;
+        $that->srid = $srid;
+
+        return $that;
+    }
+
     /**
      * @param Geometry    $reference  The geometry holding the reference coordinate system.
      * @param Geometry ...$geometries The geometries to check against this coordinate system.

diff --git a/src/Geometry.php b/src/Geometry.php
@@ -724,6 +724,25 @@ public function coordinateSystem() : CoordinateSystem
         return $this->coordinateSystem;
     }
 
+    /**
+     * Returns a copy of this Geometry, with the SRID altered.
+     *
+     * @param int $srid
+     *
+     * @return static
+     */
+    public function withSRID(int $srid) : Geometry
+    {
+        if ($srid === $this->SRID()) {
+            return $this;
+        }
+
+        $that = clone $this;
+        $that->coordinateSystem = $that->coordinateSystem->withSRID($srid);
+
+        return $that;
+    }
+
     /**
      * Returns the raw coordinates of this geometry as an array.
      *

diff --git a/src/Proxy/CircularStringProxy.php b/src/Proxy/CircularStringProxy.php
@@ -331,4 +331,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }
diff --git a/src/Proxy/CompoundCurveProxy.php b/src/Proxy/CompoundCurveProxy.php
@@ -331,4 +331,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }
diff --git a/src/Proxy/CurvePolygonProxy.php b/src/Proxy/CurvePolygonProxy.php
@@ -319,4 +319,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }
diff --git a/src/Proxy/CurveProxy.php b/src/Proxy/CurveProxy.php
@@ -271,6 +271,18 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Proxy/GeometryCollectionProxy.php b/src/Proxy/GeometryCollectionProxy.php
@@ -319,4 +319,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }
diff --git a/src/Proxy/GeometryProxy.php b/src/Proxy/GeometryProxy.php
@@ -259,6 +259,18 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Proxy/LineStringProxy.php b/src/Proxy/LineStringProxy.php
@@ -331,4 +331,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }
diff --git a/src/Proxy/MultiCurveProxy.php b/src/Proxy/MultiCurveProxy.php
@@ -319,4 +319,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }
diff --git a/src/Proxy/MultiLineStringProxy.php b/src/Proxy/MultiLineStringProxy.php
@@ -319,4 +319,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }
diff --git a/src/Proxy/MultiPointProxy.php b/src/Proxy/MultiPointProxy.php
@@ -319,4 +319,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }
diff --git a/src/Proxy/MultiPolygonProxy.php b/src/Proxy/MultiPolygonProxy.php
@@ -319,4 +319,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }
diff --git a/src/Proxy/MultiSurfaceProxy.php b/src/Proxy/MultiSurfaceProxy.php
@@ -319,4 +319,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }
diff --git a/src/Proxy/PointProxy.php b/src/Proxy/PointProxy.php
@@ -319,4 +319,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }
diff --git a/src/Proxy/PolygonProxy.php b/src/Proxy/PolygonProxy.php
@@ -319,4 +319,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }
diff --git a/src/Proxy/PolyhedralSurfaceProxy.php b/src/Proxy/PolyhedralSurfaceProxy.php
@@ -307,4 +307,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }
diff --git a/src/Proxy/SurfaceProxy.php b/src/Proxy/SurfaceProxy.php
@@ -247,6 +247,18 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Proxy/TINProxy.php b/src/Proxy/TINProxy.php
@@ -307,4 +307,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }
diff --git a/src/Proxy/TriangleProxy.php b/src/Proxy/TriangleProxy.php
@@ -319,4 +319,16 @@ public function coordinateSystem() : \Brick\Geo\CoordinateSystem
         return $this->proxyGeometry->coordinateSystem();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function withSRID(int $srid) : \Brick\Geo\Geometry
+    {
+        if ($this->proxyGeometry === null) {
+            $this->load();
+        }
+
+        return $this->proxyGeometry->withSRID($srid);
+    }
+
 }