Ysurac /
FlightAirMap
@@ -8,20 +8,20 @@ discard block |
||
| 8 | 8 | require_once(dirname(__FILE__).'/class.Stats.php'); |
| 9 | 9 | require_once(dirname(__FILE__).'/class.Source.php'); |
| 10 | 10 | if (isset($globalServerAPRS) && $globalServerAPRS) { |
| 11 | - require_once(dirname(__FILE__).'/class.APRS.php'); |
|
| 11 | + require_once(dirname(__FILE__).'/class.APRS.php'); |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | class SpotterImport { |
| 15 | - private $all_flights = array(); |
|
| 16 | - private $last_delete_hourly = 0; |
|
| 17 | - private $last_delete = 0; |
|
| 18 | - private $stats = array(); |
|
| 19 | - private $tmd = 0; |
|
| 20 | - private $source_location = array(); |
|
| 21 | - public $db = null; |
|
| 22 | - public $nb = 0; |
|
| 23 | - |
|
| 24 | - public function __construct($dbc = null) { |
|
| 15 | + private $all_flights = array(); |
|
| 16 | + private $last_delete_hourly = 0; |
|
| 17 | + private $last_delete = 0; |
|
| 18 | + private $stats = array(); |
|
| 19 | + private $tmd = 0; |
|
| 20 | + private $source_location = array(); |
|
| 21 | + public $db = null; |
|
| 22 | + public $nb = 0; |
|
| 23 | + |
|
| 24 | + public function __construct($dbc = null) { |
|
| 25 | 25 | global $globalBeta, $globalServerAPRS, $APRSSpotter, $globalNoDB; |
| 26 | 26 | if (!(isset($globalNoDB) && $globalNoDB)) { |
| 27 | 27 | $Connection = new Connection($dbc); |
@@ -33,14 +33,14 @@ discard block |
||
| 33 | 33 | $currentdate = date('Y-m-d'); |
| 34 | 34 | $sourcestat = $Stats->getStatsSource($currentdate); |
| 35 | 35 | if (!empty($sourcestat)) { |
| 36 | - foreach($sourcestat as $srcst) { |
|
| 37 | - $type = $srcst['stats_type']; |
|
| 36 | + foreach($sourcestat as $srcst) { |
|
| 37 | + $type = $srcst['stats_type']; |
|
| 38 | 38 | if ($type == 'polar' || $type == 'hist') { |
| 39 | - $source = $srcst['source_name']; |
|
| 40 | - $data = $srcst['source_data']; |
|
| 41 | - $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 42 | - } |
|
| 43 | - } |
|
| 39 | + $source = $srcst['source_name']; |
|
| 40 | + $data = $srcst['source_data']; |
|
| 41 | + $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 42 | + } |
|
| 43 | + } |
|
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | if (isset($globalServerAPRS) && $globalServerAPRS) { |
@@ -48,9 +48,9 @@ discard block |
||
| 48 | 48 | //$APRSSpotter->connect(); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - } |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - public function get_Schedule($id,$ident) { |
|
| 53 | + public function get_Schedule($id,$ident) { |
|
| 54 | 54 | global $globalDebug, $globalFork, $globalSchedulesFetch; |
| 55 | 55 | // Get schedule here, so it's done only one time |
| 56 | 56 | |
@@ -70,42 +70,42 @@ discard block |
||
| 70 | 70 | $operator = $Spotter->getOperator($ident); |
| 71 | 71 | $scheduleexist = false; |
| 72 | 72 | if ($Schedule->checkSchedule($operator) == 0) { |
| 73 | - $operator = $Translation->checkTranslation($ident); |
|
| 74 | - if ($Schedule->checkSchedule($operator) == 0) { |
|
| 73 | + $operator = $Translation->checkTranslation($ident); |
|
| 74 | + if ($Schedule->checkSchedule($operator) == 0) { |
|
| 75 | 75 | $schedule = $Schedule->fetchSchedule($operator); |
| 76 | 76 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 77 | - if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 78 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 79 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 80 | - // Should also check if route schedule = route from DB |
|
| 81 | - if ($schedule['DepartureAirportIATA'] != '') { |
|
| 77 | + if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 78 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 79 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 80 | + // Should also check if route schedule = route from DB |
|
| 81 | + if ($schedule['DepartureAirportIATA'] != '') { |
|
| 82 | 82 | if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) { |
| 83 | - $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']); |
|
| 84 | - if (trim($airport_icao) != '') { |
|
| 83 | + $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']); |
|
| 84 | + if (trim($airport_icao) != '') { |
|
| 85 | 85 | $this->all_flights[$id]['departure_airport'] = $airport_icao; |
| 86 | 86 | if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n"; |
| 87 | - } |
|
| 87 | + } |
|
| 88 | + } |
|
| 88 | 89 | } |
| 89 | - } |
|
| 90 | - if ($schedule['ArrivalAirportIATA'] != '') { |
|
| 90 | + if ($schedule['ArrivalAirportIATA'] != '') { |
|
| 91 | 91 | if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) { |
| 92 | - $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']); |
|
| 93 | - if (trim($airport_icao) != '') { |
|
| 92 | + $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']); |
|
| 93 | + if (trim($airport_icao) != '') { |
|
| 94 | 94 | $this->all_flights[$id]['arrival_airport'] = $airport_icao; |
| 95 | 95 | if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n"; |
| 96 | - } |
|
| 96 | + } |
|
| 97 | 97 | } |
| 98 | - } |
|
| 99 | - $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']); |
|
| 98 | + } |
|
| 99 | + $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']); |
|
| 100 | 100 | } |
| 101 | - } else $scheduleexist = true; |
|
| 101 | + } else $scheduleexist = true; |
|
| 102 | 102 | } else $scheduleexist = true; |
| 103 | 103 | // close connection, at least one way will work ? |
| 104 | - if ($scheduleexist) { |
|
| 104 | + if ($scheduleexist) { |
|
| 105 | 105 | if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
| 106 | - $sch = $Schedule->getSchedule($operator); |
|
| 106 | + $sch = $Schedule->getSchedule($operator); |
|
| 107 | 107 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time'])); |
| 108 | - } |
|
| 108 | + } |
|
| 109 | 109 | $Spotter->db = null; |
| 110 | 110 | $Schedule->db = null; |
| 111 | 111 | $Translation->db = null; |
@@ -120,78 +120,78 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | */ |
| 122 | 122 | } |
| 123 | - } |
|
| 123 | + } |
|
| 124 | 124 | |
| 125 | - public function checkAll() { |
|
| 125 | + public function checkAll() { |
|
| 126 | 126 | global $globalDebug, $globalNoImport; |
| 127 | 127 | if ($globalDebug) echo "Update last seen flights data...\n"; |
| 128 | 128 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 129 | - foreach ($this->all_flights as $key => $flight) { |
|
| 129 | + foreach ($this->all_flights as $key => $flight) { |
|
| 130 | 130 | if (isset($this->all_flights[$key]['id'])) { |
| 131 | - //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
|
| 132 | - $Spotter = new Spotter($this->db); |
|
| 133 | - $real_arrival = $this->arrival($key); |
|
| 134 | - if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 135 | - } |
|
| 136 | - } |
|
| 131 | + //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
|
| 132 | + $Spotter = new Spotter($this->db); |
|
| 133 | + $real_arrival = $this->arrival($key); |
|
| 134 | + if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 135 | + } |
|
| 136 | + } |
|
| 137 | + } |
|
| 137 | 138 | } |
| 138 | - } |
|
| 139 | 139 | |
| 140 | - public function arrival($key) { |
|
| 140 | + public function arrival($key) { |
|
| 141 | 141 | global $globalClosestMinDist, $globalDebug; |
| 142 | 142 | if ($globalDebug) echo 'Update arrival...'."\n"; |
| 143 | 143 | $Spotter = new Spotter($this->db); |
| 144 | - $airport_icao = ''; |
|
| 145 | - $airport_time = ''; |
|
| 146 | - if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
| 144 | + $airport_icao = ''; |
|
| 145 | + $airport_time = ''; |
|
| 146 | + if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
| 147 | 147 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 148 | - $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 149 | - if (isset($closestAirports[0])) { |
|
| 150 | - if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
|
| 151 | - $airport_icao = $closestAirports[0]['icao']; |
|
| 152 | - $airport_time = $this->all_flights[$key]['datetime']; |
|
| 153 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 154 | - } elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') { |
|
| 155 | - foreach ($closestAirports as $airport) { |
|
| 156 | - if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) { |
|
| 157 | - $airport_icao = $airport['icao']; |
|
| 158 | - $airport_time = $this->all_flights[$key]['datetime']; |
|
| 159 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 160 | - break; |
|
| 161 | - } |
|
| 162 | - } |
|
| 163 | - } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) { |
|
| 164 | - $airport_icao = $closestAirports[0]['icao']; |
|
| 165 | - $airport_time = $this->all_flights[$key]['datetime']; |
|
| 166 | - } else { |
|
| 167 | - if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 168 | - } |
|
| 169 | - } else { |
|
| 170 | - if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 171 | - } |
|
| 172 | - |
|
| 173 | - } else { |
|
| 174 | - if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 175 | - } |
|
| 176 | - return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 177 | - } |
|
| 178 | - |
|
| 179 | - |
|
| 180 | - |
|
| 181 | - public function del() { |
|
| 148 | + $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 149 | + if (isset($closestAirports[0])) { |
|
| 150 | + if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
|
| 151 | + $airport_icao = $closestAirports[0]['icao']; |
|
| 152 | + $airport_time = $this->all_flights[$key]['datetime']; |
|
| 153 | + if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 154 | + } elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') { |
|
| 155 | + foreach ($closestAirports as $airport) { |
|
| 156 | + if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) { |
|
| 157 | + $airport_icao = $airport['icao']; |
|
| 158 | + $airport_time = $this->all_flights[$key]['datetime']; |
|
| 159 | + if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 160 | + break; |
|
| 161 | + } |
|
| 162 | + } |
|
| 163 | + } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) { |
|
| 164 | + $airport_icao = $closestAirports[0]['icao']; |
|
| 165 | + $airport_time = $this->all_flights[$key]['datetime']; |
|
| 166 | + } else { |
|
| 167 | + if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 168 | + } |
|
| 169 | + } else { |
|
| 170 | + if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 171 | + } |
|
| 172 | + |
|
| 173 | + } else { |
|
| 174 | + if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 175 | + } |
|
| 176 | + return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 177 | + } |
|
| 178 | + |
|
| 179 | + |
|
| 180 | + |
|
| 181 | + public function del() { |
|
| 182 | 182 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 183 | 183 | // Delete old infos |
| 184 | 184 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 185 | 185 | foreach ($this->all_flights as $key => $flight) { |
| 186 | - if (isset($flight['lastupdate'])) { |
|
| 186 | + if (isset($flight['lastupdate'])) { |
|
| 187 | 187 | if ($flight['lastupdate'] < (time()-5900)) { |
| 188 | - $this->delKey($key); |
|
| 188 | + $this->delKey($key); |
|
| 189 | + } |
|
| 189 | 190 | } |
| 190 | - } |
|
| 191 | 191 | } |
| 192 | - } |
|
| 192 | + } |
|
| 193 | 193 | |
| 194 | - public function delKey($key) { |
|
| 194 | + public function delKey($key) { |
|
| 195 | 195 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 196 | 196 | // Delete old infos |
| 197 | 197 | if (isset($this->all_flights[$key]['id'])) { |
@@ -206,9 +206,9 @@ discard block |
||
| 206 | 206 | } |
| 207 | 207 | } |
| 208 | 208 | unset($this->all_flights[$key]); |
| 209 | - } |
|
| 209 | + } |
|
| 210 | 210 | |
| 211 | - public function add($line) { |
|
| 211 | + public function add($line) { |
|
| 212 | 212 | global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA, $globalAircraftMaxUpdate, $globalAircraftMinUpdate; |
| 213 | 213 | //if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE; |
| 214 | 214 | if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
@@ -234,19 +234,19 @@ discard block |
||
| 234 | 234 | |
| 235 | 235 | // SBS format is CSV format |
| 236 | 236 | if(is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
| 237 | - //print_r($line); |
|
| 238 | - if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
|
| 237 | + //print_r($line); |
|
| 238 | + if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
|
| 239 | 239 | |
| 240 | 240 | // Increment message number |
| 241 | 241 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) { |
| 242 | - $current_date = date('Y-m-d'); |
|
| 243 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 244 | - else $source = ''; |
|
| 245 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 246 | - if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 247 | - $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 248 | - $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 249 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 242 | + $current_date = date('Y-m-d'); |
|
| 243 | + if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 244 | + else $source = ''; |
|
| 245 | + if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 246 | + if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 247 | + $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 248 | + $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 249 | + } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | /* |
@@ -262,49 +262,49 @@ discard block |
||
| 262 | 262 | //$this->db = $dbc; |
| 263 | 263 | |
| 264 | 264 | //$hex = trim($line['hex']); |
| 265 | - if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 266 | - else $id = trim($line['id']); |
|
| 265 | + if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 266 | + else $id = trim($line['id']); |
|
| 267 | 267 | |
| 268 | 268 | if (!isset($this->all_flights[$id])) { |
| 269 | - $this->all_flights[$id] = array(); |
|
| 270 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 271 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
|
| 272 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 273 | - if (!isset($line['id'])) { |
|
| 269 | + $this->all_flights[$id] = array(); |
|
| 270 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 271 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
|
| 272 | + if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 273 | + if (!isset($line['id'])) { |
|
| 274 | 274 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 275 | 275 | // if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi'))); |
| 276 | 276 | // if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
| 277 | 277 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 278 | - //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 279 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 280 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 278 | + //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 279 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 280 | + if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 281 | 281 | } |
| 282 | 282 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 283 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 283 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | //print_r($this->all_flights); |
| 287 | 287 | if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) { |
| 288 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 289 | - //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 288 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 289 | + //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 290 | 290 | //$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 291 | - //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 292 | - if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') { |
|
| 291 | + //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 292 | + if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') { |
|
| 293 | 293 | $timeelapsed = microtime(true); |
| 294 | 294 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 295 | - $Spotter = new Spotter($this->db); |
|
| 296 | - if (isset($this->all_flights[$id]['source_type'])) { |
|
| 295 | + $Spotter = new Spotter($this->db); |
|
| 296 | + if (isset($this->all_flights[$id]['source_type'])) { |
|
| 297 | 297 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']); |
| 298 | - } else { |
|
| 298 | + } else { |
|
| 299 | 299 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 300 | - } |
|
| 301 | - $Spotter->db = null; |
|
| 302 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 303 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 300 | + } |
|
| 301 | + $Spotter->db = null; |
|
| 302 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 303 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 304 | + } |
|
| 304 | 305 | } |
| 305 | - } |
|
| 306 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 307 | - if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 306 | + if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 307 | + if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 308 | 308 | } |
| 309 | 309 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
| 310 | 310 | $icao = $line['aircraft_icao']; |
@@ -334,9 +334,9 @@ discard block |
||
| 334 | 334 | } |
| 335 | 335 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 336 | 336 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 337 | - if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
|
| 337 | + if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
|
| 338 | 338 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 339 | - } else { |
|
| 339 | + } else { |
|
| 340 | 340 | if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
| 341 | 341 | elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
| 342 | 342 | /* |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | print_r($line); |
| 346 | 346 | */ |
| 347 | 347 | return ''; |
| 348 | - } |
|
| 348 | + } |
|
| 349 | 349 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 350 | 350 | if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 351 | 351 | return ''; |
@@ -361,21 +361,21 @@ discard block |
||
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') { |
| 364 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 364 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 365 | 365 | } |
| 366 | 366 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 367 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 367 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 368 | 368 | } |
| 369 | 369 | if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
| 370 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id']))); |
|
| 370 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id']))); |
|
| 371 | 371 | } |
| 372 | 372 | if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
| 373 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name']))); |
|
| 373 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name']))); |
|
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) { |
| 377 | 377 | |
| 378 | - if ($this->all_flights[$id]['addedSpotter'] == 1) { |
|
| 378 | + if ($this->all_flights[$id]['addedSpotter'] == 1) { |
|
| 379 | 379 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 2300) { |
| 380 | 380 | if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n"; |
| 381 | 381 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
@@ -384,23 +384,23 @@ discard block |
||
| 384 | 384 | elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 385 | 385 | elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 386 | 386 | } else { |
| 387 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 388 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 387 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 388 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 389 | 389 | $timeelapsed = microtime(true); |
| 390 | - $Spotter = new Spotter($this->db); |
|
| 391 | - $fromsource = NULL; |
|
| 392 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 393 | - elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 390 | + $Spotter = new Spotter($this->db); |
|
| 391 | + $fromsource = NULL; |
|
| 392 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 393 | + elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 394 | 394 | elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
| 395 | 395 | elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
| 396 | 396 | elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
| 397 | - $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 397 | + $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 398 | 398 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 399 | 399 | $Spotter->db = null; |
| 400 | 400 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 401 | - } |
|
| 401 | + } |
|
| 402 | 402 | } |
| 403 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 403 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 404 | 404 | |
| 405 | 405 | /* |
| 406 | 406 | if (!isset($line['id'])) { |
@@ -410,86 +410,86 @@ discard block |
||
| 410 | 410 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 411 | 411 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 412 | 412 | */ |
| 413 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 413 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 414 | 414 | |
| 415 | - //$putinarchive = true; |
|
| 416 | - if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
|
| 415 | + //$putinarchive = true; |
|
| 416 | + if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
|
| 417 | 417 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
| 418 | - } |
|
| 419 | - if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
|
| 418 | + } |
|
| 419 | + if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
|
| 420 | 420 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
| 421 | - } |
|
| 422 | - if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
|
| 423 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 424 | - } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
|
| 421 | + } |
|
| 422 | + if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
|
| 423 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 424 | + } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
|
| 425 | 425 | $timeelapsed = microtime(true); |
| 426 | 426 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 427 | 427 | $Spotter = new Spotter($this->db); |
| 428 | 428 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 429 | 429 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 430 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 430 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 431 | 431 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 432 | - } |
|
| 433 | - } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
|
| 432 | + } |
|
| 433 | + } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
|
| 434 | 434 | $timeelapsed = microtime(true); |
| 435 | 435 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 436 | - $Spotter = new Spotter($this->db); |
|
| 437 | - $route = $Spotter->getRouteInfo(trim($line['ident'])); |
|
| 438 | - if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) { |
|
| 436 | + $Spotter = new Spotter($this->db); |
|
| 437 | + $route = $Spotter->getRouteInfo(trim($line['ident'])); |
|
| 438 | + if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) { |
|
| 439 | 439 | $Translation = new Translation($this->db); |
| 440 | 440 | $ident = $Translation->checkTranslation(trim($line['ident'])); |
| 441 | 441 | $route = $Spotter->getRouteInfo($ident); |
| 442 | 442 | $Translation->db = null; |
| 443 | - } |
|
| 444 | - $Spotter->db = null; |
|
| 445 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 446 | - } |
|
| 443 | + } |
|
| 444 | + $Spotter->db = null; |
|
| 445 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 446 | + } |
|
| 447 | 447 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 448 | - //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
|
| 449 | - if ($route['fromairport_icao'] != $route['toairport_icao']) { |
|
| 448 | + //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
|
| 449 | + if ($route['fromairport_icao'] != $route['toairport_icao']) { |
|
| 450 | 450 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop'])); |
| 451 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop'])); |
|
| 452 | - } |
|
| 451 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop'])); |
|
| 452 | + } |
|
| 453 | 453 | } |
| 454 | 454 | if (!isset($globalFork)) $globalFork = TRUE; |
| 455 | 455 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 456 | 456 | if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
| 457 | 457 | } |
| 458 | - } |
|
| 458 | + } |
|
| 459 | 459 | } |
| 460 | 460 | |
| 461 | 461 | if (isset($line['speed']) && $line['speed'] != '') { |
| 462 | 462 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
| 463 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 464 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 465 | - //$dataFound = true; |
|
| 463 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 464 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 465 | + //$dataFound = true; |
|
| 466 | 466 | } else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 467 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 468 | - if ($distance > 1000 && $distance < 10000) { |
|
| 469 | - // use datetime |
|
| 467 | + $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 468 | + if ($distance > 1000 && $distance < 10000) { |
|
| 469 | + // use datetime |
|
| 470 | 470 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 471 | 471 | $speed = $speed*3.6; |
| 472 | 472 | if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
| 473 | 473 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
| 474 | - } |
|
| 474 | + } |
|
| 475 | 475 | } |
| 476 | 476 | |
| 477 | 477 | |
| 478 | 478 | |
| 479 | - if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) { |
|
| 480 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 481 | - else unset($timediff); |
|
| 482 | - if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) { |
|
| 479 | + if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) { |
|
| 480 | + if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 481 | + else unset($timediff); |
|
| 482 | + if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) { |
|
| 483 | 483 | if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) { |
| 484 | - if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate) || !$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 484 | + if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate) || !$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 485 | 485 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 486 | 486 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 487 | 487 | $this->all_flights[$id]['putinarchive'] = true; |
| 488 | 488 | $this->tmd = 0; |
| 489 | 489 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 490 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 491 | - $timeelapsed = microtime(true); |
|
| 492 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 490 | + if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 491 | + $timeelapsed = microtime(true); |
|
| 492 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 493 | 493 | $Spotter = new Spotter($this->db); |
| 494 | 494 | $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 495 | 495 | if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
@@ -497,18 +497,18 @@ discard block |
||
| 497 | 497 | $Spotter->db = null; |
| 498 | 498 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 499 | 499 | if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
| 500 | - } |
|
| 500 | + } |
|
| 501 | + } |
|
| 501 | 502 | } |
| 502 | - } |
|
| 503 | 503 | } |
| 504 | 504 | |
| 505 | 505 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 506 | - //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
|
| 506 | + //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
|
| 507 | 507 | if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 508 | 508 | if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
| 509 | - $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
|
| 510 | - $dataFound = true; |
|
| 511 | - $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 509 | + $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
|
| 510 | + $dataFound = true; |
|
| 511 | + $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 512 | 512 | } |
| 513 | 513 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 514 | 514 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
@@ -519,20 +519,20 @@ discard block |
||
| 519 | 519 | //$putinarchive = true; |
| 520 | 520 | } |
| 521 | 521 | */ |
| 522 | - /* |
|
| 522 | + /* |
|
| 523 | 523 | } elseif (isset($this->all_flights[$id]['latitude'])) { |
| 524 | 524 | if ($globalDebug) echo '!!! Strange latitude value - diff : '.abs($this->all_flights[$id]['latitude']-$line['latitude']).'- previous lat : '.$this->all_flights[$id]['latitude'].'- new lat : '.$line['latitude']."\n"; |
| 525 | 525 | } |
| 526 | 526 | */ |
| 527 | 527 | } |
| 528 | 528 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 529 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 530 | - //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == '' || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
|
| 529 | + if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 530 | + //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == '' || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
|
| 531 | 531 | if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 532 | 532 | if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
| 533 | - $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
|
| 534 | - $dataFound = true; |
|
| 535 | - $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 533 | + $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
|
| 534 | + $dataFound = true; |
|
| 535 | + $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 536 | 536 | } |
| 537 | 537 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 538 | 538 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
@@ -550,77 +550,77 @@ discard block |
||
| 550 | 550 | */ |
| 551 | 551 | } |
| 552 | 552 | |
| 553 | - } else if ($globalDebug && $timediff > 30) { |
|
| 553 | + } else if ($globalDebug && $timediff > 30) { |
|
| 554 | 554 | $this->tmd = $this->tmd + 1; |
| 555 | 555 | echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
| 556 | 556 | echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
| 557 | 557 | echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
| 558 | 558 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
| 559 | - } |
|
| 559 | + } |
|
| 560 | 560 | } |
| 561 | 561 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 562 | - if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 563 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 562 | + if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 563 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 564 | 564 | } |
| 565 | 565 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 566 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 567 | - //$dataFound = true; |
|
| 566 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 567 | + //$dataFound = true; |
|
| 568 | 568 | } |
| 569 | 569 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 570 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 570 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 571 | 571 | } |
| 572 | 572 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 573 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 573 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 574 | 574 | } |
| 575 | 575 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 576 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 577 | - //$dataFound = true; |
|
| 576 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 577 | + //$dataFound = true; |
|
| 578 | 578 | } |
| 579 | 579 | if (isset($line['ground']) && $line['ground'] != '') { |
| 580 | - if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
|
| 580 | + if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
|
| 581 | 581 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 582 | 582 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 583 | 583 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 584 | 584 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 585 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 585 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 586 | 586 | elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 587 | - } |
|
| 588 | - if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 589 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 590 | - //$dataFound = true; |
|
| 587 | + } |
|
| 588 | + if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 589 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 590 | + //$dataFound = true; |
|
| 591 | 591 | } |
| 592 | 592 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 593 | - if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) { |
|
| 594 | - if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 595 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 596 | - $highlight = ''; |
|
| 597 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 598 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 599 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 600 | - if ($highlight != '') { |
|
| 593 | + if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) { |
|
| 594 | + if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 595 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 596 | + $highlight = ''; |
|
| 597 | + if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 598 | + if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 599 | + if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 600 | + if ($highlight != '') { |
|
| 601 | 601 | $timeelapsed = microtime(true); |
| 602 | 602 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 603 | - $Spotter = new Spotter($this->db); |
|
| 604 | - $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 605 | - $Spotter->db = null; |
|
| 606 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 603 | + $Spotter = new Spotter($this->db); |
|
| 604 | + $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 605 | + $Spotter->db = null; |
|
| 606 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 607 | 607 | } |
| 608 | 608 | //$putinarchive = true; |
| 609 | 609 | //$highlight = ''; |
| 610 | - } |
|
| 610 | + } |
|
| 611 | 611 | |
| 612 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 613 | - //$dataFound = true; |
|
| 612 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 613 | + //$dataFound = true; |
|
| 614 | 614 | } |
| 615 | 615 | |
| 616 | 616 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 617 | - //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 617 | + //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 618 | 618 | if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
| 619 | 619 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
| 620 | 620 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
| 621 | 621 | //$dataFound = true; |
| 622 | - //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 623 | - if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
|
| 622 | + //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 623 | + if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
|
| 624 | 624 | if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 2300) { |
| 625 | 625 | if ($globalDebug) echo '--- Reset because of altitude'."\n"; |
| 626 | 626 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
@@ -629,27 +629,27 @@ discard block |
||
| 629 | 629 | elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 630 | 630 | elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 631 | 631 | } |
| 632 | - } |
|
| 633 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
|
| 632 | + } |
|
| 633 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
|
| 634 | 634 | } |
| 635 | 635 | |
| 636 | 636 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 637 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 637 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 638 | 638 | } |
| 639 | 639 | |
| 640 | 640 | if (isset($line['heading']) && $line['heading'] != '') { |
| 641 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 642 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 643 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 644 | - //$dataFound = true; |
|
| 641 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 642 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 643 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 644 | + //$dataFound = true; |
|
| 645 | 645 | } elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) { |
| 646 | - $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 647 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 648 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 649 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
| 646 | + $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 647 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 648 | + if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 649 | + if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
| 650 | 650 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 651 | - // If not enough messages and ACARS set heading to 0 |
|
| 652 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 651 | + // If not enough messages and ACARS set heading to 0 |
|
| 652 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 653 | 653 | } |
| 654 | 654 | if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 655 | 655 | elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
@@ -661,125 +661,125 @@ discard block |
||
| 661 | 661 | //if ($dataFound == true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['ident'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 662 | 662 | //if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 663 | 663 | if ($dataFound === true && isset($this->all_flights[$id]['hex'])) { |
| 664 | - $this->all_flights[$id]['lastupdate'] = time(); |
|
| 665 | - if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
|
| 666 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 667 | - //print_r($this->all_flights); |
|
| 668 | - //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
|
| 669 | - //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
|
| 670 | - if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
|
| 664 | + $this->all_flights[$id]['lastupdate'] = time(); |
|
| 665 | + if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
|
| 666 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 667 | + //print_r($this->all_flights); |
|
| 668 | + //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
|
| 669 | + //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
|
| 670 | + if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
|
| 671 | 671 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 672 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 673 | - $timeelapsed = microtime(true); |
|
| 674 | - $SpotterLive = new SpotterLive($this->db); |
|
| 675 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 672 | + if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 673 | + $timeelapsed = microtime(true); |
|
| 674 | + $SpotterLive = new SpotterLive($this->db); |
|
| 675 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 676 | 676 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 677 | 677 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 678 | - } elseif (isset($line['id'])) { |
|
| 678 | + } elseif (isset($line['id'])) { |
|
| 679 | 679 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 680 | 680 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 681 | - } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
|
| 681 | + } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
|
| 682 | 682 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 683 | 683 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 684 | - } else $recent_ident = ''; |
|
| 685 | - $SpotterLive->db=null; |
|
| 686 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 687 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 684 | + } else $recent_ident = ''; |
|
| 685 | + $SpotterLive->db=null; |
|
| 686 | + if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 687 | + elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 688 | 688 | } else $recent_ident = ''; |
| 689 | - } else { |
|
| 689 | + } else { |
|
| 690 | 690 | $recent_ident = ''; |
| 691 | 691 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
| 692 | - } |
|
| 693 | - //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 694 | - if($recent_ident == "") |
|
| 695 | - { |
|
| 692 | + } |
|
| 693 | + //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 694 | + if($recent_ident == "") |
|
| 695 | + { |
|
| 696 | 696 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
| 697 | 697 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 698 | 698 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 699 | 699 | //adds the spotter data for the archive |
| 700 | 700 | $ignoreImport = false; |
| 701 | 701 | foreach($globalAirportIgnore as $airportIgnore) { |
| 702 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 702 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 703 | 703 | $ignoreImport = true; |
| 704 | - } |
|
| 704 | + } |
|
| 705 | 705 | } |
| 706 | 706 | if (count($globalAirportAccept) > 0) { |
| 707 | - $ignoreImport = true; |
|
| 708 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 707 | + $ignoreImport = true; |
|
| 708 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 709 | 709 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 710 | - $ignoreImport = false; |
|
| 710 | + $ignoreImport = false; |
|
| 711 | + } |
|
| 711 | 712 | } |
| 712 | - } |
|
| 713 | 713 | } |
| 714 | 714 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 715 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 715 | + foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 716 | 716 | if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
| 717 | - $ignoreImport = true; |
|
| 717 | + $ignoreImport = true; |
|
| 718 | + } |
|
| 718 | 719 | } |
| 719 | - } |
|
| 720 | 720 | } |
| 721 | 721 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 722 | - $ignoreImport = true; |
|
| 723 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 722 | + $ignoreImport = true; |
|
| 723 | + foreach($globalAirlineAccept as $airlineAccept) { |
|
| 724 | 724 | if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
| 725 | - $ignoreImport = false; |
|
| 725 | + $ignoreImport = false; |
|
| 726 | + } |
|
| 726 | 727 | } |
| 727 | - } |
|
| 728 | 728 | } |
| 729 | 729 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 730 | - $ignoreImport = true; |
|
| 731 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 730 | + $ignoreImport = true; |
|
| 731 | + foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 732 | 732 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 733 | - $ignoreImport = false; |
|
| 733 | + $ignoreImport = false; |
|
| 734 | + } |
|
| 734 | 735 | } |
| 735 | - } |
|
| 736 | 736 | } |
| 737 | 737 | |
| 738 | 738 | if (!$ignoreImport) { |
| 739 | - $highlight = ''; |
|
| 740 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 741 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 742 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 743 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 744 | - $timeelapsed = microtime(true); |
|
| 745 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 739 | + $highlight = ''; |
|
| 740 | + if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 741 | + if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 742 | + if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 743 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 744 | + $timeelapsed = microtime(true); |
|
| 745 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 746 | 746 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 747 | - $Spotter = new Spotter($this->db); |
|
| 748 | - $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
|
| 749 | - $Spotter->db = null; |
|
| 750 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 747 | + $Spotter = new Spotter($this->db); |
|
| 748 | + $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
|
| 749 | + $Spotter->db = null; |
|
| 750 | + if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 751 | + } |
|
| 751 | 752 | } |
| 752 | - } |
|
| 753 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 754 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 753 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 754 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 755 | 755 | |
| 756 | - // Add source stat in DB |
|
| 757 | - $Stats = new Stats($this->db); |
|
| 758 | - if (!empty($this->stats)) { |
|
| 756 | + // Add source stat in DB |
|
| 757 | + $Stats = new Stats($this->db); |
|
| 758 | + if (!empty($this->stats)) { |
|
| 759 | 759 | if ($globalDebug) echo 'Add source stats : '; |
| 760 | - foreach($this->stats as $date => $data) { |
|
| 761 | - foreach($data as $source => $sourced) { |
|
| 762 | - //print_r($sourced); |
|
| 763 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 764 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 765 | - if (isset($sourced['msg'])) { |
|
| 766 | - if (time() - $sourced['msg']['date'] > 10) { |
|
| 767 | - $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 768 | - echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 769 | - unset($this->stats[$date][$source]['msg']); |
|
| 770 | - } |
|
| 771 | - } |
|
| 772 | - } |
|
| 773 | - if ($date != date('Y-m-d')) { |
|
| 774 | - unset($this->stats[$date]); |
|
| 775 | - } |
|
| 776 | - } |
|
| 777 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 778 | - |
|
| 779 | - } |
|
| 780 | - $Stats->db = null; |
|
| 781 | - } |
|
| 782 | - $this->del(); |
|
| 760 | + foreach($this->stats as $date => $data) { |
|
| 761 | + foreach($data as $source => $sourced) { |
|
| 762 | + //print_r($sourced); |
|
| 763 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 764 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 765 | + if (isset($sourced['msg'])) { |
|
| 766 | + if (time() - $sourced['msg']['date'] > 10) { |
|
| 767 | + $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 768 | + echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 769 | + unset($this->stats[$date][$source]['msg']); |
|
| 770 | + } |
|
| 771 | + } |
|
| 772 | + } |
|
| 773 | + if ($date != date('Y-m-d')) { |
|
| 774 | + unset($this->stats[$date]); |
|
| 775 | + } |
|
| 776 | + } |
|
| 777 | + if ($globalDebug) echo 'Done'."\n"; |
|
| 778 | + |
|
| 779 | + } |
|
| 780 | + $Stats->db = null; |
|
| 781 | + } |
|
| 782 | + $this->del(); |
|
| 783 | 783 | } elseif ($globalDebug) echo 'Ignore data'."\n"; |
| 784 | 784 | //$ignoreImport = false; |
| 785 | 785 | $this->all_flights[$id]['addedSpotter'] = 1; |
@@ -797,41 +797,41 @@ discard block |
||
| 797 | 797 | */ |
| 798 | 798 | //SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']); |
| 799 | 799 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 800 | - if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 801 | - //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
|
| 802 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 800 | + if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 801 | + //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
|
| 802 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 803 | 803 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 804 | - $SpotterLive = new SpotterLive($this->db); |
|
| 805 | - $SpotterLive->deleteLiveSpotterData(); |
|
| 806 | - $SpotterLive->db=null; |
|
| 804 | + $SpotterLive = new SpotterLive($this->db); |
|
| 805 | + $SpotterLive->deleteLiveSpotterData(); |
|
| 806 | + $SpotterLive->db=null; |
|
| 807 | 807 | } |
| 808 | - } |
|
| 809 | - if ($globalDebug) echo " Done\n"; |
|
| 810 | - $this->last_delete = time(); |
|
| 808 | + } |
|
| 809 | + if ($globalDebug) echo " Done\n"; |
|
| 810 | + $this->last_delete = time(); |
|
| 811 | 811 | } |
| 812 | - } else { |
|
| 812 | + } else { |
|
| 813 | 813 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs')) { |
| 814 | - $this->all_flights[$id]['id'] = $recent_ident; |
|
| 815 | - $this->all_flights[$id]['addedSpotter'] = 1; |
|
| 814 | + $this->all_flights[$id]['id'] = $recent_ident; |
|
| 815 | + $this->all_flights[$id]['addedSpotter'] = 1; |
|
| 816 | 816 | } |
| 817 | 817 | if (isset($globalDaemon) && !$globalDaemon) { |
| 818 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 818 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 819 | 819 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 820 | - $Spotter = new Spotter($this->db); |
|
| 821 | - $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']); |
|
| 822 | - $Spotter->db = null; |
|
| 820 | + $Spotter = new Spotter($this->db); |
|
| 821 | + $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']); |
|
| 822 | + $Spotter->db = null; |
|
| 823 | + } |
|
| 823 | 824 | } |
| 824 | - } |
|
| 825 | 825 | } |
| 826 | 826 | |
| 827 | - } |
|
| 827 | + } |
|
| 828 | 828 | } |
| 829 | - } |
|
| 830 | - //adds the spotter LIVE data |
|
| 831 | - //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed); |
|
| 832 | - //echo "\nAdd in Live !! \n"; |
|
| 833 | - //echo "{$line[8]} {$line[7]} - MODES:{$line[4]} CALLSIGN:{$line[10]} ALT:{$line[11]} VEL:{$line[12]} HDG:{$line[13]} LAT:{$line[14]} LON:{$line[15]} VR:{$line[16]} SQUAWK:{$line[17]}\n"; |
|
| 834 | - if ($globalDebug) { |
|
| 829 | + } |
|
| 830 | + //adds the spotter LIVE data |
|
| 831 | + //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed); |
|
| 832 | + //echo "\nAdd in Live !! \n"; |
|
| 833 | + //echo "{$line[8]} {$line[7]} - MODES:{$line[4]} CALLSIGN:{$line[10]} ALT:{$line[11]} VEL:{$line[12]} HDG:{$line[13]} LAT:{$line[14]} LON:{$line[15]} VR:{$line[16]} SQUAWK:{$line[17]}\n"; |
|
| 834 | + if ($globalDebug) { |
|
| 835 | 835 | if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) { |
| 836 | 836 | if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n"; |
| 837 | 837 | else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n"; |
@@ -839,60 +839,60 @@ discard block |
||
| 839 | 839 | if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n"; |
| 840 | 840 | else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n"; |
| 841 | 841 | } |
| 842 | - } |
|
| 843 | - $ignoreImport = false; |
|
| 844 | - if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
|
| 845 | - if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
|
| 842 | + } |
|
| 843 | + $ignoreImport = false; |
|
| 844 | + if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
|
| 845 | + if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
|
| 846 | 846 | |
| 847 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 848 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 849 | - $ignoreImport = true; |
|
| 847 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 848 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 849 | + $ignoreImport = true; |
|
| 850 | + } |
|
| 850 | 851 | } |
| 851 | - } |
|
| 852 | - if (count($globalAirportAccept) > 0) { |
|
| 853 | - $ignoreImport = true; |
|
| 854 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 855 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 852 | + if (count($globalAirportAccept) > 0) { |
|
| 853 | + $ignoreImport = true; |
|
| 854 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 855 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 856 | 856 | $ignoreImport = false; |
| 857 | - } |
|
| 857 | + } |
|
| 858 | 858 | } |
| 859 | - } |
|
| 860 | - if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
|
| 859 | + } |
|
| 860 | + if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
|
| 861 | 861 | foreach($globalAirlineIgnore as $airlineIgnore) { |
| 862 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 862 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 863 | 863 | $ignoreImport = true; |
| 864 | - } |
|
| 864 | + } |
|
| 865 | 865 | } |
| 866 | - } |
|
| 867 | - if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
|
| 866 | + } |
|
| 867 | + if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
|
| 868 | 868 | $ignoreImport = true; |
| 869 | 869 | foreach($globalAirlineAccept as $airlineAccept) { |
| 870 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 870 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 871 | 871 | $ignoreImport = false; |
| 872 | - } |
|
| 872 | + } |
|
| 873 | + } |
|
| 873 | 874 | } |
| 874 | - } |
|
| 875 | - if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
|
| 875 | + if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
|
| 876 | 876 | $ignoreImport = true; |
| 877 | 877 | foreach($globalPilotIdAccept as $pilotIdAccept) { |
| 878 | - if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
|
| 879 | - $ignoreImport = false; |
|
| 880 | - } |
|
| 878 | + if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
|
| 879 | + $ignoreImport = false; |
|
| 880 | + } |
|
| 881 | + } |
|
| 881 | 882 | } |
| 882 | - } |
|
| 883 | 883 | |
| 884 | - if (!$ignoreImport) { |
|
| 884 | + if (!$ignoreImport) { |
|
| 885 | 885 | if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 886 | 886 | if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
| 887 | 887 | $timeelapsed = microtime(true); |
| 888 | 888 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 889 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 889 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 890 | 890 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
| 891 | 891 | $SpotterLive = new SpotterLive($this->db); |
| 892 | 892 | $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
| 893 | 893 | $SpotterLive->db = null; |
| 894 | 894 | if ($globalDebug) echo $result."\n"; |
| 895 | - } |
|
| 895 | + } |
|
| 896 | 896 | } |
| 897 | 897 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 898 | 898 | $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
@@ -904,7 +904,7 @@ discard block |
||
| 904 | 904 | //if ($line['format_source'] != 'aprs') { |
| 905 | 905 | //if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) { |
| 906 | 906 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 907 | - if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
|
| 907 | + if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
|
| 908 | 908 | $source = $this->all_flights[$id]['source_name']; |
| 909 | 909 | if ($source == '') $source = $this->all_flights[$id]['format_source']; |
| 910 | 910 | if (!isset($this->source_location[$source])) { |
@@ -930,7 +930,7 @@ discard block |
||
| 930 | 930 | if ($stats_heading == 16) $stats_heading = 0; |
| 931 | 931 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 932 | 932 | for ($i=0;$i<=15;$i++) { |
| 933 | - $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 933 | + $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 934 | 934 | } |
| 935 | 935 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
| 936 | 936 | } else { |
@@ -943,17 +943,17 @@ discard block |
||
| 943 | 943 | //var_dump($this->stats); |
| 944 | 944 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 945 | 945 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 946 | - end($this->stats[$current_date][$source]['hist']); |
|
| 947 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 946 | + end($this->stats[$current_date][$source]['hist']); |
|
| 947 | + $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 948 | 948 | } else $mini = 0; |
| 949 | 949 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 950 | - $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 950 | + $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 951 | 951 | } |
| 952 | 952 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
| 953 | 953 | } else { |
| 954 | 954 | $this->stats[$current_date][$source]['hist'][$distance] += 1; |
| 955 | 955 | } |
| 956 | - } |
|
| 956 | + } |
|
| 957 | 957 | } |
| 958 | 958 | |
| 959 | 959 | $this->all_flights[$id]['lastupdate'] = time(); |
@@ -963,7 +963,7 @@ discard block |
||
| 963 | 963 | //$this->del(); |
| 964 | 964 | |
| 965 | 965 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 966 | - if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 966 | + if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 967 | 967 | if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
| 968 | 968 | $SpotterLive = new SpotterLive($this->db); |
| 969 | 969 | $SpotterLive->deleteLiveSpotterDataNotUpdated(); |
@@ -971,19 +971,19 @@ discard block |
||
| 971 | 971 | //SpotterLive->deleteLiveSpotterData(); |
| 972 | 972 | if ($globalDebug) echo " Done\n"; |
| 973 | 973 | $this->last_delete_hourly = time(); |
| 974 | - } else { |
|
| 974 | + } else { |
|
| 975 | 975 | $this->del(); |
| 976 | 976 | $this->last_delete_hourly = time(); |
| 977 | - } |
|
| 977 | + } |
|
| 978 | 978 | } |
| 979 | 979 | |
| 980 | - } |
|
| 981 | - //$ignoreImport = false; |
|
| 980 | + } |
|
| 981 | + //$ignoreImport = false; |
|
| 982 | 982 | } |
| 983 | 983 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 984 | 984 | if ($send) return $this->all_flights[$id]; |
| 985 | - } |
|
| 985 | + } |
|
| 986 | + } |
|
| 986 | 987 | } |
| 987 | - } |
|
| 988 | 988 | } |
| 989 | 989 | ?> |
@@ -63,7 +63,9 @@ discard block |
||
| 63 | 63 | $dbc = $this->db; |
| 64 | 64 | $this->all_flights[$id]['schedule_check'] = true; |
| 65 | 65 | if ($globalSchedulesFetch) { |
| 66 | - if ($globalDebug) echo 'Getting schedule info...'."\n"; |
|
| 66 | + if ($globalDebug) { |
|
| 67 | + echo 'Getting schedule info...'."\n"; |
|
| 68 | + } |
|
| 67 | 69 | $Spotter = new Spotter($dbc); |
| 68 | 70 | $Schedule = new Schedule($dbc); |
| 69 | 71 | $Translation = new Translation($dbc); |
@@ -74,7 +76,9 @@ discard block |
||
| 74 | 76 | if ($Schedule->checkSchedule($operator) == 0) { |
| 75 | 77 | $schedule = $Schedule->fetchSchedule($operator); |
| 76 | 78 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 77 | - if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 79 | + if ($globalDebug) { |
|
| 80 | + echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 81 | + } |
|
| 78 | 82 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
| 79 | 83 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
| 80 | 84 | // Should also check if route schedule = route from DB |
@@ -83,7 +87,9 @@ discard block |
||
| 83 | 87 | $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']); |
| 84 | 88 | if (trim($airport_icao) != '') { |
| 85 | 89 | $this->all_flights[$id]['departure_airport'] = $airport_icao; |
| 86 | - if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n"; |
|
| 90 | + if ($globalDebug) { |
|
| 91 | + echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n"; |
|
| 92 | + } |
|
| 87 | 93 | } |
| 88 | 94 | } |
| 89 | 95 | } |
@@ -92,17 +98,25 @@ discard block |
||
| 92 | 98 | $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']); |
| 93 | 99 | if (trim($airport_icao) != '') { |
| 94 | 100 | $this->all_flights[$id]['arrival_airport'] = $airport_icao; |
| 95 | - if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n"; |
|
| 101 | + if ($globalDebug) { |
|
| 102 | + echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n"; |
|
| 103 | + } |
|
| 96 | 104 | } |
| 97 | 105 | } |
| 98 | 106 | } |
| 99 | 107 | $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']); |
| 100 | 108 | } |
| 101 | - } else $scheduleexist = true; |
|
| 102 | - } else $scheduleexist = true; |
|
| 109 | + } else { |
|
| 110 | + $scheduleexist = true; |
|
| 111 | + } |
|
| 112 | + } else { |
|
| 113 | + $scheduleexist = true; |
|
| 114 | + } |
|
| 103 | 115 | // close connection, at least one way will work ? |
| 104 | 116 | if ($scheduleexist) { |
| 105 | - if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
|
| 117 | + if ($globalDebug) { |
|
| 118 | + echo "-> get arrival/departure airport info for ".$ident."\n"; |
|
| 119 | + } |
|
| 106 | 120 | $sch = $Schedule->getSchedule($operator); |
| 107 | 121 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time'])); |
| 108 | 122 | } |
@@ -124,14 +138,18 @@ discard block |
||
| 124 | 138 | |
| 125 | 139 | public function checkAll() { |
| 126 | 140 | global $globalDebug, $globalNoImport; |
| 127 | - if ($globalDebug) echo "Update last seen flights data...\n"; |
|
| 141 | + if ($globalDebug) { |
|
| 142 | + echo "Update last seen flights data...\n"; |
|
| 143 | + } |
|
| 128 | 144 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 129 | 145 | foreach ($this->all_flights as $key => $flight) { |
| 130 | 146 | if (isset($this->all_flights[$key]['id'])) { |
| 131 | 147 | //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
| 132 | 148 | $Spotter = new Spotter($this->db); |
| 133 | 149 | $real_arrival = $this->arrival($key); |
| 134 | - if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 150 | + if (isset($this->all_flights[$key]['altitude'])) { |
|
| 151 | + $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 152 | + } |
|
| 135 | 153 | } |
| 136 | 154 | } |
| 137 | 155 | } |
@@ -139,24 +157,32 @@ discard block |
||
| 139 | 157 | |
| 140 | 158 | public function arrival($key) { |
| 141 | 159 | global $globalClosestMinDist, $globalDebug; |
| 142 | - if ($globalDebug) echo 'Update arrival...'."\n"; |
|
| 160 | + if ($globalDebug) { |
|
| 161 | + echo 'Update arrival...'."\n"; |
|
| 162 | + } |
|
| 143 | 163 | $Spotter = new Spotter($this->db); |
| 144 | 164 | $airport_icao = ''; |
| 145 | 165 | $airport_time = ''; |
| 146 | - if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
| 166 | + if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') { |
|
| 167 | + $globalClosestMinDist = 50; |
|
| 168 | + } |
|
| 147 | 169 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 148 | 170 | $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
| 149 | 171 | if (isset($closestAirports[0])) { |
| 150 | 172 | if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
| 151 | 173 | $airport_icao = $closestAirports[0]['icao']; |
| 152 | 174 | $airport_time = $this->all_flights[$key]['datetime']; |
| 153 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 175 | + if ($globalDebug) { |
|
| 176 | + echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 177 | + } |
|
| 154 | 178 | } elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') { |
| 155 | 179 | foreach ($closestAirports as $airport) { |
| 156 | 180 | if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) { |
| 157 | 181 | $airport_icao = $airport['icao']; |
| 158 | 182 | $airport_time = $this->all_flights[$key]['datetime']; |
| 159 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 183 | + if ($globalDebug) { |
|
| 184 | + echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 185 | + } |
|
| 160 | 186 | break; |
| 161 | 187 | } |
| 162 | 188 | } |
@@ -164,14 +190,20 @@ discard block |
||
| 164 | 190 | $airport_icao = $closestAirports[0]['icao']; |
| 165 | 191 | $airport_time = $this->all_flights[$key]['datetime']; |
| 166 | 192 | } else { |
| 167 | - if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 193 | + if ($globalDebug) { |
|
| 194 | + echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 195 | + } |
|
| 168 | 196 | } |
| 169 | 197 | } else { |
| 170 | - if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 198 | + if ($globalDebug) { |
|
| 199 | + echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 200 | + } |
|
| 171 | 201 | } |
| 172 | 202 | |
| 173 | 203 | } else { |
| 174 | - if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 204 | + if ($globalDebug) { |
|
| 205 | + echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 206 | + } |
|
| 175 | 207 | } |
| 176 | 208 | return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
| 177 | 209 | } |
@@ -181,7 +213,9 @@ discard block |
||
| 181 | 213 | public function del() { |
| 182 | 214 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 183 | 215 | // Delete old infos |
| 184 | - if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
|
| 216 | + if ($globalDebug) { |
|
| 217 | + echo 'Delete old values and update latest data...'."\n"; |
|
| 218 | + } |
|
| 185 | 219 | foreach ($this->all_flights as $key => $flight) { |
| 186 | 220 | if (isset($flight['lastupdate'])) { |
| 187 | 221 | if ($flight['lastupdate'] < (time()-5900)) { |
@@ -195,13 +229,17 @@ discard block |
||
| 195 | 229 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 196 | 230 | // Delete old infos |
| 197 | 231 | if (isset($this->all_flights[$key]['id'])) { |
| 198 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
| 232 | + if ($globalDebug) { |
|
| 233 | + echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
| 234 | + } |
|
| 199 | 235 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 200 | 236 | $real_arrival = $this->arrival($key); |
| 201 | 237 | $Spotter = new Spotter($this->db); |
| 202 | 238 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 203 | 239 | $result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
| 204 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 240 | + if ($globalDebug && $result != 'success') { |
|
| 241 | + echo '!!! ERROR : '.$result."\n"; |
|
| 242 | + } |
|
| 205 | 243 | } |
| 206 | 244 | } |
| 207 | 245 | } |
@@ -211,9 +249,13 @@ discard block |
||
| 211 | 249 | public function add($line) { |
| 212 | 250 | global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA, $globalAircraftMaxUpdate, $globalAircraftMinUpdate; |
| 213 | 251 | //if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE; |
| 214 | - if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
|
| 215 | - if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') $globalAircraftMaxUpdate = 2300; |
|
| 216 | -/* |
|
| 252 | + if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') { |
|
| 253 | + $globalCoordMinChange = '0.02'; |
|
| 254 | + } |
|
| 255 | + if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') { |
|
| 256 | + $globalAircraftMaxUpdate = 2300; |
|
| 257 | + } |
|
| 258 | + /* |
|
| 217 | 259 | $Spotter = new Spotter(); |
| 218 | 260 | $dbc = $Spotter->db; |
| 219 | 261 | $SpotterLive = new SpotterLive($dbc); |
@@ -240,13 +282,20 @@ discard block |
||
| 240 | 282 | // Increment message number |
| 241 | 283 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) { |
| 242 | 284 | $current_date = date('Y-m-d'); |
| 243 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 244 | - else $source = ''; |
|
| 245 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 285 | + if (isset($line['source_name'])) { |
|
| 286 | + $source = $line['source_name']; |
|
| 287 | + } else { |
|
| 288 | + $source = ''; |
|
| 289 | + } |
|
| 290 | + if ($source == '' || $line['format_source'] == 'aprs') { |
|
| 291 | + $source = $line['format_source']; |
|
| 292 | + } |
|
| 246 | 293 | if (!isset($this->stats[$current_date][$source]['msg'])) { |
| 247 | 294 | $this->stats[$current_date][$source]['msg']['date'] = time(); |
| 248 | 295 | $this->stats[$current_date][$source]['msg']['nb'] = 1; |
| 249 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 296 | + } else { |
|
| 297 | + $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 298 | + } |
|
| 250 | 299 | } |
| 251 | 300 | |
| 252 | 301 | /* |
@@ -262,22 +311,35 @@ discard block |
||
| 262 | 311 | //$this->db = $dbc; |
| 263 | 312 | |
| 264 | 313 | //$hex = trim($line['hex']); |
| 265 | - if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 266 | - else $id = trim($line['id']); |
|
| 314 | + if (!isset($line['id'])) { |
|
| 315 | + $id = trim($line['hex']); |
|
| 316 | + } else { |
|
| 317 | + $id = trim($line['id']); |
|
| 318 | + } |
|
| 267 | 319 | |
| 268 | 320 | if (!isset($this->all_flights[$id])) { |
| 269 | 321 | $this->all_flights[$id] = array(); |
| 270 | 322 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 271 | 323 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
| 272 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 324 | + if (isset($globalDaemon) && $globalDaemon === FALSE) { |
|
| 325 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 326 | + } |
|
| 273 | 327 | if (!isset($line['id'])) { |
| 274 | - if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
| 275 | -// if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi'))); |
|
| 328 | + if (!isset($globalDaemon)) { |
|
| 329 | + $globalDaemon = TRUE; |
|
| 330 | + } |
|
| 331 | + // if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi'))); |
|
| 276 | 332 | // if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
| 277 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 333 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 334 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 335 | + } |
|
| 278 | 336 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 279 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 280 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 337 | + } else { |
|
| 338 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 339 | + } |
|
| 340 | + if ($globalAllFlights !== FALSE) { |
|
| 341 | + $dataFound = true; |
|
| 342 | + } |
|
| 281 | 343 | } |
| 282 | 344 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 283 | 345 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
@@ -299,17 +361,27 @@ discard block |
||
| 299 | 361 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 300 | 362 | } |
| 301 | 363 | $Spotter->db = null; |
| 302 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 303 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 364 | + if ($globalDebugTimeElapsed) { |
|
| 365 | + echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 366 | + } |
|
| 367 | + if ($aircraft_icao != '') { |
|
| 368 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 369 | + } |
|
| 304 | 370 | } |
| 305 | 371 | } |
| 306 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 307 | - if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 372 | + if ($globalAllFlights !== FALSE) { |
|
| 373 | + $dataFound = true; |
|
| 374 | + } |
|
| 375 | + if ($globalDebug) { |
|
| 376 | + echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 377 | + } |
|
| 308 | 378 | } |
| 309 | 379 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
| 310 | 380 | $icao = $line['aircraft_icao']; |
| 311 | 381 | $Spotter = new Spotter($this->db); |
| 312 | - if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
|
| 382 | + if (isset($Spotter->aircraft_correct_icaotype[$icao])) { |
|
| 383 | + $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
|
| 384 | + } |
|
| 313 | 385 | $Spotter->db = null; |
| 314 | 386 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao)); |
| 315 | 387 | } |
@@ -319,15 +391,24 @@ discard block |
||
| 319 | 391 | $Spotter = new Spotter($this->db); |
| 320 | 392 | $aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
| 321 | 393 | $Spotter->db = null; |
| 322 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 394 | + if ($aircraft_icao != '') { |
|
| 395 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 396 | + } |
|
| 323 | 397 | } |
| 324 | 398 | } |
| 325 | 399 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) { |
| 326 | - if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID'; |
|
| 327 | - elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
|
| 328 | - elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
|
| 329 | - elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
|
| 330 | - if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 400 | + if ($line['aircraft_type'] == 'PARA_GLIDER') { |
|
| 401 | + $aircraft_icao = 'GLID'; |
|
| 402 | + } elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') { |
|
| 403 | + $aircraft_icao = 'UHEL'; |
|
| 404 | + } elseif ($line['aircraft_type'] == 'TOW_PLANE') { |
|
| 405 | + $aircraft_icao = 'TOWPLANE'; |
|
| 406 | + } elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') { |
|
| 407 | + $aircraft_icao = 'POWAIRC'; |
|
| 408 | + } |
|
| 409 | + if (isset($aircraft_icao)) { |
|
| 410 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 411 | + } |
|
| 331 | 412 | } |
| 332 | 413 | if (!isset($this->all_flights[$id]['aircraft_icao'])) { |
| 333 | 414 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
@@ -337,8 +418,11 @@ discard block |
||
| 337 | 418 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
| 338 | 419 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 339 | 420 | } else { |
| 340 | - if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 341 | - elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 421 | + if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) { |
|
| 422 | + echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 423 | + } elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) { |
|
| 424 | + echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 425 | + } |
|
| 342 | 426 | /* |
| 343 | 427 | echo strtotime($line['datetime']).' > '.strtotime($this->all_flights[$id]['datetime']); |
| 344 | 428 | print_r($this->all_flights[$id]); |
@@ -347,16 +431,22 @@ discard block |
||
| 347 | 431 | return ''; |
| 348 | 432 | } |
| 349 | 433 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 350 | - if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 434 | + if ($globalDebug) { |
|
| 435 | + echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 436 | + } |
|
| 351 | 437 | return ''; |
| 352 | 438 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
| 353 | - if ($globalDebug) echo "!!! Date is in the future ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 439 | + if ($globalDebug) { |
|
| 440 | + echo "!!! Date is in the future ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 441 | + } |
|
| 354 | 442 | return ''; |
| 355 | 443 | } elseif (!isset($line['datetime'])) { |
| 356 | 444 | date_default_timezone_set('UTC'); |
| 357 | 445 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
| 358 | 446 | } else { |
| 359 | - if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 447 | + if ($globalDebug) { |
|
| 448 | + echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 449 | + } |
|
| 360 | 450 | return ''; |
| 361 | 451 | } |
| 362 | 452 | |
@@ -377,30 +467,48 @@ discard block |
||
| 377 | 467 | |
| 378 | 468 | if ($this->all_flights[$id]['addedSpotter'] == 1) { |
| 379 | 469 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 2300) { |
| 380 | - if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n"; |
|
| 470 | + if ($globalDebug) { |
|
| 471 | + echo '---!!!! New ident, reset aircraft data...'."\n"; |
|
| 472 | + } |
|
| 381 | 473 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 382 | 474 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 383 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 384 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 385 | - elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 475 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 476 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 477 | + } elseif (isset($line['id'])) { |
|
| 478 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 479 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
| 480 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 481 | + } |
|
| 386 | 482 | } else { |
| 387 | 483 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
| 388 | 484 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 389 | 485 | $timeelapsed = microtime(true); |
| 390 | 486 | $Spotter = new Spotter($this->db); |
| 391 | 487 | $fromsource = NULL; |
| 392 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 393 | - elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 394 | - elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
|
| 395 | - elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
| 396 | - elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
| 488 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') { |
|
| 489 | + $fromsource = $globalAirlinesSource; |
|
| 490 | + } elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') { |
|
| 491 | + $fromsource = 'vatsim'; |
|
| 492 | + } elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') { |
|
| 493 | + $fromsource = 'ivao'; |
|
| 494 | + } elseif (isset($globalVATSIM) && $globalVATSIM) { |
|
| 495 | + $fromsource = 'vatsim'; |
|
| 496 | + } elseif (isset($globalIVAO) && $globalIVAO) { |
|
| 497 | + $fromsource = 'ivao'; |
|
| 498 | + } |
|
| 397 | 499 | $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
| 398 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 500 | + if ($globalDebug && $result != 'success') { |
|
| 501 | + echo '!!! ERROR : '.$result."\n"; |
|
| 502 | + } |
|
| 399 | 503 | $Spotter->db = null; |
| 400 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 504 | + if ($globalDebugTimeElapsed) { |
|
| 505 | + echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 506 | + } |
|
| 401 | 507 | } |
| 402 | 508 | } |
| 403 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 509 | + } else { |
|
| 510 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 511 | + } |
|
| 404 | 512 | |
| 405 | 513 | /* |
| 406 | 514 | if (!isset($line['id'])) { |
@@ -410,7 +518,9 @@ discard block |
||
| 410 | 518 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 411 | 519 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 412 | 520 | */ |
| 413 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 521 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 522 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 523 | + } |
|
| 414 | 524 | |
| 415 | 525 | //$putinarchive = true; |
| 416 | 526 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
@@ -428,7 +538,9 @@ discard block |
||
| 428 | 538 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 429 | 539 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 430 | 540 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
| 431 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 541 | + if ($globalDebugTimeElapsed) { |
|
| 542 | + echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 543 | + } |
|
| 432 | 544 | } |
| 433 | 545 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
| 434 | 546 | $timeelapsed = microtime(true); |
@@ -442,7 +554,9 @@ discard block |
||
| 442 | 554 | $Translation->db = null; |
| 443 | 555 | } |
| 444 | 556 | $Spotter->db = null; |
| 445 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 557 | + if ($globalDebugTimeElapsed) { |
|
| 558 | + echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 559 | + } |
|
| 446 | 560 | } |
| 447 | 561 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 448 | 562 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
@@ -451,9 +565,13 @@ discard block |
||
| 451 | 565 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop'])); |
| 452 | 566 | } |
| 453 | 567 | } |
| 454 | - if (!isset($globalFork)) $globalFork = TRUE; |
|
| 568 | + if (!isset($globalFork)) { |
|
| 569 | + $globalFork = TRUE; |
|
| 570 | + } |
|
| 455 | 571 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 456 | - if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
| 572 | + if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) { |
|
| 573 | + $this->get_Schedule($id,trim($line['ident'])); |
|
| 574 | + } |
|
| 457 | 575 | } |
| 458 | 576 | } |
| 459 | 577 | } |
@@ -469,16 +587,23 @@ discard block |
||
| 469 | 587 | // use datetime |
| 470 | 588 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 471 | 589 | $speed = $speed*3.6; |
| 472 | - if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 473 | - if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
| 590 | + if ($speed < 1000) { |
|
| 591 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 592 | + } |
|
| 593 | + if ($globalDebug) { |
|
| 594 | + echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
| 595 | + } |
|
| 474 | 596 | } |
| 475 | 597 | } |
| 476 | 598 | |
| 477 | 599 | |
| 478 | 600 | |
| 479 | 601 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) { |
| 480 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 481 | - else unset($timediff); |
|
| 602 | + if (isset($this->all_flights[$id]['time_last_coord'])) { |
|
| 603 | + $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 604 | + } else { |
|
| 605 | + unset($timediff); |
|
| 606 | + } |
|
| 482 | 607 | if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) { |
| 483 | 608 | if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) { |
| 484 | 609 | if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate) || !$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
@@ -487,16 +612,25 @@ discard block |
||
| 487 | 612 | $this->all_flights[$id]['putinarchive'] = true; |
| 488 | 613 | $this->tmd = 0; |
| 489 | 614 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 490 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 615 | + if ($globalDebug) { |
|
| 616 | + echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 617 | + } |
|
| 491 | 618 | $timeelapsed = microtime(true); |
| 492 | 619 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 493 | 620 | $Spotter = new Spotter($this->db); |
| 494 | 621 | $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 495 | - if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
| 496 | - else $this->all_flights[$id]['over_country'] = ''; |
|
| 622 | + if (!empty($all_country)) { |
|
| 623 | + $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
| 624 | + } else { |
|
| 625 | + $this->all_flights[$id]['over_country'] = ''; |
|
| 626 | + } |
|
| 497 | 627 | $Spotter->db = null; |
| 498 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 499 | - if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
| 628 | + if ($globalDebugTimeElapsed) { |
|
| 629 | + echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 630 | + } |
|
| 631 | + if ($globalDebug) { |
|
| 632 | + echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
| 633 | + } |
|
| 500 | 634 | } |
| 501 | 635 | } |
| 502 | 636 | } |
@@ -504,7 +638,9 @@ discard block |
||
| 504 | 638 | |
| 505 | 639 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 506 | 640 | //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
| 507 | - if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
|
| 641 | + if (!isset($this->all_flights[$id]['archive_latitude'])) { |
|
| 642 | + $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
|
| 643 | + } |
|
| 508 | 644 | if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
| 509 | 645 | $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
| 510 | 646 | $dataFound = true; |
@@ -526,9 +662,13 @@ discard block |
||
| 526 | 662 | */ |
| 527 | 663 | } |
| 528 | 664 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 529 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 665 | + if ($line['longitude'] > 180) { |
|
| 666 | + $line['longitude'] = $line['longitude'] - 360; |
|
| 667 | + } |
|
| 530 | 668 | //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == '' || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
| 531 | - if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
|
| 669 | + if (!isset($this->all_flights[$id]['archive_longitude'])) { |
|
| 670 | + $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
|
| 671 | + } |
|
| 532 | 672 | if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
| 533 | 673 | $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
| 534 | 674 | $dataFound = true; |
@@ -559,7 +699,9 @@ discard block |
||
| 559 | 699 | } |
| 560 | 700 | } |
| 561 | 701 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 562 | - if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 702 | + if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) { |
|
| 703 | + $dataFound = true; |
|
| 704 | + } |
|
| 563 | 705 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
| 564 | 706 | } |
| 565 | 707 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
@@ -581,53 +723,79 @@ discard block |
||
| 581 | 723 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 582 | 724 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 583 | 725 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 584 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 585 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 586 | - elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 726 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 727 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 728 | + } elseif (isset($line['id'])) { |
|
| 729 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 730 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
| 731 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 732 | + } |
|
| 733 | + } |
|
| 734 | + if ($line['ground'] != 1) { |
|
| 735 | + $line['ground'] = 0; |
|
| 587 | 736 | } |
| 588 | - if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 589 | 737 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
| 590 | 738 | //$dataFound = true; |
| 591 | 739 | } |
| 592 | 740 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 593 | 741 | if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) { |
| 594 | - if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 742 | + if ($this->all_flights[$id]['squawk'] != $line['squawk']) { |
|
| 743 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 744 | + } |
|
| 595 | 745 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
| 596 | 746 | $highlight = ''; |
| 597 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 598 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 599 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 747 | + if ($this->all_flights[$id]['squawk'] == '7500') { |
|
| 748 | + $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 749 | + } |
|
| 750 | + if ($this->all_flights[$id]['squawk'] == '7600') { |
|
| 751 | + $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 752 | + } |
|
| 753 | + if ($this->all_flights[$id]['squawk'] == '7700') { |
|
| 754 | + $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 755 | + } |
|
| 600 | 756 | if ($highlight != '') { |
| 601 | 757 | $timeelapsed = microtime(true); |
| 602 | 758 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 603 | 759 | $Spotter = new Spotter($this->db); |
| 604 | 760 | $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
| 605 | 761 | $Spotter->db = null; |
| 606 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 762 | + if ($globalDebugTimeElapsed) { |
|
| 763 | + echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 764 | + } |
|
| 607 | 765 | } |
| 608 | 766 | //$putinarchive = true; |
| 609 | 767 | //$highlight = ''; |
| 610 | 768 | } |
| 611 | 769 | |
| 612 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 770 | + } else { |
|
| 771 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 772 | + } |
|
| 613 | 773 | //$dataFound = true; |
| 614 | 774 | } |
| 615 | 775 | |
| 616 | 776 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 617 | 777 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 618 | - if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
|
| 778 | + if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) { |
|
| 779 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 780 | + } |
|
| 619 | 781 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
| 620 | 782 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
| 621 | 783 | //$dataFound = true; |
| 622 | 784 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 623 | 785 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
| 624 | 786 | if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 2300) { |
| 625 | - if ($globalDebug) echo '--- Reset because of altitude'."\n"; |
|
| 787 | + if ($globalDebug) { |
|
| 788 | + echo '--- Reset because of altitude'."\n"; |
|
| 789 | + } |
|
| 626 | 790 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 627 | 791 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 628 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 629 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 630 | - elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 792 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 793 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 794 | + } elseif (isset($line['id'])) { |
|
| 795 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 796 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
| 797 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 798 | + } |
|
| 631 | 799 | } |
| 632 | 800 | } |
| 633 | 801 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
@@ -638,22 +806,32 @@ discard block |
||
| 638 | 806 | } |
| 639 | 807 | |
| 640 | 808 | if (isset($line['heading']) && $line['heading'] != '') { |
| 641 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 809 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) { |
|
| 810 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 811 | + } |
|
| 642 | 812 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
| 643 | 813 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
| 644 | 814 | //$dataFound = true; |
| 645 | 815 | } elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) { |
| 646 | 816 | $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
| 647 | 817 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
| 648 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 649 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
| 818 | + if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) { |
|
| 819 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 820 | + } |
|
| 821 | + if ($globalDebug) { |
|
| 822 | + echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
| 823 | + } |
|
| 650 | 824 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 651 | 825 | // If not enough messages and ACARS set heading to 0 |
| 652 | 826 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
| 653 | 827 | } |
| 654 | - if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 655 | - elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 656 | - elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalMinupdate) $dataFound = false; |
|
| 828 | + if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) { |
|
| 829 | + $dataFound = false; |
|
| 830 | + } elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) { |
|
| 831 | + $dataFound = false; |
|
| 832 | + } elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalMinupdate) { |
|
| 833 | + $dataFound = false; |
|
| 834 | + } |
|
| 657 | 835 | |
| 658 | 836 | // print_r($this->all_flights[$id]); |
| 659 | 837 | //gets the callsign from the last hour |
@@ -669,23 +847,38 @@ discard block |
||
| 669 | 847 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
| 670 | 848 | if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
| 671 | 849 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 672 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 850 | + if ($globalDebug) { |
|
| 851 | + echo "Check if aircraft is already in DB..."; |
|
| 852 | + } |
|
| 673 | 853 | $timeelapsed = microtime(true); |
| 674 | 854 | $SpotterLive = new SpotterLive($this->db); |
| 675 | 855 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
| 676 | 856 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 677 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 857 | + if ($globalDebugTimeElapsed) { |
|
| 858 | + echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 859 | + } |
|
| 678 | 860 | } elseif (isset($line['id'])) { |
| 679 | 861 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 680 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 862 | + if ($globalDebugTimeElapsed) { |
|
| 863 | + echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 864 | + } |
|
| 681 | 865 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
| 682 | 866 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 683 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 684 | - } else $recent_ident = ''; |
|
| 867 | + if ($globalDebugTimeElapsed) { |
|
| 868 | + echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 869 | + } |
|
| 870 | + } else { |
|
| 871 | + $recent_ident = ''; |
|
| 872 | + } |
|
| 685 | 873 | $SpotterLive->db=null; |
| 686 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 687 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 688 | - } else $recent_ident = ''; |
|
| 874 | + if ($globalDebug && $recent_ident == '') { |
|
| 875 | + echo " Not in DB.\n"; |
|
| 876 | + } elseif ($globalDebug && $recent_ident != '') { |
|
| 877 | + echo " Already in DB.\n"; |
|
| 878 | + } |
|
| 879 | + } else { |
|
| 880 | + $recent_ident = ''; |
|
| 881 | + } |
|
| 689 | 882 | } else { |
| 690 | 883 | $recent_ident = ''; |
| 691 | 884 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
@@ -693,7 +886,9 @@ discard block |
||
| 693 | 886 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 694 | 887 | if($recent_ident == "") |
| 695 | 888 | { |
| 696 | - if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
| 889 | + if ($globalDebug) { |
|
| 890 | + echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
| 891 | + } |
|
| 697 | 892 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 698 | 893 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 699 | 894 | //adds the spotter data for the archive |
@@ -737,31 +932,49 @@ discard block |
||
| 737 | 932 | |
| 738 | 933 | if (!$ignoreImport) { |
| 739 | 934 | $highlight = ''; |
| 740 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 741 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 742 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 743 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 935 | + if ($this->all_flights[$id]['squawk'] == '7500') { |
|
| 936 | + $highlight = 'Squawk 7500 : Hijack'; |
|
| 937 | + } |
|
| 938 | + if ($this->all_flights[$id]['squawk'] == '7600') { |
|
| 939 | + $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 940 | + } |
|
| 941 | + if ($this->all_flights[$id]['squawk'] == '7700') { |
|
| 942 | + $highlight = 'Squawk 7700 : Emergency'; |
|
| 943 | + } |
|
| 944 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 945 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 946 | + } |
|
| 744 | 947 | $timeelapsed = microtime(true); |
| 745 | 948 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 746 | 949 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 747 | 950 | $Spotter = new Spotter($this->db); |
| 748 | 951 | $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
| 749 | 952 | $Spotter->db = null; |
| 750 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 953 | + if ($globalDebug && isset($result)) { |
|
| 954 | + echo $result."\n"; |
|
| 955 | + } |
|
| 751 | 956 | } |
| 752 | 957 | } |
| 753 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 958 | + if ($globalDebugTimeElapsed) { |
|
| 959 | + echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 960 | + } |
|
| 754 | 961 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 755 | 962 | |
| 756 | 963 | // Add source stat in DB |
| 757 | 964 | $Stats = new Stats($this->db); |
| 758 | 965 | if (!empty($this->stats)) { |
| 759 | - if ($globalDebug) echo 'Add source stats : '; |
|
| 966 | + if ($globalDebug) { |
|
| 967 | + echo 'Add source stats : '; |
|
| 968 | + } |
|
| 760 | 969 | foreach($this->stats as $date => $data) { |
| 761 | 970 | foreach($data as $source => $sourced) { |
| 762 | 971 | //print_r($sourced); |
| 763 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 764 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 972 | + if (isset($sourced['polar'])) { |
|
| 973 | + echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 974 | + } |
|
| 975 | + if (isset($sourced['hist'])) { |
|
| 976 | + echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 977 | + } |
|
| 765 | 978 | if (isset($sourced['msg'])) { |
| 766 | 979 | if (time() - $sourced['msg']['date'] > 10) { |
| 767 | 980 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
@@ -774,13 +987,17 @@ discard block |
||
| 774 | 987 | unset($this->stats[$date]); |
| 775 | 988 | } |
| 776 | 989 | } |
| 777 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 990 | + if ($globalDebug) { |
|
| 991 | + echo 'Done'."\n"; |
|
| 992 | + } |
|
| 778 | 993 | |
| 779 | 994 | } |
| 780 | 995 | $Stats->db = null; |
| 781 | 996 | } |
| 782 | 997 | $this->del(); |
| 783 | - } elseif ($globalDebug) echo 'Ignore data'."\n"; |
|
| 998 | + } elseif ($globalDebug) { |
|
| 999 | + echo 'Ignore data'."\n"; |
|
| 1000 | + } |
|
| 784 | 1001 | //$ignoreImport = false; |
| 785 | 1002 | $this->all_flights[$id]['addedSpotter'] = 1; |
| 786 | 1003 | //print_r($this->all_flights[$id]); |
@@ -797,7 +1014,9 @@ discard block |
||
| 797 | 1014 | */ |
| 798 | 1015 | //SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']); |
| 799 | 1016 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 800 | - if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 1017 | + if ($globalDebug) { |
|
| 1018 | + echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 1019 | + } |
|
| 801 | 1020 | //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
| 802 | 1021 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 803 | 1022 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
@@ -806,7 +1025,9 @@ discard block |
||
| 806 | 1025 | $SpotterLive->db=null; |
| 807 | 1026 | } |
| 808 | 1027 | } |
| 809 | - if ($globalDebug) echo " Done\n"; |
|
| 1028 | + if ($globalDebug) { |
|
| 1029 | + echo " Done\n"; |
|
| 1030 | + } |
|
| 810 | 1031 | $this->last_delete = time(); |
| 811 | 1032 | } |
| 812 | 1033 | } else { |
@@ -833,11 +1054,17 @@ discard block |
||
| 833 | 1054 | //echo "{$line[8]} {$line[7]} - MODES:{$line[4]} CALLSIGN:{$line[10]} ALT:{$line[11]} VEL:{$line[12]} HDG:{$line[13]} LAT:{$line[14]} LON:{$line[15]} VR:{$line[16]} SQUAWK:{$line[17]}\n"; |
| 834 | 1055 | if ($globalDebug) { |
| 835 | 1056 | if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) { |
| 836 | - if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n"; |
|
| 837 | - else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n"; |
|
| 1057 | + if (isset($this->all_flights[$id]['source_name'])) { |
|
| 1058 | + echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n"; |
|
| 1059 | + } else { |
|
| 1060 | + echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n"; |
|
| 1061 | + } |
|
| 838 | 1062 | } else { |
| 839 | - if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n"; |
|
| 840 | - else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n"; |
|
| 1063 | + if (isset($this->all_flights[$id]['source_name'])) { |
|
| 1064 | + echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n"; |
|
| 1065 | + } else { |
|
| 1066 | + echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n"; |
|
| 1067 | + } |
|
| 841 | 1068 | } |
| 842 | 1069 | } |
| 843 | 1070 | $ignoreImport = false; |
@@ -883,22 +1110,30 @@ discard block |
||
| 883 | 1110 | |
| 884 | 1111 | if (!$ignoreImport) { |
| 885 | 1112 | if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 886 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 1113 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 1114 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 1115 | + } |
|
| 887 | 1116 | $timeelapsed = microtime(true); |
| 888 | 1117 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 889 | 1118 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 890 | - if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
| 1119 | + if ($globalDebug) { |
|
| 1120 | + echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
| 1121 | + } |
|
| 891 | 1122 | $SpotterLive = new SpotterLive($this->db); |
| 892 | 1123 | $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
| 893 | 1124 | $SpotterLive->db = null; |
| 894 | - if ($globalDebug) echo $result."\n"; |
|
| 1125 | + if ($globalDebug) { |
|
| 1126 | + echo $result."\n"; |
|
| 1127 | + } |
|
| 895 | 1128 | } |
| 896 | 1129 | } |
| 897 | 1130 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 898 | 1131 | $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
| 899 | 1132 | } |
| 900 | 1133 | $this->all_flights[$id]['putinarchive'] = false; |
| 901 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 1134 | + if ($globalDebugTimeElapsed) { |
|
| 1135 | + echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 1136 | + } |
|
| 902 | 1137 | |
| 903 | 1138 | // Put statistics in $this->stats variable |
| 904 | 1139 | //if ($line['format_source'] != 'aprs') { |
@@ -906,7 +1141,9 @@ discard block |
||
| 906 | 1141 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 907 | 1142 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 908 | 1143 | $source = $this->all_flights[$id]['source_name']; |
| 909 | - if ($source == '') $source = $this->all_flights[$id]['format_source']; |
|
| 1144 | + if ($source == '') { |
|
| 1145 | + $source = $this->all_flights[$id]['format_source']; |
|
| 1146 | + } |
|
| 910 | 1147 | if (!isset($this->source_location[$source])) { |
| 911 | 1148 | $Location = new Source(); |
| 912 | 1149 | $coord = $Location->getLocationInfobySourceName($source); |
@@ -927,7 +1164,9 @@ discard block |
||
| 927 | 1164 | $stats_heading = round($stats_heading/22.5); |
| 928 | 1165 | $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
| 929 | 1166 | $current_date = date('Y-m-d'); |
| 930 | - if ($stats_heading == 16) $stats_heading = 0; |
|
| 1167 | + if ($stats_heading == 16) { |
|
| 1168 | + $stats_heading = 0; |
|
| 1169 | + } |
|
| 931 | 1170 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 932 | 1171 | for ($i=0;$i<=15;$i++) { |
| 933 | 1172 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
@@ -945,7 +1184,9 @@ discard block |
||
| 945 | 1184 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 946 | 1185 | end($this->stats[$current_date][$source]['hist']); |
| 947 | 1186 | $mini = key($this->stats[$current_date][$source]['hist'])+10; |
| 948 | - } else $mini = 0; |
|
| 1187 | + } else { |
|
| 1188 | + $mini = 0; |
|
| 1189 | + } |
|
| 949 | 1190 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 950 | 1191 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 951 | 1192 | } |
@@ -957,19 +1198,27 @@ discard block |
||
| 957 | 1198 | } |
| 958 | 1199 | |
| 959 | 1200 | $this->all_flights[$id]['lastupdate'] = time(); |
| 960 | - if ($this->all_flights[$id]['putinarchive']) $send = true; |
|
| 1201 | + if ($this->all_flights[$id]['putinarchive']) { |
|
| 1202 | + $send = true; |
|
| 1203 | + } |
|
| 961 | 1204 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
| 962 | - } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 1205 | + } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) { |
|
| 1206 | + echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 1207 | + } |
|
| 963 | 1208 | //$this->del(); |
| 964 | 1209 | |
| 965 | 1210 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 966 | 1211 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 967 | - if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
|
| 1212 | + if ($globalDebug) { |
|
| 1213 | + echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
|
| 1214 | + } |
|
| 968 | 1215 | $SpotterLive = new SpotterLive($this->db); |
| 969 | 1216 | $SpotterLive->deleteLiveSpotterDataNotUpdated(); |
| 970 | 1217 | $SpotterLive->db = null; |
| 971 | 1218 | //SpotterLive->deleteLiveSpotterData(); |
| 972 | - if ($globalDebug) echo " Done\n"; |
|
| 1219 | + if ($globalDebug) { |
|
| 1220 | + echo " Done\n"; |
|
| 1221 | + } |
|
| 973 | 1222 | $this->last_delete_hourly = time(); |
| 974 | 1223 | } else { |
| 975 | 1224 | $this->del(); |
@@ -981,7 +1230,9 @@ discard block |
||
| 981 | 1230 | //$ignoreImport = false; |
| 982 | 1231 | } |
| 983 | 1232 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 984 | - if ($send) return $this->all_flights[$id]; |
|
| 1233 | + if ($send) { |
|
| 1234 | + return $this->all_flights[$id]; |
|
| 1235 | + } |
|
| 985 | 1236 | } |
| 986 | 1237 | } |
| 987 | 1238 | } |
