Use array_reduce() in getBoundingBox()

brick · Mar 8, 2025 · a9228c0 · a9228c0
1 parent 71c49d1
commit a9228c0
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 42 deletions.
diff --git a/src/CircularString.php b/src/CircularString.php
@@ -145,13 +145,11 @@ public function geometryTypeBinary() : int
     #[Override]
     public function getBoundingBox() : BoundingBox
     {
-        $boundingBox = BoundingBox::new();
-
-        foreach ($this->points as $point) {
-            $boundingBox = $boundingBox->extendedWithPoint($point);
-        }
-
-        return $boundingBox;
+        return array_reduce(
+            $this->points,
+            fn (BoundingBox $boundingBox, Point $point) => $boundingBox->extendedWithPoint($point),
+            BoundingBox::new(),
+        );
     }
 
     /**

diff --git a/src/CompoundCurve.php b/src/CompoundCurve.php
@@ -154,13 +154,11 @@ public function geometryTypeBinary() : int
     #[Override]
     public function getBoundingBox() : BoundingBox
     {
-        $boundingBox = BoundingBox::new();
-
-        foreach ($this->curves as $curve) {
-            $boundingBox = $boundingBox->extendedWithBoundingBox($curve->getBoundingBox());
-        }
-
-        return $boundingBox;
+        return array_reduce(
+            $this->curves,
+            fn (BoundingBox $boundingBox, Curve $curve) => $boundingBox->extendedWithBoundingBox($curve->getBoundingBox()),
+            BoundingBox::new(),
+        );
     }
 
     /**

diff --git a/src/CurvePolygon.php b/src/CurvePolygon.php
@@ -136,13 +136,11 @@ public function geometryTypeBinary() : int
     #[Override]
     public function getBoundingBox() : BoundingBox
     {
-        $boundingBox = BoundingBox::new();
-
-        foreach ($this->rings as $ring) {
-            $boundingBox = $boundingBox->extendedWithBoundingBox($ring->getBoundingBox());
-        }
-
-        return $boundingBox;
+        return array_reduce(
+            $this->rings,
+            fn (BoundingBox $boundingBox, Curve $ring) => $boundingBox->extendedWithBoundingBox($ring->getBoundingBox()),
+            BoundingBox::new(),
+        );
     }
 
     #[Override]

diff --git a/src/LineString.php b/src/LineString.php
@@ -187,13 +187,11 @@ public function geometryTypeBinary() : int
     #[Override]
     public function getBoundingBox() : BoundingBox
     {
-        $boundingBox = BoundingBox::new();
-
-        foreach ($this->points as $point) {
-            $boundingBox = $boundingBox->extendedWithPoint($point);
-        }
-
-        return $boundingBox;
+        return array_reduce(
+            $this->points,
+            fn (BoundingBox $boundingBox, Point $point) => $boundingBox->extendedWithPoint($point),
+            BoundingBox::new()
+        );
     }
 
     /**

diff --git a/src/Polygon.php b/src/Polygon.php
@@ -178,13 +178,11 @@ public function geometryTypeBinary() : int
     #[Override]
     public function getBoundingBox() : BoundingBox
     {
-        $boundingBox = BoundingBox::new();
-
-        foreach ($this->rings as $ring) {
-            $boundingBox = $boundingBox->extendedWithBoundingBox($ring->getBoundingBox());
-        }
-
-        return $boundingBox;
+        return array_reduce(
+            $this->rings,
+            fn (BoundingBox $carry, LineString $ring) => $carry->extendedWithBoundingBox($ring->getBoundingBox()),
+            BoundingBox::new()
+        );
     }
 
     /**

diff --git a/src/PolyhedralSurface.php b/src/PolyhedralSurface.php
@@ -157,13 +157,11 @@ public function geometryTypeBinary() : int
     #[Override]
     public function getBoundingBox() : BoundingBox
     {
-        $boundingBox = BoundingBox::new();
-
-        foreach ($this->patches as $patch) {
-            $boundingBox = $boundingBox->extendedWithBoundingBox($patch->getBoundingBox());
-        }
-
-        return $boundingBox;
+        return array_reduce(
+            $this->patches,
+            fn (BoundingBox $boundingBox, Polygon $patch) => $boundingBox->extendedWithBoundingBox($patch->getBoundingBox()),
+            BoundingBox::new(),
+        );
     }
 
     /**