where touches; fix tests

Author: MatanYadaev

src/Builders/SpatialBuilder.php

@@ -69,14 +69,21 @@ public function whereWithin(string $column, Geometry | string $geometryOrColumn)
     {
         $geometryOrColumn = $this->toExpression($geometryOrColumn);
 
-        return $this->orderByRaw("ST_WITHIN(`{$column}`, {$geometryOrColumn})");
+        return $this->whereRaw("ST_WITHIN(`{$column}`, {$geometryOrColumn})");
     }
 
     public function whereContains(string $column, Geometry | string $geometryOrColumn): self
     {
         $geometryOrColumn = $this->toExpression($geometryOrColumn);
 
-        return $this->orderByRaw("ST_CONTAINS(`{$column}`, {$geometryOrColumn})");
+        return $this->whereRaw("ST_CONTAINS(`{$column}`, {$geometryOrColumn})");
+    }
+
+    public function whereTouches(string $column, Geometry | string $geometryOrColumn): self
+    {
+        $geometryOrColumn = $this->toExpression($geometryOrColumn);
+
+        return $this->whereRaw("ST_TOUCHES(`{$column}`, {$geometryOrColumn})");
     }
 
     protected function toExpression(Geometry | string $geometryOrColumn): Expression

tests/Builders/SpatialBuilderTest.php

@@ -5,6 +5,7 @@
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use MatanYadaev\EloquentSpatial\Objects\MultiPolygon;
 use MatanYadaev\EloquentSpatial\Objects\Point;
+use MatanYadaev\EloquentSpatial\Objects\Polygon;
 use MatanYadaev\EloquentSpatial\Tests\TestCase;
 use MatanYadaev\EloquentSpatial\Tests\TestModels\TestPlace;
 
@@ -173,11 +174,11 @@ public function it_orders_by_distance_sphere(): void
     public function it_filters_by_within(): void
     {
         TestPlace::factory()->create([
-            'multi_polygon' => MultiPolygon::fromJson('{"type":"MultiPolygon","coordinates":[[[[55.5,23.1],[55.6,23.2],[55.7,23.3],[55.5,23.1]]]]}'),
+            'point' => new Point(23.1, 55.5),
         ]);
 
         $testPlace = TestPlace::query()
-            ->whereWithin('multi_polygon', new Point(23.1, 55.51))
+            ->whereWithin('point', MultiPolygon::fromJson('{"type":"MultiPolygon","coordinates":[[[[55.5,23.0],[55.4,23.2],[55.8,23.3],[55.5,23.0]]]]}'))
             ->first();
 
         $this->assertNotNull($testPlace);
@@ -187,11 +188,25 @@ public function it_filters_by_within(): void
     public function it_filters_by_contains(): void
     {
         TestPlace::factory()->create([
-            'point' => new Point(23.1, 55.51),
+            'multi_polygon' => MultiPolygon::fromJson('{"type":"MultiPolygon","coordinates":[[[[55.5,23.0],[55.4,23.2],[55.8,23.3],[55.5,23.0]]]]}'),
+        ]);
+
+        $testPlace = TestPlace::query()
+            ->whereContains('multi_polygon', new Point(23.1, 55.5))
+            ->first();
+
+        $this->assertNotNull($testPlace);
+    }
+
+    /** @test */
+    public function it_filters_by_touches(): void
+    {
+        TestPlace::factory()->create([
+            'point' => new Point(23.1, 55.5),
         ]);
 
         $testPlace = TestPlace::query()
-            ->whereContains('point', MultiPolygon::fromJson('{"type":"MultiPolygon","coordinates":[[[[55.5,23.1],[55.6,23.2],[55.7,23.3],[55.5,23.1]]]]}'))
+            ->whereTouches('point', MultiPolygon::fromJson('{"type":"MultiPolygon","coordinates":[[[[55.5,23.1],[55.6,23.2],[55.7,23.3],[55.5,23.1]]]]}'))
             ->first();
 
         $this->assertNotNull($testPlace);