Fix displaying svg points with x or y zero

Points where at least one coordinate is non-zero are definitely valid. Only points with x and y zero may be invalid. Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
MoonE · Nov 3, 2024 · b3ba7c5 · b3ba7c5
1 parent bdf9afc
commit b3ba7c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/libraries/classes/Gis/GisMultiPoint.php b/libraries/classes/Gis/GisMultiPoint.php
@@ -199,7 +199,7 @@ public function prepareRowAsSvg($spatial, $label, $point_color, array $scale_dat
 
         $row = '';
         foreach ($points_arr as $point) {
-            if (((float) $point[0]) === 0.0 || ((float) $point[1]) === 0.0) {
+            if (((float) $point[0]) === 0.0 && ((float) $point[1]) === 0.0) {
                 continue;
             }
 

diff --git a/libraries/classes/Gis/GisPoint.php b/libraries/classes/Gis/GisPoint.php
@@ -192,7 +192,7 @@ public function prepareRowAsSvg($spatial, $label, $point_color, array $scale_dat
         $points_arr = $this->extractPoints($point, $scale_data);
 
         $row = '';
-        if (((float) $points_arr[0][0]) !== 0.0 && ((float) $points_arr[0][1]) !== 0.0) {
+        if (((float) $points_arr[0][0]) !== 0.0 || ((float) $points_arr[0][1]) !== 0.0) {
             $row .= '<circle cx="' . $points_arr[0][0]
                 . '" cy="' . $points_arr[0][1] . '" r="3"';
             foreach ($point_options as $option => $val) {

diff --git a/test/classes/Gis/GisPointTest.php b/test/classes/Gis/GisPointTest.php
@@ -260,12 +260,8 @@ public function testPrepareRowAsSvg(
         array $scaleData,
         string $output
     ): void {
-        self::assertSame($output, $this->object->prepareRowAsSvg(
-            $spatial,
-            $label,
-            $pointColor,
-            $scaleData
-        ));
+        $string = $this->object->prepareRowAsSvg($spatial, $label, $pointColor, $scaleData);
+        self::assertMatchesRegularExpressionCompat($output, $string);
     }
 
     /**
@@ -286,7 +282,8 @@ public static function providerForPrepareRowAsSvg(): array
                     'scale' => 2,
                     'height' => 150,
                 ],
-                '',
+                '/^<circle cx="0" cy="218" r="3" name="svg" id="svg\d+" class="point vector"'
+                . ' fill="white" stroke="#B02EE0" stroke-width="2"\/>$/',
             ],
         ];
     }