|
@@ -41,12 +41,12 @@ discard block |
|
|
block discarded – undo |
|
41
|
41
|
$currentdate = date('Y-m-d'); |
|
42
|
42
|
$sourcestat = $Stats->getStatsSource($currentdate); |
|
43
|
43
|
if (!empty($sourcestat)) { |
|
44
|
|
- foreach($sourcestat as $srcst) { |
|
|
44
|
+ foreach ($sourcestat as $srcst) { |
|
45
|
45
|
$type = $srcst['stats_type']; |
|
46
|
46
|
if ($type == 'polar' || $type == 'hist') { |
|
47
|
47
|
$source = $srcst['source_name']; |
|
48
|
48
|
$data = $srcst['source_data']; |
|
49
|
|
- $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
|
49
|
+ $this->stats[$currentdate][$source][$type] = json_decode($data, true); |
|
50
|
50
|
} |
|
51
|
51
|
} |
|
52
|
52
|
} |
|
@@ -58,14 +58,14 @@ discard block |
|
|
block discarded – undo |
|
58
|
58
|
if (isset($globalGeoid) && $globalGeoid) { |
|
59
|
59
|
try { |
|
60
|
60
|
$GeoidClass = new GeoidHeight(); |
|
61
|
|
- } catch(Exception $e) { |
|
|
61
|
+ } catch (Exception $e) { |
|
62
|
62
|
if ($globalDebug) echo "Can't calculate geoid, check that you downloaded it via update_db.php (".$e.")\n"; |
|
63
|
63
|
$GeoidClass = FALSE; |
|
64
|
64
|
} |
|
65
|
65
|
} |
|
66
|
66
|
} |
|
67
|
67
|
|
|
68
|
|
- public function get_Schedule($id,$ident) { |
|
|
68
|
+ public function get_Schedule($id, $ident) { |
|
69
|
69
|
global $globalDebug, $globalFork, $globalSchedulesFetch; |
|
70
|
70
|
// Get schedule here, so it's done only one time |
|
71
|
71
|
|
|
@@ -90,8 +90,8 @@ discard block |
|
|
block discarded – undo |
|
90
|
90
|
$schedule = $Schedule->fetchSchedule($operator); |
|
91
|
91
|
if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
|
92
|
92
|
if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
93
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
94
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
|
93
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime'])); |
|
|
94
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
95
|
95
|
// Should also check if route schedule = route from DB |
|
96
|
96
|
if ($schedule['DepartureAirportIATA'] != '') { |
|
97
|
97
|
if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) { |
|
@@ -111,7 +111,7 @@ discard block |
|
|
block discarded – undo |
|
111
|
111
|
} |
|
112
|
112
|
} |
|
113
|
113
|
} |
|
114
|
|
- $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']); |
|
|
114
|
+ $Schedule->addSchedule($operator, $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time'], $schedule['Source']); |
|
115
|
115
|
} |
|
116
|
116
|
} else $scheduleexist = true; |
|
117
|
117
|
} else $scheduleexist = true; |
|
@@ -119,8 +119,8 @@ discard block |
|
|
block discarded – undo |
|
119
|
119
|
if ($scheduleexist) { |
|
120
|
120
|
if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
|
121
|
121
|
$sch = $Schedule->getSchedule($operator); |
|
122
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time'])); |
|
123
|
|
- if ($this->all_flights[$id]['addedSpotter'] == 1) $Spotter->updateLatestScheduleSpotterData($this->all_flights[$id]['id'],$sch['departure_airport_icao'],$sch['departure_airport_time'],$sch['arrival_airport_icao'],$sch['arrival_airport_time']); |
|
|
122
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport' => $sch['arrival_airport_icao'], 'departure_airport' => $sch['departure_airport_icao'], 'departure_airport_time' => $sch['departure_airport_time'], 'arrival_airport_time' => $sch['arrival_airport_time'])); |
|
|
123
|
+ if ($this->all_flights[$id]['addedSpotter'] == 1) $Spotter->updateLatestScheduleSpotterData($this->all_flights[$id]['id'], $sch['departure_airport_icao'], $sch['departure_airport_time'], $sch['arrival_airport_icao'], $sch['arrival_airport_time']); |
|
124
|
124
|
} |
|
125
|
125
|
$Spotter->db = null; |
|
126
|
126
|
$Schedule->db = null; |
|
@@ -147,7 +147,7 @@ discard block |
|
|
block discarded – undo |
|
147
|
147
|
//echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
|
148
|
148
|
$Spotter = new Spotter($this->db); |
|
149
|
149
|
$real_arrival = $this->arrival($key); |
|
150
|
|
- if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],'',$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
|
150
|
+ if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], '', $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']); |
|
151
|
151
|
} |
|
152
|
152
|
} |
|
153
|
153
|
} |
|
@@ -161,7 +161,7 @@ discard block |
|
|
block discarded – undo |
|
161
|
161
|
$airport_time = ''; |
|
162
|
162
|
if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
163
|
163
|
if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
|
164
|
|
- $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
|
164
|
+ $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist); |
|
165
|
165
|
if (isset($closestAirports[0])) { |
|
166
|
166
|
if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
|
167
|
167
|
$airport_icao = $closestAirports[0]['icao']; |
|
@@ -176,7 +176,7 @@ discard block |
|
|
block discarded – undo |
|
176
|
176
|
break; |
|
177
|
177
|
} |
|
178
|
178
|
} |
|
179
|
|
- } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) { |
|
|
179
|
+ } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude'] + 5000))) { |
|
180
|
180
|
$airport_icao = $closestAirports[0]['icao']; |
|
181
|
181
|
$airport_time = $this->all_flights[$key]['datetime']; |
|
182
|
182
|
} else { |
|
@@ -189,7 +189,7 @@ discard block |
|
|
block discarded – undo |
|
189
|
189
|
} else { |
|
190
|
190
|
if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
191
|
191
|
} |
|
192
|
|
- return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
|
192
|
+ return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time); |
|
193
|
193
|
} |
|
194
|
194
|
|
|
195
|
195
|
|
|
@@ -201,7 +201,7 @@ discard block |
|
|
block discarded – undo |
|
201
|
201
|
|
|
202
|
202
|
foreach ($this->all_flights as $key => $flight) { |
|
203
|
203
|
if (isset($flight['lastupdate'])) { |
|
204
|
|
- if ($flight['lastupdate'] < (time()-1800)) { |
|
|
204
|
+ if ($flight['lastupdate'] < (time() - 1800)) { |
|
205
|
205
|
$this->delKey($key); |
|
206
|
206
|
} |
|
207
|
207
|
} |
|
@@ -218,10 +218,10 @@ discard block |
|
|
block discarded – undo |
|
218
|
218
|
$Spotter = new Spotter($this->db); |
|
219
|
219
|
$SpotterLive = new SpotterLive($this->db); |
|
220
|
220
|
if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
|
221
|
|
- $result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],'',$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
|
221
|
+ $result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], '', $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']); |
|
222
|
222
|
if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
223
|
223
|
$this->all_flights[$key]['putinarchive'] = true; |
|
224
|
|
- $result = $SpotterLive->addLiveSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['aircraft_icao'], $this->all_flights[$key]['departure_airport'], $this->all_flights[$key]['arrival_airport'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['waypoints'], $this->all_flights[$key]['altitude'],$this->all_flights[$key]['altitude_real'], $this->all_flights[$key]['heading'], $this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'], $this->all_flights[$key]['departure_airport_time'], $this->all_flights[$key]['arrival_airport_time'], $this->all_flights[$key]['squawk'],$this->all_flights[$key]['route_stop'],$this->all_flights[$key]['hex'],$this->all_flights[$key]['putinarchive'],$this->all_flights[$key]['registration'],$this->all_flights[$key]['pilot_id'],$this->all_flights[$key]['pilot_name'], $this->all_flights[$key]['verticalrate'], $this->all_flights[$key]['noarchive'], $this->all_flights[$key]['ground'],$this->all_flights[$key]['format_source'],$this->all_flights[$key]['source_name'],$this->all_flights[$key]['over_country']); |
|
|
224
|
+ $result = $SpotterLive->addLiveSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['aircraft_icao'], $this->all_flights[$key]['departure_airport'], $this->all_flights[$key]['arrival_airport'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['waypoints'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['altitude_real'], $this->all_flights[$key]['heading'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $this->all_flights[$key]['departure_airport_time'], $this->all_flights[$key]['arrival_airport_time'], $this->all_flights[$key]['squawk'], $this->all_flights[$key]['route_stop'], $this->all_flights[$key]['hex'], $this->all_flights[$key]['putinarchive'], $this->all_flights[$key]['registration'], $this->all_flights[$key]['pilot_id'], $this->all_flights[$key]['pilot_name'], $this->all_flights[$key]['verticalrate'], $this->all_flights[$key]['noarchive'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['format_source'], $this->all_flights[$key]['source_name'], $this->all_flights[$key]['over_country']); |
|
225
|
225
|
if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
226
|
226
|
} |
|
227
|
227
|
$Spotter->db = null; |
|
@@ -257,10 +257,10 @@ discard block |
|
|
block discarded – undo |
|
257
|
257
|
$send = false; |
|
258
|
258
|
|
|
259
|
259
|
// SBS format is CSV format |
|
260
|
|
- if(is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
|
|
260
|
+ if (is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
|
261
|
261
|
//print_r($line); |
|
262
|
262
|
if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']); |
|
263
|
|
- if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && substr($line['hex'],0,1) != '~' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
|
|
263
|
+ if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && substr($line['hex'], 0, 1) != '~' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
|
264
|
264
|
|
|
265
|
265
|
// Increment message number |
|
266
|
266
|
if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) { |
|
@@ -293,25 +293,25 @@ discard block |
|
|
block discarded – undo |
|
293
|
293
|
if (!isset($this->all_flights[$id])) { |
|
294
|
294
|
if ($globalDebug) echo 'New flight...'."\n"; |
|
295
|
295
|
$this->all_flights[$id] = array(); |
|
296
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
297
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '','coordinates' => 0)); |
|
298
|
|
- if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
|
296
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
|
297
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => '', 'departure_airport' => '', 'arrival_airport' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'altitude_real' => '', 'altitude_previous' => '', 'heading' => '', 'departure_airport_time' => '', 'arrival_airport_time' => '', 'squawk' => '', 'route_stop' => '', 'registration' => '', 'pilot_id' => '', 'pilot_name' => '', 'waypoints' => '', 'ground' => '0', 'format_source' => '', 'source_name' => '', 'over_country' => '', 'verticalrate' => '', 'noarchive' => false, 'putinarchive' => true, 'source_type' => '', 'coordinates' => 0)); |
|
|
298
|
+ if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time())); |
|
299
|
299
|
if (!isset($line['id'])) { |
|
300
|
300
|
if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
301
|
301
|
// if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi'))); |
|
302
|
302
|
// if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
303
|
|
- if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
|
303
|
+ if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
304
|
304
|
//else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
305
|
|
- } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
|
305
|
+ } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
306
|
306
|
if ($globalAllFlights !== FALSE) $dataFound = true; |
|
307
|
307
|
} |
|
308
|
308
|
if (isset($line['source_type']) && $line['source_type'] != '') { |
|
309
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
|
309
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type'])); |
|
310
|
310
|
} |
|
311
|
311
|
|
|
312
|
312
|
//print_r($this->all_flights); |
|
313
|
313
|
if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) { |
|
314
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
|
314
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex']))); |
|
315
|
315
|
//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
316
|
316
|
//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
|
317
|
317
|
//} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
@@ -320,20 +320,20 @@ discard block |
|
|
block discarded – undo |
|
320
|
320
|
if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
321
|
321
|
$Spotter = new Spotter($this->db); |
|
322
|
322
|
if (isset($this->all_flights[$id]['source_type'])) { |
|
323
|
|
- $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']); |
|
|
323
|
+ $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']); |
|
324
|
324
|
} else { |
|
325
|
325
|
$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
|
326
|
326
|
} |
|
327
|
327
|
$Spotter->db = null; |
|
328
|
|
- if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
329
|
|
- if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
|
328
|
+ if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
|
329
|
+ if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
330
|
330
|
} |
|
331
|
331
|
} |
|
332
|
332
|
if ($globalAllFlights !== FALSE) $dataFound = true; |
|
333
|
333
|
if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
334
|
334
|
} |
|
335
|
335
|
if (isset($line['id']) && !isset($line['hex'])) { |
|
336
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => '')); |
|
|
336
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => '')); |
|
337
|
337
|
} |
|
338
|
338
|
if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
|
339
|
339
|
$icao = $line['aircraft_icao']; |
|
@@ -342,14 +342,14 @@ discard block |
|
|
block discarded – undo |
|
342
|
342
|
if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
|
343
|
343
|
$Spotter->db = null; |
|
344
|
344
|
} |
|
345
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao)); |
|
|
345
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $icao)); |
|
346
|
346
|
} elseif (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) { |
|
347
|
347
|
if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
348
|
348
|
// Get aircraft ICAO from aircraft name |
|
349
|
349
|
$Spotter = new Spotter($this->db); |
|
350
|
350
|
$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
|
351
|
351
|
$Spotter->db = null; |
|
352
|
|
- if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
|
352
|
+ if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
353
|
353
|
} |
|
354
|
354
|
} |
|
355
|
355
|
if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) { |
|
@@ -357,15 +357,15 @@ discard block |
|
|
block discarded – undo |
|
357
|
357
|
elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
|
358
|
358
|
elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
|
359
|
359
|
elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
|
360
|
|
- if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
|
360
|
+ if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
361
|
361
|
} |
|
362
|
362
|
if (!isset($this->all_flights[$id]['aircraft_icao'])) { |
|
363
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
|
|
363
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA')); |
|
364
|
364
|
} |
|
365
|
365
|
//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
366
|
|
- if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
|
|
366
|
+ if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
367
|
367
|
if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
|
368
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
|
|
368
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime'])); |
|
369
|
369
|
} else { |
|
370
|
370
|
if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
371
|
371
|
elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
@@ -376,31 +376,31 @@ discard block |
|
|
block discarded – undo |
|
376
|
376
|
*/ |
|
377
|
377
|
return ''; |
|
378
|
378
|
} |
|
379
|
|
- } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
|
|
379
|
+ } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) { |
|
380
|
380
|
if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n"; |
|
381
|
381
|
return ''; |
|
382
|
|
- } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
|
|
382
|
+ } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) { |
|
383
|
383
|
if ($globalDebug) echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n"; |
|
384
|
384
|
return ''; |
|
385
|
385
|
} elseif (!isset($line['datetime'])) { |
|
386
|
386
|
date_default_timezone_set('UTC'); |
|
387
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
|
387
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
388
|
388
|
} else { |
|
389
|
389
|
if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
390
|
390
|
return ''; |
|
391
|
391
|
} |
|
392
|
392
|
|
|
393
|
393
|
if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG' && $line['registration'] != 'NA') { |
|
394
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
|
394
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration'])); |
|
395
|
395
|
} |
|
396
|
396
|
if (isset($line['waypoints']) && $line['waypoints'] != '') { |
|
397
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
|
397
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints'])); |
|
398
|
398
|
} |
|
399
|
399
|
if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
|
400
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id']))); |
|
|
400
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => trim($line['pilot_id']))); |
|
401
|
401
|
} |
|
402
|
402
|
if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
|
403
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name']))); |
|
|
403
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => trim($line['pilot_name']))); |
|
404
|
404
|
} |
|
405
|
405
|
|
|
406
|
406
|
if (isset($line['ident']) && trim($line['ident']) != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) { |
|
@@ -408,13 +408,13 @@ discard block |
|
|
block discarded – undo |
|
408
|
408
|
if ($this->all_flights[$id]['addedSpotter'] == 1) { |
|
409
|
409
|
if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
|
410
|
410
|
if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n"; |
|
411
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
412
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
413
|
|
- if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
414
|
|
- elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
415
|
|
- elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
|
411
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
|
412
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
|
413
|
+ if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
|
414
|
+ elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
|
415
|
+ elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
416
|
416
|
} else { |
|
417
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
|
417
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident']))); |
|
418
|
418
|
if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
419
|
419
|
$timeelapsed = microtime(true); |
|
420
|
420
|
$Spotter = new Spotter($this->db); |
|
@@ -424,13 +424,13 @@ discard block |
|
|
block discarded – undo |
|
424
|
424
|
elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
|
425
|
425
|
elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
426
|
426
|
elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
427
|
|
- $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource,$this->all_flights[$id]['source_type']); |
|
|
427
|
+ $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource, $this->all_flights[$id]['source_type']); |
|
428
|
428
|
if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
429
|
429
|
$Spotter->db = null; |
|
430
|
|
- if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
|
430
|
+ if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
431
|
431
|
} |
|
432
|
432
|
} |
|
433
|
|
- } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
|
433
|
+ } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident']))); |
|
434
|
434
|
|
|
435
|
435
|
/* |
|
436
|
436
|
if (!isset($line['id'])) { |
|
@@ -440,25 +440,25 @@ discard block |
|
|
block discarded – undo |
|
440
|
440
|
else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
441
|
441
|
} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
442
|
442
|
*/ |
|
443
|
|
- if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
|
443
|
+ if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
444
|
444
|
|
|
445
|
445
|
//$putinarchive = true; |
|
446
|
446
|
if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
|
447
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
|
|
447
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time'])); |
|
448
|
448
|
} |
|
449
|
449
|
if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
|
450
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
|
450
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
451
|
451
|
} |
|
452
|
452
|
if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
|
453
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
|
453
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => '')); |
|
454
|
454
|
} elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
|
455
|
455
|
$timeelapsed = microtime(true); |
|
456
|
456
|
if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
457
|
457
|
$Spotter = new Spotter($this->db); |
|
458
|
458
|
$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
|
459
|
459
|
$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
|
460
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
461
|
|
- if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
|
460
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => '')); |
|
|
461
|
+ if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
462
|
462
|
} |
|
463
|
463
|
} elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
|
464
|
464
|
$timeelapsed = microtime(true); |
|
@@ -472,35 +472,35 @@ discard block |
|
|
block discarded – undo |
|
472
|
472
|
$Translation->db = null; |
|
473
|
473
|
} |
|
474
|
474
|
$Spotter->db = null; |
|
475
|
|
- if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
|
475
|
+ if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
476
|
476
|
} |
|
477
|
477
|
if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
|
478
|
478
|
//if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
|
479
|
479
|
if ($route['fromairport_icao'] != $route['toairport_icao']) { |
|
480
|
480
|
// $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop'])); |
|
481
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop'])); |
|
|
481
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $route['fromairport_icao'], 'arrival_airport' => $route['toairport_icao'], 'route_stop' => $route['routestop'])); |
|
482
|
482
|
} |
|
483
|
483
|
} |
|
484
|
484
|
if (!isset($globalFork)) $globalFork = TRUE; |
|
485
|
485
|
if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
|
486
|
|
- if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
|
486
|
+ if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident'])); |
|
487
|
487
|
} |
|
488
|
488
|
} |
|
489
|
489
|
} |
|
490
|
490
|
|
|
491
|
491
|
if (isset($line['speed']) && $line['speed'] != '' && $line['speed'] != 0) { |
|
492
|
492
|
// $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
|
493
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
494
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
|
493
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed']))); |
|
|
494
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true)); |
|
495
|
495
|
//$dataFound = true; |
|
496
|
496
|
} else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
|
497
|
|
- $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
|
497
|
+ $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm'); |
|
498
|
498
|
if ($distance > 1000 && $distance < 10000) { |
|
499
|
499
|
// use datetime |
|
500
|
500
|
$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
|
501
|
501
|
$speed = $speed*3.6; |
|
502
|
502
|
if ($speed < 1000) { |
|
503
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
|
503
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed))); |
|
504
|
504
|
if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
505
|
505
|
} else { |
|
506
|
506
|
if ($globalDebug) echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
@@ -515,9 +515,9 @@ discard block |
|
|
block discarded – undo |
|
515
|
515
|
if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
|
516
|
516
|
return false; |
|
517
|
517
|
} |
|
518
|
|
- if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
|
518
|
+ if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']); |
|
519
|
519
|
else unset($timediff); |
|
520
|
|
- if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']); |
|
|
520
|
+ if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time() - $this->all_flights[$id]['time_last_archive_coord']); |
|
521
|
521
|
else unset($timediff_archive); |
|
522
|
522
|
if ($this->tmd > 5 |
|
523
|
523
|
|| (isset($line['format_source']) |
|
@@ -542,7 +542,7 @@ discard block |
|
|
block discarded – undo |
|
542
|
542
|
|| (isset($timediff) && $timediff > 30 |
|
543
|
543
|
&& isset($this->all_flights[$id]['latitude']) |
|
544
|
544
|
&& isset($this->all_flights[$id]['longitude']) |
|
545
|
|
- && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')) |
|
|
545
|
+ && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')) |
|
546
|
546
|
) |
|
547
|
547
|
) { |
|
548
|
548
|
|
|
@@ -554,7 +554,7 @@ discard block |
|
|
block discarded – undo |
|
554
|
554
|
&& isset($this->all_flights[$id]['archive_longitude']) |
|
555
|
555
|
&& isset($this->all_flights[$id]['livedb_latitude']) |
|
556
|
556
|
&& isset($this->all_flights[$id]['livedb_longitude'])) |
|
557
|
|
- && !$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude']) |
|
|
557
|
+ && !$Common->checkLine($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'], $line['latitude'], $line['longitude']) |
|
558
|
558
|
) |
|
559
|
559
|
) { |
|
560
|
560
|
$this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
|
@@ -570,11 +570,11 @@ discard block |
|
|
block discarded – undo |
|
570
|
570
|
$timeelapsed = microtime(true); |
|
571
|
571
|
if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
572
|
572
|
$Spotter = new Spotter($this->db); |
|
573
|
|
- $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
|
573
|
+ $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
574
|
574
|
if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
575
|
575
|
else $this->all_flights[$id]['over_country'] = ''; |
|
576
|
576
|
$Spotter->db = null; |
|
577
|
|
- if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
|
577
|
+ if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
578
|
578
|
if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
579
|
579
|
} |
|
580
|
580
|
} |
|
@@ -600,13 +600,13 @@ discard block |
|
|
block discarded – undo |
|
600
|
600
|
$this->all_flights[$id]['time_last_coord'] = time(); |
|
601
|
601
|
} |
|
602
|
602
|
//if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) { |
|
603
|
|
- if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) { |
|
|
603
|
+ if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > 0.0001)) { |
|
604
|
604
|
$this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
|
605
|
605
|
$dataFound = true; |
|
606
|
606
|
$this->all_flights[$id]['time_last_coord'] = time(); |
|
607
|
607
|
} |
|
608
|
608
|
// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
|
609
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
|
|
609
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude'])); |
|
610
|
610
|
/* |
|
611
|
611
|
if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) { |
|
612
|
612
|
$this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
|
@@ -628,14 +628,14 @@ discard block |
|
|
block discarded – undo |
|
628
|
628
|
$this->all_flights[$id]['time_last_coord'] = time(); |
|
629
|
629
|
} |
|
630
|
630
|
//if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) { |
|
631
|
|
- if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) { |
|
|
631
|
+ if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > 0.0001)) { |
|
632
|
632
|
$this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
|
633
|
633
|
$dataFound = true; |
|
634
|
634
|
$this->all_flights[$id]['coordinates'] += 1; |
|
635
|
635
|
$this->all_flights[$id]['time_last_coord'] = time(); |
|
636
|
636
|
} |
|
637
|
637
|
// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
|
638
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
|
|
638
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude'])); |
|
639
|
639
|
/* |
|
640
|
640
|
if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) { |
|
641
|
641
|
$this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
|
@@ -656,52 +656,52 @@ discard block |
|
|
block discarded – undo |
|
656
|
656
|
$SpotterArchive->deleteSpotterArchiveTrackDataByID($this->all_flights[$id]['id']); |
|
657
|
657
|
$SpotterArchive->db = null; |
|
658
|
658
|
$Spotter = new Spotter(); |
|
659
|
|
- $Spotter->updateInitialSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime']); |
|
|
659
|
+ $Spotter->updateInitialSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime']); |
|
660
|
660
|
$Spotter->db = null; |
|
661
|
661
|
} |
|
662
|
662
|
} else if ($globalDebug && $timediff > 30) { |
|
663
|
663
|
$this->tmd = $this->tmd + 1; |
|
664
|
664
|
echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
|
665
|
|
- echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
|
666
|
|
- echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
|
665
|
+ echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -"; |
|
|
666
|
+ echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
667
|
667
|
echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
|
668
|
668
|
} |
|
669
|
669
|
} |
|
670
|
670
|
if (isset($line['last_update']) && $line['last_update'] != '') { |
|
671
|
671
|
if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
672
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
|
672
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update'])); |
|
673
|
673
|
} |
|
674
|
674
|
if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
|
675
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
|
675
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate'])); |
|
676
|
676
|
//$dataFound = true; |
|
677
|
677
|
} |
|
678
|
678
|
if (isset($line['format_source']) && $line['format_source'] != '') { |
|
679
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
|
679
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source'])); |
|
680
|
680
|
} |
|
681
|
681
|
if (isset($line['source_name']) && $line['source_name'] != '') { |
|
682
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
|
682
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name'])); |
|
683
|
683
|
} |
|
684
|
684
|
if (isset($line['emergency']) && $line['emergency'] != '') { |
|
685
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
|
685
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency'])); |
|
686
|
686
|
//$dataFound = true; |
|
687
|
687
|
} |
|
688
|
688
|
if (isset($line['ground']) && $line['ground'] != '') { |
|
689
|
689
|
if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
|
690
|
690
|
// Here we force archive of flight because after ground it's a new one (or should be) |
|
691
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
692
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
693
|
|
- if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
694
|
|
- elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
695
|
|
- elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
|
691
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
|
692
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
|
693
|
+ if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
|
694
|
+ elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
|
695
|
+ elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
696
|
696
|
} |
|
697
|
697
|
if ($line['ground'] != 1) $line['ground'] = 0; |
|
698
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
|
698
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground'])); |
|
699
|
699
|
//$dataFound = true; |
|
700
|
700
|
} |
|
701
|
701
|
if (isset($line['squawk']) && $line['squawk'] != '') { |
|
702
|
702
|
if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) { |
|
703
|
703
|
if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
704
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
|
704
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
705
|
705
|
$highlight = ''; |
|
706
|
706
|
if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
707
|
707
|
if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
@@ -710,66 +710,66 @@ discard block |
|
|
block discarded – undo |
|
710
|
710
|
$timeelapsed = microtime(true); |
|
711
|
711
|
if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
712
|
712
|
$Spotter = new Spotter($this->db); |
|
713
|
|
- $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
|
713
|
+ $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight); |
|
714
|
714
|
$Spotter->db = null; |
|
715
|
|
- if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
|
715
|
+ if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
716
|
716
|
} |
|
717
|
717
|
//$putinarchive = true; |
|
718
|
718
|
//$highlight = ''; |
|
719
|
719
|
} |
|
720
|
720
|
|
|
721
|
|
- } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
|
721
|
+ } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
722
|
722
|
//$dataFound = true; |
|
723
|
723
|
} |
|
724
|
724
|
|
|
725
|
725
|
if (isset($line['altitude']) && $line['altitude'] != '') { |
|
726
|
726
|
if (isset($line['altitude_relative']) && isset($GeoidClass) && is_object($GeoidClass)) { |
|
727
|
727
|
if ($line['altitude_relative'] == 'AMSL' || $line['altitude_relative'] == 'MSL') { |
|
728
|
|
- $geoid = round($GeoidClass->get($this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'])*3.28084,2); |
|
|
728
|
+ $geoid = round($GeoidClass->get($this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'])*3.28084, 2); |
|
729
|
729
|
//if ($globalDebug) echo '=> Set altitude to WGS84 Ellipsoid, add '.$geoid.' to '.$line['altitude']."\n"; |
|
730
|
730
|
$line['altitude'] = $line['altitude'] - $geoid; |
|
731
|
731
|
} |
|
732
|
732
|
} |
|
733
|
733
|
//if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
734
|
|
- if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
|
735
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
|
736
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
|
|
734
|
+ if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
|
|
735
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100))); |
|
|
736
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude'])); |
|
737
|
737
|
//$dataFound = true; |
|
738
|
738
|
//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
739
|
739
|
if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
|
740
|
740
|
if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
|
741
|
741
|
if ($globalDebug) echo '--- Reset because of altitude'."\n"; |
|
742
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
743
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
744
|
|
- if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
745
|
|
- elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
746
|
|
- elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
|
742
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
|
743
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
|
744
|
+ if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
|
745
|
+ elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
|
746
|
+ elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
747
|
747
|
} |
|
748
|
748
|
} |
|
749
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
|
|
749
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_previous' => $line['altitude'])); |
|
750
|
750
|
} |
|
751
|
751
|
|
|
752
|
752
|
if (isset($line['noarchive']) && $line['noarchive'] === true) { |
|
753
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
|
753
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true)); |
|
754
|
754
|
} |
|
755
|
755
|
|
|
756
|
756
|
if (isset($line['heading']) && $line['heading'] != '') { |
|
757
|
|
- if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
758
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
759
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
|
757
|
+ if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
|
758
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading']))); |
|
|
759
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true)); |
|
760
|
760
|
//$dataFound = true; |
|
761
|
761
|
} elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) { |
|
762
|
|
- $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
763
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
764
|
|
- if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
|
762
|
+ $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
|
763
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading))); |
|
|
764
|
+ if (abs($this->all_flights[$id]['heading'] - round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
765
|
765
|
if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
766
|
766
|
} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
|
767
|
767
|
// If not enough messages and ACARS set heading to 0 |
|
768
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
|
768
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0)); |
|
769
|
769
|
} |
|
770
|
|
- if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
771
|
|
- elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
772
|
|
- elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalAircraftMinUpdate) $dataFound = false; |
|
|
770
|
+ if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
|
771
|
+ elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
|
772
|
+ elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalAircraftMinUpdate) $dataFound = false; |
|
773
|
773
|
|
|
774
|
774
|
// print_r($this->all_flights[$id]); |
|
775
|
775
|
//gets the callsign from the last hour |
|
@@ -780,7 +780,7 @@ discard block |
|
|
block discarded – undo |
|
780
|
780
|
if ($dataFound === true && isset($this->all_flights[$id]['id'])) { |
|
781
|
781
|
$this->all_flights[$id]['lastupdate'] = time(); |
|
782
|
782
|
if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
|
783
|
|
- if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
|
783
|
+ if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
784
|
784
|
//print_r($this->all_flights); |
|
785
|
785
|
//echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
|
786
|
786
|
//$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
|
@@ -791,61 +791,61 @@ discard block |
|
|
block discarded – undo |
|
791
|
791
|
$SpotterLive = new SpotterLive($this->db); |
|
792
|
792
|
if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
793
|
793
|
$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
|
794
|
|
- if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
|
794
|
+ if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
795
|
795
|
} elseif (isset($line['id'])) { |
|
796
|
796
|
$recent_ident = $SpotterLive->checkIdRecent($line['id']); |
|
797
|
|
- if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
|
797
|
+ if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
798
|
798
|
} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
|
799
|
799
|
$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
|
800
|
|
- if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
|
800
|
+ if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
801
|
801
|
} else $recent_ident = ''; |
|
802
|
|
- $SpotterLive->db=null; |
|
|
802
|
+ $SpotterLive->db = null; |
|
803
|
803
|
if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
804
|
804
|
elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
805
|
805
|
} else $recent_ident = ''; |
|
806
|
806
|
} else { |
|
807
|
807
|
$recent_ident = ''; |
|
808
|
|
- $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
|
|
808
|
+ $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0)); |
|
809
|
809
|
} |
|
810
|
810
|
//if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
811
|
|
- if($recent_ident == "") |
|
|
811
|
+ if ($recent_ident == "") |
|
812
|
812
|
{ |
|
813
|
813
|
if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
814
|
814
|
if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
|
815
|
815
|
if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
|
816
|
816
|
//adds the spotter data for the archive |
|
817
|
817
|
$ignoreImport = false; |
|
818
|
|
- foreach($globalAirportIgnore as $airportIgnore) { |
|
|
818
|
+ foreach ($globalAirportIgnore as $airportIgnore) { |
|
819
|
819
|
if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
820
|
820
|
$ignoreImport = true; |
|
821
|
821
|
} |
|
822
|
822
|
} |
|
823
|
823
|
if (count($globalAirportAccept) > 0) { |
|
824
|
824
|
$ignoreImport = true; |
|
825
|
|
- foreach($globalAirportIgnore as $airportIgnore) { |
|
|
825
|
+ foreach ($globalAirportIgnore as $airportIgnore) { |
|
826
|
826
|
if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
827
|
827
|
$ignoreImport = false; |
|
828
|
828
|
} |
|
829
|
829
|
} |
|
830
|
830
|
} |
|
831
|
831
|
if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
|
832
|
|
- foreach($globalAirlineIgnore as $airlineIgnore) { |
|
833
|
|
- if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
|
832
|
+ foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
|
833
|
+ if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) { |
|
834
|
834
|
$ignoreImport = true; |
|
835
|
835
|
} |
|
836
|
836
|
} |
|
837
|
837
|
} |
|
838
|
838
|
if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
|
839
|
839
|
$ignoreImport = true; |
|
840
|
|
- foreach($globalAirlineAccept as $airlineAccept) { |
|
841
|
|
- if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
|
840
|
+ foreach ($globalAirlineAccept as $airlineAccept) { |
|
|
841
|
+ if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) { |
|
842
|
842
|
$ignoreImport = false; |
|
843
|
843
|
} |
|
844
|
844
|
} |
|
845
|
845
|
} |
|
846
|
846
|
if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
|
847
|
847
|
$ignoreImport = true; |
|
848
|
|
- foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
|
848
|
+ foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
849
|
849
|
if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
|
850
|
850
|
$ignoreImport = false; |
|
851
|
851
|
} |
|
@@ -857,12 +857,12 @@ discard block |
|
|
block discarded – undo |
|
857
|
857
|
if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
858
|
858
|
if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
859
|
859
|
if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
860
|
|
- if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
|
860
|
+ if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
861
|
861
|
$timeelapsed = microtime(true); |
|
862
|
862
|
if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
863
|
863
|
if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
864
|
864
|
$Spotter = new Spotter($this->db); |
|
865
|
|
- $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
|
|
865
|
+ $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $highlight, $this->all_flights[$id]['hex'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['source_type']); |
|
866
|
866
|
$Spotter->db = null; |
|
867
|
867
|
if ($globalDebug) { |
|
868
|
868
|
if (isset($result['error'])) echo 'Error: '.$result['error']."\n"; |
|
@@ -875,22 +875,22 @@ discard block |
|
|
block discarded – undo |
|
875
|
875
|
} |
|
876
|
876
|
} |
|
877
|
877
|
} |
|
878
|
|
- if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
|
878
|
+ if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
879
|
879
|
if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
880
|
880
|
|
|
881
|
881
|
// Add source stat in DB |
|
882
|
882
|
$Stats = new Stats($this->db); |
|
883
|
883
|
if (!empty($this->stats)) { |
|
884
|
884
|
if ($globalDebug) echo 'Add source stats : '; |
|
885
|
|
- foreach($this->stats as $date => $data) { |
|
886
|
|
- foreach($data as $source => $sourced) { |
|
|
885
|
+ foreach ($this->stats as $date => $data) { |
|
|
886
|
+ foreach ($data as $source => $sourced) { |
|
887
|
887
|
//print_r($sourced); |
|
888
|
|
- if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
889
|
|
- if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
|
888
|
+ if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date); |
|
|
889
|
+ if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date); |
|
890
|
890
|
if (isset($sourced['msg'])) { |
|
891
|
891
|
if (time() - $sourced['msg']['date'] > 10) { |
|
892
|
892
|
$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
893
|
|
- echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
|
893
|
+ echo $Stats->addStatSource($nbmsg, $source, 'msg', $date); |
|
894
|
894
|
unset($this->stats[$date][$source]['msg']); |
|
895
|
895
|
} |
|
896
|
896
|
} |
|
@@ -928,14 +928,14 @@ discard block |
|
|
block discarded – undo |
|
928
|
928
|
if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
929
|
929
|
$SpotterLive = new SpotterLive($this->db); |
|
930
|
930
|
$SpotterLive->deleteLiveSpotterData(); |
|
931
|
|
- $SpotterLive->db=null; |
|
|
931
|
+ $SpotterLive->db = null; |
|
932
|
932
|
} |
|
933
|
933
|
} |
|
934
|
934
|
if ($globalDebug) echo " Done\n"; |
|
935
|
935
|
$this->last_delete = time(); |
|
936
|
936
|
} |
|
937
|
937
|
} else { |
|
938
|
|
- if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) { |
|
|
938
|
+ if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) { |
|
939
|
939
|
$this->all_flights[$id]['id'] = $recent_ident; |
|
940
|
940
|
$this->all_flights[$id]['addedSpotter'] = 1; |
|
941
|
941
|
} |
|
@@ -943,7 +943,7 @@ discard block |
|
|
block discarded – undo |
|
943
|
943
|
if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
944
|
944
|
if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
945
|
945
|
$Spotter = new Spotter($this->db); |
|
946
|
|
- $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']); |
|
|
946
|
+ $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time']); |
|
947
|
947
|
$Spotter->db = null; |
|
948
|
948
|
} |
|
949
|
949
|
} |
|
@@ -969,37 +969,37 @@ discard block |
|
|
block discarded – undo |
|
969
|
969
|
if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
|
970
|
970
|
if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
|
971
|
971
|
|
|
972
|
|
- foreach($globalAirportIgnore as $airportIgnore) { |
|
|
972
|
+ foreach ($globalAirportIgnore as $airportIgnore) { |
|
973
|
973
|
if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
974
|
974
|
$ignoreImport = true; |
|
975
|
975
|
} |
|
976
|
976
|
} |
|
977
|
977
|
if (count($globalAirportAccept) > 0) { |
|
978
|
978
|
$ignoreImport = true; |
|
979
|
|
- foreach($globalAirportIgnore as $airportIgnore) { |
|
|
979
|
+ foreach ($globalAirportIgnore as $airportIgnore) { |
|
980
|
980
|
if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
981
|
981
|
$ignoreImport = false; |
|
982
|
982
|
} |
|
983
|
983
|
} |
|
984
|
984
|
} |
|
985
|
985
|
if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
|
986
|
|
- foreach($globalAirlineIgnore as $airlineIgnore) { |
|
987
|
|
- if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
|
986
|
+ foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
|
987
|
+ if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) { |
|
988
|
988
|
$ignoreImport = true; |
|
989
|
989
|
} |
|
990
|
990
|
} |
|
991
|
991
|
} |
|
992
|
992
|
if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
|
993
|
993
|
$ignoreImport = true; |
|
994
|
|
- foreach($globalAirlineAccept as $airlineAccept) { |
|
995
|
|
- if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
|
994
|
+ foreach ($globalAirlineAccept as $airlineAccept) { |
|
|
995
|
+ if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) { |
|
996
|
996
|
$ignoreImport = false; |
|
997
|
997
|
} |
|
998
|
998
|
} |
|
999
|
999
|
} |
|
1000
|
1000
|
if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
|
1001
|
1001
|
$ignoreImport = true; |
|
1002
|
|
- foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
|
1002
|
+ foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
1003
|
1003
|
if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
|
1004
|
1004
|
$ignoreImport = false; |
|
1005
|
1005
|
} |
|
@@ -1007,24 +1007,24 @@ discard block |
|
|
block discarded – undo |
|
1007
|
1007
|
} |
|
1008
|
1008
|
|
|
1009
|
1009
|
if (!$ignoreImport) { |
|
1010
|
|
- if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
1011
|
|
- if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
|
1010
|
+ if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
|
1011
|
+ if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
1012
|
1012
|
$timeelapsed = microtime(true); |
|
1013
|
1013
|
if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
1014
|
1014
|
if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
1015
|
1015
|
if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
1016
|
1016
|
$SpotterLive = new SpotterLive($this->db); |
|
1017
|
1017
|
//var_dump($this->all_flights[$id]); |
|
1018
|
|
- $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
|
|
1018
|
+ $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']); |
|
1019
|
1019
|
$SpotterLive->db = null; |
|
1020
|
1020
|
if ($globalDebug) echo $result."\n"; |
|
1021
|
1021
|
} |
|
1022
|
1022
|
} |
|
1023
|
1023
|
if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
|
1024
|
|
- $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
|
|
1024
|
+ $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']); |
|
1025
|
1025
|
} |
|
1026
|
1026
|
$this->all_flights[$id]['putinarchive'] = false; |
|
1027
|
|
- if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
|
1027
|
+ if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
1028
|
1028
|
|
|
1029
|
1029
|
// Put statistics in $this->stats variable |
|
1030
|
1030
|
//if ($line['format_source'] != 'aprs') { |
|
@@ -1043,19 +1043,19 @@ discard block |
|
|
block discarded – undo |
|
1043
|
1043
|
$latitude = $globalCenterLatitude; |
|
1044
|
1044
|
$longitude = $globalCenterLongitude; |
|
1045
|
1045
|
} |
|
1046
|
|
- $this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude); |
|
|
1046
|
+ $this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude); |
|
1047
|
1047
|
} else { |
|
1048
|
1048
|
$latitude = $this->source_location[$source]['latitude']; |
|
1049
|
1049
|
$longitude = $this->source_location[$source]['longitude']; |
|
1050
|
1050
|
} |
|
1051
|
|
- $stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
|
1051
|
+ $stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
1052
|
1052
|
//$stats_heading = $stats_heading%22.5; |
|
1053
|
1053
|
$stats_heading = round($stats_heading/22.5); |
|
1054
|
|
- $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
|
1054
|
+ $stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
1055
|
1055
|
$current_date = date('Y-m-d'); |
|
1056
|
1056
|
if ($stats_heading == 16) $stats_heading = 0; |
|
1057
|
1057
|
if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
|
1058
|
|
- for ($i=0;$i<=15;$i++) { |
|
|
1058
|
+ for ($i = 0; $i <= 15; $i++) { |
|
1059
|
1059
|
$this->stats[$current_date][$source]['polar'][$i] = 0; |
|
1060
|
1060
|
} |
|
1061
|
1061
|
$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
|
@@ -1070,9 +1070,9 @@ discard block |
|
|
block discarded – undo |
|
1070
|
1070
|
if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
|
1071
|
1071
|
if (isset($this->stats[$current_date][$source]['hist'][0])) { |
|
1072
|
1072
|
end($this->stats[$current_date][$source]['hist']); |
|
1073
|
|
- $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
|
1073
|
+ $mini = key($this->stats[$current_date][$source]['hist']) + 10; |
|
1074
|
1074
|
} else $mini = 0; |
|
1075
|
|
- for ($i=$mini;$i<=$distance;$i+=10) { |
|
|
1075
|
+ for ($i = $mini; $i <= $distance; $i += 10) { |
|
1076
|
1076
|
$this->stats[$current_date][$source]['hist'][$i] = 0; |
|
1077
|
1077
|
} |
|
1078
|
1078
|
$this->stats[$current_date][$source]['hist'][$distance] = 1; |
|
@@ -1085,7 +1085,7 @@ discard block |
|
|
block discarded – undo |
|
1085
|
1085
|
$this->all_flights[$id]['lastupdate'] = time(); |
|
1086
|
1086
|
if ($this->all_flights[$id]['putinarchive']) $send = true; |
|
1087
|
1087
|
//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
1088
|
|
- } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
|
1088
|
+ } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n"; |
|
1089
|
1089
|
//$this->del(); |
|
1090
|
1090
|
|
|
1091
|
1091
|
if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
Ysurac /
FlightAirMap
