@fleetbase/fleetops-engine 0.4.4 → 0.4.6

package/server/src/Http/Controllers/Internal/v1/GeocoderController.php

@@ -22,11 +22,11 @@ class GeocoderController extends Controller
         $query  = $request->or(['coordinates', 'query']);
         $single = $request->boolean('single');
 
-        /** @var \Grimzy\LaravelMysqlSpatial\Types\Point $coordinates */
+        /** @var \Fleetbase\LaravelMysqlSpatial\Types\Point $coordinates */
         $coordinates = Utils::getPointFromCoordinates($query);
 
         // if not a valid point error
-        if (!$coordinates instanceof \Grimzy\LaravelMysqlSpatial\Types\Point) {
+        if (!$coordinates instanceof \Fleetbase\LaravelMysqlSpatial\Types\Point) {
             return response()->error('Invalid coordinates provided.');
         }
 

package/server/src/Http/Controllers/Internal/v1/MetricsController.php

@@ -8,6 +8,12 @@ use Illuminate\Http\Request;
 
 class MetricsController extends Controller
 {
+    /**
+     * Gets all key metrics for the current session.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\Response
+     */
     public function all(Request $request)
     {
         $start    = $request->date('start');
@@ -22,54 +28,4 @@ class MetricsController extends Controller
 
         return response()->json($data);
     }
-
-    public function dashboard(Request $request)
-    {
-        $start    = $request->date('start');
-        $end      = $request->date('end');
-        $discover = $request->array('discover', []);
-        $metrics  = [];
-
-        try {
-            $metrics = Metrics::forCompany($request->user()->company, $start, $end)->with($discover)->get();
-        } catch (\Exception $e) {
-            return response()->error($e->getMessage());
-        }
-
-        // metrics format map
-        $metricsFormats = [
-            'earnings'                => 'money',
-            'fuel_costs'              => 'money',
-            'total_distance_traveled' => 'meters',
-        ];
-
-        // dashboard config
-        $dashboardConfig = [
-            [
-                'size'        => 12,
-                'title'       => 'Fleet-Ops Metrics',
-                'classList'   => [],
-                'component'   => null,
-                'queryParams' => [
-                    'start' => ['component' => 'date-picker'],
-                    'end'   => ['component' => 'date-picker'],
-                ],
-                'widgets' => collect($metrics)
-                    ->map(function ($value, $key) use ($metricsFormats) {
-                        return [
-                            'component' => 'count',
-                            'options'   => [
-                                'format' => $metricsFormats[$key] ?? null,
-                                'title'  => str_replace('_', ' ', \Illuminate\Support\Str::title($key)),
-                                'value'  => $value,
-                            ],
-                        ];
-                    })
-                    ->values()
-                    ->toArray(),
-            ],
-        ];
-
-        return response()->json(array_values($dashboardConfig));
-    }
 }

package/server/src/Http/Controllers/Internal/v1/OrderController.php

@@ -381,7 +381,7 @@ class OrderController extends FleetOpsController
         $flow = $activity = Flow::getNextActivity($order);
 
         /**
-         * @var \Grimzy\LaravelMysqlSpatial\Types\Point
+         * @var \Fleetbase\LaravelMysqlSpatial\Types\Point
          */
         $location = $order->getLastLocation();
 
@@ -453,7 +453,7 @@ class OrderController extends FleetOpsController
         }
 
         /**
-         * @var \Grimzy\LaravelMysqlSpatial\Types\Point
+         * @var \Fleetbase\LaravelMysqlSpatial\Types\Point
          */
         $location = $order->getLastLocation();
 

package/server/src/Http/Controllers/Internal/v1/PlaceController.php

@@ -8,7 +8,7 @@ use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Support\Geocoding;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\Internal\BulkDeleteRequest;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;

package/server/src/Http/Filter/PlaceFilter.php

@@ -6,7 +6,7 @@ use Fleetbase\FleetOps\Models\ServiceArea;
 use Fleetbase\FleetOps\Models\Zone;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Filter\Filter;
-use Grimzy\LaravelMysqlSpatial\Types\Geometry;
+use Fleetbase\LaravelMysqlSpatial\Types\Geometry;
 
 class PlaceFilter extends Filter
 {

package/server/src/Http/Resources/v1/Driver.php

@@ -4,8 +4,8 @@ namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class Driver extends FleetbaseResource
 {

package/server/src/Http/Resources/v1/FuelReport.php

@@ -3,8 +3,8 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class FuelReport extends FleetbaseResource
 {

package/server/src/Http/Resources/v1/Issue.php

@@ -3,8 +3,8 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class Issue extends FleetbaseResource
 {

package/server/src/Http/Resources/v1/Payload.php

@@ -43,6 +43,7 @@ class Payload extends FleetbaseResource
     {
         return $this->waypoints->map(function ($waypoint) {
             $waypoint->payload_uuid = $this->uuid;
+
             return $waypoint;
         });
     }

package/server/src/Http/Resources/v1/Place.php

@@ -3,9 +3,9 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
 use Fleetbase\Support\Resolve;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class Place extends FleetbaseResource
 {

package/server/src/Http/Resources/v1/TrackingStatus.php

@@ -4,8 +4,8 @@ namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class TrackingStatus extends FleetbaseResource
 {

package/server/src/Http/Resources/v1/Vehicle.php

@@ -3,8 +3,8 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class Vehicle extends FleetbaseResource
 {

package/server/src/Http/Resources/v1/VehicleWithoutDriver.php

@@ -3,8 +3,8 @@
 namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class VehicleWithoutDriver extends FleetbaseResource
 {

package/server/src/Http/Resources/v1/Waypoint.php

@@ -4,9 +4,9 @@ namespace Fleetbase\FleetOps\Http\Resources\v1;
 
 use Fleetbase\FleetOps\Models\Waypoint as WaypointModel;
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Support\Http;
 use Fleetbase\Support\Resolve;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 
 class Waypoint extends FleetbaseResource
 {
@@ -56,9 +56,7 @@ class Waypoint extends FleetbaseResource
     }
 
     /**
-     * Finds the waypoint got a payload and place
-     *
-     * @return WaypointModel|null
+     * Finds the waypoint got a payload and place.
      */
     private function getWaypoint(): ?WaypointModel
     {

package/server/src/Integrations/Lalamove/LalamoveDeliveryStop.php

@@ -3,8 +3,8 @@
 namespace Fleetbase\FleetOps\Integrations\Lalamove;
 
 use Fleetbase\FleetOps\Models\Place;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialExpression;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialExpression;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Support\Str;
 
 class LalamoveDeliveryStop

package/server/src/Jobs/SimulateWaypointReached.php

@@ -4,7 +4,7 @@ namespace Fleetbase\FleetOps\Jobs;
 
 use Fleetbase\FleetOps\Events\DriverSimulatedLocationChanged;
 use Fleetbase\FleetOps\Models\Driver;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -28,7 +28,7 @@ class SimulateWaypointReached implements ShouldQueue
     public Driver $driver;
 
     /**
-     * @var \Grimzy\LaravelMysqlSpatial\Types\Point the waypoint that the driver is simulated to have reached
+     * @var \Fleetbase\LaravelMysqlSpatial\Types\Point the waypoint that the driver is simulated to have reached
      */
     public Point $waypoint;
 

package/server/src/Models/Contact.php

@@ -13,6 +13,7 @@ use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
 use Illuminate\Notifications\Notifiable;
+use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\CausesActivity;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Sluggable\HasSlug;
@@ -92,25 +93,12 @@ class Contact extends Model
     protected $filterParams = ['place_uuid', 'customer_type', 'facilitator_type', 'place'];
 
     /**
-     * Properties which activity needs to be logged.
-     *
-     * @var array
+     * Get the activity log options for the model.
      */
-    protected static $logAttributes = '*';
-
-    /**
-     * Do not log empty changed.
-     *
-     * @var bool
-     */
-    protected static $submitEmptyLogs = false;
-
-    /**
-     * The name of the subject to log.
-     *
-     * @var string
-     */
-    protected static $logName = 'contact';
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()->logOnly(['*'])->logOnlyDirty();
+    }
 
     /**
      * Get the options for generating the slug.

package/server/src/Models/Driver.php

@@ -7,6 +7,7 @@ use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Scopes\DriverScope;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\FleetOps\Support\Utils as FleetOpsUtils;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasInternalId;
@@ -14,11 +15,11 @@ use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
+use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\CausesActivity;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Sluggable\HasSlug;
@@ -157,25 +158,12 @@ class Driver extends Model
     protected $filterParams = ['vendor', 'facilitator', 'customer', 'fleet', 'photo_uuid', 'avatar_uuid'];
 
     /**
-     * Properties which activity needs to be logged.
-     *
-     * @var array
+     * Get the activity log options for the model.
      */
-    protected static $logAttributes = '*';
-
-    /**
-     * Do not log empty changed.
-     *
-     * @var bool
-     */
-    protected static $submitEmptyLogs = false;
-
-    /**
-     * The name of the subject to log.
-     *
-     * @var string
-     */
-    protected static $logName = 'driver';
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()->logOnly(['*'])->logOnlyDirty();
+    }
 
     /**
      * Get the options for generating the slug.

package/server/src/Models/Fleet.php

@@ -10,6 +10,7 @@ use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
 use Illuminate\Notifications\Notifiable;
+use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Sluggable\HasSlug;
 use Spatie\Sluggable\SlugOptions;
@@ -48,32 +49,12 @@ class Fleet extends Model
     protected $searchableColumns = ['name'];
 
     /**
-     * Properties which activity needs to be logged.
-     *
-     * @var array
+     * Get the activity log options for the model.
      */
-    protected static $logAttributes = ['name', 'task', 'service_area_uuid', 'zone_uuid'];
-
-    /**
-     * Do not log empty changed.
-     *
-     * @var bool
-     */
-    protected static $submitEmptyLogs = false;
-
-    /**
-     * We only want to log changed attributes.
-     *
-     * @var bool
-     */
-    protected static $logOnlyDirty = true;
-
-    /**
-     * The name of the subject to log.
-     *
-     * @var string
-     */
-    protected static $logName = 'fleet';
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()->logOnly(['name', 'task', 'service_area_uuid', 'zone_uuid'])->logOnlyDirty();
+    }
 
     /**
      * The flug options for this model.

package/server/src/Models/FuelReport.php

@@ -5,13 +5,13 @@ namespace Fleetbase\FleetOps\Models;
 use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 
 class FuelReport extends Model
 {

package/server/src/Models/Issue.php

@@ -4,12 +4,12 @@ namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Illuminate\Support\Str;
 
 class Issue extends Model

package/server/src/Models/Order.php

@@ -12,6 +12,7 @@ use Fleetbase\FleetOps\Events\OrderDriverAssigned;
 use Fleetbase\FleetOps\Support\Flow;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\FleetOps\Traits\HasTrackingNumber;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\Transaction;
 use Fleetbase\Traits\HasApiModelBehavior;
@@ -23,9 +24,9 @@ use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
+use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
 
 class Order extends Model
@@ -201,25 +202,12 @@ class Order extends Model
     ];
 
     /**
-     * Properties which activity needs to be logged.
-     *
-     * @var array
-     */
-    protected static $logAttributes = '*';
-
-    /**
-     * Do not log empty changed.
-     *
-     * @var bool
+     * Get the activity log options for the model.
      */
-    protected static $submitEmptyLogs = false;
-
-    /**
-     * The name of the subject to log.
-     *
-     * @var string
-     */
-    protected static $logName = 'order';
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()->logOnly(['*'])->logOnlyDirty();
+    }
 
     /**
      * @return \Barryvdh\DomPDF\PDF
@@ -339,6 +327,14 @@ class Order extends Model
         return $this->hasMany(\Fleetbase\Models\File::class, 'subject_uuid')->latest();
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function customFields()
+    {
+        return $this->hasMany(\Fleetbase\Models\CustomField::class, 'subject_uuid')->orderBy('order');
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
      */

package/server/src/Models/Payload.php

@@ -5,13 +5,13 @@ namespace Fleetbase\FleetOps\Models;
 use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Resources\Internal\v1\Payload as PayloadResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasMetaAttributes;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
@@ -562,7 +562,7 @@ class Payload extends Model
     /**
      * Get the pickup location for the payload.
      *
-     * @return \Grimzy\LaravelMysqlSpatial\Types\Point
+     * @return \Fleetbase\LaravelMysqlSpatial\Types\Point
      */
     public function getPickupLocation()
     {
@@ -653,8 +653,8 @@ class Payload extends Model
     /**
      * Set the first waypoint and update activity.
      *
-     * @param array                                   $activity
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point $location
+     * @param array                                      $activity
+     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point $location
      *
      * @return void
      */
@@ -682,9 +682,9 @@ class Payload extends Model
     /**
      * Update the current waypoint activity and it's entities.
      *
-     * @param array                                   $activity
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point $location
-     * @param \Fleetbase\Models\Proof|string|null     $proof    resolvable proof of delivery/activity
+     * @param array                                      $activity
+     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point $location
+     * @param \Fleetbase\Models\Proof|string|null        $proof    resolvable proof of delivery/activity
      *
      * @return $this
      */

package/server/src/Models/Place.php

@@ -6,6 +6,7 @@ use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Geocoding;
 use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasMetaAttributes;
@@ -14,7 +15,6 @@ use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
@@ -171,7 +171,7 @@ class Place extends Model
     /**
      * Returns a Point instance from the location of the model.
      */
-    public function getLocationAsPoint(): \Grimzy\LaravelMysqlSpatial\Types\Point
+    public function getLocationAsPoint(): \Fleetbase\LaravelMysqlSpatial\Types\Point
     {
         return Utils::getPointFromCoordinates($this->location);
     }
@@ -218,7 +218,7 @@ class Place extends Model
         }
 
         if ($coordinates = $address->getCoordinates()) {
-            $this->setAttribute('location', new \Grimzy\LaravelMysqlSpatial\Types\Point($coordinates->getLatitude(), $coordinates->getLongitude()));
+            $this->setAttribute('location', new \Fleetbase\LaravelMysqlSpatial\Types\Point($coordinates->getLatitude(), $coordinates->getLongitude()));
         }
 
         return $this;
@@ -245,7 +245,7 @@ class Place extends Model
         $attributes['city']         = $address->getLocality();
         $attributes['building']     = $address->getStreetNumber();
         $attributes['country']      = $address->getCountry() instanceof \Geocoder\Model\Country ? $address->getCountry()->getCode() : null;
-        $attributes['location']     = new \Grimzy\LaravelMysqlSpatial\Types\Point($coordinates->getLatitude(), $coordinates->getLongitude());
+        $attributes['location']     = new \Fleetbase\LaravelMysqlSpatial\Types\Point($coordinates->getLatitude(), $coordinates->getLongitude());
 
         return $attributes;
     }
@@ -303,7 +303,7 @@ class Place extends Model
      *
      * @return \Fleetbase\Models\Place|null
      */
-    public static function createFromReverseGeocodingLookup(\Grimzy\LaravelMysqlSpatial\Types\Point $point, $saveInstance = false): ?Place
+    public static function createFromReverseGeocodingLookup(\Fleetbase\LaravelMysqlSpatial\Types\Point $point, $saveInstance = false): ?Place
     {
         $results = Geocoding::reverseFromCoordinates($point->getLat(), $point->getLng());
         $place   = $results->first();
@@ -322,8 +322,8 @@ class Place extends Model
     /**
      * Creates a new Place instance from given coordinates.
      *
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point|array $coordinates
-     * @param bool                                          $saveInstance
+     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point|array $coordinates
+     * @param bool                                             $saveInstance
      *
      * @return \Fleetbase\Models\Place|null
      */
@@ -332,15 +332,15 @@ class Place extends Model
         $instance = new Place();
         $point    = Utils::getPointFromMixed($coordinates);
 
-        if ($coordinates instanceof \Grimzy\LaravelMysqlSpatial\Types\Point) {
+        if ($coordinates instanceof \Fleetbase\LaravelMysqlSpatial\Types\Point) {
             $latitude               = $coordinates->getLat();
             $longitude              = $coordinates->getLng();
-        } elseif ($point instanceof \Grimzy\LaravelMysqlSpatial\Types\Point) {
+        } elseif ($point instanceof \Fleetbase\LaravelMysqlSpatial\Types\Point) {
             $latitude               = $point->getLat();
             $longitude              = $point->getLng();
         }
 
-        $instance->setAttribute('location', new \Grimzy\LaravelMysqlSpatial\Types\Point($latitude, $longitude));
+        $instance->setAttribute('location', new \Fleetbase\LaravelMysqlSpatial\Types\Point($latitude, $longitude));
         $instance->fill($attributes);
 
         $results = \Geocoder\Laravel\Facades\Geocoder::reverse($latitude, $longitude)->get();
@@ -361,8 +361,8 @@ class Place extends Model
     /**
      * Inserts a new place into the database using latitude and longitude coordinates.
      *
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point|array        $coordinates
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point|string|array $coordinates the coordinates to use for the new place
+     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point|array        $coordinates
+     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point|string|array $coordinates the coordinates to use for the new place
      *
      * @return mixed returns the UUID of the new place on success or false on failure
      */
@@ -371,11 +371,11 @@ class Place extends Model
         $attributes = array_merge([], $attributes);
         $point      = Utils::getPointFromMixed($coordinates);
 
-        if ($coordinates instanceof \Grimzy\LaravelMysqlSpatial\Types\Point) {
+        if ($coordinates instanceof \Fleetbase\LaravelMysqlSpatial\Types\Point) {
             $attributes['location'] = $coordinates;
             $latitude               = $coordinates->getLat();
             $longitude              = $coordinates->getLng();
-        } elseif ($point instanceof \Grimzy\LaravelMysqlSpatial\Types\Point) {
+        } elseif ($point instanceof \Fleetbase\LaravelMysqlSpatial\Types\Point) {
             $attributes['location'] = $point;
             $latitude               = $point->getLat();
             $longitude              = $point->getLng();

package/server/src/Models/Position.php

@@ -2,11 +2,11 @@
 
 namespace Fleetbase\FleetOps\Models;
 
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 
 class Position extends Model
 {