updates

Author: yassir3wad

src/Postgis.php

@@ -15,15 +15,14 @@ trait Postgis
      * @param Point $location
      * @return Builder
      */
-    public function scopeWithDistance(Builder $query, Point $location = null)
+    public function scopeWithDistance(Builder $query, $location)
     {
         $classQuery = $query->getQuery();
 
         if ($classQuery && !$classQuery->columns) {
             $query->select([$classQuery->from . '.*']);
         }
 
-
         if ($location) {
             $longitude = $location->getLng();
             $latitude = $location->getLat();
@@ -58,18 +57,18 @@ public function scopeWithGeofence(Builder $query, Point $location = null, $inner
      * @param float $units
      * @return Builder
      */
-    public function scopeWhereDistance(Builder $query, Point $location, $operator, $units)
+    public function scopeWhereDistance(Builder $query, $location, $operator, $units)
     {
         $classQuery = $query->getQuery();
 
         if ($classQuery && !$classQuery->columns) {
             $query->select([$classQuery->from . '.*']);
         }
 
-        $longitude = $location ? $location->getLng() : null;
-        $latitude = $location ? $location->getLat() : null;
+        if ($location) {
+            $longitude = $location->getLng();
+            $latitude = $location->getLat();
 
-        if ($longitude && $latitude) {
             $q = "ST_Distance({$this->getLocationColumn()},ST_Point({$longitude},{$latitude}))";
         } else {
             $q = "0";
@@ -101,5 +100,4 @@ private function getDivisionFactor()
 
         return $division;
     }
-
 }