🚑 Hotfix: ManualTrip & GeoService (#3277)

Author: HerrLevin

app/Http/Controllers/Backend/Support/LocationController.php

@@ -114,6 +114,9 @@ public function calculateLivePosition(): ?LivePointDto {
                 $point ?? $recentPoint,
                 $distance < 1 ? 0 : $meters / $distance
             );
+            if ($currentPosition === null) {
+                return null;
+            }
 
             $polyline->features = array_slice($polyline->features, $key);
             array_unshift($polyline->features, Feature::fromCoordinate($currentPosition));

app/Http/Requests/ManualTripCreationRequest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ManualTripCreationRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        if (auth()->user()?->can('disallow-manual-trips')) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'category' => ['required', new Enum(HafasTravelType::class)],
+            'lineName' => ['required'],
+            'journeyNumber' => ['nullable', 'numeric', 'min:1'],
+            'operatorId' => ['nullable', 'numeric', 'exists:hafas_operators,id'],
+            'originId' => ['required', 'exists:train_stations,id'],
+            'originDeparturePlanned' => ['required', 'date'],
+            'originDepartureReal' => ['nullable', 'date'],
+            'destinationId' => ['required', 'exists:train_stations,id'],
+            'destinationArrivalPlanned' => ['required', 'date'],
+            'destinationArrivalReal' => ['nullable', 'date'],
+            'stopovers.*.stationId' => ['required', 'exists:train_stations,id'],
+            'stopovers.*.arrival' => ['required_without:stopovers.*.departure', 'required_with:stopovers.*.arrivalReal', 'date'],
+            'stopovers.*.arrivalReal' => ['nullable', 'date'],
+            'stopovers.*.departure' => ['required_without:stopovers.*.arrival,null', 'required_with:stopovers.*.departureReal', 'date'],
+            'stopovers.*.departureReal' => ['nullable', 'date'],
+        ];
+    }
+}

app/Objects/LineSegment.php

@@ -25,7 +25,7 @@ public function calculateDistance(): int {
     /**
      * @deprecated Use GeoService::interpolatePoint instead
      */
-    public function interpolatePoint(float $percent): Coordinate {
+    public function interpolatePoint(float $percent): ?Coordinate {
         return (new GeoService())->interpolatePoint($this->start, $this->finish, $percent);
     }
 }

app/Services/GeoService.php

@@ -41,7 +41,11 @@ public function getBoundingBox(Coordinate $center, int $radius, int $precision =
     }
 
 
-    public function interpolatePoint(Coordinate $start, Coordinate $end, float $percent): Coordinate {
+    public function interpolatePoint(?Coordinate $start, ?Coordinate $end, float $percent): ?Coordinate {
+        if ($start === null || $end === null) {
+            return $start ?? $end ?? null;
+        }
+
         return new Coordinate(
             round($start->latitude + $percent * ($end->latitude - $start->latitude), 6),
             round($start->longitude + $percent * ($end->longitude - $start->longitude), 6)