Merge remote-tracking branch 'origin/main'

cheesegrits · Mar 26, 2023 · 49d99e1 · 49d99e1
2 parents ac8fc8f + f6cac4b
commit 49d99e1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/src/Fields/Map.php b/src/Fields/Map.php
@@ -57,19 +57,19 @@ class Map extends Field
      * Main field config variables
      */
     private array $mapConfig = [
-        'autocomplete'         => false,
-        'autocompleteReverse'  => false,
-        'geolocate'            => false,
-        'geolocateLabel'       => '',
-        'draggable'            => true,
-        'clickable'            => false,
-        'defaultLocation'      => [
+        'autocomplete'        => false,
+        'autocompleteReverse' => false,
+        'geolocate'           => false,
+        'geolocateLabel'      => '',
+        'draggable'           => true,
+        'clickable'           => false,
+        'defaultLocation'     => [
             'lat' => 15.3419776,
             'lng' => 44.2171392,
         ],
-        'controls'             => [],
-        'drawingControl'       => false,
-        'drawingModes'         => [
+        'controls'       => [],
+        'drawingControl' => false,
+        'drawingModes'   => [
             'marker'    => true,
             'circle'    => true,
             'rectangle' => true,
@@ -231,7 +231,6 @@ public function getGeolocateLabel(): string
     /**
      * Add drawing controls to the map
      *
-     * @param  Closure|bool  $drawingControl
      * @return $this
      */
     public function drawingControl(Closure|bool $drawingControl = true): static
@@ -280,7 +279,6 @@ public function getDrawingField(): ?string
      *    'rectangle' => true,
      * ]
      *
-     * @param  Closure|array  $drawingModes
      * @return $this
      */
     public function drawingModes(Closure|array $drawingModes): static
@@ -424,6 +422,7 @@ public function getMapControls(): string
         $controls = $this->evaluate($this->mapControls);
 
         return json_encode(array_merge($this->controls, $controls), JSON_THROW_ON_ERROR);
+
         return json_encode(array_merge($this->controls, $controls), JSON_THROW_ON_ERROR);
     }
 
@@ -539,7 +538,7 @@ public function mapsHasJs(): bool
 
     public function mapsJsUrl(): string
     {
-        $manifest = json_decode(file_get_contents(__DIR__ . '/../../dist/mix-manifest.json'), true);
+        $manifest = json_decode(file_get_contents(__DIR__.'/../../dist/mix-manifest.json'), true);
 
         return url($manifest['/cheesegrits/filament-google-maps/filament-google-maps.js']);
     }
@@ -551,7 +550,7 @@ public function mapsHasCss(): bool
 
     public function mapsCssUrl(): string
     {
-        $manifest = json_decode(file_get_contents(__DIR__ . '/../../dist/mix-manifest.json'), true);
+        $manifest = json_decode(file_get_contents(__DIR__.'/../../dist/mix-manifest.json'), true);
 
         return url($manifest['/cheesegrits/filament-google-maps/filament-google-maps.css']);
     }

diff --git a/src/Filters/RadiusFilter.php b/src/Filters/RadiusFilter.php
@@ -29,8 +29,7 @@ class RadiusFilter extends BaseFilter
 
     protected int|Closure|null $radius = null;
 
-    protected string | Closure | null $attribute = null;
-
+    protected string|Closure|null $attribute = null;
 
     public function getColumns(): array|int|null
     {
@@ -83,8 +82,8 @@ public function apply(Builder $query, array $data = []): Builder
             //			$sql = "((ACOS(SIN(? * PI() / 180) * SIN(" . $latName . " * PI() / 180) + COS(? * PI() / 180) * COS(" .
             //				$latName . " * PI() / 180) * COS((? - " . $lngName . ") * PI() / 180)) * 180 / PI()) * 60 * ?) as distance";
 
-            $sql = "((ACOS(SIN($latitude * PI() / 180) * SIN(" . $latName . " * PI() / 180) + COS($latitude * PI() / 180) * COS(" .
-                $latName . " * PI() / 180) * COS(($longitude - " . $lngName . ") * PI() / 180)) * 180 / PI()) * 60 * %f) < $distance";
+            $sql = "((ACOS(SIN($latitude * PI() / 180) * SIN(".$latName." * PI() / 180) + COS($latitude * PI() / 180) * COS(".
+                $latName." * PI() / 180) * COS(($longitude - ".$lngName.") * PI() / 180)) * 180 / PI()) * 60 * %f) < $distance";
 
             $sql = sprintf($sql, $kilometers ? (1.1515 * 1.609344) : 1.1515);
 
@@ -257,7 +256,7 @@ public function isRelationship(): bool
         return ! empty($this->getRelationship());
     }
 
-    public function attribute(string | Closure | null $name): static
+    public function attribute(string|Closure|null $name): static
     {
         $this->attribute = $name;