Skip to content

updated distance query handling #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abnegate merged 2 commits into from
Aug 26, 2025
Merged

updated distance query handling #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cffbfd6
updated distance query handling
ArnabChatterjee20k Aug 26, 2025
966c3cd
added missing return type
ArnabChatterjee20k Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/Database/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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]]);
}

/**
Expand Down
Loading