Ysurac /
FlightAirMap
@@ -41,12 +41,12 @@ discard block |
||
| 41 | 41 | $currentdate = date('Y-m-d'); |
| 42 | 42 | $sourcestat = $Stats->getStatsSource($currentdate); |
| 43 | 43 | if (!empty($sourcestat)) { |
| 44 | - foreach($sourcestat as $srcst) { |
|
| 44 | + foreach ($sourcestat as $srcst) { |
|
| 45 | 45 | $type = $srcst['stats_type']; |
| 46 | 46 | if ($type == 'polar' || $type == 'hist') { |
| 47 | 47 | $source = $srcst['source_name']; |
| 48 | 48 | $data = $srcst['source_data']; |
| 49 | - $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 49 | + $this->stats[$currentdate][$source][$type] = json_decode($data, true); |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | } |
@@ -58,14 +58,14 @@ discard block |
||
| 58 | 58 | if (isset($globalGeoid) && $globalGeoid) { |
| 59 | 59 | try { |
| 60 | 60 | $GeoidClass = new GeoidHeight(); |
| 61 | - } catch(Exception $e) { |
|
| 61 | + } catch (Exception $e) { |
|
| 62 | 62 | if ($globalDebug) echo "Can't calculate geoid, check that you downloaded it via update_db.php (".$e.")\n"; |
| 63 | 63 | $GeoidClass = FALSE; |
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - public function get_Schedule($id,$ident) { |
|
| 68 | + public function get_Schedule($id, $ident) { |
|
| 69 | 69 | global $globalDebug, $globalFork, $globalSchedulesFetch; |
| 70 | 70 | // Get schedule here, so it's done only one time |
| 71 | 71 | |
@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | $schedule = $Schedule->fetchSchedule($operator); |
| 91 | 91 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 92 | 92 | if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
| 93 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 94 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 93 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 94 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 95 | 95 | // Should also check if route schedule = route from DB |
| 96 | 96 | if ($schedule['DepartureAirportIATA'] != '') { |
| 97 | 97 | if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) { |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | - $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']); |
|
| 114 | + $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']); |
|
| 115 | 115 | } |
| 116 | 116 | } else $scheduleexist = true; |
| 117 | 117 | } else $scheduleexist = true; |
@@ -119,8 +119,8 @@ discard block |
||
| 119 | 119 | if ($scheduleexist) { |
| 120 | 120 | if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
| 121 | 121 | $sch = $Schedule->getSchedule($operator); |
| 122 | - $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'])); |
|
| 123 | - if ($this->all_flights[$id]['addedSpotter'] == 1) $Spotter->updateLatestScheduleSpotterData($this->all_flights[$id]['id'],$sch['departure_airport_icao'],$sch['departure_airport_time'],$sch['arrival_airport_icao'],$sch['arrival_airport_time']); |
|
| 122 | + $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'])); |
|
| 123 | + if ($this->all_flights[$id]['addedSpotter'] == 1) $Spotter->updateLatestScheduleSpotterData($this->all_flights[$id]['id'], $sch['departure_airport_icao'], $sch['departure_airport_time'], $sch['arrival_airport_icao'], $sch['arrival_airport_time']); |
|
| 124 | 124 | } |
| 125 | 125 | $Spotter->db = null; |
| 126 | 126 | $Schedule->db = null; |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
| 148 | 148 | $Spotter = new Spotter($this->db); |
| 149 | 149 | $real_arrival = $this->arrival($key); |
| 150 | - if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $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']) && isset($this->all_flights[$key]['datetime'])) $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']); |
|
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | } |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | $airport_time = ''; |
| 162 | 162 | if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
| 163 | 163 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 164 | - $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 164 | + $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist); |
|
| 165 | 165 | if (isset($closestAirports[0])) { |
| 166 | 166 | if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
| 167 | 167 | $airport_icao = $closestAirports[0]['icao']; |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | break; |
| 177 | 177 | } |
| 178 | 178 | } |
| 179 | - } 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))) { |
|
| 179 | + } 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))) { |
|
| 180 | 180 | $airport_icao = $closestAirports[0]['icao']; |
| 181 | 181 | $airport_time = $this->all_flights[$key]['datetime']; |
| 182 | 182 | } else { |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | } else { |
| 190 | 190 | if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
| 191 | 191 | } |
| 192 | - return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 192 | + return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | |
| 202 | 202 | foreach ($this->all_flights as $key => $flight) { |
| 203 | 203 | if (isset($flight['lastupdate'])) { |
| 204 | - if ($flight['lastupdate'] < (time()-1800)) { |
|
| 204 | + if ($flight['lastupdate'] < (time() - 1800)) { |
|
| 205 | 205 | $this->delKey($key); |
| 206 | 206 | } |
| 207 | 207 | } |
@@ -218,10 +218,10 @@ discard block |
||
| 218 | 218 | $Spotter = new Spotter($this->db); |
| 219 | 219 | $SpotterLive = new SpotterLive($this->db); |
| 220 | 220 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 221 | - $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']); |
|
| 221 | + $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']); |
|
| 222 | 222 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 223 | 223 | $this->all_flights[$key]['putinarchive'] = true; |
| 224 | - $result = $SpotterLive->addLiveSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['aircraft_icao'], $this->all_flights[$key]['departure_airport'], $this->all_flights[$key]['arrival_airport'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['waypoints'], $this->all_flights[$key]['altitude'],$this->all_flights[$key]['altitude_real'], $this->all_flights[$key]['heading'], $this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'], $this->all_flights[$key]['departure_airport_time'], $this->all_flights[$key]['arrival_airport_time'], $this->all_flights[$key]['squawk'],$this->all_flights[$key]['route_stop'],$this->all_flights[$key]['hex'],$this->all_flights[$key]['putinarchive'],$this->all_flights[$key]['registration'],$this->all_flights[$key]['pilot_id'],$this->all_flights[$key]['pilot_name'], $this->all_flights[$key]['verticalrate'], $this->all_flights[$key]['noarchive'], $this->all_flights[$key]['ground'],$this->all_flights[$key]['format_source'],$this->all_flights[$key]['source_name'],$this->all_flights[$key]['over_country']); |
|
| 224 | + $result = $SpotterLive->addLiveSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['aircraft_icao'], $this->all_flights[$key]['departure_airport'], $this->all_flights[$key]['arrival_airport'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['waypoints'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['altitude_real'], $this->all_flights[$key]['heading'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $this->all_flights[$key]['departure_airport_time'], $this->all_flights[$key]['arrival_airport_time'], $this->all_flights[$key]['squawk'], $this->all_flights[$key]['route_stop'], $this->all_flights[$key]['hex'], $this->all_flights[$key]['putinarchive'], $this->all_flights[$key]['registration'], $this->all_flights[$key]['pilot_id'], $this->all_flights[$key]['pilot_name'], $this->all_flights[$key]['verticalrate'], $this->all_flights[$key]['noarchive'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['format_source'], $this->all_flights[$key]['source_name'], $this->all_flights[$key]['over_country']); |
|
| 225 | 225 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 226 | 226 | } |
| 227 | 227 | $Spotter->db = null; |
@@ -257,10 +257,10 @@ discard block |
||
| 257 | 257 | $send = false; |
| 258 | 258 | |
| 259 | 259 | // SBS format is CSV format |
| 260 | - if(is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
|
| 260 | + if (is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
|
| 261 | 261 | //print_r($line); |
| 262 | 262 | if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']); |
| 263 | - if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && substr($line['hex'],0,1) != '~' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
|
| 263 | + if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && substr($line['hex'], 0, 1) != '~' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
|
| 264 | 264 | |
| 265 | 265 | // Increment message number |
| 266 | 266 | if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) { |
@@ -293,25 +293,25 @@ discard block |
||
| 293 | 293 | if (!isset($this->all_flights[$id])) { |
| 294 | 294 | if ($globalDebug) echo 'New flight...'."\n"; |
| 295 | 295 | $this->all_flights[$id] = array(); |
| 296 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 297 | - $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' => '','coordinates' => 0)); |
|
| 298 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 296 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 297 | + $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' => '', 'coordinates' => 0)); |
|
| 298 | + if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time())); |
|
| 299 | 299 | if (!isset($line['id'])) { |
| 300 | 300 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 301 | 301 | // 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'))); |
| 302 | 302 | // 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'))); |
| 303 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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'))); |
|
| 303 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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'))); |
|
| 304 | 304 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 305 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 305 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 306 | 306 | if ($globalAllFlights !== FALSE) $dataFound = true; |
| 307 | 307 | } |
| 308 | 308 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 309 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 309 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type'])); |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | //print_r($this->all_flights); |
| 313 | 313 | if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) { |
| 314 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 314 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex']))); |
|
| 315 | 315 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 316 | 316 | //$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 317 | 317 | //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
@@ -320,20 +320,20 @@ discard block |
||
| 320 | 320 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 321 | 321 | $Spotter = new Spotter($this->db); |
| 322 | 322 | if (isset($this->all_flights[$id]['source_type'])) { |
| 323 | - $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']); |
|
| 323 | + $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']); |
|
| 324 | 324 | } else { |
| 325 | 325 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 326 | 326 | } |
| 327 | 327 | $Spotter->db = null; |
| 328 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 329 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 328 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 329 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 330 | 330 | } |
| 331 | 331 | } |
| 332 | 332 | if ($globalAllFlights !== FALSE) $dataFound = true; |
| 333 | 333 | if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
| 334 | 334 | } |
| 335 | 335 | if (isset($line['id']) && !isset($line['hex'])) { |
| 336 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => '')); |
|
| 336 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => '')); |
|
| 337 | 337 | } |
| 338 | 338 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
| 339 | 339 | $icao = $line['aircraft_icao']; |
@@ -342,14 +342,14 @@ discard block |
||
| 342 | 342 | if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
| 343 | 343 | $Spotter->db = null; |
| 344 | 344 | } |
| 345 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao)); |
|
| 345 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $icao)); |
|
| 346 | 346 | } elseif (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) { |
| 347 | 347 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 348 | 348 | // Get aircraft ICAO from aircraft name |
| 349 | 349 | $Spotter = new Spotter($this->db); |
| 350 | 350 | $aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
| 351 | 351 | $Spotter->db = null; |
| 352 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 352 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 353 | 353 | } |
| 354 | 354 | } |
| 355 | 355 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) { |
@@ -357,15 +357,15 @@ discard block |
||
| 357 | 357 | elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
| 358 | 358 | elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
| 359 | 359 | elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
| 360 | - if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 360 | + if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 361 | 361 | } |
| 362 | 362 | if (!isset($this->all_flights[$id]['aircraft_icao'])) { |
| 363 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
|
| 363 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA')); |
|
| 364 | 364 | } |
| 365 | 365 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 366 | - if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
|
| 366 | + if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
| 367 | 367 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
| 368 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
|
| 368 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime'])); |
|
| 369 | 369 | } else { |
| 370 | 370 | 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"; |
| 371 | 371 | 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"; |
@@ -376,31 +376,31 @@ discard block |
||
| 376 | 376 | */ |
| 377 | 377 | return ''; |
| 378 | 378 | } |
| 379 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
|
| 379 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) { |
|
| 380 | 380 | if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n"; |
| 381 | 381 | return ''; |
| 382 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
|
| 382 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) { |
|
| 383 | 383 | if ($globalDebug) echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n"; |
| 384 | 384 | return ''; |
| 385 | 385 | } elseif (!isset($line['datetime'])) { |
| 386 | 386 | date_default_timezone_set('UTC'); |
| 387 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 387 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 388 | 388 | } else { |
| 389 | 389 | if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 390 | 390 | return ''; |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | 393 | if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG' && $line['registration'] != 'NA') { |
| 394 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 394 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration'])); |
|
| 395 | 395 | } |
| 396 | 396 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 397 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 397 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints'])); |
|
| 398 | 398 | } |
| 399 | 399 | if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
| 400 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id']))); |
|
| 400 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => trim($line['pilot_id']))); |
|
| 401 | 401 | } |
| 402 | 402 | if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
| 403 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name']))); |
|
| 403 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => trim($line['pilot_name']))); |
|
| 404 | 404 | } |
| 405 | 405 | |
| 406 | 406 | if (isset($line['ident']) && trim($line['ident']) != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) { |
@@ -408,13 +408,13 @@ discard block |
||
| 408 | 408 | if ($this->all_flights[$id]['addedSpotter'] == 1) { |
| 409 | 409 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 410 | 410 | if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n"; |
| 411 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 412 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 413 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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'))); |
|
| 414 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 415 | - 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'])); |
|
| 411 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 412 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 413 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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'))); |
|
| 414 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 415 | + 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'])); |
|
| 416 | 416 | } else { |
| 417 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 417 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident']))); |
|
| 418 | 418 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 419 | 419 | $timeelapsed = microtime(true); |
| 420 | 420 | $Spotter = new Spotter($this->db); |
@@ -424,13 +424,13 @@ discard block |
||
| 424 | 424 | elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
| 425 | 425 | elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
| 426 | 426 | elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
| 427 | - $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource,$this->all_flights[$id]['source_type']); |
|
| 427 | + $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource, $this->all_flights[$id]['source_type']); |
|
| 428 | 428 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 429 | 429 | $Spotter->db = null; |
| 430 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 430 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 431 | 431 | } |
| 432 | 432 | } |
| 433 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 433 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident']))); |
|
| 434 | 434 | |
| 435 | 435 | /* |
| 436 | 436 | if (!isset($line['id'])) { |
@@ -440,25 +440,25 @@ discard block |
||
| 440 | 440 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 441 | 441 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 442 | 442 | */ |
| 443 | - 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'])); |
|
| 443 | + 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'])); |
|
| 444 | 444 | |
| 445 | 445 | //$putinarchive = true; |
| 446 | 446 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
| 447 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 447 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 448 | 448 | } |
| 449 | 449 | if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
| 450 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 450 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 451 | 451 | } |
| 452 | 452 | if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
| 453 | - $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' => '')); |
|
| 453 | + $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' => '')); |
|
| 454 | 454 | } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
| 455 | 455 | $timeelapsed = microtime(true); |
| 456 | 456 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 457 | 457 | $Spotter = new Spotter($this->db); |
| 458 | 458 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 459 | 459 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 460 | - $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' => '')); |
|
| 461 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 460 | + $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' => '')); |
|
| 461 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 462 | 462 | } |
| 463 | 463 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
| 464 | 464 | $timeelapsed = microtime(true); |
@@ -472,35 +472,35 @@ discard block |
||
| 472 | 472 | $Translation->db = null; |
| 473 | 473 | } |
| 474 | 474 | $Spotter->db = null; |
| 475 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 475 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 476 | 476 | } |
| 477 | 477 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 478 | 478 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
| 479 | 479 | if ($route['fromairport_icao'] != $route['toairport_icao']) { |
| 480 | 480 | // $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'])); |
| 481 | - $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'])); |
|
| 481 | + $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'])); |
|
| 482 | 482 | } |
| 483 | 483 | } |
| 484 | 484 | if (!isset($globalFork)) $globalFork = TRUE; |
| 485 | 485 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 486 | - if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
| 486 | + if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident'])); |
|
| 487 | 487 | } |
| 488 | 488 | } |
| 489 | 489 | } |
| 490 | 490 | |
| 491 | 491 | if (isset($line['speed']) && $line['speed'] != '' && $line['speed'] != 0) { |
| 492 | 492 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
| 493 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 494 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 493 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed']))); |
|
| 494 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true)); |
|
| 495 | 495 | //$dataFound = true; |
| 496 | 496 | } 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'])) { |
| 497 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 497 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm'); |
|
| 498 | 498 | if ($distance > 1000 && $distance < 10000) { |
| 499 | 499 | // use datetime |
| 500 | 500 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 501 | 501 | $speed = $speed*3.6; |
| 502 | 502 | if ($speed < 1000) { |
| 503 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 503 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed))); |
|
| 504 | 504 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
| 505 | 505 | } else { |
| 506 | 506 | if ($globalDebug) echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
@@ -515,9 +515,9 @@ discard block |
||
| 515 | 515 | if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
| 516 | 516 | return false; |
| 517 | 517 | } |
| 518 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 518 | + if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']); |
|
| 519 | 519 | else unset($timediff); |
| 520 | - if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']); |
|
| 520 | + if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time() - $this->all_flights[$id]['time_last_archive_coord']); |
|
| 521 | 521 | else unset($timediff_archive); |
| 522 | 522 | if ($this->tmd > 5 |
| 523 | 523 | || (isset($line['format_source']) |
@@ -542,7 +542,7 @@ discard block |
||
| 542 | 542 | || (isset($timediff) && $timediff > 30 |
| 543 | 543 | && isset($this->all_flights[$id]['latitude']) |
| 544 | 544 | && isset($this->all_flights[$id]['longitude']) |
| 545 | - && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')) |
|
| 545 | + && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')) |
|
| 546 | 546 | ) |
| 547 | 547 | ) { |
| 548 | 548 | |
@@ -554,7 +554,7 @@ discard block |
||
| 554 | 554 | && isset($this->all_flights[$id]['archive_longitude']) |
| 555 | 555 | && isset($this->all_flights[$id]['livedb_latitude']) |
| 556 | 556 | && isset($this->all_flights[$id]['livedb_longitude'])) |
| 557 | - && !$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']) |
|
| 557 | + && !$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']) |
|
| 558 | 558 | ) |
| 559 | 559 | ) { |
| 560 | 560 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
@@ -570,11 +570,11 @@ discard block |
||
| 570 | 570 | $timeelapsed = microtime(true); |
| 571 | 571 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 572 | 572 | $Spotter = new Spotter($this->db); |
| 573 | - $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 573 | + $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 574 | 574 | if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
| 575 | 575 | else $this->all_flights[$id]['over_country'] = ''; |
| 576 | 576 | $Spotter->db = null; |
| 577 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 577 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 578 | 578 | if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
| 579 | 579 | } |
| 580 | 580 | } |
@@ -600,13 +600,13 @@ discard block |
||
| 600 | 600 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 601 | 601 | } |
| 602 | 602 | //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' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) { |
| 603 | - if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) { |
|
| 603 | + if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > 0.0001)) { |
|
| 604 | 604 | $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
| 605 | 605 | $dataFound = true; |
| 606 | 606 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 607 | 607 | } |
| 608 | 608 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 609 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
|
| 609 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude'])); |
|
| 610 | 610 | /* |
| 611 | 611 | if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) { |
| 612 | 612 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
@@ -628,14 +628,14 @@ discard block |
||
| 628 | 628 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 629 | 629 | } |
| 630 | 630 | //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' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) { |
| 631 | - if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) { |
|
| 631 | + if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > 0.0001)) { |
|
| 632 | 632 | $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
| 633 | 633 | $dataFound = true; |
| 634 | 634 | $this->all_flights[$id]['coordinates'] += 1; |
| 635 | 635 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 636 | 636 | } |
| 637 | 637 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 638 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
|
| 638 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude'])); |
|
| 639 | 639 | /* |
| 640 | 640 | if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) { |
| 641 | 641 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
@@ -656,52 +656,52 @@ discard block |
||
| 656 | 656 | $SpotterArchive->deleteSpotterArchiveTrackDataByID($this->all_flights[$id]['id']); |
| 657 | 657 | $SpotterArchive->db = null; |
| 658 | 658 | $Spotter = new Spotter(); |
| 659 | - $Spotter->updateInitialSpotterData($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']); |
|
| 659 | + $Spotter->updateInitialSpotterData($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']); |
|
| 660 | 660 | $Spotter->db = null; |
| 661 | 661 | } |
| 662 | 662 | } else if ($globalDebug && $timediff > 30) { |
| 663 | 663 | $this->tmd = $this->tmd + 1; |
| 664 | 664 | echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
| 665 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
|
| 666 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 665 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -"; |
|
| 666 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 667 | 667 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
| 668 | 668 | } |
| 669 | 669 | } |
| 670 | 670 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 671 | 671 | if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 672 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 672 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update'])); |
|
| 673 | 673 | } |
| 674 | 674 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 675 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 675 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate'])); |
|
| 676 | 676 | //$dataFound = true; |
| 677 | 677 | } |
| 678 | 678 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 679 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 679 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source'])); |
|
| 680 | 680 | } |
| 681 | 681 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 682 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 682 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name'])); |
|
| 683 | 683 | } |
| 684 | 684 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 685 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 685 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency'])); |
|
| 686 | 686 | //$dataFound = true; |
| 687 | 687 | } |
| 688 | 688 | if (isset($line['ground']) && $line['ground'] != '') { |
| 689 | 689 | if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
| 690 | 690 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 691 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 692 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 693 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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'))); |
|
| 694 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 695 | - 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'])); |
|
| 691 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 692 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 693 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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'))); |
|
| 694 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 695 | + 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'])); |
|
| 696 | 696 | } |
| 697 | 697 | if ($line['ground'] != 1) $line['ground'] = 0; |
| 698 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 698 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground'])); |
|
| 699 | 699 | //$dataFound = true; |
| 700 | 700 | } |
| 701 | 701 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 702 | 702 | 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'])) { |
| 703 | 703 | if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
| 704 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 704 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 705 | 705 | $highlight = ''; |
| 706 | 706 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
| 707 | 707 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
@@ -710,66 +710,66 @@ discard block |
||
| 710 | 710 | $timeelapsed = microtime(true); |
| 711 | 711 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 712 | 712 | $Spotter = new Spotter($this->db); |
| 713 | - $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 713 | + $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight); |
|
| 714 | 714 | $Spotter->db = null; |
| 715 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 715 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 716 | 716 | } |
| 717 | 717 | //$putinarchive = true; |
| 718 | 718 | //$highlight = ''; |
| 719 | 719 | } |
| 720 | 720 | |
| 721 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 721 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 722 | 722 | //$dataFound = true; |
| 723 | 723 | } |
| 724 | 724 | |
| 725 | 725 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 726 | 726 | if (isset($line['altitude_relative']) && isset($GeoidClass) && is_object($GeoidClass)) { |
| 727 | 727 | if ($line['altitude_relative'] == 'AMSL' || $line['altitude_relative'] == 'MSL') { |
| 728 | - $geoid = round($GeoidClass->get($this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'])*3.28084,2); |
|
| 728 | + $geoid = round($GeoidClass->get($this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'])*3.28084, 2); |
|
| 729 | 729 | //if ($globalDebug) echo '=> Set altitude to WGS84 Ellipsoid, add '.$geoid.' to '.$line['altitude']."\n"; |
| 730 | 730 | $line['altitude'] = $line['altitude'] - $geoid; |
| 731 | 731 | } |
| 732 | 732 | } |
| 733 | 733 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 734 | - 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; |
|
| 735 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
|
| 736 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
|
| 734 | + 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; |
|
| 735 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100))); |
|
| 736 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude'])); |
|
| 737 | 737 | //$dataFound = true; |
| 738 | 738 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 739 | 739 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
| 740 | 740 | 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() - 1600) { |
| 741 | 741 | if ($globalDebug) echo '--- Reset because of altitude'."\n"; |
| 742 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 743 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 744 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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'))); |
|
| 745 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 746 | - 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'])); |
|
| 742 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 743 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 744 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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'))); |
|
| 745 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 746 | + 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'])); |
|
| 747 | 747 | } |
| 748 | 748 | } |
| 749 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
|
| 749 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_previous' => $line['altitude'])); |
|
| 750 | 750 | } |
| 751 | 751 | |
| 752 | 752 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 753 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 753 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true)); |
|
| 754 | 754 | } |
| 755 | 755 | |
| 756 | 756 | if (isset($line['heading']) && $line['heading'] != '') { |
| 757 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 758 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 759 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 757 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 758 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading']))); |
|
| 759 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true)); |
|
| 760 | 760 | //$dataFound = true; |
| 761 | 761 | } 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']) { |
| 762 | - $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']); |
|
| 763 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 764 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 762 | + $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']); |
|
| 763 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading))); |
|
| 764 | + if (abs($this->all_flights[$id]['heading'] - round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 765 | 765 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
| 766 | 766 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 767 | 767 | // If not enough messages and ACARS set heading to 0 |
| 768 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 768 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0)); |
|
| 769 | 769 | } |
| 770 | - if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 771 | - elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 772 | - elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalAircraftMinUpdate) $dataFound = false; |
|
| 770 | + if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 771 | + elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 772 | + elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalAircraftMinUpdate) $dataFound = false; |
|
| 773 | 773 | |
| 774 | 774 | // print_r($this->all_flights[$id]); |
| 775 | 775 | //gets the callsign from the last hour |
@@ -780,7 +780,7 @@ discard block |
||
| 780 | 780 | if ($dataFound === true && isset($this->all_flights[$id]['id'])) { |
| 781 | 781 | $this->all_flights[$id]['lastupdate'] = time(); |
| 782 | 782 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
| 783 | - 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'])) { |
|
| 783 | + 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'])) { |
|
| 784 | 784 | //print_r($this->all_flights); |
| 785 | 785 | //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
| 786 | 786 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
@@ -791,61 +791,61 @@ discard block |
||
| 791 | 791 | $SpotterLive = new SpotterLive($this->db); |
| 792 | 792 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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 | 793 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 794 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 794 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 795 | 795 | } elseif (isset($line['id'])) { |
| 796 | 796 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 797 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 797 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 798 | 798 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
| 799 | 799 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 800 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 800 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 801 | 801 | } else $recent_ident = ''; |
| 802 | - $SpotterLive->db=null; |
|
| 802 | + $SpotterLive->db = null; |
|
| 803 | 803 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 804 | 804 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 805 | 805 | } else $recent_ident = ''; |
| 806 | 806 | } else { |
| 807 | 807 | $recent_ident = ''; |
| 808 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
|
| 808 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0)); |
|
| 809 | 809 | } |
| 810 | 810 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 811 | - if($recent_ident == "") |
|
| 811 | + if ($recent_ident == "") |
|
| 812 | 812 | { |
| 813 | 813 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
| 814 | 814 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 815 | 815 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 816 | 816 | //adds the spotter data for the archive |
| 817 | 817 | $ignoreImport = false; |
| 818 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 818 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 819 | 819 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 820 | 820 | $ignoreImport = true; |
| 821 | 821 | } |
| 822 | 822 | } |
| 823 | 823 | if (count($globalAirportAccept) > 0) { |
| 824 | 824 | $ignoreImport = true; |
| 825 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 825 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 826 | 826 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 827 | 827 | $ignoreImport = false; |
| 828 | 828 | } |
| 829 | 829 | } |
| 830 | 830 | } |
| 831 | 831 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 832 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 833 | - 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)) { |
|
| 832 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 833 | + 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)) { |
|
| 834 | 834 | $ignoreImport = true; |
| 835 | 835 | } |
| 836 | 836 | } |
| 837 | 837 | } |
| 838 | 838 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 839 | 839 | $ignoreImport = true; |
| 840 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 841 | - 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)) { |
|
| 840 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 841 | + 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)) { |
|
| 842 | 842 | $ignoreImport = false; |
| 843 | 843 | } |
| 844 | 844 | } |
| 845 | 845 | } |
| 846 | 846 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 847 | 847 | $ignoreImport = true; |
| 848 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 848 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 849 | 849 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 850 | 850 | $ignoreImport = false; |
| 851 | 851 | } |
@@ -857,12 +857,12 @@ discard block |
||
| 857 | 857 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
| 858 | 858 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
| 859 | 859 | if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
| 860 | - 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'))); |
|
| 860 | + 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'))); |
|
| 861 | 861 | $timeelapsed = microtime(true); |
| 862 | 862 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 863 | 863 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 864 | 864 | $Spotter = new Spotter($this->db); |
| 865 | - $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']); |
|
| 865 | + $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']); |
|
| 866 | 866 | $Spotter->db = null; |
| 867 | 867 | if ($globalDebug) { |
| 868 | 868 | if (isset($result['error'])) echo 'Error: '.$result['error']."\n"; |
@@ -875,22 +875,22 @@ discard block |
||
| 875 | 875 | } |
| 876 | 876 | } |
| 877 | 877 | } |
| 878 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 878 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 879 | 879 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 880 | 880 | |
| 881 | 881 | // Add source stat in DB |
| 882 | 882 | $Stats = new Stats($this->db); |
| 883 | 883 | if (!empty($this->stats)) { |
| 884 | 884 | if ($globalDebug) echo 'Add source stats : '; |
| 885 | - foreach($this->stats as $date => $data) { |
|
| 886 | - foreach($data as $source => $sourced) { |
|
| 885 | + foreach ($this->stats as $date => $data) { |
|
| 886 | + foreach ($data as $source => $sourced) { |
|
| 887 | 887 | //print_r($sourced); |
| 888 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 889 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 888 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date); |
|
| 889 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date); |
|
| 890 | 890 | if (isset($sourced['msg'])) { |
| 891 | 891 | if (time() - $sourced['msg']['date'] > 10) { |
| 892 | 892 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
| 893 | - echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 893 | + echo $Stats->addStatSource($nbmsg, $source, 'msg', $date); |
|
| 894 | 894 | unset($this->stats[$date][$source]['msg']); |
| 895 | 895 | } |
| 896 | 896 | } |
@@ -928,14 +928,14 @@ discard block |
||
| 928 | 928 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 929 | 929 | $SpotterLive = new SpotterLive($this->db); |
| 930 | 930 | $SpotterLive->deleteLiveSpotterData(); |
| 931 | - $SpotterLive->db=null; |
|
| 931 | + $SpotterLive->db = null; |
|
| 932 | 932 | } |
| 933 | 933 | } |
| 934 | 934 | if ($globalDebug) echo " Done\n"; |
| 935 | 935 | $this->last_delete = time(); |
| 936 | 936 | } |
| 937 | 937 | } else { |
| 938 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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' || $line['format_source'] === 'airwhere')) { |
|
| 938 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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' || $line['format_source'] === 'airwhere')) { |
|
| 939 | 939 | $this->all_flights[$id]['id'] = $recent_ident; |
| 940 | 940 | $this->all_flights[$id]['addedSpotter'] = 1; |
| 941 | 941 | } |
@@ -943,7 +943,7 @@ discard block |
||
| 943 | 943 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 944 | 944 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 945 | 945 | $Spotter = new Spotter($this->db); |
| 946 | - $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']); |
|
| 946 | + $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']); |
|
| 947 | 947 | $Spotter->db = null; |
| 948 | 948 | } |
| 949 | 949 | } |
@@ -969,37 +969,37 @@ discard block |
||
| 969 | 969 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 970 | 970 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 971 | 971 | |
| 972 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 972 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 973 | 973 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 974 | 974 | $ignoreImport = true; |
| 975 | 975 | } |
| 976 | 976 | } |
| 977 | 977 | if (count($globalAirportAccept) > 0) { |
| 978 | 978 | $ignoreImport = true; |
| 979 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 979 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 980 | 980 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 981 | 981 | $ignoreImport = false; |
| 982 | 982 | } |
| 983 | 983 | } |
| 984 | 984 | } |
| 985 | 985 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 986 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 987 | - 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)) { |
|
| 986 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 987 | + 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)) { |
|
| 988 | 988 | $ignoreImport = true; |
| 989 | 989 | } |
| 990 | 990 | } |
| 991 | 991 | } |
| 992 | 992 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 993 | 993 | $ignoreImport = true; |
| 994 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 995 | - 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)) { |
|
| 994 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 995 | + 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)) { |
|
| 996 | 996 | $ignoreImport = false; |
| 997 | 997 | } |
| 998 | 998 | } |
| 999 | 999 | } |
| 1000 | 1000 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 1001 | 1001 | $ignoreImport = true; |
| 1002 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 1002 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 1003 | 1003 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 1004 | 1004 | $ignoreImport = false; |
| 1005 | 1005 | } |
@@ -1007,24 +1007,24 @@ discard block |
||
| 1007 | 1007 | } |
| 1008 | 1008 | |
| 1009 | 1009 | if (!$ignoreImport) { |
| 1010 | - 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'])) { |
|
| 1011 | - 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'))); |
|
| 1010 | + 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'])) { |
|
| 1011 | + 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'))); |
|
| 1012 | 1012 | $timeelapsed = microtime(true); |
| 1013 | 1013 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 1014 | 1014 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 1015 | 1015 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
| 1016 | 1016 | $SpotterLive = new SpotterLive($this->db); |
| 1017 | 1017 | //var_dump($this->all_flights[$id]); |
| 1018 | - $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']); |
|
| 1018 | + $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']); |
|
| 1019 | 1019 | $SpotterLive->db = null; |
| 1020 | 1020 | if ($globalDebug) echo $result."\n"; |
| 1021 | 1021 | } |
| 1022 | 1022 | } |
| 1023 | 1023 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 1024 | - $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']); |
|
| 1024 | + $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']); |
|
| 1025 | 1025 | } |
| 1026 | 1026 | $this->all_flights[$id]['putinarchive'] = false; |
| 1027 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 1027 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 1028 | 1028 | |
| 1029 | 1029 | // Put statistics in $this->stats variable |
| 1030 | 1030 | //if ($line['format_source'] != 'aprs') { |
@@ -1043,19 +1043,19 @@ discard block |
||
| 1043 | 1043 | $latitude = $globalCenterLatitude; |
| 1044 | 1044 | $longitude = $globalCenterLongitude; |
| 1045 | 1045 | } |
| 1046 | - $this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude); |
|
| 1046 | + $this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude); |
|
| 1047 | 1047 | } else { |
| 1048 | 1048 | $latitude = $this->source_location[$source]['latitude']; |
| 1049 | 1049 | $longitude = $this->source_location[$source]['longitude']; |
| 1050 | 1050 | } |
| 1051 | - $stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 1051 | + $stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 1052 | 1052 | //$stats_heading = $stats_heading%22.5; |
| 1053 | 1053 | $stats_heading = round($stats_heading/22.5); |
| 1054 | - $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 1054 | + $stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 1055 | 1055 | $current_date = date('Y-m-d'); |
| 1056 | 1056 | if ($stats_heading == 16) $stats_heading = 0; |
| 1057 | 1057 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 1058 | - for ($i=0;$i<=15;$i++) { |
|
| 1058 | + for ($i = 0; $i <= 15; $i++) { |
|
| 1059 | 1059 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
| 1060 | 1060 | } |
| 1061 | 1061 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
@@ -1070,9 +1070,9 @@ discard block |
||
| 1070 | 1070 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 1071 | 1071 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 1072 | 1072 | end($this->stats[$current_date][$source]['hist']); |
| 1073 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 1073 | + $mini = key($this->stats[$current_date][$source]['hist']) + 10; |
|
| 1074 | 1074 | } else $mini = 0; |
| 1075 | - for ($i=$mini;$i<=$distance;$i+=10) { |
|
| 1075 | + for ($i = $mini; $i <= $distance; $i += 10) { |
|
| 1076 | 1076 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 1077 | 1077 | } |
| 1078 | 1078 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
@@ -1085,7 +1085,7 @@ discard block |
||
| 1085 | 1085 | $this->all_flights[$id]['lastupdate'] = time(); |
| 1086 | 1086 | if ($this->all_flights[$id]['putinarchive']) $send = true; |
| 1087 | 1087 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
| 1088 | - } 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"; |
|
| 1088 | + } 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"; |
|
| 1089 | 1089 | //$this->del(); |
| 1090 | 1090 | |
| 1091 | 1091 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
@@ -59,7 +59,9 @@ discard block |
||
| 59 | 59 | try { |
| 60 | 60 | $GeoidClass = new GeoidHeight(); |
| 61 | 61 | } catch(Exception $e) { |
| 62 | - if ($globalDebug) echo "Can't calculate geoid, check that you downloaded it via update_db.php (".$e.")\n"; |
|
| 62 | + if ($globalDebug) { |
|
| 63 | + echo "Can't calculate geoid, check that you downloaded it via update_db.php (".$e.")\n"; |
|
| 64 | + } |
|
| 63 | 65 | $GeoidClass = FALSE; |
| 64 | 66 | } |
| 65 | 67 | } |
@@ -78,7 +80,9 @@ discard block |
||
| 78 | 80 | $dbc = $this->db; |
| 79 | 81 | $this->all_flights[$id]['schedule_check'] = true; |
| 80 | 82 | if ($globalSchedulesFetch) { |
| 81 | - if ($globalDebug) echo 'Getting schedule info...'."\n"; |
|
| 83 | + if ($globalDebug) { |
|
| 84 | + echo 'Getting schedule info...'."\n"; |
|
| 85 | + } |
|
| 82 | 86 | $Spotter = new Spotter($dbc); |
| 83 | 87 | $Schedule = new Schedule($dbc); |
| 84 | 88 | $Translation = new Translation($dbc); |
@@ -89,7 +93,9 @@ discard block |
||
| 89 | 93 | if ($Schedule->checkSchedule($operator) == 0) { |
| 90 | 94 | $schedule = $Schedule->fetchSchedule($operator); |
| 91 | 95 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 92 | - if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 96 | + if ($globalDebug) { |
|
| 97 | + echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 98 | + } |
|
| 93 | 99 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
| 94 | 100 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
| 95 | 101 | // Should also check if route schedule = route from DB |
@@ -98,7 +104,9 @@ discard block |
||
| 98 | 104 | $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']); |
| 99 | 105 | if (trim($airport_icao) != '') { |
| 100 | 106 | $this->all_flights[$id]['departure_airport'] = $airport_icao; |
| 101 | - if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n"; |
|
| 107 | + if ($globalDebug) { |
|
| 108 | + echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n"; |
|
| 109 | + } |
|
| 102 | 110 | } |
| 103 | 111 | } |
| 104 | 112 | } |
@@ -107,20 +115,30 @@ discard block |
||
| 107 | 115 | $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']); |
| 108 | 116 | if (trim($airport_icao) != '') { |
| 109 | 117 | $this->all_flights[$id]['arrival_airport'] = $airport_icao; |
| 110 | - if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n"; |
|
| 118 | + if ($globalDebug) { |
|
| 119 | + echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n"; |
|
| 120 | + } |
|
| 111 | 121 | } |
| 112 | 122 | } |
| 113 | 123 | } |
| 114 | 124 | $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']); |
| 115 | 125 | } |
| 116 | - } else $scheduleexist = true; |
|
| 117 | - } else $scheduleexist = true; |
|
| 126 | + } else { |
|
| 127 | + $scheduleexist = true; |
|
| 128 | + } |
|
| 129 | + } else { |
|
| 130 | + $scheduleexist = true; |
|
| 131 | + } |
|
| 118 | 132 | // close connection, at least one way will work ? |
| 119 | 133 | if ($scheduleexist) { |
| 120 | - if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
|
| 134 | + if ($globalDebug) { |
|
| 135 | + echo "-> get arrival/departure airport info for ".$ident."\n"; |
|
| 136 | + } |
|
| 121 | 137 | $sch = $Schedule->getSchedule($operator); |
| 122 | 138 | $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'])); |
| 123 | - if ($this->all_flights[$id]['addedSpotter'] == 1) $Spotter->updateLatestScheduleSpotterData($this->all_flights[$id]['id'],$sch['departure_airport_icao'],$sch['departure_airport_time'],$sch['arrival_airport_icao'],$sch['arrival_airport_time']); |
|
| 139 | + if ($this->all_flights[$id]['addedSpotter'] == 1) { |
|
| 140 | + $Spotter->updateLatestScheduleSpotterData($this->all_flights[$id]['id'],$sch['departure_airport_icao'],$sch['departure_airport_time'],$sch['arrival_airport_icao'],$sch['arrival_airport_time']); |
|
| 141 | + } |
|
| 124 | 142 | } |
| 125 | 143 | $Spotter->db = null; |
| 126 | 144 | $Schedule->db = null; |
@@ -140,14 +158,18 @@ discard block |
||
| 140 | 158 | |
| 141 | 159 | public function checkAll() { |
| 142 | 160 | global $globalDebug, $globalNoImport; |
| 143 | - if ($globalDebug) echo "Update last seen flights data...\n"; |
|
| 161 | + if ($globalDebug) { |
|
| 162 | + echo "Update last seen flights data...\n"; |
|
| 163 | + } |
|
| 144 | 164 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 145 | 165 | foreach ($this->all_flights as $key => $flight) { |
| 146 | 166 | if (isset($this->all_flights[$key]['id'])) { |
| 147 | 167 | //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
| 148 | 168 | $Spotter = new Spotter($this->db); |
| 149 | 169 | $real_arrival = $this->arrival($key); |
| 150 | - if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $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']); |
|
| 170 | + if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) { |
|
| 171 | + $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']); |
|
| 172 | + } |
|
| 151 | 173 | } |
| 152 | 174 | } |
| 153 | 175 | } |
@@ -155,24 +177,32 @@ discard block |
||
| 155 | 177 | |
| 156 | 178 | public function arrival($key) { |
| 157 | 179 | global $globalClosestMinDist, $globalDebug; |
| 158 | - if ($globalDebug) echo 'Update arrival...'."\n"; |
|
| 180 | + if ($globalDebug) { |
|
| 181 | + echo 'Update arrival...'."\n"; |
|
| 182 | + } |
|
| 159 | 183 | $Spotter = new Spotter($this->db); |
| 160 | 184 | $airport_icao = ''; |
| 161 | 185 | $airport_time = ''; |
| 162 | - if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
| 186 | + if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') { |
|
| 187 | + $globalClosestMinDist = 50; |
|
| 188 | + } |
|
| 163 | 189 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 164 | 190 | $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
| 165 | 191 | if (isset($closestAirports[0])) { |
| 166 | 192 | if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
| 167 | 193 | $airport_icao = $closestAirports[0]['icao']; |
| 168 | 194 | $airport_time = $this->all_flights[$key]['datetime']; |
| 169 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 195 | + if ($globalDebug) { |
|
| 196 | + echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 197 | + } |
|
| 170 | 198 | } elseif (count($closestAirports) > 1 && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') { |
| 171 | 199 | foreach ($closestAirports as $airport) { |
| 172 | 200 | if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) { |
| 173 | 201 | $airport_icao = $airport['icao']; |
| 174 | 202 | $airport_time = $this->all_flights[$key]['datetime']; |
| 175 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 203 | + if ($globalDebug) { |
|
| 204 | + echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 205 | + } |
|
| 176 | 206 | break; |
| 177 | 207 | } |
| 178 | 208 | } |
@@ -180,14 +210,20 @@ discard block |
||
| 180 | 210 | $airport_icao = $closestAirports[0]['icao']; |
| 181 | 211 | $airport_time = $this->all_flights[$key]['datetime']; |
| 182 | 212 | } else { |
| 183 | - if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 213 | + if ($globalDebug) { |
|
| 214 | + echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 215 | + } |
|
| 184 | 216 | } |
| 185 | 217 | } else { |
| 186 | - if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 218 | + if ($globalDebug) { |
|
| 219 | + echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 220 | + } |
|
| 187 | 221 | } |
| 188 | 222 | |
| 189 | 223 | } else { |
| 190 | - if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 224 | + if ($globalDebug) { |
|
| 225 | + echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 226 | + } |
|
| 191 | 227 | } |
| 192 | 228 | return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
| 193 | 229 | } |
@@ -197,7 +233,9 @@ discard block |
||
| 197 | 233 | public function del() { |
| 198 | 234 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 199 | 235 | // Delete old infos |
| 200 | - if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
|
| 236 | + if ($globalDebug) { |
|
| 237 | + echo 'Delete old values and update latest data...'."\n"; |
|
| 238 | + } |
|
| 201 | 239 | |
| 202 | 240 | foreach ($this->all_flights as $key => $flight) { |
| 203 | 241 | if (isset($flight['lastupdate'])) { |
@@ -212,22 +250,30 @@ discard block |
||
| 212 | 250 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 213 | 251 | // Delete old infos |
| 214 | 252 | if (isset($this->all_flights[$key]['id'])) { |
| 215 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
| 253 | + if ($globalDebug) { |
|
| 254 | + echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
| 255 | + } |
|
| 216 | 256 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 217 | 257 | $real_arrival = $this->arrival($key); |
| 218 | 258 | $Spotter = new Spotter($this->db); |
| 219 | 259 | $SpotterLive = new SpotterLive($this->db); |
| 220 | 260 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 221 | 261 | $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']); |
| 222 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 262 | + if ($globalDebug && $result != 'success') { |
|
| 263 | + echo '!!! ERROR : '.$result."\n"; |
|
| 264 | + } |
|
| 223 | 265 | $this->all_flights[$key]['putinarchive'] = true; |
| 224 | 266 | $result = $SpotterLive->addLiveSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['aircraft_icao'], $this->all_flights[$key]['departure_airport'], $this->all_flights[$key]['arrival_airport'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['waypoints'], $this->all_flights[$key]['altitude'],$this->all_flights[$key]['altitude_real'], $this->all_flights[$key]['heading'], $this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'], $this->all_flights[$key]['departure_airport_time'], $this->all_flights[$key]['arrival_airport_time'], $this->all_flights[$key]['squawk'],$this->all_flights[$key]['route_stop'],$this->all_flights[$key]['hex'],$this->all_flights[$key]['putinarchive'],$this->all_flights[$key]['registration'],$this->all_flights[$key]['pilot_id'],$this->all_flights[$key]['pilot_name'], $this->all_flights[$key]['verticalrate'], $this->all_flights[$key]['noarchive'], $this->all_flights[$key]['ground'],$this->all_flights[$key]['format_source'],$this->all_flights[$key]['source_name'],$this->all_flights[$key]['over_country']); |
| 225 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 267 | + if ($globalDebug && $result != 'success') { |
|
| 268 | + echo '!!! ERROR : '.$result."\n"; |
|
| 269 | + } |
|
| 226 | 270 | } |
| 227 | 271 | $Spotter->db = null; |
| 228 | 272 | $SpotterLive->db = null; |
| 229 | 273 | } |
| 230 | - if ($globalDebug) echo "\n"; |
|
| 274 | + if ($globalDebug) { |
|
| 275 | + echo "\n"; |
|
| 276 | + } |
|
| 231 | 277 | } |
| 232 | 278 | unset($this->all_flights[$key]); |
| 233 | 279 | } |
@@ -235,9 +281,13 @@ discard block |
||
| 235 | 281 | public function add($line) { |
| 236 | 282 | 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, $globalLiveInterval, $GeoidClass, $globalArchive, $globalAPRSdelete; |
| 237 | 283 | //if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE; |
| 238 | - if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.01'; |
|
| 239 | - if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') $globalAircraftMaxUpdate = 3000; |
|
| 240 | -/* |
|
| 284 | + if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') { |
|
| 285 | + $globalCoordMinChange = '0.01'; |
|
| 286 | + } |
|
| 287 | + if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') { |
|
| 288 | + $globalAircraftMaxUpdate = 3000; |
|
| 289 | + } |
|
| 290 | + /* |
|
| 241 | 291 | $Spotter = new Spotter(); |
| 242 | 292 | $dbc = $Spotter->db; |
| 243 | 293 | $SpotterLive = new SpotterLive($dbc); |
@@ -259,19 +309,28 @@ discard block |
||
| 259 | 309 | // SBS format is CSV format |
| 260 | 310 | if(is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
| 261 | 311 | //print_r($line); |
| 262 | - if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']); |
|
| 312 | + if (isset($line['hex'])) { |
|
| 313 | + $line['hex'] = strtoupper($line['hex']); |
|
| 314 | + } |
|
| 263 | 315 | if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && substr($line['hex'],0,1) != '~' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
| 264 | 316 | |
| 265 | 317 | // Increment message number |
| 266 | 318 | if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) { |
| 267 | 319 | $current_date = date('Y-m-d'); |
| 268 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 269 | - else $source = ''; |
|
| 270 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 320 | + if (isset($line['source_name'])) { |
|
| 321 | + $source = $line['source_name']; |
|
| 322 | + } else { |
|
| 323 | + $source = ''; |
|
| 324 | + } |
|
| 325 | + if ($source == '' || $line['format_source'] == 'aprs') { |
|
| 326 | + $source = $line['format_source']; |
|
| 327 | + } |
|
| 271 | 328 | if (!isset($this->stats[$current_date][$source]['msg'])) { |
| 272 | 329 | $this->stats[$current_date][$source]['msg']['date'] = time(); |
| 273 | 330 | $this->stats[$current_date][$source]['msg']['nb'] = 1; |
| 274 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 331 | + } else { |
|
| 332 | + $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 333 | + } |
|
| 275 | 334 | } |
| 276 | 335 | |
| 277 | 336 | /* |
@@ -287,23 +346,38 @@ discard block |
||
| 287 | 346 | //$this->db = $dbc; |
| 288 | 347 | |
| 289 | 348 | //$hex = trim($line['hex']); |
| 290 | - if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 291 | - else $id = trim($line['id']); |
|
| 349 | + if (!isset($line['id'])) { |
|
| 350 | + $id = trim($line['hex']); |
|
| 351 | + } else { |
|
| 352 | + $id = trim($line['id']); |
|
| 353 | + } |
|
| 292 | 354 | |
| 293 | 355 | if (!isset($this->all_flights[$id])) { |
| 294 | - if ($globalDebug) echo 'New flight...'."\n"; |
|
| 356 | + if ($globalDebug) { |
|
| 357 | + echo 'New flight...'."\n"; |
|
| 358 | + } |
|
| 295 | 359 | $this->all_flights[$id] = array(); |
| 296 | 360 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 297 | 361 | $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' => '','coordinates' => 0)); |
| 298 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 362 | + if (isset($globalDaemon) && $globalDaemon === FALSE) { |
|
| 363 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 364 | + } |
|
| 299 | 365 | if (!isset($line['id'])) { |
| 300 | - if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
| 301 | -// 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'))); |
|
| 366 | + if (!isset($globalDaemon)) { |
|
| 367 | + $globalDaemon = TRUE; |
|
| 368 | + } |
|
| 369 | + // 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'))); |
|
| 302 | 370 | // 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'))); |
| 303 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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'))); |
|
| 371 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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')) { |
|
| 372 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 373 | + } |
|
| 304 | 374 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 305 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 306 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 375 | + } else { |
|
| 376 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 377 | + } |
|
| 378 | + if ($globalAllFlights !== FALSE) { |
|
| 379 | + $dataFound = true; |
|
| 380 | + } |
|
| 307 | 381 | } |
| 308 | 382 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 309 | 383 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
@@ -325,12 +399,20 @@ discard block |
||
| 325 | 399 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 326 | 400 | } |
| 327 | 401 | $Spotter->db = null; |
| 328 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 329 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 402 | + if ($globalDebugTimeElapsed) { |
|
| 403 | + echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 404 | + } |
|
| 405 | + if ($aircraft_icao != '') { |
|
| 406 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 407 | + } |
|
| 330 | 408 | } |
| 331 | 409 | } |
| 332 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 333 | - if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 410 | + if ($globalAllFlights !== FALSE) { |
|
| 411 | + $dataFound = true; |
|
| 412 | + } |
|
| 413 | + if ($globalDebug) { |
|
| 414 | + echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 415 | + } |
|
| 334 | 416 | } |
| 335 | 417 | if (isset($line['id']) && !isset($line['hex'])) { |
| 336 | 418 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => '')); |
@@ -339,7 +421,9 @@ discard block |
||
| 339 | 421 | $icao = $line['aircraft_icao']; |
| 340 | 422 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 341 | 423 | $Spotter = new Spotter($this->db); |
| 342 | - if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
|
| 424 | + if (isset($Spotter->aircraft_correct_icaotype[$icao])) { |
|
| 425 | + $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
|
| 426 | + } |
|
| 343 | 427 | $Spotter->db = null; |
| 344 | 428 | } |
| 345 | 429 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao)); |
@@ -349,15 +433,24 @@ discard block |
||
| 349 | 433 | $Spotter = new Spotter($this->db); |
| 350 | 434 | $aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
| 351 | 435 | $Spotter->db = null; |
| 352 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 436 | + if ($aircraft_icao != '') { |
|
| 437 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 438 | + } |
|
| 353 | 439 | } |
| 354 | 440 | } |
| 355 | 441 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) { |
| 356 | - if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID'; |
|
| 357 | - elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
|
| 358 | - elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
|
| 359 | - elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
|
| 360 | - if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 442 | + if ($line['aircraft_type'] == 'PARA_GLIDER') { |
|
| 443 | + $aircraft_icao = 'GLID'; |
|
| 444 | + } elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') { |
|
| 445 | + $aircraft_icao = 'UHEL'; |
|
| 446 | + } elseif ($line['aircraft_type'] == 'TOW_PLANE') { |
|
| 447 | + $aircraft_icao = 'TOWPLANE'; |
|
| 448 | + } elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') { |
|
| 449 | + $aircraft_icao = 'POWAIRC'; |
|
| 450 | + } |
|
| 451 | + if (isset($aircraft_icao)) { |
|
| 452 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 453 | + } |
|
| 361 | 454 | } |
| 362 | 455 | if (!isset($this->all_flights[$id]['aircraft_icao'])) { |
| 363 | 456 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
@@ -367,8 +460,11 @@ discard block |
||
| 367 | 460 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
| 368 | 461 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 369 | 462 | } else { |
| 370 | - 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"; |
|
| 371 | - 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"; |
|
| 463 | + if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) { |
|
| 464 | + echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 465 | + } elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) { |
|
| 466 | + echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 467 | + } |
|
| 372 | 468 | /* |
| 373 | 469 | echo strtotime($line['datetime']).' > '.strtotime($this->all_flights[$id]['datetime']); |
| 374 | 470 | print_r($this->all_flights[$id]); |
@@ -377,16 +473,22 @@ discard block |
||
| 377 | 473 | return ''; |
| 378 | 474 | } |
| 379 | 475 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 380 | - if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n"; |
|
| 476 | + if ($globalDebug) { |
|
| 477 | + echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n"; |
|
| 478 | + } |
|
| 381 | 479 | return ''; |
| 382 | 480 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
| 383 | - if ($globalDebug) echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n"; |
|
| 481 | + if ($globalDebug) { |
|
| 482 | + echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n"; |
|
| 483 | + } |
|
| 384 | 484 | return ''; |
| 385 | 485 | } elseif (!isset($line['datetime'])) { |
| 386 | 486 | date_default_timezone_set('UTC'); |
| 387 | 487 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
| 388 | 488 | } else { |
| 389 | - if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 489 | + if ($globalDebug) { |
|
| 490 | + echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 491 | + } |
|
| 390 | 492 | return ''; |
| 391 | 493 | } |
| 392 | 494 | |
@@ -407,30 +509,48 @@ discard block |
||
| 407 | 509 | |
| 408 | 510 | if ($this->all_flights[$id]['addedSpotter'] == 1) { |
| 409 | 511 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 410 | - if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n"; |
|
| 512 | + if ($globalDebug) { |
|
| 513 | + echo '---!!!! New ident, reset aircraft data...'."\n"; |
|
| 514 | + } |
|
| 411 | 515 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 412 | 516 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 413 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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'))); |
|
| 414 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 415 | - 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'])); |
|
| 517 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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')) { |
|
| 518 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 519 | + } elseif (isset($line['id'])) { |
|
| 520 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 521 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
| 522 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 523 | + } |
|
| 416 | 524 | } else { |
| 417 | 525 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
| 418 | 526 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 419 | 527 | $timeelapsed = microtime(true); |
| 420 | 528 | $Spotter = new Spotter($this->db); |
| 421 | 529 | $fromsource = NULL; |
| 422 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 423 | - elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 424 | - elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
|
| 425 | - elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
| 426 | - elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
| 530 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') { |
|
| 531 | + $fromsource = $globalAirlinesSource; |
|
| 532 | + } elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') { |
|
| 533 | + $fromsource = 'vatsim'; |
|
| 534 | + } elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') { |
|
| 535 | + $fromsource = 'ivao'; |
|
| 536 | + } elseif (isset($globalVATSIM) && $globalVATSIM) { |
|
| 537 | + $fromsource = 'vatsim'; |
|
| 538 | + } elseif (isset($globalIVAO) && $globalIVAO) { |
|
| 539 | + $fromsource = 'ivao'; |
|
| 540 | + } |
|
| 427 | 541 | $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource,$this->all_flights[$id]['source_type']); |
| 428 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 542 | + if ($globalDebug && $result != 'success') { |
|
| 543 | + echo '!!! ERROR : '.$result."\n"; |
|
| 544 | + } |
|
| 429 | 545 | $Spotter->db = null; |
| 430 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 546 | + if ($globalDebugTimeElapsed) { |
|
| 547 | + echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 548 | + } |
|
| 431 | 549 | } |
| 432 | 550 | } |
| 433 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 551 | + } else { |
|
| 552 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 553 | + } |
|
| 434 | 554 | |
| 435 | 555 | /* |
| 436 | 556 | if (!isset($line['id'])) { |
@@ -440,7 +560,9 @@ discard block |
||
| 440 | 560 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 441 | 561 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 442 | 562 | */ |
| 443 | - 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'])); |
|
| 563 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 564 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 565 | + } |
|
| 444 | 566 | |
| 445 | 567 | //$putinarchive = true; |
| 446 | 568 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
@@ -458,7 +580,9 @@ discard block |
||
| 458 | 580 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 459 | 581 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 460 | 582 | $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' => '')); |
| 461 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 583 | + if ($globalDebugTimeElapsed) { |
|
| 584 | + echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 585 | + } |
|
| 462 | 586 | } |
| 463 | 587 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
| 464 | 588 | $timeelapsed = microtime(true); |
@@ -472,7 +596,9 @@ discard block |
||
| 472 | 596 | $Translation->db = null; |
| 473 | 597 | } |
| 474 | 598 | $Spotter->db = null; |
| 475 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 599 | + if ($globalDebugTimeElapsed) { |
|
| 600 | + echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 601 | + } |
|
| 476 | 602 | } |
| 477 | 603 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 478 | 604 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
@@ -481,9 +607,13 @@ discard block |
||
| 481 | 607 | $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'])); |
| 482 | 608 | } |
| 483 | 609 | } |
| 484 | - if (!isset($globalFork)) $globalFork = TRUE; |
|
| 610 | + if (!isset($globalFork)) { |
|
| 611 | + $globalFork = TRUE; |
|
| 612 | + } |
|
| 485 | 613 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 486 | - if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
| 614 | + if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) { |
|
| 615 | + $this->get_Schedule($id,trim($line['ident'])); |
|
| 616 | + } |
|
| 487 | 617 | } |
| 488 | 618 | } |
| 489 | 619 | } |
@@ -501,9 +631,13 @@ discard block |
||
| 501 | 631 | $speed = $speed*3.6; |
| 502 | 632 | if ($speed < 1000) { |
| 503 | 633 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
| 504 | - if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
| 634 | + if ($globalDebug) { |
|
| 635 | + echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
| 636 | + } |
|
| 505 | 637 | } else { |
| 506 | - if ($globalDebug) echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
| 638 | + if ($globalDebug) { |
|
| 639 | + echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
| 640 | + } |
|
| 507 | 641 | } |
| 508 | 642 | } |
| 509 | 643 | } |
@@ -512,13 +646,21 @@ discard block |
||
| 512 | 646 | |
| 513 | 647 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 514 | 648 | if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) { |
| 515 | - if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
|
| 649 | + if ($globalDebug) { |
|
| 650 | + echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
|
| 651 | + } |
|
| 516 | 652 | return false; |
| 517 | 653 | } |
| 518 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 519 | - else unset($timediff); |
|
| 520 | - if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']); |
|
| 521 | - else unset($timediff_archive); |
|
| 654 | + if (isset($this->all_flights[$id]['time_last_coord'])) { |
|
| 655 | + $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 656 | + } else { |
|
| 657 | + unset($timediff); |
|
| 658 | + } |
|
| 659 | + if (isset($this->all_flights[$id]['time_last_archive_coord'])) { |
|
| 660 | + $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']); |
|
| 661 | + } else { |
|
| 662 | + unset($timediff_archive); |
|
| 663 | + } |
|
| 522 | 664 | if ($this->tmd > 5 |
| 523 | 665 | || (isset($line['format_source']) |
| 524 | 666 | && $line['format_source'] == 'airwhere' |
@@ -561,21 +703,32 @@ discard block |
||
| 561 | 703 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 562 | 704 | $this->all_flights[$id]['putinarchive'] = true; |
| 563 | 705 | if ($this->tmd > 5 && $this->all_flights[$id]['putinarchive'] == true) { |
| 564 | - if ($globalDebug) echo "\n".' Update Initial data ! '."\n"; |
|
| 706 | + if ($globalDebug) { |
|
| 707 | + echo "\n".' Update Initial data ! '."\n"; |
|
| 708 | + } |
|
| 565 | 709 | $updateinitial = true; |
| 566 | 710 | } |
| 567 | 711 | $this->tmd = 0; |
| 568 | 712 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 569 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 713 | + if ($globalDebug) { |
|
| 714 | + echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 715 | + } |
|
| 570 | 716 | $timeelapsed = microtime(true); |
| 571 | 717 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 572 | 718 | $Spotter = new Spotter($this->db); |
| 573 | 719 | $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 574 | - if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
| 575 | - else $this->all_flights[$id]['over_country'] = ''; |
|
| 720 | + if (!empty($all_country)) { |
|
| 721 | + $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
| 722 | + } else { |
|
| 723 | + $this->all_flights[$id]['over_country'] = ''; |
|
| 724 | + } |
|
| 576 | 725 | $Spotter->db = null; |
| 577 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 578 | - if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
| 726 | + if ($globalDebugTimeElapsed) { |
|
| 727 | + echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 728 | + } |
|
| 729 | + if ($globalDebug) { |
|
| 730 | + echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
| 731 | + } |
|
| 579 | 732 | } |
| 580 | 733 | } |
| 581 | 734 | $this->all_flights[$id]['time_last_archive_coord'] = time(); |
@@ -621,7 +774,9 @@ discard block |
||
| 621 | 774 | */ |
| 622 | 775 | } |
| 623 | 776 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 624 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 777 | + if ($line['longitude'] > 180) { |
|
| 778 | + $line['longitude'] = $line['longitude'] - 360; |
|
| 779 | + } |
|
| 625 | 780 | //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) { |
| 626 | 781 | if (!isset($this->all_flights[$id]['archive_longitude'])) { |
| 627 | 782 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
@@ -650,7 +805,9 @@ discard block |
||
| 650 | 805 | */ |
| 651 | 806 | } |
| 652 | 807 | if ($globalDaemon === TRUE && isset($updateinitial) && $updateinitial && $this->all_flights[$id]['addedSpotter'] == 1) { |
| 653 | - if ($globalDebug) echo "\n".'>>> Update initial data !'."\n"; |
|
| 808 | + if ($globalDebug) { |
|
| 809 | + echo "\n".'>>> Update initial data !'."\n"; |
|
| 810 | + } |
|
| 654 | 811 | unset($updateinitial); |
| 655 | 812 | $SpotterArchive = new SpotterArchive(); |
| 656 | 813 | $SpotterArchive->deleteSpotterArchiveTrackDataByID($this->all_flights[$id]['id']); |
@@ -668,7 +825,9 @@ discard block |
||
| 668 | 825 | } |
| 669 | 826 | } |
| 670 | 827 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 671 | - if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 828 | + if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) { |
|
| 829 | + $dataFound = true; |
|
| 830 | + } |
|
| 672 | 831 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
| 673 | 832 | } |
| 674 | 833 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
@@ -690,35 +849,53 @@ discard block |
||
| 690 | 849 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 691 | 850 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 692 | 851 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 693 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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'))); |
|
| 694 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 695 | - 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'])); |
|
| 852 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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')) { |
|
| 853 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 854 | + } elseif (isset($line['id'])) { |
|
| 855 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 856 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
| 857 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 858 | + } |
|
| 859 | + } |
|
| 860 | + if ($line['ground'] != 1) { |
|
| 861 | + $line['ground'] = 0; |
|
| 696 | 862 | } |
| 697 | - if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 698 | 863 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
| 699 | 864 | //$dataFound = true; |
| 700 | 865 | } |
| 701 | 866 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 702 | 867 | 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'])) { |
| 703 | - if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 868 | + if ($this->all_flights[$id]['squawk'] != $line['squawk']) { |
|
| 869 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 870 | + } |
|
| 704 | 871 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
| 705 | 872 | $highlight = ''; |
| 706 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 707 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 708 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 873 | + if ($this->all_flights[$id]['squawk'] == '7500') { |
|
| 874 | + $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 875 | + } |
|
| 876 | + if ($this->all_flights[$id]['squawk'] == '7600') { |
|
| 877 | + $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 878 | + } |
|
| 879 | + if ($this->all_flights[$id]['squawk'] == '7700') { |
|
| 880 | + $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 881 | + } |
|
| 709 | 882 | if ($highlight != '') { |
| 710 | 883 | $timeelapsed = microtime(true); |
| 711 | 884 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 712 | 885 | $Spotter = new Spotter($this->db); |
| 713 | 886 | $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
| 714 | 887 | $Spotter->db = null; |
| 715 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 888 | + if ($globalDebugTimeElapsed) { |
|
| 889 | + echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 890 | + } |
|
| 716 | 891 | } |
| 717 | 892 | //$putinarchive = true; |
| 718 | 893 | //$highlight = ''; |
| 719 | 894 | } |
| 720 | 895 | |
| 721 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 896 | + } else { |
|
| 897 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 898 | + } |
|
| 722 | 899 | //$dataFound = true; |
| 723 | 900 | } |
| 724 | 901 | |
@@ -731,19 +908,27 @@ discard block |
||
| 731 | 908 | } |
| 732 | 909 | } |
| 733 | 910 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 734 | - 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; |
|
| 911 | + if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) { |
|
| 912 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 913 | + } |
|
| 735 | 914 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
| 736 | 915 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
| 737 | 916 | //$dataFound = true; |
| 738 | 917 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 739 | 918 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
| 740 | 919 | 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() - 1600) { |
| 741 | - if ($globalDebug) echo '--- Reset because of altitude'."\n"; |
|
| 920 | + if ($globalDebug) { |
|
| 921 | + echo '--- Reset because of altitude'."\n"; |
|
| 922 | + } |
|
| 742 | 923 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 743 | 924 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 744 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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'))); |
|
| 745 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 746 | - 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'])); |
|
| 925 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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')) { |
|
| 926 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 927 | + } elseif (isset($line['id'])) { |
|
| 928 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 929 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
| 930 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 931 | + } |
|
| 747 | 932 | } |
| 748 | 933 | } |
| 749 | 934 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
@@ -754,22 +939,32 @@ discard block |
||
| 754 | 939 | } |
| 755 | 940 | |
| 756 | 941 | if (isset($line['heading']) && $line['heading'] != '') { |
| 757 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 942 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) { |
|
| 943 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 944 | + } |
|
| 758 | 945 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
| 759 | 946 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
| 760 | 947 | //$dataFound = true; |
| 761 | 948 | } 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']) { |
| 762 | 949 | $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']); |
| 763 | 950 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
| 764 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 765 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
| 951 | + if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) { |
|
| 952 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 953 | + } |
|
| 954 | + if ($globalDebug) { |
|
| 955 | + echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
| 956 | + } |
|
| 766 | 957 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 767 | 958 | // If not enough messages and ACARS set heading to 0 |
| 768 | 959 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
| 769 | 960 | } |
| 770 | - if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 771 | - elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 772 | - elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalAircraftMinUpdate) $dataFound = false; |
|
| 961 | + if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) { |
|
| 962 | + $dataFound = false; |
|
| 963 | + } elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) { |
|
| 964 | + $dataFound = false; |
|
| 965 | + } elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalAircraftMinUpdate) { |
|
| 966 | + $dataFound = false; |
|
| 967 | + } |
|
| 773 | 968 | |
| 774 | 969 | // print_r($this->all_flights[$id]); |
| 775 | 970 | //gets the callsign from the last hour |
@@ -786,23 +981,38 @@ discard block |
||
| 786 | 981 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
| 787 | 982 | if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
| 788 | 983 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 789 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 984 | + if ($globalDebug) { |
|
| 985 | + echo "Check if aircraft is already in DB..."; |
|
| 986 | + } |
|
| 790 | 987 | $timeelapsed = microtime(true); |
| 791 | 988 | $SpotterLive = new SpotterLive($this->db); |
| 792 | 989 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $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 | 990 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 794 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 991 | + if ($globalDebugTimeElapsed) { |
|
| 992 | + echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 993 | + } |
|
| 795 | 994 | } elseif (isset($line['id'])) { |
| 796 | 995 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 797 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 996 | + if ($globalDebugTimeElapsed) { |
|
| 997 | + echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 998 | + } |
|
| 798 | 999 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
| 799 | 1000 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 800 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 801 | - } else $recent_ident = ''; |
|
| 1001 | + if ($globalDebugTimeElapsed) { |
|
| 1002 | + echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 1003 | + } |
|
| 1004 | + } else { |
|
| 1005 | + $recent_ident = ''; |
|
| 1006 | + } |
|
| 802 | 1007 | $SpotterLive->db=null; |
| 803 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 804 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 805 | - } else $recent_ident = ''; |
|
| 1008 | + if ($globalDebug && $recent_ident == '') { |
|
| 1009 | + echo " Not in DB.\n"; |
|
| 1010 | + } elseif ($globalDebug && $recent_ident != '') { |
|
| 1011 | + echo " Already in DB.\n"; |
|
| 1012 | + } |
|
| 1013 | + } else { |
|
| 1014 | + $recent_ident = ''; |
|
| 1015 | + } |
|
| 806 | 1016 | } else { |
| 807 | 1017 | $recent_ident = ''; |
| 808 | 1018 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
@@ -810,7 +1020,9 @@ discard block |
||
| 810 | 1020 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 811 | 1021 | if($recent_ident == "") |
| 812 | 1022 | { |
| 813 | - if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
| 1023 | + if ($globalDebug) { |
|
| 1024 | + echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
| 1025 | + } |
|
| 814 | 1026 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 815 | 1027 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 816 | 1028 | //adds the spotter data for the archive |
@@ -854,10 +1066,18 @@ discard block |
||
| 854 | 1066 | |
| 855 | 1067 | if (!$ignoreImport) { |
| 856 | 1068 | $highlight = ''; |
| 857 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 858 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 859 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 860 | - 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'))); |
|
| 1069 | + if ($this->all_flights[$id]['squawk'] == '7500') { |
|
| 1070 | + $highlight = 'Squawk 7500 : Hijack'; |
|
| 1071 | + } |
|
| 1072 | + if ($this->all_flights[$id]['squawk'] == '7600') { |
|
| 1073 | + $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 1074 | + } |
|
| 1075 | + if ($this->all_flights[$id]['squawk'] == '7700') { |
|
| 1076 | + $highlight = 'Squawk 7700 : Emergency'; |
|
| 1077 | + } |
|
| 1078 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 1079 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 1080 | + } |
|
| 861 | 1081 | $timeelapsed = microtime(true); |
| 862 | 1082 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 863 | 1083 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
@@ -865,28 +1085,43 @@ discard block |
||
| 865 | 1085 | $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']); |
| 866 | 1086 | $Spotter->db = null; |
| 867 | 1087 | if ($globalDebug) { |
| 868 | - if (isset($result['error'])) echo 'Error: '.$result['error']."\n"; |
|
| 869 | - else echo 'Success'; |
|
| 1088 | + if (isset($result['error'])) { |
|
| 1089 | + echo 'Error: '.$result['error']."\n"; |
|
| 1090 | + } else { |
|
| 1091 | + echo 'Success'; |
|
| 1092 | + } |
|
| 870 | 1093 | } |
| 871 | 1094 | if (count($result) > 1) { |
| 872 | 1095 | // ':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type, |
| 873 | - if ($this->all_flights[$id]['aircraft_icao'] == '') $this->all_flights[$id]['aircraft_icao'] = $result[':aircraft_icao']; |
|
| 874 | - if ($this->all_flights[$id]['registration'] == '') $this->all_flights[$id]['registration'] = $result[':registration']; |
|
| 1096 | + if ($this->all_flights[$id]['aircraft_icao'] == '') { |
|
| 1097 | + $this->all_flights[$id]['aircraft_icao'] = $result[':aircraft_icao']; |
|
| 1098 | + } |
|
| 1099 | + if ($this->all_flights[$id]['registration'] == '') { |
|
| 1100 | + $this->all_flights[$id]['registration'] = $result[':registration']; |
|
| 1101 | + } |
|
| 875 | 1102 | } |
| 876 | 1103 | } |
| 877 | 1104 | } |
| 878 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 1105 | + if ($globalDebugTimeElapsed) { |
|
| 1106 | + echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 1107 | + } |
|
| 879 | 1108 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 880 | 1109 | |
| 881 | 1110 | // Add source stat in DB |
| 882 | 1111 | $Stats = new Stats($this->db); |
| 883 | 1112 | if (!empty($this->stats)) { |
| 884 | - if ($globalDebug) echo 'Add source stats : '; |
|
| 1113 | + if ($globalDebug) { |
|
| 1114 | + echo 'Add source stats : '; |
|
| 1115 | + } |
|
| 885 | 1116 | foreach($this->stats as $date => $data) { |
| 886 | 1117 | foreach($data as $source => $sourced) { |
| 887 | 1118 | //print_r($sourced); |
| 888 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 889 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 1119 | + if (isset($sourced['polar'])) { |
|
| 1120 | + echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 1121 | + } |
|
| 1122 | + if (isset($sourced['hist'])) { |
|
| 1123 | + echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 1124 | + } |
|
| 890 | 1125 | if (isset($sourced['msg'])) { |
| 891 | 1126 | if (time() - $sourced['msg']['date'] > 10) { |
| 892 | 1127 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
@@ -899,13 +1134,17 @@ discard block |
||
| 899 | 1134 | unset($this->stats[$date]); |
| 900 | 1135 | } |
| 901 | 1136 | } |
| 902 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 1137 | + if ($globalDebug) { |
|
| 1138 | + echo 'Done'."\n"; |
|
| 1139 | + } |
|
| 903 | 1140 | |
| 904 | 1141 | } |
| 905 | 1142 | $Stats->db = null; |
| 906 | 1143 | } |
| 907 | 1144 | $this->del(); |
| 908 | - } elseif ($globalDebug) echo 'Ignore data'."\n"; |
|
| 1145 | + } elseif ($globalDebug) { |
|
| 1146 | + echo 'Ignore data'."\n"; |
|
| 1147 | + } |
|
| 909 | 1148 | //$ignoreImport = false; |
| 910 | 1149 | $this->all_flights[$id]['addedSpotter'] = 1; |
| 911 | 1150 | //print_r($this->all_flights[$id]); |
@@ -922,7 +1161,9 @@ discard block |
||
| 922 | 1161 | */ |
| 923 | 1162 | //SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']); |
| 924 | 1163 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 925 | - if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 1164 | + if ($globalDebug) { |
|
| 1165 | + echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 1166 | + } |
|
| 926 | 1167 | //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
| 927 | 1168 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 928 | 1169 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
@@ -931,7 +1172,9 @@ discard block |
||
| 931 | 1172 | $SpotterLive->db=null; |
| 932 | 1173 | } |
| 933 | 1174 | } |
| 934 | - if ($globalDebug) echo " Done\n"; |
|
| 1175 | + if ($globalDebug) { |
|
| 1176 | + echo " Done\n"; |
|
| 1177 | + } |
|
| 935 | 1178 | $this->last_delete = time(); |
| 936 | 1179 | } |
| 937 | 1180 | } else { |
@@ -958,11 +1201,17 @@ discard block |
||
| 958 | 1201 | //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"; |
| 959 | 1202 | if ($globalDebug) { |
| 960 | 1203 | if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) { |
| 961 | - 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"; |
|
| 962 | - 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"; |
|
| 1204 | + if (isset($this->all_flights[$id]['source_name'])) { |
|
| 1205 | + 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"; |
|
| 1206 | + } else { |
|
| 1207 | + 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"; |
|
| 1208 | + } |
|
| 963 | 1209 | } else { |
| 964 | - 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"; |
|
| 965 | - 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"; |
|
| 1210 | + if (isset($this->all_flights[$id]['source_name'])) { |
|
| 1211 | + 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"; |
|
| 1212 | + } else { |
|
| 1213 | + 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"; |
|
| 1214 | + } |
|
| 966 | 1215 | } |
| 967 | 1216 | } |
| 968 | 1217 | $ignoreImport = false; |
@@ -1008,23 +1257,31 @@ discard block |
||
| 1008 | 1257 | |
| 1009 | 1258 | if (!$ignoreImport) { |
| 1010 | 1259 | 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'])) { |
| 1011 | - 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'))); |
|
| 1260 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 1261 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 1262 | + } |
|
| 1012 | 1263 | $timeelapsed = microtime(true); |
| 1013 | 1264 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 1014 | 1265 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 1015 | - if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
| 1266 | + if ($globalDebug) { |
|
| 1267 | + echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
| 1268 | + } |
|
| 1016 | 1269 | $SpotterLive = new SpotterLive($this->db); |
| 1017 | 1270 | //var_dump($this->all_flights[$id]); |
| 1018 | 1271 | $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']); |
| 1019 | 1272 | $SpotterLive->db = null; |
| 1020 | - if ($globalDebug) echo $result."\n"; |
|
| 1273 | + if ($globalDebug) { |
|
| 1274 | + echo $result."\n"; |
|
| 1275 | + } |
|
| 1021 | 1276 | } |
| 1022 | 1277 | } |
| 1023 | 1278 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 1024 | 1279 | $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']); |
| 1025 | 1280 | } |
| 1026 | 1281 | $this->all_flights[$id]['putinarchive'] = false; |
| 1027 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 1282 | + if ($globalDebugTimeElapsed) { |
|
| 1283 | + echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 1284 | + } |
|
| 1028 | 1285 | |
| 1029 | 1286 | // Put statistics in $this->stats variable |
| 1030 | 1287 | //if ($line['format_source'] != 'aprs') { |
@@ -1032,7 +1289,9 @@ discard block |
||
| 1032 | 1289 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 1033 | 1290 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 1034 | 1291 | $source = $this->all_flights[$id]['source_name']; |
| 1035 | - if ($source == '') $source = $this->all_flights[$id]['format_source']; |
|
| 1292 | + if ($source == '') { |
|
| 1293 | + $source = $this->all_flights[$id]['format_source']; |
|
| 1294 | + } |
|
| 1036 | 1295 | if (!isset($this->source_location[$source])) { |
| 1037 | 1296 | $Location = new Source($this->db); |
| 1038 | 1297 | $coord = $Location->getLocationInfobySourceName($source); |
@@ -1053,7 +1312,9 @@ discard block |
||
| 1053 | 1312 | $stats_heading = round($stats_heading/22.5); |
| 1054 | 1313 | $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
| 1055 | 1314 | $current_date = date('Y-m-d'); |
| 1056 | - if ($stats_heading == 16) $stats_heading = 0; |
|
| 1315 | + if ($stats_heading == 16) { |
|
| 1316 | + $stats_heading = 0; |
|
| 1317 | + } |
|
| 1057 | 1318 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 1058 | 1319 | for ($i=0;$i<=15;$i++) { |
| 1059 | 1320 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
@@ -1071,7 +1332,9 @@ discard block |
||
| 1071 | 1332 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 1072 | 1333 | end($this->stats[$current_date][$source]['hist']); |
| 1073 | 1334 | $mini = key($this->stats[$current_date][$source]['hist'])+10; |
| 1074 | - } else $mini = 0; |
|
| 1335 | + } else { |
|
| 1336 | + $mini = 0; |
|
| 1337 | + } |
|
| 1075 | 1338 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 1076 | 1339 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 1077 | 1340 | } |
@@ -1083,25 +1346,37 @@ discard block |
||
| 1083 | 1346 | } |
| 1084 | 1347 | |
| 1085 | 1348 | $this->all_flights[$id]['lastupdate'] = time(); |
| 1086 | - if ($this->all_flights[$id]['putinarchive']) $send = true; |
|
| 1349 | + if ($this->all_flights[$id]['putinarchive']) { |
|
| 1350 | + $send = true; |
|
| 1351 | + } |
|
| 1087 | 1352 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
| 1088 | - } 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"; |
|
| 1353 | + } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) { |
|
| 1354 | + echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 1355 | + } |
|
| 1089 | 1356 | //$this->del(); |
| 1090 | 1357 | |
| 1091 | 1358 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 1092 | 1359 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 1093 | - if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
|
| 1360 | + if ($globalDebug) { |
|
| 1361 | + echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
|
| 1362 | + } |
|
| 1094 | 1363 | $SpotterLive = new SpotterLive($this->db); |
| 1095 | 1364 | $SpotterLive->deleteLiveSpotterDataNotUpdated(); |
| 1096 | 1365 | $SpotterLive->db = null; |
| 1097 | 1366 | //SpotterLive->deleteLiveSpotterData(); |
| 1098 | - if ($globalDebug) echo " Done\n"; |
|
| 1367 | + if ($globalDebug) { |
|
| 1368 | + echo " Done\n"; |
|
| 1369 | + } |
|
| 1099 | 1370 | if (isset($globalAPRSdelete) && $globalAPRSdelete) { |
| 1100 | - if ($globalDebug) echo "---- Deleting old APRS data..."; |
|
| 1371 | + if ($globalDebug) { |
|
| 1372 | + echo "---- Deleting old APRS data..."; |
|
| 1373 | + } |
|
| 1101 | 1374 | $Spotter = new Spotter($this->db); |
| 1102 | 1375 | $Spotter->deleteOldAPRSData(); |
| 1103 | 1376 | $Spotter->db = null; |
| 1104 | - if ($globalDebug) echo " Done\n"; |
|
| 1377 | + if ($globalDebug) { |
|
| 1378 | + echo " Done\n"; |
|
| 1379 | + } |
|
| 1105 | 1380 | } |
| 1106 | 1381 | $this->last_delete_hourly = time(); |
| 1107 | 1382 | } else { |
@@ -1114,7 +1389,9 @@ discard block |
||
| 1114 | 1389 | //$ignoreImport = false; |
| 1115 | 1390 | } |
| 1116 | 1391 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 1117 | - if ($send) return $this->all_flights[$id]; |
|
| 1392 | + if ($send) { |
|
| 1393 | + return $this->all_flights[$id]; |
|
| 1394 | + } |
|
| 1118 | 1395 | } |
| 1119 | 1396 | } |
| 1120 | 1397 | } |
