Refactor spatial query handling to improve clarity and consistency in distance calculations

Author: ArnabChatterjee20k

src/Database/Adapter/MariaDB.php

@@ -1368,7 +1368,7 @@ protected function handleDistanceSpatialQueries(Query $query, array &$binds, str
         $binds[":{$placeholder}_0"] = $this->convertArrayToWKT($distanceParams[0]);
         $binds[":{$placeholder}_1"] = $distanceParams[1];
 
-        $meters = isset($distanceParams[2]) && $distanceParams[2] === true;
+        $useMeters = isset($distanceParams[2]) && $distanceParams[2] === true;
 
         switch ($query->getMethod()) {
             case Query::TYPE_DISTANCE_EQUAL:
@@ -1387,7 +1387,7 @@ protected function handleDistanceSpatialQueries(Query $query, array &$binds, str
                 throw new DatabaseException('Unknown spatial query method: ' . $query->getMethod());
         }
 
-        if ($meters) {
+        if ($useMeters) {
             return "ST_DISTANCE_SPHERE({$alias}.{$attribute}, ST_GeomFromText(:{$placeholder}_0), 6371000) {$operator} :{$placeholder}_1";
         }
         return "ST_Distance({$alias}.{$attribute}, ST_GeomFromText(:{$placeholder}_0)) {$operator} :{$placeholder}_1";

src/Database/Adapter/MySQL.php

@@ -114,9 +114,14 @@ protected function handleDistanceSpatialQueries(Query $query, array &$binds, str
                 throw new DatabaseException('Unknown spatial query method: ' . $query->getMethod());
         }
 
-        $unit = $useMeters ? ", 'meter'" : '';
+        if ($useMeters) {
+            $attr = "ST_SRID({$alias}.{$attribute}, " . Database::SRID . ")";
+            $geom = "ST_GeomFromText(:{$placeholder}_0, " . Database::SRID . ")";
+            return "ST_Distance({$attr}, {$geom}, 'metre') {$operator} :{$placeholder}_1";
+        }
 
-        return "ST_Distance({$alias}.{$attribute}, ST_GeomFromText(:{$placeholder}_0){$unit}) {$operator} :{$placeholder}_1";
+        // Without meters, use default behavior
+        return "ST_Distance({$alias}.{$attribute}, ST_GeomFromText(:{$placeholder}_0)) {$operator} :{$placeholder}_1";
     }
 
     public function getSupportForIndexArray(): bool