From ee328dabc60c2443757820a2e21f253d0301bfd6 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Wed, 27 Dec 2017 21:05:53 -0600
Subject: [PATCH] geojson cleanup

---
 app/Services/GeoService.php                   | 32 +++++++++----------
 .../layouts/default/pireps/map.blade.php      |  4 +--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/Services/GeoService.php b/app/Services/GeoService.php
index 1b50fce3..2cb4ceea 100644
--- a/app/Services/GeoService.php
+++ b/app/Services/GeoService.php
@@ -293,17 +293,18 @@ class GeoService extends BaseService
      */
     public function pirepGeoJson(Pirep $pirep)
     {
-        $route_points = [];
+        $planned_rte_points = [];
         $planned_rte_coords = [];
 
         $planned_rte_coords[] = [$pirep->dpt_airport->lon, $pirep->dpt_airport->lat];
-        $route_points[] = new Feature(
+        $feature = new Feature(
             new Point([$pirep->dpt_airport->lon, $pirep->dpt_airport->lat]), [
-                'name'  => $pirep->dpt_airport->icao,
+                'name' => $pirep->dpt_airport->icao,
                 'popup' => $pirep->dpt_airport->full_name,
-                'icon'  => 'airport',
-            ]
-        );
+                'icon' => 'airport',
+           ]);
+
+        $planned_rte_points[] = $feature;
 
         if (!empty($pirep->route)) {
             $all_route_points = $this->getCoordsFromRoute(
@@ -315,7 +316,7 @@ class GeoService extends BaseService
             // lat, lon needs to be reversed for GeoJSON
             foreach ($all_route_points as $point) {
                 $planned_rte_coords[] = [$point->lon, $point->lat];
-                $route_points[] = new Feature(new Point([$point->lon, $point->lat]), [
+                $planned_rte_points[] = new Feature(new Point([$point->lon, $point->lat]), [
                     'name'  => $point->name,
                     'popup' => $point->name . ' (' . $point->name . ')',
                     'icon'  => ''
@@ -324,7 +325,8 @@ class GeoService extends BaseService
         }
 
         $planned_rte_coords[] = [$pirep->arr_airport->lon, $pirep->arr_airport->lat];
-        $route_points[] = new Feature(
+
+        $planned_rte_points[] = new Feature(
             new Point([$pirep->arr_airport->lon, $pirep->arr_airport->lat]), [
                 'name'  => $pirep->arr_airport->icao,
                 'popup' => $pirep->arr_airport->full_name,
@@ -332,21 +334,19 @@ class GeoService extends BaseService
             ]
         );
 
-        $route_points = new FeatureCollection($route_points);
+        $planned_rte_points = new FeatureCollection($planned_rte_points);
 
-        $planned_route_line = new LineString($planned_rte_coords);
         $planned_route = new FeatureCollection([
-            new Feature($planned_route_line, [], 1)
+            new Feature(new LineString($planned_rte_coords), [])
         ]);
 
-
         $actual_route = $this->getFeatureFromAcars($pirep);
 
         return [
-            'route_points'          => $route_points,
-            'planned_route_line'    => $planned_route,
-            'actual_route_line'     => $actual_route['line'],
-            'actual_route_points'   => $actual_route['points'],
+            'planned_rte_points'  => $planned_rte_points,
+            'planned_rte_line'    => $planned_route,
+            'actual_route_line'   => $actual_route['line'],
+            'actual_route_points' => $actual_route['points'],
         ];
     }
 }
diff --git a/resources/views/layouts/default/pireps/map.blade.php b/resources/views/layouts/default/pireps/map.blade.php
index 0e431ed9..5752e48b 100644
--- a/resources/views/layouts/default/pireps/map.blade.php
+++ b/resources/views/layouts/default/pireps/map.blade.php
@@ -12,8 +12,8 @@
 @section('scripts')
 <script type="text/javascript">
 phpvms.render_route_map({
-    route_points: {!! json_encode($map_features['route_points']) !!},
-    planned_route_line: {!! json_encode($map_features['planned_route_line']); !!},
+    route_points: {!! json_encode($map_features['planned_rte_points']) !!},
+    planned_route_line: {!! json_encode($map_features['planned_rte_line']); !!},
     actual_route_line: {!! json_encode($map_features['actual_route_line']); !!},
     actual_route_points: {!! json_encode($map_features['actual_route_points']); !!},
 });