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