Merge branch 'develop' into dev-lb/move-polylines-to-files

Traewelling · Oct 11, 2024 · 6458e23 · 6458e23
2 parents 5fdbce4 + b02c6d2
commit 6458e23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/Http/Controllers/Backend/BrouterController.php b/app/Http/Controllers/Backend/BrouterController.php
@@ -8,9 +8,9 @@
 use App\Http\Controllers\Backend\Transport\TrainCheckinController;
 use App\Http\Controllers\Controller;
 use App\Jobs\RefreshPolyline;
-use App\Models\Trip;
-use App\Models\PolyLine;
 use App\Models\Checkin;
+use App\Models\PolyLine;
+use App\Models\Trip;
 use App\Objects\LineSegment;
 use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Http\Client\PendingRequest;
@@ -25,7 +25,7 @@
 
 abstract class BrouterController extends Controller
 {
-    public static function getHttpClient(): PendingRequest {
+    private static function getHttpClient(): PendingRequest {
         return Http::baseUrl(config('trwl.brouter_url'))
                    ->timeout(config('trwl.brouter_timeout'));
     }
@@ -37,7 +37,7 @@ public static function getHttpClient(): PendingRequest {
      * @return stdClass
      * @throws JsonException|InvalidArgumentException|ConnectionException
      */
-    public static function getGeoJSONForRoute(
+    private static function getGeoJSONForRoute(
         array          $coordinates,
         BrouterProfile $profile = BrouterProfile::RAIL //Maybe extend this for other travel types later
     ): stdClass {
@@ -80,7 +80,7 @@ public static function getGeoJSONForRoute(
      * @throws JsonException
      */
     public static function reroutePolyline(Trip $trip): void {
-        if (App::runningUnitTests()) {
+        if (App::runningUnitTests() || !config('trwl.brouter')) {
             return;
         }
 
@@ -176,7 +176,7 @@ public static function reroutePolyline(Trip $trip): void {
      *
      * @return void
      */
-    public static function recalculateDistanceAndPoints(Trip $trip, $polyline): void {
+    private static function recalculateDistanceAndPoints(Trip $trip, $polyline): void {
         DB::beginTransaction();
         $oldPolyLine = self::getOldPolyline($trip);
         Log::debug('[RefreshPolyline] Recalculating distance and points for Trip#' . $trip->trip_id);

diff --git a/config/trwl.php b/config/trwl.php
@@ -12,6 +12,7 @@
     'mastodon_timeout_seconds'  => env("MASTODON_TIMEOUT_SECONDS", 5),
 
     # Brouter
+    'brouter'                  => env('BROUTER', true),
     'brouter_url'               => env('BROUTER_URL', 'https://brouter.de/'),
     'brouter_timeout'           => env('BROUTER_TIMEOUT', 10),