Merge pull request #126 from clickbar/fix-box-precision

fix(box): use maximum precision in toString
clickbar · Jan 3, 2025 · 07c5507 · 07c5507
2 parents b50a220 + e59ae5c
commit 07c5507
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fixed only using a precision of 6 decimal digits in WKT, now uses the maximum precision
+- Fixed only using default PHP string precision in Box `toString` methods, now uses the maximum precision
 
 ### Removed
 

diff --git a/src/Data/Boxes/Box2D.php b/src/Data/Boxes/Box2D.php
@@ -2,6 +2,7 @@
 
 namespace Clickbar\Magellan\Data\Boxes;
 
+use Clickbar\Magellan\Data\Geometries\GeometryHelper;
 use Illuminate\Database\Grammar;
 
 class Box2D extends Box
@@ -37,7 +38,10 @@ public function getYMax(): float
 
     public function toString(): string
     {
-        return "BOX({$this->xMin} {$this->yMin},{$this->xMax} {$this->yMax})";
+        $min = GeometryHelper::stringifyFloat($this->xMin).' '.GeometryHelper::stringifyFloat($this->yMin);
+        $max = GeometryHelper::stringifyFloat($this->xMax).' '.GeometryHelper::stringifyFloat($this->yMax);
+
+        return "BOX({$min},{$max})";
     }
 
     public function getValue(Grammar $grammar): string

diff --git a/src/Data/Boxes/Box3D.php b/src/Data/Boxes/Box3D.php
@@ -2,6 +2,7 @@
 
 namespace Clickbar\Magellan\Data\Boxes;
 
+use Clickbar\Magellan\Data\Geometries\GeometryHelper;
 use Illuminate\Database\Grammar;
 
 class Box3D extends Box
@@ -47,7 +48,10 @@ public function getZMax(): float
 
     public function toString(): string
     {
-        return "BOX3D({$this->xMin} {$this->yMin} {$this->zMin},{$this->xMax} {$this->yMax} {$this->zMax})";
+        $min = GeometryHelper::stringifyFloat($this->xMin).' '.GeometryHelper::stringifyFloat($this->yMin).' '.GeometryHelper::stringifyFloat($this->zMin);
+        $max = GeometryHelper::stringifyFloat($this->xMax).' '.GeometryHelper::stringifyFloat($this->yMax).' '.GeometryHelper::stringifyFloat($this->zMax);
+
+        return "BOX3D({$min},{$max})";
     }
 
     public function getValue(Grammar $grammar): string

diff --git a/tests/Data/BoxesTest.php b/tests/Data/BoxesTest.php
@@ -0,0 +1,16 @@
+<?php
+
+use Clickbar\Magellan\Data\Boxes\Box2D;
+use Clickbar\Magellan\Data\Boxes\Box3D;
+
+test('Box2D retains precision in toString', function () {
+    $box = Box2D::make(1.123456789012345, 2.123456789, 3.123456789, 4.123456789);
+
+    expect($box->toString())->toBe('BOX(1.123456789012345 2.123456789,3.123456789 4.123456789)');
+});
+
+test('Box3D retains precision in toString', function () {
+    $box = Box3D::make(1.123456789012345, 2.123456789, 2.123456789, 3.123456789, 4.123456789, 6.123456789);
+
+    expect($box->toString())->toBe('BOX3D(1.123456789012345 2.123456789 2.123456789,3.123456789 4.123456789 6.123456789)');
+});