Merge pull request #673 from ArnabChatterjee20k/spatial-attribute-support

updated distance query handling

Author: abnegate

src/Database/Query.php

@@ -263,6 +263,8 @@ public static function isMethod(string $value): bool
             self::TYPE_NOT_CROSSES,
             self::TYPE_DISTANCE_EQUAL,
             self::TYPE_DISTANCE_NOT_EQUAL,
+            self::TYPE_DISTANCE_GREATER_THAN,
+            self::TYPE_DISTANCE_LESS_THAN,
             self::TYPE_INTERSECTS,
             self::TYPE_NOT_INTERSECTS,
             self::TYPE_OVERLAPS,
@@ -900,47 +902,51 @@ public function setOnArray(bool $bool): void
      *
      * @param string $attribute
      * @param array<mixed> $values
+     * @param int|float $distance
      * @return Query
      */
-    public static function distanceEqual(string $attribute, array $values): self
+    public static function distanceEqual(string $attribute, array $values, int|float $distance): self
     {
-        return new self(self::TYPE_DISTANCE_EQUAL, $attribute, $values);
+        return new self(self::TYPE_DISTANCE_EQUAL, $attribute, [[$values,$distance]]);
     }
 
     /**
      * Helper method to create Query with distanceNotEqual method
      *
      * @param string $attribute
      * @param array<mixed> $values
+     * @param int|float $distance
      * @return Query
      */
-    public static function distanceNotEqual(string $attribute, array $values): self
+    public static function distanceNotEqual(string $attribute, array $values, int|float $distance): self
     {
-        return new self(self::TYPE_DISTANCE_NOT_EQUAL, $attribute, $values);
+        return new self(self::TYPE_DISTANCE_NOT_EQUAL, $attribute, [[$values,$distance]]);
     }
 
     /**
      * Helper method to create Query with distanceGreaterThan method
      *
      * @param string $attribute
      * @param array<mixed> $values
+     * @param int|float $distance
      * @return Query
      */
-    public static function distanceGreaterThan(string $attribute, array $values): self
+    public static function distanceGreaterThan(string $attribute, array $values, int|float $distance): self
     {
-        return new self(self::TYPE_DISTANCE_GREATER_THAN, $attribute, $values);
+        return new self(self::TYPE_DISTANCE_GREATER_THAN, $attribute, [[$values,$distance]]);
     }
 
     /**
      * Helper method to create Query with distanceLessThan method
      *
      * @param string $attribute
      * @param array<mixed> $values
+     * @param int|float $distance
      * @return Query
      */
-    public static function distanceLessThan(string $attribute, array $values): self
+    public static function distanceLessThan(string $attribute, array $values, int|float $distance): self
     {
-        return new self(self::TYPE_DISTANCE_LESS_THAN, $attribute, $values);
+        return new self(self::TYPE_DISTANCE_LESS_THAN, $attribute, [[$values,$distance]]);
     }
 
     /**