Rearranged parameters of spatial analysis Eloquent scopes and fixed tests accordingly

Author: grimzy

src/Eloquent/SpatialTrait.php

@@ -72,25 +72,25 @@ public function getSpatialFields()
         }
     }
 
-    public function scopeDistance($query, $distance, $geometry, $column_name, $exclude_self = false)
+    public function scopeDistance($query, $geometryColumn, $geometry, $distance, $exclude_self = false)
     {
-        $query->whereRaw("st_distance(`{$column_name}`, GeomFromText('{$geometry->toWkt()}')) <= {$distance}");
+        $query->whereRaw("st_distance(`{$geometryColumn}`, GeomFromText('{$geometry->toWkt()}')) <= {$distance}");
 
         if ($exclude_self) {
-            $query->whereRaw("st_distance(`{$column_name}`, GeomFromText('{$geometry->toWkt()}')) != 0");
+            $query->whereRaw("st_distance(`{$geometryColumn}`, GeomFromText('{$geometry->toWkt()}')) != 0");
         }
 
         return $query;
     }
 
-    public function scopeDistanceValue($query, $geometry, $column_name)
+    public function scopeDistanceValue($query, $geometryColumn, $geometry)
     {
         $columns = $query->getQuery()->columns;
 
         if (! $columns) {
             $query->select('*');
         }
-        $query->selectRaw("st_distance(`{$column_name}`, GeomFromText('{$geometry->toWkt()}')) as distance");
+        $query->selectRaw("st_distance(`{$geometryColumn}`, GeomFromText('{$geometry->toWkt()}')) as distance");
     }
 
     public function scopeComparison($query, $geometryColumn, $geometry, $relationship)

tests/Integration/SpatialTest.php

@@ -192,20 +192,20 @@ public function testDistance()
         $loc3->location = new Point(3, 3); // Distance from loc1: 2.8284271247462
         $loc3->save();
 
-        $a = GeometryModel::distance(2, $loc1->location, 'location')->get();
+        $a = GeometryModel::distance('location', $loc1->location, 2)->get();
         $this->assertCount(2, $a);
         $this->assertTrue($a->contains('location', $loc1->location));
         $this->assertTrue($a->contains('location', $loc2->location));
         $this->assertFalse($a->contains('location', $loc3->location));
 
         // Excluding self
-        $b = GeometryModel::distance(2, $loc1->location, 'location', true)->get();
+        $b = GeometryModel::distance('location', $loc1->location, 2, true)->get();
         $this->assertCount(1, $b);
         $this->assertFalse($b->contains('location',$loc1->location));
         $this->assertTrue($b->contains('location',$loc2->location));
         $this->assertFalse($b->contains('location',$loc3->location));
 
-        $c = GeometryModel::distance(1, $loc1->location, 'location')->get();
+        $c = GeometryModel::distance('location', $loc1->location, 1)->get();
         $this->assertCount(1, $c);
         $this->assertTrue($c->contains('location', $loc1->location));
         $this->assertFalse($c->contains('location', $loc2->location));
@@ -222,7 +222,7 @@ public function testDistanceValue()
         $loc2->location = new Point(2, 2); // Distance from loc1: 1.4142135623731
         $loc2->save();
 
-        $a = GeometryModel::distanceValue($loc1->location, 'location')->get();
+        $a = GeometryModel::distanceValue('location', $loc1->location)->get();
         $this->assertCount(2, $a);
         $this->assertEquals(0, $a[0]->distance);
         $this->assertEquals(1.4142135623, $a[1]->distance); // PHP floats' 11th+ digits don't matter

tests/Unit/Eloquent/SpatialTraitTest.php

@@ -194,7 +194,7 @@ public function testInsertUpdateGeometryCollectionHasCorrectSql()
     public function testScopeDistance()
     {
         $point = new Point(1, 2);
-        $query = TestModel::Distance(10, $point, 'point');
+        $query = TestModel::Distance('point', $point, 10);
 
         $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
@@ -205,7 +205,7 @@ public function testScopeDistance()
     public function testScopeDistanceExcludingSelf()
     {
         $point = new Point(1, 2);
-        $query = TestModel::Distance(10, $point, 'point', true);
+        $query = TestModel::Distance('point', $point, 10, true);
 
         $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
@@ -217,7 +217,7 @@ public function testScopeDistanceExcludingSelf()
     public function testScopeDistanceValue()
     {
         $point = new Point(1, 2);
-        $query = TestModel::DistanceValue($point, 'point');
+        $query = TestModel::DistanceValue('point', $point);
 
         $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();
@@ -230,7 +230,7 @@ public function testScopeDistanceValue()
     public function testScopeDistanceValueWithSelect()
     {
         $point = new Point(1, 2);
-        $query = TestModel::select('some_column')->distanceValue($point, 'point');
+        $query = TestModel::select('some_column')->distanceValue('point', $point);
 
         $this->assertInstanceOf(\Grimzy\LaravelMysqlSpatial\Eloquent\Builder::class, $query);
         $q = $query->getQuery();