From 3786a91cf025f3b15c5784fa1c5b56032f1c76d1 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Fri, 21 Jul 2023 23:21:34 +0200 Subject: [PATCH] Fix #18543 - Unsupported operand types: string - float (#18552) * Fix Unsupported operand types: string - float Signed-off-by: Liviu-Mihail Concioiu * Improve code Signed-off-by: Liviu-Mihail Concioiu --------- Signed-off-by: Liviu-Mihail Concioiu --- libraries/classes/Gis/GisGeometry.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libraries/classes/Gis/GisGeometry.php b/libraries/classes/Gis/GisGeometry.php index cf1189f798..da8be6ff24 100644 --- a/libraries/classes/Gis/GisGeometry.php +++ b/libraries/classes/Gis/GisGeometry.php @@ -241,13 +241,12 @@ abstract class GisGeometry $coordinates = explode(' ', $point); if (isset($coordinates[0], $coordinates[1]) && trim($coordinates[0]) != '' && trim($coordinates[1]) != '') { + $x = floatval(trim($coordinates[0])); + $y = floatval(trim($coordinates[1])); + if ($scale_data != null) { - $x = ($coordinates[0] - $scale_data['x']) * $scale_data['scale']; - $y = $scale_data['height'] - - ($coordinates[1] - $scale_data['y']) * $scale_data['scale']; - } else { - $x = floatval(trim($coordinates[0])); - $y = floatval(trim($coordinates[1])); + $x = floatval(($x - $scale_data['x']) * $scale_data['scale']); + $y = floatval($scale_data['height'] - ($y - $scale_data['y']) * $scale_data['scale']); } } else { $x = 0;