gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #18543 - Unsupported operand types: string - float (#18552)

Browse Source 
* Fix Unsupported operand types: string - float

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Improve code

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

---------

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
This commit is contained in:
Liviu-Mihail Concioiu 2023-07-21 23:21:34 +02:00 committed by GitHub
parent aa3496f401
commit 3786a91cf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/classes/Gis/GisGeometry.php
View File

@ -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;