more geometry stuff

Author: ianardee

docs/code_samples/custom_v1.txt

@@ -2,7 +2,7 @@
 
 //
 // DEPRECATED API
-// Support removed in version 2.0.
+// Support removed in version 2.0 of the Mindee PHP library.
 // Use only with version 1.x of the library.
 //
 

src/Extraction/ExtractedImage.php

@@ -86,17 +86,12 @@ public function asInputSource(): BytesInput
      */
     private function getEncodedImageFormat(string $saveFormat): string
     {
-        switch (strtolower($saveFormat)) {
-            case 'png':
-                return 'png';
-            case 'bmp':
-                return 'bmp';
-            case 'gif':
-                return 'gif';
-            case 'webp':
-                return 'webp';
-            default:
-                return 'jpeg';
-        }
+        return match (strtolower($saveFormat)) {
+            'png' => 'png',
+            'bmp', => 'bmp',
+            'gif' => 'gif',
+            'webp' => 'webp',
+            default => 'jpeg',
+        };
     }
 }

src/Extraction/PdfExtractor.php

@@ -180,8 +180,6 @@ public function extractInvoices($pageIndexes, bool $strict = false): array
             $previousConfidence = $confidence;
             $i++;
         }
-
-
         return $this->extractSubDocuments($correctPageIndexes);
     }
 

src/Geometry/BBoxUtils.php

@@ -18,12 +18,11 @@ public static function generateBBoxFromPolygon(?Polygon $polygon): ?BBox
         if (!$polygon || !$polygon->getCoordinates()) {
             return null;
         }
-
         return new BBox(
-            PolygonUtils::getMinXCoordinate($polygon),
-            PolygonUtils::getMaxXCoordinate($polygon),
-            PolygonUtils::getMinYCoordinate($polygon),
-            PolygonUtils::getMaxYCoordinate($polygon),
+            $polygon->getMinX(),
+            $polygon->getMaxX(),
+            $polygon->getMinY(),
+            $polygon->getMaxY(),
         );
     }
 
@@ -38,19 +37,17 @@ public static function generateBBoxFromPolygons(array $polygons): ?BBox
         if (!$polygons) {
             return null;
         }
-
         $merged = $polygons[0];
         foreach ($polygons as $polygon) {
-            if ($merged !== $polygon) {
+            if ($polygon && $merged !== $polygon) {
                 $merged = PolygonUtils::merge($merged, $polygon);
             }
         }
-
         return new BBox(
-            PolygonUtils::getMinXCoordinate($merged),
-            PolygonUtils::getMaxXCoordinate($merged),
-            PolygonUtils::getMinYCoordinate($merged),
-            PolygonUtils::getMaxYCoordinate($merged),
+            $merged->getMinX(),
+            $merged->getMaxX(),
+            $merged->getMinY(),
+            $merged->getMaxY(),
         );
     }
 
@@ -83,7 +80,6 @@ public static function mergeBBoxes(array $bboxes): ?BBox
                 $maxY = $bbox->getMaxY();
             }
         }
-
         return new BBox((float)$minX, (float)$maxX, (float)$minY, (float)$maxY);
     }
 }

src/Geometry/Polygon.php

@@ -2,6 +2,8 @@
 
 namespace Mindee\Geometry;
 
+use Mindee\Error\MindeeGeometryException;
+
 /**
  * Polygon represented as a set of coordinates (vertices/points).
  */
@@ -12,6 +14,16 @@ class Polygon
      */
     public ?array $coordinates;
 
+    /**
+     * @var MinMax Min and max Y values of the polygon.
+     */
+    private MinMax $minMaxY;
+
+    /**
+     * @var MinMax Min and max X values of the polygon.
+     */
+    private MinMax $minMaxX;
+
     /**
      * @param array|null $coordinates Coordinates of the polygon as a set of Points.
      */
@@ -44,7 +56,10 @@ public function getCentroid(): Point
      */
     public function getMinMaxY(): MinMax
     {
-        return MinMaxUtils::getMinMaxY($this->coordinates);
+        if (!isset($this->minMaxY)) {
+            $this->minMaxY = MinMaxUtils::getMinMaxY($this->coordinates);
+        }
+        return $this->minMaxY;
     }
 
     /**
@@ -54,7 +69,10 @@ public function getMinMaxY(): MinMax
      */
     public function getMinMaxX(): MinMax
     {
-        return MinMaxUtils::getMinMaxX($this->coordinates);
+        if (!isset($this->minMaxX)) {
+            $this->minMaxX = MinMaxUtils::getMinMaxX($this->coordinates);
+        }
+        return $this->minMaxX;
     }
 
     /**
@@ -81,6 +99,46 @@ public function isPointInX(Point $point): bool
         return PolygonUtils::isPointInX($point, $minMax->getMin(), $minMax->getMax());
     }
 
+    /**
+     * Retrieves the minimum X coordinate.
+     *
+     * @return float
+     */
+    public function getMinX(): float
+    {
+        return $this->getMinMaxX()->getMin();
+    }
+
+    /**
+     * Retrieves the maximum X coordinate.
+     *
+     * @return float
+     */
+    public function getMaxX(): float
+    {
+        return $this->getMinMaxX()->getMax();
+    }
+
+    /**
+     * Retrieves the minimum Y coordinate.
+     *
+     * @return float
+     */
+    public function getMinY(): float
+    {
+        return $this->getMinMaxY()->getMin();
+    }
+
+    /**
+     * Retrieves the maximum Y coordinate.
+     *
+     * @return float
+     */
+    public function getMaxY(): float
+    {
+        return $this->getMinMaxY()->getMax();
+    }
+
     /**
      * Checks whether the Polygon has coordinates.
      *