Merge branch 'srid'

Author: sikhlana

src/Eloquent/SpatialExpression.php

@@ -8,7 +8,7 @@ class SpatialExpression extends Expression
 {
     public function getValue()
     {
-        return 'ST_GeomFromText(?, ?)';
+        return "ST_GeomFromText(?, ?, 'axis-order=long-lat')";
     }
 
     public function getSpatialValue()

src/Eloquent/SpatialTrait.php

@@ -132,8 +132,9 @@ public function scopeDistance($query, $geometryColumn, $geometry, $distance)
     {
         $this->isColumnAllowed($geometryColumn);
 
-        $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?)) <= ?", [
+        $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) <= ?", [
             $geometry->toWkt(),
+            $geometry->getSrid(),
             $distance,
         ]);
 
@@ -146,8 +147,9 @@ public function scopeDistanceExcludingSelf($query, $geometryColumn, $geometry, $
 
         $query = $this->scopeDistance($query, $geometryColumn, $geometry, $distance);
 
-        $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?)) != 0", [
+        $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) != 0", [
             $geometry->toWkt(),
+            $geometry->getSrid(),
         ]);
 
         return $query;
@@ -163,17 +165,19 @@ public function scopeDistanceValue($query, $geometryColumn, $geometry)
             $query->select('*');
         }
 
-        $query->selectRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?)) as distance", [
+        $query->selectRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) as distance", [
             $geometry->toWkt(),
+            $geometry->getSrid(),
         ]);
     }
 
     public function scopeDistanceSphere($query, $geometryColumn, $geometry, $distance)
     {
         $this->isColumnAllowed($geometryColumn);
 
-        $query->whereRaw("st_distance_sphere(`$geometryColumn`, ST_GeomFromText(?)) <= ?", [
+        $query->whereRaw("st_distance_sphere(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) <= ?", [
             $geometry->toWkt(),
+            $geometry->getSrid(),
             $distance,
         ]);
 
@@ -186,8 +190,9 @@ public function scopeDistanceSphereExcludingSelf($query, $geometryColumn, $geome
 
         $query = $this->scopeDistanceSphere($query, $geometryColumn, $geometry, $distance);
 
-        $query->whereRaw("st_distance_sphere($geometryColumn, ST_GeomFromText(?)) != 0", [
+        $query->whereRaw("st_distance_sphere($geometryColumn, ST_GeomFromText(?, ?, 'axis-order=long-lat')) != 0", [
             $geometry->toWkt(),
+            $geometry->getSrid(),
         ]);
 
         return $query;
@@ -202,8 +207,9 @@ public function scopeDistanceSphereValue($query, $geometryColumn, $geometry)
         if (!$columns) {
             $query->select('*');
         }
-        $query->selectRaw("st_distance_sphere(`$geometryColumn`, ST_GeomFromText(?)) as distance", [
+        $query->selectRaw("st_distance_sphere(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) as distance", [
             $geometry->toWkt(),
+            $geometry->getSrid(),
         ]);
     }
 
@@ -215,8 +221,9 @@ public function scopeComparison($query, $geometryColumn, $geometry, $relationshi
             throw new UnknownSpatialRelationFunction($relationship);
         }
 
-        $query->whereRaw("st_{$relationship}(`$geometryColumn`, ST_GeomFromText(?))", [
+        $query->whereRaw("st_{$relationship}(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat'))", [
             $geometry->toWkt(),
+            $geometry->getSrid(),
         ]);
 
         return $query;
@@ -270,8 +277,9 @@ public function scopeOrderBySpatial($query, $geometryColumn, $geometry, $orderFu
             throw new UnknownSpatialFunctionException($orderFunction);
         }
 
-        $query->orderByRaw("st_{$orderFunction}(`$geometryColumn`, ST_GeomFromText(?)) {$direction}", [
+        $query->orderByRaw("st_{$orderFunction}(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) {$direction}", [
             $geometry->toWkt(),
+            $geometry->getSrid(),
         ]);
 
         return $query;

tests/Integration/SridSpatialTest.php

@@ -113,22 +113,22 @@ public function testInsertPointWithWrongSrid()
             'of the geometry is 0, but the SRID of the column is 3857. ' .
             'Consider changing the SRID of the geometry or the SRID property ' .
             'of the column. (SQL: insert into `with_srid` (`location`) values ' .
-            '(ST_GeomFromText(POINT(2 1), 0)))'
+            '(ST_GeomFromText(POINT(2 1), 0, \'axis-order=long-lat\')))'
         );
         $geo->save();
     }
 
-//    public function testGeometryInsertedHasRightSrid () {
-//        $geo = new WithSridModel();
-//        $geo->location = new Point(1, 2, 3857);
-//        $geo->save();
-//
-//        $srid = \DB::selectOne('select ST_SRID(location) as srid from with_srid');
-//        $this->assertEquals(3857, $srid->srid);
-//
-//        $result = WithSridModel::first();
-//
-//        $this->assertEquals($geo->location->getSrid(), $result->location->getSrid());
-//        $a = 1;
-//    }
+    public function testGeometryInsertedHasRightSrid () {
+        $geo = new WithSridModel();
+        $geo->location = new Point(1, 2, 3857);
+        $geo->save();
+
+        $srid = \DB::selectOne('select ST_SRID(location) as srid from with_srid');
+        $this->assertEquals(3857, $srid->srid);
+
+        $result = WithSridModel::first();
+
+        $this->assertEquals($geo->location->getSrid(), $result->location->getSrid());
+        $a = 1;
+    }
 }