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