Refactor gis file export tests

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>

Author: MoonE

src/Controllers/GisDataEditorController.php

@@ -81,7 +81,7 @@ public function __invoke(ServerRequest $request): Response
         $result = "'" . $wkt . "'," . $srid;
 
         // Generate SVG based visualization
-        $visualizationSettings = new GisVisualizationSettings(450, 300, 'wkt');
+        $visualizationSettings = new GisVisualizationSettings(width: 450, height: 300, spatialColumn: 'wkt');
         $data = [['wkt' => $wktWithZero, 'srid' => $srid]];
 
         $visualization = GisVisualization::getByData($data, $visualizationSettings);

src/Controllers/Table/GisVisualizationController.php

@@ -195,7 +195,7 @@ private function getVisualizationSettings(
         mixed $settingsIn,
     ): GisVisualizationSettings {
         if (! is_array($settingsIn)) {
-            return new GisVisualizationSettings(600, 450, $spatialCandidates[0]);
+            return new GisVisualizationSettings(width: 600, height: 450, spatialColumn: $spatialCandidates[0]);
         }
 
         $labelColumn = '';
@@ -213,7 +213,12 @@ private function getVisualizationSettings(
             true,
         )];
 
-        return new GisVisualizationSettings(600, 450, $spatialColumn, $labelColumn);
+        return new GisVisualizationSettings(
+            width: 600,
+            height: 450,
+            spatialColumn: $spatialColumn,
+            labelColumn: $labelColumn,
+        );
     }
 
     private function getPos(): int

src/Gis/GisVisualization.php

@@ -64,6 +64,8 @@ class GisVisualization
     /** The height of the GIS visualization. */
     private int $height;
 
+    private int $border;
+
     private string $spatialColumn;
 
     private string $labelColumn;
@@ -153,11 +155,11 @@ private function __construct(
         private int $pos = 0,
     ) {
         $this->width = $options->width;
-
         $this->height = $options->height;
 
-        $this->spatialColumn = $options->spatialColumn;
+        $this->border = $options->border;
 
+        $this->spatialColumn = $options->spatialColumn;
         $this->labelColumn = $options->labelColumn;
 
         $this->data = is_string($sqlOrData)
@@ -378,24 +380,29 @@ public function asOl(): array
      */
     public function toFileAsPdf(string $fileName): void
     {
-        // create pdf
-        $pdf = new TCPDF('', 'pt', Config::getInstance()->config->PDFDefaultPageSize, true, 'UTF-8', false);
+        $fileName = $this->sanitizeName($fileName, 'pdf');
+        $pdf = $this->createPdf(Config::getInstance()->config->PDFDefaultPageSize ?? 'A4');
+        $this->prepareDataSet($this->data, 'pdf', $pdf);
+
+        $pdf->Output($fileName, 'D');
+    }
 
-        // disable header and footer
+    private function createPdf(string $format): TCPDF
+    {
+        $pdf = new TCPDF(
+            orientation: 'P',
+            unit: 'mm',
+            format: $format,
+            unicode: true,
+            encoding: 'UTF-8',
+            diskcache: false,
+        );
         $pdf->setPrintHeader(false);
         $pdf->setPrintFooter(false);
-
-        //set auto page breaks
         $pdf->setAutoPageBreak(false);
-
-        // add a page
         $pdf->AddPage();
 
-        $this->prepareDataSet($this->data, 'pdf', $pdf);
-
-        // sanitize file name
-        $fileName = $this->sanitizeName($fileName, 'pdf');
-        $pdf->Output($fileName, 'D');
+        return $pdf;
     }
 
     /**
@@ -444,11 +451,9 @@ private function scaleDataSet(array $data): ScaleData|null
             return null;
         }
 
-        $border = 15;
-
         // effective width and height of the plot
-        $plotWidth = $this->width - 2 * $border;
-        $plotHeight = $this->height - 2 * $border;
+        $plotWidth = $this->width - 2 * $this->border;
+        $plotHeight = $this->height - 2 * $this->border;
 
         // scale the visualization
         $xRatio = ($extent->maxX - $extent->minX) / $plotWidth;
@@ -460,10 +465,10 @@ private function scaleDataSet(array $data): ScaleData|null
         // Center plot
         $x = $ratio === 0.0 || $xRatio < $yRatio
             ? ($extent->maxX + $extent->minX - $this->width / $scale) / 2
-            : $extent->minX - ($border / $scale);
+            : $extent->minX - ($this->border / $scale);
         $y = $ratio === 0.0 || $xRatio >= $yRatio
             ? ($extent->maxY + $extent->minY - $this->height / $scale) / 2
-            : $extent->minY - ($border / $scale);
+            : $extent->minY - ($this->border / $scale);
 
         return new ScaleData(scale: $scale, offsetX: $x, offsetY: $y, height: $this->height);
     }

src/Gis/GisVisualizationSettings.php

@@ -15,6 +15,7 @@ public function __construct(
         public int $height,
         public string $spatialColumn,
         public string $labelColumn = '',
+        public int $border = 15,
     ) {
     }
 }