Ysurac /
FlightAirMap
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | require_once('require/class.Stats.php'); |
| 5 | 5 | require_once('require/class.Language.php'); |
| 6 | 6 | if (!isset($_GET['aircraft_type'])) { |
| 7 | - header('Location: '.$globalURL.'/aircraft'); |
|
| 8 | - die(); |
|
| 7 | + header('Location: '.$globalURL.'/aircraft'); |
|
| 8 | + die(); |
|
| 9 | 9 | } |
| 10 | 10 | |
| 11 | 11 | $aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING); |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | require_once('require/class.Stats.php'); |
| 5 | 5 | require_once('require/class.Language.php'); |
| 6 | 6 | if (!isset($_GET['airport'])) { |
| 7 | - header('Location: '.$globalURL.'/airport'); |
|
| 8 | - die(); |
|
| 7 | + header('Location: '.$globalURL.'/airport'); |
|
| 8 | + die(); |
|
| 9 | 9 | } |
| 10 | 10 | $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING); |
| 11 | 11 | $Spotter = new Spotter(); |
@@ -5,8 +5,8 @@ |
||
| 5 | 5 | require_once('require/class.Language.php'); |
| 6 | 6 | |
| 7 | 7 | if (!isset($_GET['aircraft_type'])) { |
| 8 | - header('Location: '.$globalURL.'/aircraft'); |
|
| 9 | - die(); |
|
| 8 | + header('Location: '.$globalURL.'/aircraft'); |
|
| 9 | + die(); |
|
| 10 | 10 | } |
| 11 | 11 | |
| 12 | 12 | $aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING); |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | $metar_info = $METAR->getMETAR($airport_icao); |
| 49 | 49 | //print_r($metar_info); |
| 50 | 50 | if (isset($metar_info[0]['metar'])) $metar_parse = $METAR->parse($metar_info[0]['metar']); |
| 51 | - //print_r($metar_parse); |
|
| 51 | + //print_r($metar_parse); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | $title = sprintf(_("Detailed View for %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']); |
@@ -385,10 +385,10 @@ discard block |
||
| 385 | 385 | setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>); |
| 386 | 386 | |
| 387 | 387 | <?php |
| 388 | - // Add support for custom json via $globalMapJson |
|
| 389 | - if (isset($globalMapJson) && is_array($globalMapJson)) { |
|
| 388 | + // Add support for custom json via $globalMapJson |
|
| 389 | + if (isset($globalMapJson) && is_array($globalMapJson)) { |
|
| 390 | 390 | foreach ($globalMapJson as $json) { |
| 391 | - if (isset($json['url'])) { |
|
| 391 | + if (isset($json['url'])) { |
|
| 392 | 392 | ?> |
| 393 | 393 | update_genLayer('<?php print $json['url']; ?>'); |
| 394 | 394 | <?php |
@@ -397,9 +397,9 @@ discard block |
||
| 397 | 397 | setInterval(function(){update_genLayer('<?php print $json['url']; ?>')}, <?php print $json['refresh']; ?>); |
| 398 | 398 | <?php |
| 399 | 399 | } |
| 400 | - } |
|
| 400 | + } |
|
| 401 | + } |
|
| 401 | 402 | } |
| 402 | - } |
|
| 403 | 403 | |
| 404 | 404 | ?> |
| 405 | 405 | //adds the bootstrap tooltip to the map icons |
@@ -7,16 +7,16 @@ discard block |
||
| 7 | 7 | require_once(dirname(__FILE__).'/class.Source.php'); |
| 8 | 8 | |
| 9 | 9 | class TrackerImport { |
| 10 | - private $all_tracked = array(); |
|
| 11 | - private $last_delete_hourly = 0; |
|
| 12 | - private $last_delete = 0; |
|
| 13 | - private $stats = array(); |
|
| 14 | - private $tmd = 0; |
|
| 15 | - private $source_location = array(); |
|
| 16 | - public $db = null; |
|
| 17 | - public $nb = 0; |
|
| 10 | + private $all_tracked = array(); |
|
| 11 | + private $last_delete_hourly = 0; |
|
| 12 | + private $last_delete = 0; |
|
| 13 | + private $stats = array(); |
|
| 14 | + private $tmd = 0; |
|
| 15 | + private $source_location = array(); |
|
| 16 | + public $db = null; |
|
| 17 | + public $nb = 0; |
|
| 18 | 18 | |
| 19 | - public function __construct($dbc = null) { |
|
| 19 | + public function __construct($dbc = null) { |
|
| 20 | 20 | global $globalBeta; |
| 21 | 21 | $Connection = new Connection($dbc); |
| 22 | 22 | $this->db = $Connection->db(); |
@@ -38,50 +38,50 @@ discard block |
||
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | */ |
| 41 | - } |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - public function checkAll() { |
|
| 43 | + public function checkAll() { |
|
| 44 | 44 | global $globalDebug; |
| 45 | 45 | if ($globalDebug) echo "Update last seen tracked data...\n"; |
| 46 | 46 | foreach ($this->all_tracked as $key => $flight) { |
| 47 | - if (isset($this->all_tracked[$key]['id'])) { |
|
| 47 | + if (isset($this->all_tracked[$key]['id'])) { |
|
| 48 | 48 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
| 49 | - $Tracker = new Tracker($this->db); |
|
| 50 | - $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 51 | - } |
|
| 49 | + $Tracker = new Tracker($this->db); |
|
| 50 | + $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 51 | + } |
|
| 52 | + } |
|
| 52 | 53 | } |
| 53 | - } |
|
| 54 | 54 | |
| 55 | - public function del() { |
|
| 55 | + public function del() { |
|
| 56 | 56 | global $globalDebug; |
| 57 | 57 | // Delete old infos |
| 58 | 58 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 59 | 59 | foreach ($this->all_tracked as $key => $flight) { |
| 60 | - if (isset($flight['lastupdate'])) { |
|
| 61 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 62 | - if (isset($this->all_tracked[$key]['id'])) { |
|
| 63 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 60 | + if (isset($flight['lastupdate'])) { |
|
| 61 | + if ($flight['lastupdate'] < (time()-3000)) { |
|
| 62 | + if (isset($this->all_tracked[$key]['id'])) { |
|
| 63 | + if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 64 | 64 | /* |
| 65 | 65 | $TrackerLive = new TrackerLive(); |
| 66 | 66 | $TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']); |
| 67 | 67 | $TrackerLive->db = null; |
| 68 | 68 | */ |
| 69 | - //$real_arrival = $this->arrival($key); |
|
| 70 | - $Tracker = new Tracker($this->db); |
|
| 71 | - if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
|
| 69 | + //$real_arrival = $this->arrival($key); |
|
| 70 | + $Tracker = new Tracker($this->db); |
|
| 71 | + if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
|
| 72 | 72 | $result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']); |
| 73 | 73 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 74 | 74 | } |
| 75 | 75 | // Put in archive |
| 76 | 76 | // $Tracker->db = null; |
| 77 | - } |
|
| 78 | - unset($this->all_tracked[$key]); |
|
| 79 | - } |
|
| 80 | - } |
|
| 81 | - } |
|
| 82 | - } |
|
| 77 | + } |
|
| 78 | + unset($this->all_tracked[$key]); |
|
| 79 | + } |
|
| 80 | + } |
|
| 81 | + } |
|
| 82 | + } |
|
| 83 | 83 | |
| 84 | - public function add($line) { |
|
| 84 | + public function add($line) { |
|
| 85 | 85 | global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChangeTracker, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked; |
| 86 | 86 | if (!isset($globalCoordMinChangeTracker) || $globalCoordMinChangeTracker == '') $globalCoordMinChangeTracker = '0.015'; |
| 87 | 87 | date_default_timezone_set('UTC'); |
@@ -90,47 +90,47 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | // SBS format is CSV format |
| 92 | 92 | if(is_array($line) && isset($line['ident'])) { |
| 93 | - //print_r($line); |
|
| 94 | - if (isset($line['ident'])) { |
|
| 93 | + //print_r($line); |
|
| 94 | + if (isset($line['ident'])) { |
|
| 95 | 95 | |
| 96 | 96 | |
| 97 | 97 | // Increment message number |
| 98 | 98 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) { |
| 99 | - $current_date = date('Y-m-d'); |
|
| 100 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 101 | - else $source = ''; |
|
| 102 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 103 | - if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 104 | - $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 105 | - $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 106 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 99 | + $current_date = date('Y-m-d'); |
|
| 100 | + if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 101 | + else $source = ''; |
|
| 102 | + if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 103 | + if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 104 | + $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 105 | + $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 106 | + } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | |
| 110 | 110 | $Common = new Common(); |
| 111 | - if (!isset($line['id'])) $id = trim($line['ident']); |
|
| 112 | - else $id = trim($line['id']); |
|
| 111 | + if (!isset($line['id'])) $id = trim($line['ident']); |
|
| 112 | + else $id = trim($line['id']); |
|
| 113 | 113 | |
| 114 | 114 | if (!isset($this->all_tracked[$id])) { |
| 115 | - $this->all_tracked[$id] = array(); |
|
| 116 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0)); |
|
| 117 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => '')); |
|
| 118 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 119 | - if (!isset($line['id'])) { |
|
| 115 | + $this->all_tracked[$id] = array(); |
|
| 116 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0)); |
|
| 117 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => '')); |
|
| 118 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 119 | + if (!isset($line['id'])) { |
|
| 120 | 120 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 121 | 121 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 122 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 123 | - if ($globalAllTracked !== FALSE) $dataFound = true; |
|
| 122 | + } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 123 | + if ($globalAllTracked !== FALSE) $dataFound = true; |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 127 | - if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) { |
|
| 127 | + if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) { |
|
| 128 | 128 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
| 129 | - } else { |
|
| 129 | + } else { |
|
| 130 | 130 | if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
| 131 | 131 | elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
| 132 | 132 | return ''; |
| 133 | - } |
|
| 133 | + } |
|
| 134 | 134 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 135 | 135 | if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n"; |
| 136 | 136 | return ''; |
@@ -147,38 +147,38 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | //if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) { |
| 149 | 149 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) { |
| 150 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 151 | - if ($this->all_tracked[$id]['addedTracker'] == 1) { |
|
| 150 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 151 | + if ($this->all_tracked[$id]['addedTracker'] == 1) { |
|
| 152 | 152 | $timeelapsed = microtime(true); |
| 153 | - $Tracker = new Tracker($this->db); |
|
| 154 | - $fromsource = NULL; |
|
| 155 | - $result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
|
| 153 | + $Tracker = new Tracker($this->db); |
|
| 154 | + $fromsource = NULL; |
|
| 155 | + $result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
|
| 156 | 156 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 157 | 157 | $Tracker->db = null; |
| 158 | 158 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 159 | - } |
|
| 160 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 159 | + } |
|
| 160 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | if (isset($line['speed']) && $line['speed'] != '') { |
| 164 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 165 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 164 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 165 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 166 | 166 | } else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 167 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 168 | - if ($distance > 100 && $distance < 10000) { |
|
| 167 | + $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 168 | + if ($distance > 100 && $distance < 10000) { |
|
| 169 | 169 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 170 | 170 | $speed = $speed*3.6; |
| 171 | 171 | if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
| 172 | 172 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n"; |
| 173 | - } |
|
| 173 | + } |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | - if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 177 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 178 | - else unset($timediff); |
|
| 179 | - if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
|
| 176 | + if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 177 | + if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 178 | + else unset($timediff); |
|
| 179 | + if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
|
| 180 | 180 | if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) { |
| 181 | - if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.1)) { |
|
| 181 | + if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.1)) { |
|
| 182 | 182 | $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 183 | 183 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 184 | 184 | $this->all_tracked[$id]['putinarchive'] = true; |
@@ -192,30 +192,30 @@ discard block |
||
| 192 | 192 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 193 | 193 | $this->tmd = 0; |
| 194 | 194 | if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
| 195 | - } |
|
| 195 | + } |
|
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 199 | 199 | if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 200 | 200 | if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 201 | - $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
|
| 202 | - $dataFound = true; |
|
| 203 | - $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 201 | + $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
|
| 202 | + $dataFound = true; |
|
| 203 | + $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 204 | 204 | } |
| 205 | 205 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
| 206 | 206 | } |
| 207 | 207 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 208 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 208 | + if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 209 | 209 | if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 210 | 210 | if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 211 | - $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
|
| 212 | - $dataFound = true; |
|
| 213 | - $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 211 | + $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
|
| 212 | + $dataFound = true; |
|
| 213 | + $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 214 | 214 | } |
| 215 | 215 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude'])); |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | - } else if ($globalDebug && $timediff > 20) { |
|
| 218 | + } else if ($globalDebug && $timediff > 20) { |
|
| 219 | 219 | $this->tmd = $this->tmd + 1; |
| 220 | 220 | if ($line['latitude'] != $this->all_tracked[$id]['latitude'] && $line['longitude'] != $this->all_tracked[$id]['longitude']) { |
| 221 | 221 | echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n"; |
@@ -223,131 +223,131 @@ discard block |
||
| 223 | 223 | echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
| 224 | 224 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n"; |
| 225 | 225 | } |
| 226 | - } |
|
| 226 | + } |
|
| 227 | 227 | } |
| 228 | 228 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 229 | - if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 230 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 229 | + if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 230 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 231 | 231 | } |
| 232 | 232 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 233 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 233 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 234 | 234 | } |
| 235 | 235 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 236 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 236 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 237 | 237 | } |
| 238 | 238 | if (isset($line['comment']) && $line['comment'] != '') { |
| 239 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment'])); |
|
| 240 | - //$dataFound = true; |
|
| 239 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment'])); |
|
| 240 | + //$dataFound = true; |
|
| 241 | 241 | } |
| 242 | 242 | if (isset($line['type']) && $line['type'] != '') { |
| 243 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 244 | - //$dataFound = true; |
|
| 243 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 244 | + //$dataFound = true; |
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 248 | - //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 248 | + //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 249 | 249 | if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true; |
| 250 | 250 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude'])); |
| 251 | 251 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude'])); |
| 252 | 252 | //$dataFound = true; |
| 253 | - //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 253 | + //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 257 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 257 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | if (isset($line['heading']) && $line['heading'] != '') { |
| 261 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 262 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 263 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 264 | - //$dataFound = true; |
|
| 261 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 262 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 263 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 264 | + //$dataFound = true; |
|
| 265 | 265 | } elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) { |
| 266 | - $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 267 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 268 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 269 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 266 | + $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 267 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 268 | + if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 269 | + if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 270 | 270 | } |
| 271 | 271 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 272 | 272 | |
| 273 | 273 | if ($dataFound === true && isset($this->all_tracked[$id]['ident'])) { |
| 274 | - $this->all_tracked[$id]['lastupdate'] = time(); |
|
| 275 | - if ($this->all_tracked[$id]['addedTracker'] == 0) { |
|
| 276 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 277 | - if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
|
| 274 | + $this->all_tracked[$id]['lastupdate'] = time(); |
|
| 275 | + if ($this->all_tracked[$id]['addedTracker'] == 0) { |
|
| 276 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 277 | + if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
|
| 278 | 278 | if ($globalDebug) echo "Check if aircraft is already in DB..."; |
| 279 | 279 | $timeelapsed = microtime(true); |
| 280 | 280 | $TrackerLive = new TrackerLive($this->db); |
| 281 | 281 | if (isset($line['id'])) { |
| 282 | - $recent_ident = $TrackerLive->checkIdRecent($line['id']); |
|
| 283 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 282 | + $recent_ident = $TrackerLive->checkIdRecent($line['id']); |
|
| 283 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 284 | 284 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 285 | - $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
|
| 286 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 285 | + $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
|
| 286 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 287 | 287 | } else $recent_ident = ''; |
| 288 | 288 | $TrackerLive->db=null; |
| 289 | 289 | |
| 290 | 290 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 291 | 291 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 292 | - } else { |
|
| 292 | + } else { |
|
| 293 | 293 | $recent_ident = ''; |
| 294 | 294 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
| 295 | - } |
|
| 296 | - //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 297 | - if($recent_ident == "") |
|
| 298 | - { |
|
| 295 | + } |
|
| 296 | + //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 297 | + if($recent_ident == "") |
|
| 298 | + { |
|
| 299 | 299 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : "; |
| 300 | 300 | //adds the spotter data for the archive |
| 301 | - $highlight = ''; |
|
| 302 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 303 | - $timeelapsed = microtime(true); |
|
| 304 | - $Tracker = new Tracker($this->db); |
|
| 305 | - $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 306 | - $Tracker->db = null; |
|
| 307 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 308 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 301 | + $highlight = ''; |
|
| 302 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 303 | + $timeelapsed = microtime(true); |
|
| 304 | + $Tracker = new Tracker($this->db); |
|
| 305 | + $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 306 | + $Tracker->db = null; |
|
| 307 | + if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 308 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 309 | 309 | |
| 310 | 310 | |
| 311 | - // Add source stat in DB |
|
| 312 | - $Stats = new Stats($this->db); |
|
| 313 | - if (!empty($this->stats)) { |
|
| 311 | + // Add source stat in DB |
|
| 312 | + $Stats = new Stats($this->db); |
|
| 313 | + if (!empty($this->stats)) { |
|
| 314 | 314 | if ($globalDebug) echo 'Add source stats : '; |
| 315 | - foreach($this->stats as $date => $data) { |
|
| 316 | - foreach($data as $source => $sourced) { |
|
| 317 | - //print_r($sourced); |
|
| 318 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date); |
|
| 319 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date); |
|
| 320 | - if (isset($sourced['msg'])) { |
|
| 321 | - if (time() - $sourced['msg']['date'] > 10) { |
|
| 322 | - $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 323 | - echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date); |
|
| 324 | - unset($this->stats[$date][$source]['msg']); |
|
| 325 | - } |
|
| 326 | - } |
|
| 327 | - } |
|
| 328 | - if ($date != date('Y-m-d')) { |
|
| 329 | - unset($this->stats[$date]); |
|
| 330 | - } |
|
| 331 | - } |
|
| 332 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 315 | + foreach($this->stats as $date => $data) { |
|
| 316 | + foreach($data as $source => $sourced) { |
|
| 317 | + //print_r($sourced); |
|
| 318 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date); |
|
| 319 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date); |
|
| 320 | + if (isset($sourced['msg'])) { |
|
| 321 | + if (time() - $sourced['msg']['date'] > 10) { |
|
| 322 | + $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 323 | + echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date); |
|
| 324 | + unset($this->stats[$date][$source]['msg']); |
|
| 325 | + } |
|
| 326 | + } |
|
| 327 | + } |
|
| 328 | + if ($date != date('Y-m-d')) { |
|
| 329 | + unset($this->stats[$date]); |
|
| 330 | + } |
|
| 331 | + } |
|
| 332 | + if ($globalDebug) echo 'Done'."\n"; |
|
| 333 | 333 | |
| 334 | - } |
|
| 335 | - $Stats->db = null; |
|
| 334 | + } |
|
| 335 | + $Stats->db = null; |
|
| 336 | 336 | |
| 337 | - $this->del(); |
|
| 337 | + $this->del(); |
|
| 338 | 338 | //$ignoreImport = false; |
| 339 | 339 | $this->all_tracked[$id]['addedTracker'] = 1; |
| 340 | 340 | //print_r($this->all_tracked[$id]); |
| 341 | 341 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 342 | - if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours..."; |
|
| 343 | - //TrackerLive->deleteLiveTrackerDataNotUpdated(); |
|
| 344 | - $TrackerLive = new TrackerLive($this->db); |
|
| 345 | - $TrackerLive->deleteLiveTrackerData(); |
|
| 346 | - $TrackerLive->db=null; |
|
| 347 | - if ($globalDebug) echo " Done\n"; |
|
| 348 | - $this->last_delete = time(); |
|
| 342 | + if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours..."; |
|
| 343 | + //TrackerLive->deleteLiveTrackerDataNotUpdated(); |
|
| 344 | + $TrackerLive = new TrackerLive($this->db); |
|
| 345 | + $TrackerLive->deleteLiveTrackerData(); |
|
| 346 | + $TrackerLive->db=null; |
|
| 347 | + if ($globalDebug) echo " Done\n"; |
|
| 348 | + $this->last_delete = time(); |
|
| 349 | 349 | } |
| 350 | - } else { |
|
| 350 | + } else { |
|
| 351 | 351 | $this->all_tracked[$id]['id'] = $recent_ident; |
| 352 | 352 | $this->all_tracked[$id]['addedTracker'] = 1; |
| 353 | 353 | if (isset($globalDaemon) && !$globalDaemon) { |
@@ -356,16 +356,16 @@ discard block |
||
| 356 | 356 | $Tracker->db = null; |
| 357 | 357 | } |
| 358 | 358 | |
| 359 | - } |
|
| 359 | + } |
|
| 360 | 360 | } |
| 361 | - } |
|
| 362 | - //adds the spotter LIVE data |
|
| 363 | - if ($globalDebug) { |
|
| 361 | + } |
|
| 362 | + //adds the spotter LIVE data |
|
| 363 | + if ($globalDebug) { |
|
| 364 | 364 | echo 'DATA : ident : '.$this->all_tracked[$id]['ident'].' - type : '.$this->all_tracked[$id]['type'].' - Latitude : '.$this->all_tracked[$id]['latitude'].' - Longitude : '.$this->all_tracked[$id]['longitude'].' - Altitude : '.$this->all_tracked[$id]['altitude'].' - Heading : '.$this->all_tracked[$id]['heading'].' - Speed : '.$this->all_tracked[$id]['speed']."\n"; |
| 365 | - } |
|
| 366 | - $ignoreImport = false; |
|
| 365 | + } |
|
| 366 | + $ignoreImport = false; |
|
| 367 | 367 | |
| 368 | - if (!$ignoreImport) { |
|
| 368 | + if (!$ignoreImport) { |
|
| 369 | 369 | if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 370 | 370 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
| 371 | 371 | $timeelapsed = microtime(true); |
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | if ($stats_heading == 16) $stats_heading = 0; |
| 404 | 404 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 405 | 405 | for ($i=0;$i<=15;$i++) { |
| 406 | - $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 406 | + $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 407 | 407 | } |
| 408 | 408 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
| 409 | 409 | } else { |
@@ -416,11 +416,11 @@ discard block |
||
| 416 | 416 | //var_dump($this->stats); |
| 417 | 417 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 418 | 418 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 419 | - end($this->stats[$current_date][$source]['hist']); |
|
| 420 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 419 | + end($this->stats[$current_date][$source]['hist']); |
|
| 420 | + $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 421 | 421 | } else $mini = 0; |
| 422 | 422 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 423 | - $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 423 | + $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 424 | 424 | } |
| 425 | 425 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
| 426 | 426 | } else { |
@@ -436,22 +436,22 @@ discard block |
||
| 436 | 436 | |
| 437 | 437 | |
| 438 | 438 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 439 | - if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour..."; |
|
| 440 | - $TrackerLive = new TrackerLive($this->db); |
|
| 441 | - $TrackerLive->deleteLiveTrackerDataNotUpdated(); |
|
| 442 | - $TrackerLive->db = null; |
|
| 443 | - //TrackerLive->deleteLiveTrackerData(); |
|
| 444 | - if ($globalDebug) echo " Done\n"; |
|
| 445 | - $this->last_delete_hourly = time(); |
|
| 439 | + if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour..."; |
|
| 440 | + $TrackerLive = new TrackerLive($this->db); |
|
| 441 | + $TrackerLive->deleteLiveTrackerDataNotUpdated(); |
|
| 442 | + $TrackerLive->db = null; |
|
| 443 | + //TrackerLive->deleteLiveTrackerData(); |
|
| 444 | + if ($globalDebug) echo " Done\n"; |
|
| 445 | + $this->last_delete_hourly = time(); |
|
| 446 | 446 | } |
| 447 | 447 | |
| 448 | - } |
|
| 449 | - //$ignoreImport = false; |
|
| 448 | + } |
|
| 449 | + //$ignoreImport = false; |
|
| 450 | 450 | } |
| 451 | 451 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 452 | 452 | if ($send) return $this->all_tracked[$id]; |
| 453 | - } |
|
| 453 | + } |
|
| 454 | + } |
|
| 454 | 455 | } |
| 455 | - } |
|
| 456 | 456 | } |
| 457 | 457 | ?> |
@@ -68,10 +68,10 @@ discard block |
||
| 68 | 68 | ); |
| 69 | 69 | |
| 70 | 70 | /** |
| 71 | - * Returns list of available locales |
|
| 72 | - * |
|
| 73 | - * @return array |
|
| 74 | - */ |
|
| 71 | + * Returns list of available locales |
|
| 72 | + * |
|
| 73 | + * @return array |
|
| 74 | + */ |
|
| 75 | 75 | public function listLocaleDir() |
| 76 | 76 | { |
| 77 | 77 | $result = array('en_GB'); |
@@ -96,9 +96,9 @@ discard block |
||
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | /** |
| 99 | - * Returns list of available languages |
|
| 100 | - * |
|
| 101 | - * @return array |
|
| 99 | + * Returns list of available languages |
|
| 100 | + * |
|
| 101 | + * @return array |
|
| 102 | 102 | */ |
| 103 | 103 | public function getLanguages() |
| 104 | 104 | { |
@@ -15,11 +15,11 @@ |
||
| 15 | 15 | |
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | - * Change IATA to ICAO value for ident |
|
| 19 | - * |
|
| 20 | - * @param String $ident ident |
|
| 21 | - * @return String the icao |
|
| 22 | - */ |
|
| 18 | + * Change IATA to ICAO value for ident |
|
| 19 | + * |
|
| 20 | + * @param String $ident ident |
|
| 21 | + * @return String the icao |
|
| 22 | + */ |
|
| 23 | 23 | public function ident2icao($ident) { |
| 24 | 24 | $Spotter = new Spotter(); |
| 25 | 25 | if (!is_numeric(substr($ident, 0, 3))) { |
@@ -90,40 +90,40 @@ |
||
| 90 | 90 | if (!empty($spotter_array)) { |
| 91 | 91 | foreach($spotter_array as $spotter_item) { |
| 92 | 92 | array_push($flights, array( |
| 93 | - "id" => $spotter_item['spotter_id'], |
|
| 94 | - "ident" => $spotter_item['ident'], |
|
| 95 | - "registration" => $spotter_item['registration'], |
|
| 96 | - "aircraft_icao" => $spotter_item['aircraft_type'], |
|
| 97 | - "aircraft_name" => $spotter_item['aircraft_name'], |
|
| 98 | - "aircraft_manufacturer" => $spotter_item['aircraft_manufacturer'], |
|
| 99 | - "airline_name" => $spotter_item['airline_name'], |
|
| 100 | - "airline_icao" => $spotter_item['airline_icao'], |
|
| 101 | - "airline_iata" => $spotter_item['airline_iata'], |
|
| 102 | - "airline_country" => $spotter_item['airline_country'], |
|
| 103 | - "airline_callsign" => $spotter_item['airline_callsign'], |
|
| 104 | - "airline_type" => $spotter_item['airline_type'], |
|
| 105 | - "departure_airport_city" => $spotter_item['departure_airport_city'], |
|
| 106 | - "departure_airport_country" => $spotter_item['departure_airport_country'], |
|
| 107 | - "departure_airport_iata" => $spotter_item['departure_airport_iata'], |
|
| 108 | - "departure_airport_icao" => $spotter_item['departure_airport_icao'], |
|
| 109 | - "departure_airport_latitude" => $spotter_item['departure_airport_latitude'], |
|
| 110 | - "departure_airport_longitude" => $spotter_item['departure_airport_longitude'], |
|
| 111 | - "departure_airport_altitude" => $spotter_item['departure_airport_altitude'], |
|
| 112 | - "arrival_airport_city" => $spotter_item['arrival_airport_city'], |
|
| 113 | - "arrival_airport_country" => $spotter_item['arrival_airport_country'], |
|
| 114 | - "arrival_airport_iata" => $spotter_item['arrival_airport_iata'], |
|
| 115 | - "arrival_airport_icao" => $spotter_item['arrival_airport_icao'], |
|
| 116 | - "arrival_airport_latitude" => $spotter_item['arrival_airport_latitude'], |
|
| 117 | - "arrival_airport_longitude" => $spotter_item['arrival_airport_longitude'], |
|
| 118 | - "arrival_airport_altitude" => $spotter_item['arrival_airport_altitude'], |
|
| 119 | - "latitude" => $spotter_item['latitude'], |
|
| 120 | - "longitude" => $spotter_item['longitude'], |
|
| 121 | - "altitude" => $spotter_item['altitude'], |
|
| 122 | - "ground_speed" => $spotter_item['ground_speed'], |
|
| 123 | - "heading" => $spotter_item['heading'], |
|
| 124 | - "heading_name" => $spotter_item['heading_name'], |
|
| 125 | - "waypoints" => $spotter_item['waypoints'], |
|
| 126 | - "date" => date("c", strtotime($spotter_item['date_iso_8601'])) |
|
| 93 | + "id" => $spotter_item['spotter_id'], |
|
| 94 | + "ident" => $spotter_item['ident'], |
|
| 95 | + "registration" => $spotter_item['registration'], |
|
| 96 | + "aircraft_icao" => $spotter_item['aircraft_type'], |
|
| 97 | + "aircraft_name" => $spotter_item['aircraft_name'], |
|
| 98 | + "aircraft_manufacturer" => $spotter_item['aircraft_manufacturer'], |
|
| 99 | + "airline_name" => $spotter_item['airline_name'], |
|
| 100 | + "airline_icao" => $spotter_item['airline_icao'], |
|
| 101 | + "airline_iata" => $spotter_item['airline_iata'], |
|
| 102 | + "airline_country" => $spotter_item['airline_country'], |
|
| 103 | + "airline_callsign" => $spotter_item['airline_callsign'], |
|
| 104 | + "airline_type" => $spotter_item['airline_type'], |
|
| 105 | + "departure_airport_city" => $spotter_item['departure_airport_city'], |
|
| 106 | + "departure_airport_country" => $spotter_item['departure_airport_country'], |
|
| 107 | + "departure_airport_iata" => $spotter_item['departure_airport_iata'], |
|
| 108 | + "departure_airport_icao" => $spotter_item['departure_airport_icao'], |
|
| 109 | + "departure_airport_latitude" => $spotter_item['departure_airport_latitude'], |
|
| 110 | + "departure_airport_longitude" => $spotter_item['departure_airport_longitude'], |
|
| 111 | + "departure_airport_altitude" => $spotter_item['departure_airport_altitude'], |
|
| 112 | + "arrival_airport_city" => $spotter_item['arrival_airport_city'], |
|
| 113 | + "arrival_airport_country" => $spotter_item['arrival_airport_country'], |
|
| 114 | + "arrival_airport_iata" => $spotter_item['arrival_airport_iata'], |
|
| 115 | + "arrival_airport_icao" => $spotter_item['arrival_airport_icao'], |
|
| 116 | + "arrival_airport_latitude" => $spotter_item['arrival_airport_latitude'], |
|
| 117 | + "arrival_airport_longitude" => $spotter_item['arrival_airport_longitude'], |
|
| 118 | + "arrival_airport_altitude" => $spotter_item['arrival_airport_altitude'], |
|
| 119 | + "latitude" => $spotter_item['latitude'], |
|
| 120 | + "longitude" => $spotter_item['longitude'], |
|
| 121 | + "altitude" => $spotter_item['altitude'], |
|
| 122 | + "ground_speed" => $spotter_item['ground_speed'], |
|
| 123 | + "heading" => $spotter_item['heading'], |
|
| 124 | + "heading_name" => $spotter_item['heading_name'], |
|
| 125 | + "waypoints" => $spotter_item['waypoints'], |
|
| 126 | + "date" => date("c", strtotime($spotter_item['date_iso_8601'])) |
|
| 127 | 127 | )); |
| 128 | 128 | } |
| 129 | 129 | } |
