From e2ab6445d224cea6630875a58246282e3cc230e8 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Thu, 28 Dec 2017 16:00:43 -0600
Subject: [PATCH] flight follow if one is selected in map; don't draw full map

---
 app/Console/Commands/AcarsReplay.php |  2 +-
 app/Services/GeoService.php          |  8 ++++++--
 public/assets/system/js/system.js    | 25 +++++++++++++++++++------
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/Console/Commands/AcarsReplay.php b/app/Console/Commands/AcarsReplay.php
index 3dcefed9..3b8537e1 100644
--- a/app/Console/Commands/AcarsReplay.php
+++ b/app/Console/Commands/AcarsReplay.php
@@ -112,7 +112,7 @@ class AcarsReplay extends Command
      */
     protected function postUpdate($pirep_id, $data)
     {
-        $uri = '/api/pirep/' . $pirep_id . '/acars';
+        $uri = '/api/pireps/' . $pirep_id . '/acars';
 
         $upd = [
             'log'           => '',
diff --git a/app/Services/GeoService.php b/app/Services/GeoService.php
index f4607638..84ff8ffe 100644
--- a/app/Services/GeoService.php
+++ b/app/Services/GeoService.php
@@ -174,7 +174,7 @@ class GeoService extends BaseService
     {
         $route_line = [];
         $route_points = [];
-        $route_line[] = [$pirep->dpt_airport->lon, $pirep->dpt_airport->lat];
+        #$route_line[] = [$pirep->dpt_airport->lon, $pirep->dpt_airport->lat];
 
         /**
          * @var $point \App\Models\Acars
@@ -192,7 +192,7 @@ class GeoService extends BaseService
             ++$counter;
         }
         # Arrival
-        $route_line[] = [$pirep->arr_airport->lon, $pirep->arr_airport->lat];
+        #$route_line[] = [$pirep->arr_airport->lon, $pirep->arr_airport->lat];
         $route_line = new Feature(new LineString($route_line));
 
         return [
@@ -217,6 +217,10 @@ class GeoService extends BaseService
              * @var $point \App\Models\Acars
              */
             $point = $pirep->position;
+            if(!$point) {
+                continue;
+            }
+
             $flight_points[] = new Feature(
                 new Point([$point->lon, $point->lat]), [
                     'pirep_id'  => $pirep->id,
diff --git a/public/assets/system/js/system.js b/public/assets/system/js/system.js
index c8a0f85b..391f6815 100644
--- a/public/assets/system/js/system.js
+++ b/public/assets/system/js/system.js
@@ -12,7 +12,9 @@ const phpvms = (function() {
 
         opts = _.defaults(opts, {
             render_elem: 'map',
-            zoom: 12,
+            center: [29.98139, -95.33374],
+            zoom: 5,
+            maxZoom: 10,
             layers: [],
             set_marker: false,
         });
@@ -59,6 +61,7 @@ const phpvms = (function() {
 
         let map = L.map('map', {
             layers: [openaip_basemap_phys_osm],
+            center: opts.center,
             zoom: opts.zoom,
             scrollWheelZoom: false,
         });
@@ -227,13 +230,14 @@ const phpvms = (function() {
         const map = draw_base_map(opts);
         const aircraftIcon = L.icon({
             iconUrl: opts.aircraft_icon,
-            iconSize: [48, 48],
-            iconAnchor: [0, 0],
-            popupAnchor: [-3, -76],
+            iconSize: [42, 42],
+            iconAnchor: [21, 21],
         });
 
         let layerFlights = null;
         let layerSelFlight = null;
+        let layerSelFlightFeature = null;
+        let layerSelFlightLayer = null;
 
         /**
          * When a flight is clicked on, show the path, etc for that flight
@@ -241,6 +245,7 @@ const phpvms = (function() {
          * @param layer
          */
         const onFlightClick = (feature, layer) => {
+
             const uri = opts.pirep_uri.replace('{id}', feature.properties.pirep_id);
             console.log('flight check uri', uri);
 
@@ -263,6 +268,9 @@ const phpvms = (function() {
                 }).addTo(map);
 
                 layerSelFlight.geoJson(routeJson.line);
+
+                layerSelFlightFeature = feature;
+                layerSelFlightLayer = layer;
                 //map.fitBounds(layerSelFlight.getBounds());
             });
         };
@@ -312,12 +320,17 @@ const phpvms = (function() {
                 });
 
                 layerFlights.addTo(map);
-                map.fitBounds(layerFlights.getBounds());
+
+                if (layerSelFlight !== null) {
+                    onFlightClick(layerSelFlightFeature, layerSelFlightLayer);
+                }
+                //map.fitBounds(layerFlights.getBounds());
+                //map.fitBounds('39.8283° N, 98.5795° W', 40);
             });
         };
 
         updateMap();
-        setTimeout(updateMap, 10000);
+        setInterval(updateMap, 10000);
     };
 
     return {