Fixed filtering on negative coordinates was not supported (#75)

loupe-php · Apr 22, 2024 · 68889a2 · 68889a2
1 parent cda7035
commit 68889a2
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 6 deletions.
diff --git a/src/Internal/Filter/Lexer.php b/src/Internal/Filter/Lexer.php
@@ -35,6 +35,8 @@ class Lexer extends AbstractLexer
 
     public const T_LOWER_THAN = 13;
 
+    public const T_MINUS = 20;
+
     public const T_NEGATE = 16;
 
     public const T_NONE = 1;
@@ -106,6 +108,9 @@ protected function getType(mixed &$value): int
             case $value === 'true':
                 return self::T_TRUE;
 
+            case $value === '-':
+                return self::T_MINUS;
+
             case $value === '_geoRadius':
                 return self::T_GEO_RADIUS;
 

diff --git a/src/Internal/Filter/Parser.php b/src/Internal/Filter/Parser.php
@@ -111,6 +111,19 @@ private function addNode(Node $node): self
         return $this;
     }
 
+    private function assertAndExtractFloat(?Token $token, bool $allowNegative = false): float
+    {
+        $multipler = 1;
+        if ($allowNegative && $token !== null && $token->type === Lexer::T_MINUS) {
+            $multipler = -1;
+            $this->lexer->moveNext();
+            $token = $this->lexer->token;
+        }
+
+        $this->assertFloat($token);
+        return (float) $this->lexer->token?->value * $multipler;
+    }
+
     private function assertClosingParenthesis(?Token $token): void
     {
         $this->assertTokenTypes($token, [Lexer::T_CLOSE_PARENTHESIS], "')'");
@@ -232,14 +245,12 @@ private function handleGeoRadius(Engine $engine): void
         $this->validateFilterableAttribute($engine, $attributeName);
 
         $this->lexer->moveNext();
-        $this->assertFloat($this->lexer->lookahead);
         $this->lexer->moveNext();
-        $lat = (float) $this->lexer->token?->value;
+        $lat = $this->assertAndExtractFloat($this->lexer->token, true);
         $this->assertComma($this->lexer->lookahead);
         $this->lexer->moveNext();
-        $this->assertFloat($this->lexer->lookahead);
         $this->lexer->moveNext();
-        $lng = (float) $this->lexer->token?->value;
+        $lng = $this->assertAndExtractFloat($this->lexer->token, true);
         $this->assertComma($this->lexer->lookahead);
         $this->lexer->moveNext();
         $this->assertFloat($this->lexer->lookahead);

diff --git a/tests/Functional/IndexData/restaurants.json b/tests/Functional/IndexData/restaurants.json
@@ -31,5 +31,16 @@
             "lat": 45.4632046,
             "lng": 9.1719421
         }
+    },
+    {
+        "id": 4,
+        "name": "Revire Brasas Bravas",
+        "address": "Av. Corrientes 1124, C1043 Cdad. Autónoma de Buenos Aires, Argentina",
+        "type": "steak",
+        "rating": 10,
+        "location": {
+            "lat": -34.6002321,
+            "lng": -58.3823691
+        }
     }
-]
+]
diff --git a/tests/Functional/SearchTest.php b/tests/Functional/SearchTest.php
@@ -998,6 +998,30 @@ public function testGeoSearch(): void
             'totalHits' => 2,
         ]);
 
+        $searchParameters = SearchParameters::create()
+            ->withAttributesToRetrieve(['id', 'name', 'location'])
+            ->withFilter('_geoRadius(location, -34.5567580, -58.4153774, 10000)') // search with negative coordinates
+            ->withSort(['_geoPoint(location, -34.5567580, -58.4153774):asc'])  // sort with negative coordinates
+        ;
+
+        $this->searchAndAssertResults($loupe, $searchParameters, [
+            'hits' => [
+                [
+                    'id' => 4,
+                    'name' => 'Revire Brasas Bravas',
+                    'location' => [
+                        'lat' => -34.6002321,
+                        'lng' => -58.3823691,
+                    ],
+                ],
+            ],
+            'query' => '',
+            'hitsPerPage' => 20,
+            'page' => 1,
+            'totalPages' => 1,
+            'totalHits' => 1,
+        ]);
+
         $searchParameters = SearchParameters::create()
             ->withAttributesToRetrieve(['id', 'name', 'location', '_geoDistance(location)'])
             ->withSort(['_geoPoint(location, 48.8561446,2.2978204):asc'])
@@ -1032,12 +1056,21 @@ public function testGeoSearch(): void
                     ],
                     '_geoDistance(location)' => 642336,
                 ],
+                [
+                    'id' => 4,
+                    'name' => 'Revire Brasas Bravas',
+                    'location' => [
+                        'lat' => -34.6002321,
+                        'lng' => -58.3823691,
+                    ],
+                    '_geoDistance(location)' => 11046932,
+                ],
             ],
             'query' => '',
             'hitsPerPage' => 20,
             'page' => 1,
             'totalPages' => 1,
-            'totalHits' => 3,
+            'totalHits' => 4,
         ]);
     }
 

diff --git a/tests/Unit/Internal/Filter/ParserTest.php b/tests/Unit/Internal/Filter/ParserTest.php
@@ -161,6 +161,18 @@ public static function filterProvider(): \Generator
             ],
         ];
 
+        yield 'Basic geo filter with negative coordinates' => [
+            '_geoRadius(location, -34.5567580, -58.4153774, 2000)',
+            [
+                [
+                    'attribute' => 'location',
+                    'lat' => -34.5567580,
+                    'lng' => -58.4153774,
+                    'distance' => 2000.0,
+                ],
+            ],
+        ];
+
         yield 'Basic IN filter' => [
             "genres IN ('Drama', 'Action', 'Documentary')",
             [