cleaner SpatialBuilder

Author: MatanYadaev

README.md

@@ -1,7 +1,7 @@
 # Laravel Eloquent Spatial
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/matanyadaev/laravel-eloquent-spatial.svg?style=flat-square)](https://packagist.org/packages/matanyadaev/laravel-eloquent-spatial)
-![GitHub Workflow Status](https://img.shields.io/github/workflow/status/matanyadaev/laravel-eloquent-spatial/Tests?label=tests)
+![Tests](https://img.shields.io/github/workflow/status/matanyadaev/laravel-eloquent-spatial/Tests?label=tests)
 ![Lint](https://github.com/matanyadaev/laravel-eloquent-spatial/workflows/Lint/badge.svg)
 [![Total Downloads](https://img.shields.io/packagist/dt/matanyadaev/laravel-eloquent-spatial.svg?style=flat-square)](https://packagist.org/packages/matanyadaev/laravel-eloquent-spatial)
 

src/SpatialBuilder.php

@@ -15,8 +15,6 @@ public function withDistance(
         Geometry | string $geometryOrColumn,
         string $alias = 'distance'
     ): self {
-        $geometryOrColumn = $this->toExpression($geometryOrColumn);
-
         if (! $this->getQuery()->columns) {
             $this->select('*');
         }
@@ -25,7 +23,7 @@ public function withDistance(
             sprintf(
                 'ST_DISTANCE(%s, %s) AS %s',
                 "`{$column}`",
-                $geometryOrColumn,
+                $this->toExpression($geometryOrColumn),
                 $alias,
             )
         );
@@ -37,13 +35,11 @@ public function whereDistance(
         string $operator,
         int | float $value
     ): self {
-        $geometryOrColumn = $this->toExpression($geometryOrColumn);
-
         return $this->whereRaw(
             sprintf(
                 'ST_DISTANCE(%s, %s) %s %s',
                 "`{$column}`",
-                $geometryOrColumn,
+                $this->toExpression($geometryOrColumn),
                 $operator,
                 $value,
             )
@@ -55,13 +51,11 @@ public function orderByDistance(
         Geometry | string $geometryOrColumn,
         string $direction = 'asc'
     ): self {
-        $geometryOrColumn = $this->toExpression($geometryOrColumn);
-
         return $this->orderByRaw(
             sprintf(
                 'ST_DISTANCE(%s, %s) %s',
                 "`{$column}`",
-                $geometryOrColumn,
+                $this->toExpression($geometryOrColumn),
                 $direction,
             )
         );
@@ -72,8 +66,6 @@ public function withDistanceSphere(
         Geometry | string $geometryOrColumn,
         string $alias = 'distance'
     ): self {
-        $geometryOrColumn = $this->toExpression($geometryOrColumn);
-
         if (! $this->getQuery()->columns) {
             $this->select('*');
         }
@@ -82,7 +74,7 @@ public function withDistanceSphere(
             sprintf(
                 'ST_DISTANCE_SPHERE(%s, %s) AS %s',
                 "`{$column}`",
-                $geometryOrColumn,
+                $this->toExpression($geometryOrColumn),
                 $alias,
             )
         );
@@ -94,13 +86,11 @@ public function whereDistanceSphere(
         string $operator,
         int | float $value
     ): self {
-        $geometryOrColumn = $this->toExpression($geometryOrColumn);
-
         return $this->whereRaw(
             sprintf(
                 'ST_DISTANCE_SPHERE(%s, %s) %s %s',
                 "`{$column}`",
-                $geometryOrColumn,
+                $this->toExpression($geometryOrColumn),
                 $operator,
                 $value
             )
@@ -112,118 +102,100 @@ public function orderByDistanceSphere(
         Geometry | string $geometryOrColumn,
         string $direction = 'asc'
     ): self {
-        $geometryOrColumn = $this->toExpression($geometryOrColumn);
-
         return $this->orderByRaw(
             sprintf(
                 'ST_DISTANCE_SPHERE(%s, %s) %s',
                 "`{$column}`",
-                $geometryOrColumn,
+                $this->toExpression($geometryOrColumn),
                 $direction
             )
         );
     }
 
     public function whereWithin(string $column, Geometry | string $geometryOrColumn): self
     {
-        $geometryOrColumn = $this->toExpression($geometryOrColumn);
-
         return $this->whereRaw(
             sprintf(
                 'ST_WITHIN(%s, %s)',
                 "`{$column}`",
-                $geometryOrColumn,
+                $this->toExpression($geometryOrColumn),
             )
         );
     }
 
     public function whereContains(string $column, Geometry | string $geometryOrColumn): self
     {
-        $geometryOrColumn = $this->toExpression($geometryOrColumn);
-
         return $this->whereRaw(
             sprintf(
                 'ST_CONTAINS(%s, %s)',
                 "`{$column}`",
-                $geometryOrColumn,
+                $this->toExpression($geometryOrColumn),
             )
         );
     }
 
     public function whereTouches(string $column, Geometry | string $geometryOrColumn): self
     {
-        $geometryOrColumn = $this->toExpression($geometryOrColumn);
-
         return $this->whereRaw(
             sprintf(
                 'ST_TOUCHES(%s, %s)',
                 "`{$column}`",
-                $geometryOrColumn,
+                $this->toExpression($geometryOrColumn),
             )
         );
     }
 
     public function whereIntersects(string $column, Geometry | string $geometryOrColumn): self
     {
-        $geometryOrColumn = $this->toExpression($geometryOrColumn);
-
         return $this->whereRaw(
             sprintf(
                 'ST_INTERSECTS(%s, %s)',
                 "`{$column}`",
-                $geometryOrColumn,
+                $this->toExpression($geometryOrColumn),
             )
         );
     }
 
     public function whereCrosses(string $column, Geometry | string $geometryOrColumn): self
     {
-        $geometryOrColumn = $this->toExpression($geometryOrColumn);
-
         return $this->whereRaw(
             sprintf(
                 'ST_CROSSES(%s, %s)',
                 "`{$column}`",
-                $geometryOrColumn,
+                $this->toExpression($geometryOrColumn),
             )
         );
     }
 
     public function whereDisjoint(string $column, Geometry | string $geometryOrColumn): self
     {
-        $geometryOrColumn = $this->toExpression($geometryOrColumn);
-
         return $this->whereRaw(
             sprintf(
                 'ST_DISJOINT(%s, %s)',
                 "`{$column}`",
-                $geometryOrColumn,
+                $this->toExpression($geometryOrColumn),
             )
         );
     }
 
     public function whereOverlaps(string $column, Geometry | string $geometryOrColumn): self
     {
-        $geometryOrColumn = $this->toExpression($geometryOrColumn);
-
         return $this->whereRaw(
             sprintf(
                 'ST_OVERLAPS(%s, %s)',
                 "`{$column}`",
-                $geometryOrColumn,
+                $this->toExpression($geometryOrColumn),
             )
         );
     }
 
     public function whereEquals(string $column, Geometry | string $geometryOrColumn): self
     {
-        $geometryOrColumn = $this->toExpression($geometryOrColumn);
-
         return $this->whereRaw(
             sprintf(
                 'ST_EQUALS(%s, %s)',
                 "`{$column}`",
-                $geometryOrColumn,
+                $this->toExpression($geometryOrColumn),
             )
         );
     }