Fix GeoService errors when viewing PIREP #498

nabeelio · Jan 15, 2020 · bef879a · bef879a
1 parent d4da0a6
commit bef879a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/app/Models/Pirep.php b/app/Models/Pirep.php
@@ -267,6 +267,9 @@ public function getProgressPercentAttribute()
             $upper_bound = $this->planned_distance;
         }
 
+        $upper_bound = empty($upper_bound) ? 1 : $upper_bound;
+        $distance = empty($distance) ? $upper_bound : $distance;
+
         return round(($distance / $upper_bound) * 100, 0);
     }
 

diff --git a/app/Services/GeoService.php b/app/Services/GeoService.php
@@ -5,6 +5,7 @@
 use App\Contracts\Service;
 use App\Models\Acars;
 use App\Models\Enums\AcarsType;
+use App\Models\Enums\PirepState;
 use App\Models\Flight;
 use App\Models\GeoJson;
 use App\Models\Pirep;
@@ -231,11 +232,23 @@ public function getFeatureFromAcars(Pirep $pirep)
             ]);
         }*/
 
-        return [
-            'position' => [
+        // If there is a position update from ACARS, show where it is
+        // Otherwise, just assume it's at the arrival airport currently
+        if ($pirep->position) {
+            $position = [
                 'lat' => $pirep->position->lat,
                 'lon' => $pirep->position->lon,
-            ],
+            ];
+        } else {
+            // if arrived, show it being at the arrival airport
+            $position = [
+                'lat' => $pirep->arr_airport->lat,
+                'lon' => $pirep->arr_airport->lon,
+            ];
+        }
+
+        return [
+            'position' => $position,
             'line'     => $route->getLine(),
             'points'   => $route->getPoints(),
             'airports' => [