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;