@@ -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,7 +138,9 @@ 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'])) { |
@@ -139,24 +155,32 @@ discard block |
||
139 | 155 | |
140 | 156 | public function arrival($key) { |
141 | 157 | global $globalClosestMinDist, $globalDebug; |
142 | - if ($globalDebug) echo 'Update arrival...'."\n"; |
|
158 | + if ($globalDebug) { |
|
159 | + echo 'Update arrival...'."\n"; |
|
160 | + } |
|
143 | 161 | $Spotter = new Spotter($this->db); |
144 | 162 | $airport_icao = ''; |
145 | 163 | $airport_time = ''; |
146 | - if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
164 | + if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') { |
|
165 | + $globalClosestMinDist = 50; |
|
166 | + } |
|
147 | 167 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
148 | 168 | $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
149 | 169 | if (isset($closestAirports[0])) { |
150 | 170 | if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
151 | 171 | $airport_icao = $closestAirports[0]['icao']; |
152 | 172 | $airport_time = $this->all_flights[$key]['datetime']; |
153 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
173 | + if ($globalDebug) { |
|
174 | + echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
175 | + } |
|
154 | 176 | } elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') { |
155 | 177 | foreach ($closestAirports as $airport) { |
156 | 178 | if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) { |
157 | 179 | $airport_icao = $airport['icao']; |
158 | 180 | $airport_time = $this->all_flights[$key]['datetime']; |
159 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
181 | + if ($globalDebug) { |
|
182 | + echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
183 | + } |
|
160 | 184 | break; |
161 | 185 | } |
162 | 186 | } |
@@ -164,14 +188,20 @@ discard block |
||
164 | 188 | $airport_icao = $closestAirports[0]['icao']; |
165 | 189 | $airport_time = $this->all_flights[$key]['datetime']; |
166 | 190 | } else { |
167 | - if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
191 | + if ($globalDebug) { |
|
192 | + echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
193 | + } |
|
168 | 194 | } |
169 | 195 | } 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"; |
|
196 | + if ($globalDebug) { |
|
197 | + echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
198 | + } |
|
171 | 199 | } |
172 | 200 | |
173 | 201 | } else { |
174 | - if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
202 | + if ($globalDebug) { |
|
203 | + echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
204 | + } |
|
175 | 205 | } |
176 | 206 | return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
177 | 207 | } |
@@ -181,12 +211,16 @@ discard block |
||
181 | 211 | public function del() { |
182 | 212 | global $globalDebug, $globalNoImport, $globalNoDB; |
183 | 213 | // Delete old infos |
184 | - if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
|
214 | + if ($globalDebug) { |
|
215 | + echo 'Delete old values and update latest data...'."\n"; |
|
216 | + } |
|
185 | 217 | foreach ($this->all_flights as $key => $flight) { |
186 | 218 | if (isset($flight['lastupdate'])) { |
187 | 219 | if ($flight['lastupdate'] < (time()-3000)) { |
188 | 220 | if (isset($this->all_flights[$key]['id'])) { |
189 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
221 | + if ($globalDebug) { |
|
222 | + echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
223 | + } |
|
190 | 224 | /* |
191 | 225 | $SpotterLive = new SpotterLive(); |
192 | 226 | $SpotterLive->deleteLiveSpotterDataById($this->all_flights[$key]['id']); |
@@ -197,7 +231,9 @@ discard block |
||
197 | 231 | $Spotter = new Spotter($this->db); |
198 | 232 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
199 | 233 | $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"; |
|
234 | + if ($globalDebug && $result != 'success') { |
|
235 | + echo '!!! ERROR : '.$result."\n"; |
|
236 | + } |
|
201 | 237 | } |
202 | 238 | // Put in archive |
203 | 239 | // $Spotter->db = null; |
@@ -212,8 +248,10 @@ discard block |
||
212 | 248 | public function add($line) { |
213 | 249 | 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; |
214 | 250 | //if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE; |
215 | - if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
|
216 | -/* |
|
251 | + if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') { |
|
252 | + $globalCoordMinChange = '0.02'; |
|
253 | + } |
|
254 | + /* |
|
217 | 255 | $Spotter = new Spotter(); |
218 | 256 | $dbc = $Spotter->db; |
219 | 257 | $SpotterLive = new SpotterLive($dbc); |
@@ -241,11 +279,15 @@ discard block |
||
241 | 279 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) { |
242 | 280 | $current_date = date('Y-m-d'); |
243 | 281 | $source = $line['source_name']; |
244 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
282 | + if ($source == '' || $line['format_source'] == 'aprs') { |
|
283 | + $source = $line['format_source']; |
|
284 | + } |
|
245 | 285 | if (!isset($this->stats[$current_date][$source]['msg'])) { |
246 | 286 | $this->stats[$current_date][$source]['msg']['date'] = time(); |
247 | 287 | $this->stats[$current_date][$source]['msg']['nb'] = 1; |
248 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
288 | + } else { |
|
289 | + $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
290 | + } |
|
249 | 291 | } |
250 | 292 | |
251 | 293 | /* |
@@ -261,22 +303,35 @@ discard block |
||
261 | 303 | //$this->db = $dbc; |
262 | 304 | |
263 | 305 | //$hex = trim($line['hex']); |
264 | - if (!isset($line['id'])) $id = trim($line['hex']); |
|
265 | - else $id = trim($line['id']); |
|
306 | + if (!isset($line['id'])) { |
|
307 | + $id = trim($line['hex']); |
|
308 | + } else { |
|
309 | + $id = trim($line['id']); |
|
310 | + } |
|
266 | 311 | |
267 | 312 | if (!isset($this->all_flights[$id])) { |
268 | 313 | $this->all_flights[$id] = array(); |
269 | 314 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
270 | 315 | $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' => '')); |
271 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
316 | + if (isset($globalDaemon) && $globalDaemon === FALSE) { |
|
317 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
318 | + } |
|
272 | 319 | if (!isset($line['id'])) { |
273 | - if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
274 | -// 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'))); |
|
320 | + if (!isset($globalDaemon)) { |
|
321 | + $globalDaemon = TRUE; |
|
322 | + } |
|
323 | + // 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'))); |
|
275 | 324 | // 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'))); |
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' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
325 | + 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')) { |
|
326 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
327 | + } |
|
277 | 328 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
278 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
279 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
329 | + } else { |
|
330 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
331 | + } |
|
332 | + if ($globalAllFlights !== FALSE) { |
|
333 | + $dataFound = true; |
|
334 | + } |
|
280 | 335 | } |
281 | 336 | if (isset($line['source_type']) && $line['source_type'] != '') { |
282 | 337 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
@@ -298,12 +353,20 @@ discard block |
||
298 | 353 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
299 | 354 | } |
300 | 355 | $Spotter->db = null; |
301 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
302 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
356 | + if ($globalDebugTimeElapsed) { |
|
357 | + echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
358 | + } |
|
359 | + if ($aircraft_icao != '') { |
|
360 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
361 | + } |
|
303 | 362 | } |
304 | 363 | } |
305 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
306 | - if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
364 | + if ($globalAllFlights !== FALSE) { |
|
365 | + $dataFound = true; |
|
366 | + } |
|
367 | + if ($globalDebug) { |
|
368 | + echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
369 | + } |
|
307 | 370 | } |
308 | 371 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
309 | 372 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $line['aircraft_icao'])); |
@@ -314,15 +377,24 @@ discard block |
||
314 | 377 | $Spotter = new Spotter($this->db); |
315 | 378 | $aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
316 | 379 | $Spotter->db = null; |
317 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
380 | + if ($aircraft_icao != '') { |
|
381 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
382 | + } |
|
318 | 383 | } |
319 | 384 | } |
320 | 385 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) { |
321 | - if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID'; |
|
322 | - elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
|
323 | - elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
|
324 | - elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
|
325 | - if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
386 | + if ($line['aircraft_type'] == 'PARA_GLIDER') { |
|
387 | + $aircraft_icao = 'GLID'; |
|
388 | + } elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') { |
|
389 | + $aircraft_icao = 'UHEL'; |
|
390 | + } elseif ($line['aircraft_type'] == 'TOW_PLANE') { |
|
391 | + $aircraft_icao = 'TOWPLANE'; |
|
392 | + } elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') { |
|
393 | + $aircraft_icao = 'POWAIRC'; |
|
394 | + } |
|
395 | + if (isset($aircraft_icao)) { |
|
396 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
397 | + } |
|
326 | 398 | } |
327 | 399 | if (!isset($this->all_flights[$id]['aircraft_icao'])) { |
328 | 400 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
@@ -332,8 +404,11 @@ discard block |
||
332 | 404 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
333 | 405 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
334 | 406 | } else { |
335 | - 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"; |
|
336 | - 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"; |
|
407 | + if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) { |
|
408 | + echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
409 | + } elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) { |
|
410 | + echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
411 | + } |
|
337 | 412 | /* |
338 | 413 | echo strtotime($line['datetime']).' > '.strtotime($this->all_flights[$id]['datetime']); |
339 | 414 | print_r($this->all_flights[$id]); |
@@ -366,15 +441,25 @@ discard block |
||
366 | 441 | $timeelapsed = microtime(true); |
367 | 442 | $Spotter = new Spotter($this->db); |
368 | 443 | $fromsource = NULL; |
369 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
370 | - elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
371 | - elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
|
372 | - elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
373 | - elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
444 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') { |
|
445 | + $fromsource = $globalAirlinesSource; |
|
446 | + } elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') { |
|
447 | + $fromsource = 'vatsim'; |
|
448 | + } elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') { |
|
449 | + $fromsource = 'ivao'; |
|
450 | + } elseif (isset($globalVATSIM) && $globalVATSIM) { |
|
451 | + $fromsource = 'vatsim'; |
|
452 | + } elseif (isset($globalIVAO) && $globalIVAO) { |
|
453 | + $fromsource = 'ivao'; |
|
454 | + } |
|
374 | 455 | $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
375 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
456 | + if ($globalDebug && $result != 'success') { |
|
457 | + echo '!!! ERROR : '.$result."\n"; |
|
458 | + } |
|
376 | 459 | $Spotter->db = null; |
377 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
460 | + if ($globalDebugTimeElapsed) { |
|
461 | + echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
462 | + } |
|
378 | 463 | } |
379 | 464 | } |
380 | 465 | |
@@ -386,7 +471,9 @@ discard block |
||
386 | 471 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
387 | 472 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
388 | 473 | */ |
389 | - 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'])); |
|
474 | + if (!isset($this->all_flights[$id]['id'])) { |
|
475 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
476 | + } |
|
390 | 477 | |
391 | 478 | //$putinarchive = true; |
392 | 479 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
@@ -404,7 +491,9 @@ discard block |
||
404 | 491 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
405 | 492 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
406 | 493 | $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' => '')); |
407 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
494 | + if ($globalDebugTimeElapsed) { |
|
495 | + echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
496 | + } |
|
408 | 497 | } |
409 | 498 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
410 | 499 | $timeelapsed = microtime(true); |
@@ -418,7 +507,9 @@ discard block |
||
418 | 507 | $Translation->db = null; |
419 | 508 | } |
420 | 509 | $Spotter->db = null; |
421 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
510 | + if ($globalDebugTimeElapsed) { |
|
511 | + echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
512 | + } |
|
422 | 513 | } |
423 | 514 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
424 | 515 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
@@ -427,9 +518,13 @@ discard block |
||
427 | 518 | $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'])); |
428 | 519 | } |
429 | 520 | } |
430 | - if (!isset($globalFork)) $globalFork = TRUE; |
|
521 | + if (!isset($globalFork)) { |
|
522 | + $globalFork = TRUE; |
|
523 | + } |
|
431 | 524 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
432 | - if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
525 | + if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) { |
|
526 | + $this->get_Schedule($id,trim($line['ident'])); |
|
527 | + } |
|
433 | 528 | } |
434 | 529 | } |
435 | 530 | } |
@@ -445,16 +540,23 @@ discard block |
||
445 | 540 | // use datetime |
446 | 541 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
447 | 542 | $speed = $speed*3.6; |
448 | - if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
449 | - if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
543 | + if ($speed < 1000) { |
|
544 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
545 | + } |
|
546 | + if ($globalDebug) { |
|
547 | + echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
548 | + } |
|
450 | 549 | } |
451 | 550 | } |
452 | 551 | |
453 | 552 | |
454 | 553 | |
455 | 554 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
456 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
457 | - else unset($timediff); |
|
555 | + if (isset($this->all_flights[$id]['time_last_coord'])) { |
|
556 | + $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
557 | + } else { |
|
558 | + unset($timediff); |
|
559 | + } |
|
458 | 560 | if ($this->tmd > 5 || (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')))) { |
459 | 561 | 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'])) { |
460 | 562 | 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'])) { |
@@ -463,15 +565,23 @@ discard block |
||
463 | 565 | $this->all_flights[$id]['putinarchive'] = true; |
464 | 566 | $this->tmd = 0; |
465 | 567 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
466 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
568 | + if ($globalDebug) { |
|
569 | + echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
570 | + } |
|
467 | 571 | $timeelapsed = microtime(true); |
468 | 572 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
469 | 573 | $Spotter = new Spotter($this->db); |
470 | 574 | $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
471 | - if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
575 | + if (!empty($all_country)) { |
|
576 | + $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
577 | + } |
|
472 | 578 | $Spotter->db = null; |
473 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
474 | - if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
579 | + if ($globalDebugTimeElapsed) { |
|
580 | + echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
581 | + } |
|
582 | + if ($globalDebug) { |
|
583 | + echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
584 | + } |
|
475 | 585 | } |
476 | 586 | } |
477 | 587 | } |
@@ -479,7 +589,9 @@ discard block |
||
479 | 589 | |
480 | 590 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
481 | 591 | //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) { |
482 | - if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
|
592 | + if (!isset($this->all_flights[$id]['archive_latitude'])) { |
|
593 | + $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
|
594 | + } |
|
483 | 595 | 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') { |
484 | 596 | $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
485 | 597 | $dataFound = true; |
@@ -501,9 +613,13 @@ discard block |
||
501 | 613 | */ |
502 | 614 | } |
503 | 615 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
504 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
616 | + if ($line['longitude'] > 180) { |
|
617 | + $line['longitude'] = $line['longitude'] - 360; |
|
618 | + } |
|
505 | 619 | //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) { |
506 | - if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
|
620 | + if (!isset($this->all_flights[$id]['archive_longitude'])) { |
|
621 | + $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
|
622 | + } |
|
507 | 623 | 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') { |
508 | 624 | $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
509 | 625 | $dataFound = true; |
@@ -534,7 +650,9 @@ discard block |
||
534 | 650 | } |
535 | 651 | } |
536 | 652 | if (isset($line['last_update']) && $line['last_update'] != '') { |
537 | - if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
653 | + if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) { |
|
654 | + $dataFound = true; |
|
655 | + } |
|
538 | 656 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
539 | 657 | } |
540 | 658 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
@@ -556,41 +674,61 @@ discard block |
||
556 | 674 | // Here we force archive of flight because after ground it's a new one (or should be) |
557 | 675 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
558 | 676 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
559 | - 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'))); |
|
560 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
561 | - 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'])); |
|
677 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) { |
|
678 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi'))); |
|
679 | + } elseif (isset($line['id'])) { |
|
680 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
681 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
682 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
683 | + } |
|
684 | + } |
|
685 | + if ($line['ground'] != 1) { |
|
686 | + $line['ground'] = 0; |
|
562 | 687 | } |
563 | - if ($line['ground'] != 1) $line['ground'] = 0; |
|
564 | 688 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
565 | 689 | //$dataFound = true; |
566 | 690 | } |
567 | 691 | if (isset($line['squawk']) && $line['squawk'] != '') { |
568 | 692 | 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'])) { |
569 | - if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
693 | + if ($this->all_flights[$id]['squawk'] != $line['squawk']) { |
|
694 | + $this->all_flights[$id]['putinarchive'] = true; |
|
695 | + } |
|
570 | 696 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
571 | 697 | $highlight = ''; |
572 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
573 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
574 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
698 | + if ($this->all_flights[$id]['squawk'] == '7500') { |
|
699 | + $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
700 | + } |
|
701 | + if ($this->all_flights[$id]['squawk'] == '7600') { |
|
702 | + $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
703 | + } |
|
704 | + if ($this->all_flights[$id]['squawk'] == '7700') { |
|
705 | + $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
706 | + } |
|
575 | 707 | if ($highlight != '') { |
576 | 708 | $timeelapsed = microtime(true); |
577 | 709 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
578 | 710 | $Spotter = new Spotter($this->db); |
579 | 711 | $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
580 | 712 | $Spotter->db = null; |
581 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
713 | + if ($globalDebugTimeElapsed) { |
|
714 | + echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
715 | + } |
|
582 | 716 | } |
583 | 717 | //$putinarchive = true; |
584 | 718 | //$highlight = ''; |
585 | 719 | } |
586 | 720 | |
587 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
721 | + } else { |
|
722 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
723 | + } |
|
588 | 724 | //$dataFound = true; |
589 | 725 | } |
590 | 726 | |
591 | 727 | if (isset($line['altitude']) && $line['altitude'] != '') { |
592 | 728 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
593 | - 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; |
|
729 | + if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) { |
|
730 | + $this->all_flights[$id]['putinarchive'] = true; |
|
731 | + } |
|
594 | 732 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
595 | 733 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
596 | 734 | //$dataFound = true; |
@@ -602,21 +740,30 @@ discard block |
||
602 | 740 | } |
603 | 741 | |
604 | 742 | if (isset($line['heading']) && $line['heading'] != '') { |
605 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
743 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) { |
|
744 | + $this->all_flights[$id]['putinarchive'] = true; |
|
745 | + } |
|
606 | 746 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
607 | 747 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
608 | 748 | //$dataFound = true; |
609 | 749 | } 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']) { |
610 | 750 | $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']); |
611 | 751 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
612 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
613 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
752 | + if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) { |
|
753 | + $this->all_flights[$id]['putinarchive'] = true; |
|
754 | + } |
|
755 | + if ($globalDebug) { |
|
756 | + echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
757 | + } |
|
614 | 758 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
615 | 759 | // If not enough messages and ACARS set heading to 0 |
616 | 760 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
617 | 761 | } |
618 | - if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
619 | - elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
762 | + if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) { |
|
763 | + $dataFound = false; |
|
764 | + } elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) { |
|
765 | + $dataFound = false; |
|
766 | + } |
|
620 | 767 | |
621 | 768 | // print_r($this->all_flights[$id]); |
622 | 769 | //gets the callsign from the last hour |
@@ -632,23 +779,38 @@ discard block |
||
632 | 779 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
633 | 780 | if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
634 | 781 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
635 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
782 | + if ($globalDebug) { |
|
783 | + echo "Check if aircraft is already in DB..."; |
|
784 | + } |
|
636 | 785 | $timeelapsed = microtime(true); |
637 | 786 | $SpotterLive = new SpotterLive($this->db); |
638 | 787 | 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')) { |
639 | 788 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
640 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
789 | + if ($globalDebugTimeElapsed) { |
|
790 | + echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
791 | + } |
|
641 | 792 | } elseif (isset($line['id'])) { |
642 | 793 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
643 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
794 | + if ($globalDebugTimeElapsed) { |
|
795 | + echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
796 | + } |
|
644 | 797 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
645 | 798 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
646 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
647 | - } else $recent_ident = ''; |
|
799 | + if ($globalDebugTimeElapsed) { |
|
800 | + echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
801 | + } |
|
802 | + } else { |
|
803 | + $recent_ident = ''; |
|
804 | + } |
|
648 | 805 | $SpotterLive->db=null; |
649 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
650 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
651 | - } else $recent_ident = ''; |
|
806 | + if ($globalDebug && $recent_ident == '') { |
|
807 | + echo " Not in DB.\n"; |
|
808 | + } elseif ($globalDebug && $recent_ident != '') { |
|
809 | + echo " Already in DB.\n"; |
|
810 | + } |
|
811 | + } else { |
|
812 | + $recent_ident = ''; |
|
813 | + } |
|
652 | 814 | } else { |
653 | 815 | $recent_ident = ''; |
654 | 816 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
@@ -656,7 +818,9 @@ discard block |
||
656 | 818 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
657 | 819 | if($recent_ident == "") |
658 | 820 | { |
659 | - if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
821 | + if ($globalDebug) { |
|
822 | + echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
823 | + } |
|
660 | 824 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
661 | 825 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
662 | 826 | //adds the spotter data for the archive |
@@ -700,31 +864,49 @@ discard block |
||
700 | 864 | |
701 | 865 | if (!$ignoreImport) { |
702 | 866 | $highlight = ''; |
703 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
704 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
705 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
706 | - 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'))); |
|
867 | + if ($this->all_flights[$id]['squawk'] == '7500') { |
|
868 | + $highlight = 'Squawk 7500 : Hijack'; |
|
869 | + } |
|
870 | + if ($this->all_flights[$id]['squawk'] == '7600') { |
|
871 | + $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
872 | + } |
|
873 | + if ($this->all_flights[$id]['squawk'] == '7700') { |
|
874 | + $highlight = 'Squawk 7700 : Emergency'; |
|
875 | + } |
|
876 | + if (!isset($this->all_flights[$id]['id'])) { |
|
877 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
878 | + } |
|
707 | 879 | $timeelapsed = microtime(true); |
708 | 880 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
709 | 881 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
710 | 882 | $Spotter = new Spotter($this->db); |
711 | 883 | $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']); |
712 | 884 | $Spotter->db = null; |
713 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
885 | + if ($globalDebug && isset($result)) { |
|
886 | + echo $result."\n"; |
|
887 | + } |
|
714 | 888 | } |
715 | 889 | } |
716 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
890 | + if ($globalDebugTimeElapsed) { |
|
891 | + echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
892 | + } |
|
717 | 893 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
718 | 894 | |
719 | 895 | // Add source stat in DB |
720 | 896 | $Stats = new Stats($this->db); |
721 | 897 | if (!empty($this->stats)) { |
722 | - if ($globalDebug) echo 'Add source stats : '; |
|
898 | + if ($globalDebug) { |
|
899 | + echo 'Add source stats : '; |
|
900 | + } |
|
723 | 901 | foreach($this->stats as $date => $data) { |
724 | 902 | foreach($data as $source => $sourced) { |
725 | 903 | //print_r($sourced); |
726 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
727 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
904 | + if (isset($sourced['polar'])) { |
|
905 | + echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
906 | + } |
|
907 | + if (isset($sourced['hist'])) { |
|
908 | + echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
909 | + } |
|
728 | 910 | if (isset($sourced['msg'])) { |
729 | 911 | if (time() - $sourced['msg']['date'] > 10) { |
730 | 912 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
@@ -737,13 +919,17 @@ discard block |
||
737 | 919 | unset($this->stats[$date]); |
738 | 920 | } |
739 | 921 | } |
740 | - if ($globalDebug) echo 'Done'."\n"; |
|
922 | + if ($globalDebug) { |
|
923 | + echo 'Done'."\n"; |
|
924 | + } |
|
741 | 925 | |
742 | 926 | } |
743 | 927 | $Stats->db = null; |
744 | 928 | } |
745 | 929 | $this->del(); |
746 | - } elseif ($globalDebug) echo 'Ignore data'."\n"; |
|
930 | + } elseif ($globalDebug) { |
|
931 | + echo 'Ignore data'."\n"; |
|
932 | + } |
|
747 | 933 | //$ignoreImport = false; |
748 | 934 | $this->all_flights[$id]['addedSpotter'] = 1; |
749 | 935 | //print_r($this->all_flights[$id]); |
@@ -760,7 +946,9 @@ discard block |
||
760 | 946 | */ |
761 | 947 | //SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']); |
762 | 948 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
763 | - if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
949 | + if ($globalDebug) { |
|
950 | + echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
951 | + } |
|
764 | 952 | //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
765 | 953 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
766 | 954 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
@@ -769,7 +957,9 @@ discard block |
||
769 | 957 | $SpotterLive->db=null; |
770 | 958 | } |
771 | 959 | } |
772 | - if ($globalDebug) echo " Done\n"; |
|
960 | + if ($globalDebug) { |
|
961 | + echo " Done\n"; |
|
962 | + } |
|
773 | 963 | $this->last_delete = time(); |
774 | 964 | } |
775 | 965 | } else { |
@@ -796,11 +986,17 @@ discard block |
||
796 | 986 | //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"; |
797 | 987 | if ($globalDebug) { |
798 | 988 | if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) { |
799 | - 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"; |
|
800 | - 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"; |
|
989 | + if (isset($this->all_flights[$id]['source_name'])) { |
|
990 | + 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"; |
|
991 | + } else { |
|
992 | + 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"; |
|
993 | + } |
|
801 | 994 | } else { |
802 | - 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"; |
|
803 | - 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"; |
|
995 | + if (isset($this->all_flights[$id]['source_name'])) { |
|
996 | + 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"; |
|
997 | + } else { |
|
998 | + 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"; |
|
999 | + } |
|
804 | 1000 | } |
805 | 1001 | } |
806 | 1002 | $ignoreImport = false; |
@@ -846,22 +1042,30 @@ discard block |
||
846 | 1042 | |
847 | 1043 | if (!$ignoreImport) { |
848 | 1044 | 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'])) { |
849 | - 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'))); |
|
1045 | + if (!isset($this->all_flights[$id]['id'])) { |
|
1046 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
1047 | + } |
|
850 | 1048 | $timeelapsed = microtime(true); |
851 | 1049 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
852 | 1050 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
853 | - if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
1051 | + if ($globalDebug) { |
|
1052 | + echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
1053 | + } |
|
854 | 1054 | $SpotterLive = new SpotterLive($this->db); |
855 | 1055 | $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']); |
856 | 1056 | $SpotterLive->db = null; |
857 | - if ($globalDebug) echo $result."\n"; |
|
1057 | + if ($globalDebug) { |
|
1058 | + echo $result."\n"; |
|
1059 | + } |
|
858 | 1060 | } |
859 | 1061 | } |
860 | 1062 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
861 | 1063 | $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']); |
862 | 1064 | } |
863 | 1065 | $this->all_flights[$id]['putinarchive'] = false; |
864 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
1066 | + if ($globalDebugTimeElapsed) { |
|
1067 | + echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
1068 | + } |
|
865 | 1069 | |
866 | 1070 | // Put statistics in $this->stats variable |
867 | 1071 | //if ($line['format_source'] != 'aprs') { |
@@ -869,7 +1073,9 @@ discard block |
||
869 | 1073 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
870 | 1074 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
871 | 1075 | $source = $this->all_flights[$id]['source_name']; |
872 | - if ($source == '') $source = $this->all_flights[$id]['format_source']; |
|
1076 | + if ($source == '') { |
|
1077 | + $source = $this->all_flights[$id]['format_source']; |
|
1078 | + } |
|
873 | 1079 | if (!isset($this->source_location[$source])) { |
874 | 1080 | $Location = new Source(); |
875 | 1081 | $coord = $Location->getLocationInfobySourceName($source); |
@@ -890,7 +1096,9 @@ discard block |
||
890 | 1096 | $stats_heading = round($stats_heading/22.5); |
891 | 1097 | $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
892 | 1098 | $current_date = date('Y-m-d'); |
893 | - if ($stats_heading == 16) $stats_heading = 0; |
|
1099 | + if ($stats_heading == 16) { |
|
1100 | + $stats_heading = 0; |
|
1101 | + } |
|
894 | 1102 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
895 | 1103 | for ($i=0;$i<=15;$i++) { |
896 | 1104 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
@@ -908,7 +1116,9 @@ discard block |
||
908 | 1116 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
909 | 1117 | end($this->stats[$current_date][$source]['hist']); |
910 | 1118 | $mini = key($this->stats[$current_date][$source]['hist'])+10; |
911 | - } else $mini = 0; |
|
1119 | + } else { |
|
1120 | + $mini = 0; |
|
1121 | + } |
|
912 | 1122 | for ($i=$mini;$i<=$distance;$i+=10) { |
913 | 1123 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
914 | 1124 | } |
@@ -920,19 +1130,27 @@ discard block |
||
920 | 1130 | } |
921 | 1131 | |
922 | 1132 | $this->all_flights[$id]['lastupdate'] = time(); |
923 | - if ($this->all_flights[$id]['putinarchive']) $send = true; |
|
1133 | + if ($this->all_flights[$id]['putinarchive']) { |
|
1134 | + $send = true; |
|
1135 | + } |
|
924 | 1136 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
925 | - } 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"; |
|
1137 | + } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) { |
|
1138 | + echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
1139 | + } |
|
926 | 1140 | //$this->del(); |
927 | 1141 | |
928 | 1142 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
929 | 1143 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
930 | - if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
|
1144 | + if ($globalDebug) { |
|
1145 | + echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
|
1146 | + } |
|
931 | 1147 | $SpotterLive = new SpotterLive($this->db); |
932 | 1148 | $SpotterLive->deleteLiveSpotterDataNotUpdated(); |
933 | 1149 | $SpotterLive->db = null; |
934 | 1150 | //SpotterLive->deleteLiveSpotterData(); |
935 | - if ($globalDebug) echo " Done\n"; |
|
1151 | + if ($globalDebug) { |
|
1152 | + echo " Done\n"; |
|
1153 | + } |
|
936 | 1154 | $this->last_delete_hourly = time(); |
937 | 1155 | } else { |
938 | 1156 | $this->del(); |
@@ -944,7 +1162,9 @@ discard block |
||
944 | 1162 | //$ignoreImport = false; |
945 | 1163 | } |
946 | 1164 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
947 | - if ($send) return $this->all_flights[$id]; |
|
1165 | + if ($send) { |
|
1166 | + return $this->all_flights[$id]; |
|
1167 | + } |
|
948 | 1168 | } |
949 | 1169 | } |
950 | 1170 | } |
@@ -107,17 +107,23 @@ discard block |
||
107 | 107 | |
108 | 108 | /* Check that end was found and body has at least one byte. */ |
109 | 109 | if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) { |
110 | - if ($globalDebug) echo '!!! APRS invalid : '.$input."\n"; |
|
110 | + if ($globalDebug) { |
|
111 | + echo '!!! APRS invalid : '.$input."\n"; |
|
112 | + } |
|
111 | 113 | return false; |
112 | 114 | } |
113 | 115 | |
114 | - if ($debug) echo 'input : '.$input."\n"; |
|
116 | + if ($debug) { |
|
117 | + echo 'input : '.$input."\n"; |
|
118 | + } |
|
115 | 119 | /* Save header and body. */ |
116 | 120 | $body = substr($input,$splitpos+1,$input_len); |
117 | 121 | $body_len = strlen($body); |
118 | 122 | $header = substr($input,0,$splitpos); |
119 | 123 | //$header_len = strlen($header); |
120 | - if ($debug) echo 'header : '.$header."\n"; |
|
124 | + if ($debug) { |
|
125 | + echo 'header : '.$header."\n"; |
|
126 | + } |
|
121 | 127 | |
122 | 128 | /* Parse source, target and path. */ |
123 | 129 | //FLRDF0A52>APRS,qAS,LSTB |
@@ -131,10 +137,14 @@ discard block |
||
131 | 137 | $result['format_source'] = 'famaprs'; |
132 | 138 | $result['source_type'] = 'ais'; |
133 | 139 | } else { |
134 | - if ($debug) echo 'ident : '.$ident."\n"; |
|
140 | + if ($debug) { |
|
141 | + echo 'ident : '.$ident."\n"; |
|
142 | + } |
|
135 | 143 | $result['ident'] = $ident; |
136 | 144 | } |
137 | - } else return false; |
|
145 | + } else { |
|
146 | + return false; |
|
147 | + } |
|
138 | 148 | $elements = explode(',',$all_elements); |
139 | 149 | $source = end($elements); |
140 | 150 | $result['source'] = $source; |
@@ -143,7 +153,9 @@ discard block |
||
143 | 153 | //echo "ok"; |
144 | 154 | //if ($element == 'TCPIP*') return false; |
145 | 155 | } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
146 | - if ($debug) echo 'element : '.$element."\n"; |
|
156 | + if ($debug) { |
|
157 | + echo 'element : '.$element."\n"; |
|
158 | + } |
|
147 | 159 | return false; |
148 | 160 | } |
149 | 161 | /* |
@@ -156,11 +168,15 @@ discard block |
||
156 | 168 | } |
157 | 169 | |
158 | 170 | $type = substr($body,0,1); |
159 | - if ($debug) echo 'type : '.$type."\n"; |
|
171 | + if ($debug) { |
|
172 | + echo 'type : '.$type."\n"; |
|
173 | + } |
|
160 | 174 | if ($type == ';') { |
161 | 175 | if (isset($result['source_type']) && $result['source_type'] == 'modes') { |
162 | 176 | $result['address'] = trim(substr($body,1,9)); |
163 | - } else $result['ident'] = trim(substr($body,1,9)); |
|
177 | + } else { |
|
178 | + $result['ident'] = trim(substr($body,1,9)); |
|
179 | + } |
|
164 | 180 | } elseif ($type == ',') { |
165 | 181 | // Invalid data or test data |
166 | 182 | return false; |
@@ -228,7 +244,9 @@ discard block |
||
228 | 244 | //$symbol_table = $matches[4]; |
229 | 245 | $lat = intval($lat_deg); |
230 | 246 | $lon = intval($lon_deg); |
231 | - if ($lat > 89 || $lon > 179) return false; |
|
247 | + if ($lat > 89 || $lon > 179) { |
|
248 | + return false; |
|
249 | + } |
|
232 | 250 | |
233 | 251 | /* |
234 | 252 | $tmp_5b = str_replace('.','',$lat_min); |
@@ -238,8 +256,12 @@ discard block |
||
238 | 256 | */ |
239 | 257 | $latitude = $lat + floatval($lat_min)/60; |
240 | 258 | $longitude = $lon + floatval($lon_min)/60; |
241 | - if ($sind == 'S') $latitude = 0-$latitude; |
|
242 | - if ($wind == 'W') $longitude = 0-$longitude; |
|
259 | + if ($sind == 'S') { |
|
260 | + $latitude = 0-$latitude; |
|
261 | + } |
|
262 | + if ($wind == 'W') { |
|
263 | + $longitude = 0-$longitude; |
|
264 | + } |
|
243 | 265 | $result['latitude'] = $latitude; |
244 | 266 | $result['longitude'] = $longitude; |
245 | 267 | $body_parse = substr($body_parse,18); |
@@ -273,7 +295,9 @@ discard block |
||
273 | 295 | $body_parse = substr($body_parse,1); |
274 | 296 | $body_parse_len = strlen($body_parse); |
275 | 297 | $result['symbol_code'] = $symbol_code; |
276 | - if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code]; |
|
298 | + if (isset($this->symbols[$symbol_code])) { |
|
299 | + $result['symbol'] = $this->symbols[$symbol_code]; |
|
300 | + } |
|
277 | 301 | if ($symbol_code != '_') { |
278 | 302 | } |
279 | 303 | //$body_parse = substr($body_parse,1); |
@@ -284,7 +308,9 @@ discard block |
||
284 | 308 | if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
285 | 309 | $course = substr($body_parse,0,3); |
286 | 310 | $tmp_s = intval($course); |
287 | - if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
|
311 | + if ($tmp_s >= 1 && $tmp_s <= 360) { |
|
312 | + $result['heading'] = intval($course); |
|
313 | + } |
|
288 | 314 | $speed = substr($body_parse,4,3); |
289 | 315 | if ($speed != '...') { |
290 | 316 | //$result['speed'] = round($speed*1.852); |
@@ -323,10 +349,16 @@ discard block |
||
323 | 349 | $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
324 | 350 | $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
325 | 351 | |
326 | - if ($result['latitude'] < 0) $result['latitude'] -= $lat_off; |
|
327 | - else $result['latitude'] += $lat_off; |
|
328 | - if ($result['longitude'] < 0) $result['longitude'] -= $lon_off; |
|
329 | - else $result['longitude'] += $lon_off; |
|
352 | + if ($result['latitude'] < 0) { |
|
353 | + $result['latitude'] -= $lat_off; |
|
354 | + } else { |
|
355 | + $result['latitude'] += $lat_off; |
|
356 | + } |
|
357 | + if ($result['longitude'] < 0) { |
|
358 | + $result['longitude'] -= $lon_off; |
|
359 | + } else { |
|
360 | + $result['longitude'] += $lon_off; |
|
361 | + } |
|
330 | 362 | } |
331 | 363 | $body_parse = substr($body_parse,6); |
332 | 364 | } |
@@ -361,27 +393,48 @@ discard block |
||
361 | 393 | $address = substr($id,2); |
362 | 394 | //print_r($matches); |
363 | 395 | $addressType = (intval(substr($id,0,2),16))&3; |
364 | - if ($addressType == 0) $result['addresstype'] = "RANDOM"; |
|
365 | - elseif ($addressType == 1) $result['addresstype'] = "ICAO"; |
|
366 | - elseif ($addressType == 2) $result['addresstype'] = "FLARM"; |
|
367 | - elseif ($addressType == 3) $result['addresstype'] = "OGN"; |
|
396 | + if ($addressType == 0) { |
|
397 | + $result['addresstype'] = "RANDOM"; |
|
398 | + } elseif ($addressType == 1) { |
|
399 | + $result['addresstype'] = "ICAO"; |
|
400 | + } elseif ($addressType == 2) { |
|
401 | + $result['addresstype'] = "FLARM"; |
|
402 | + } elseif ($addressType == 3) { |
|
403 | + $result['addresstype'] = "OGN"; |
|
404 | + } |
|
368 | 405 | $aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2); |
369 | 406 | $result['aircrafttype_code'] = $aircraftType; |
370 | - if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN"; |
|
371 | - elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER"; |
|
372 | - elseif ($aircraftType == 2) $result['aircrafttype'] = "TOW_PLANE"; |
|
373 | - elseif ($aircraftType == 3) $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT"; |
|
374 | - elseif ($aircraftType == 4) $result['aircrafttype'] = "PARACHUTE"; |
|
375 | - elseif ($aircraftType == 5) $result['aircrafttype'] = "DROP_PLANE"; |
|
376 | - elseif ($aircraftType == 6) $result['aircrafttype'] = "HANG_GLIDER"; |
|
377 | - elseif ($aircraftType == 7) $result['aircrafttype'] = "PARA_GLIDER"; |
|
378 | - elseif ($aircraftType == 8) $result['aircrafttype'] = "POWERED_AIRCRAFT"; |
|
379 | - elseif ($aircraftType == 9) $result['aircrafttype'] = "JET_AIRCRAFT"; |
|
380 | - elseif ($aircraftType == 10) $result['aircrafttype'] = "UFO"; |
|
381 | - elseif ($aircraftType == 11) $result['aircrafttype'] = "BALLOON"; |
|
382 | - elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP"; |
|
383 | - elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV"; |
|
384 | - elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT"; |
|
407 | + if ($aircraftType == 0) { |
|
408 | + $result['aircrafttype'] = "UNKNOWN"; |
|
409 | + } elseif ($aircraftType == 1) { |
|
410 | + $result['aircrafttype'] = "GLIDER"; |
|
411 | + } elseif ($aircraftType == 2) { |
|
412 | + $result['aircrafttype'] = "TOW_PLANE"; |
|
413 | + } elseif ($aircraftType == 3) { |
|
414 | + $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT"; |
|
415 | + } elseif ($aircraftType == 4) { |
|
416 | + $result['aircrafttype'] = "PARACHUTE"; |
|
417 | + } elseif ($aircraftType == 5) { |
|
418 | + $result['aircrafttype'] = "DROP_PLANE"; |
|
419 | + } elseif ($aircraftType == 6) { |
|
420 | + $result['aircrafttype'] = "HANG_GLIDER"; |
|
421 | + } elseif ($aircraftType == 7) { |
|
422 | + $result['aircrafttype'] = "PARA_GLIDER"; |
|
423 | + } elseif ($aircraftType == 8) { |
|
424 | + $result['aircrafttype'] = "POWERED_AIRCRAFT"; |
|
425 | + } elseif ($aircraftType == 9) { |
|
426 | + $result['aircrafttype'] = "JET_AIRCRAFT"; |
|
427 | + } elseif ($aircraftType == 10) { |
|
428 | + $result['aircrafttype'] = "UFO"; |
|
429 | + } elseif ($aircraftType == 11) { |
|
430 | + $result['aircrafttype'] = "BALLOON"; |
|
431 | + } elseif ($aircraftType == 12) { |
|
432 | + $result['aircrafttype'] = "AIRSHIP"; |
|
433 | + } elseif ($aircraftType == 13) { |
|
434 | + $result['aircrafttype'] = "UAV"; |
|
435 | + } elseif ($aircraftType == 15) { |
|
436 | + $result['aircrafttype'] = "STATIC_OBJECT"; |
|
437 | + } |
|
385 | 438 | $stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0; |
386 | 439 | $result['stealth'] = $stealth; |
387 | 440 | $result['address'] = $address; |
@@ -421,13 +474,21 @@ discard block |
||
421 | 474 | $result['temp'] = round(5/9*(($matches[1])-32),1); |
422 | 475 | } |
423 | 476 | } |
424 | - } else $result['comment'] = trim($body_parse); |
|
477 | + } else { |
|
478 | + $result['comment'] = trim($body_parse); |
|
479 | + } |
|
425 | 480 | |
426 | 481 | } |
427 | 482 | //} |
428 | - if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4); |
|
429 | - if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4); |
|
430 | - if ($debug) print_r($result); |
|
483 | + if (isset($result['latitude'])) { |
|
484 | + $result['latitude'] = round($result['latitude'],4); |
|
485 | + } |
|
486 | + if (isset($result['longitude'])) { |
|
487 | + $result['longitude'] = round($result['longitude'],4); |
|
488 | + } |
|
489 | + if ($debug) { |
|
490 | + print_r($result); |
|
491 | + } |
|
431 | 492 | return $result; |
432 | 493 | } |
433 | 494 | |
@@ -436,12 +497,21 @@ discard block |
||
436 | 497 | $aprs_connect = 0; |
437 | 498 | $aprs_keep = 120; |
438 | 499 | $aprs_last_tx = time(); |
439 | - if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
|
440 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
441 | - if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid; |
|
442 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
443 | - if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass; |
|
444 | - else $aprs_pass = '-1'; |
|
500 | + if (isset($globalAPRSversion)) { |
|
501 | + $aprs_version = $globalAPRSversion; |
|
502 | + } else { |
|
503 | + $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
504 | + } |
|
505 | + if (isset($globalServerAPRSssid)) { |
|
506 | + $aprs_ssid = $globalServerAPRSssid; |
|
507 | + } else { |
|
508 | + $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
509 | + } |
|
510 | + if (isset($globalServerAPRSpass)) { |
|
511 | + $aprs_pass = $globalServerAPRSpass; |
|
512 | + } else { |
|
513 | + $aprs_pass = '-1'; |
|
514 | + } |
|
445 | 515 | |
446 | 516 | $aprs_filter = ''; |
447 | 517 | $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; |
@@ -469,7 +539,9 @@ discard block |
||
469 | 539 | } |
470 | 540 | |
471 | 541 | function send($data) { |
472 | - if ($this->connected === false) $this->connect(); |
|
542 | + if ($this->connected === false) { |
|
543 | + $this->connect(); |
|
544 | + } |
|
473 | 545 | $send = socket_send( $this->socket , $data , strlen($data),0); |
474 | 546 | if ($send === FALSE) { |
475 | 547 | socket_close($this->socket); |
@@ -491,18 +563,26 @@ discard block |
||
491 | 563 | //$w = '00'; |
492 | 564 | $custom = ''; |
493 | 565 | if ($ident != '') { |
494 | - if ($custom != '') $custom .= '/'; |
|
566 | + if ($custom != '') { |
|
567 | + $custom .= '/'; |
|
568 | + } |
|
495 | 569 | $custom .= 'CS='.$ident; |
496 | 570 | } |
497 | 571 | if ($squawk != '') { |
498 | - if ($custom != '') $custom .= '/'; |
|
572 | + if ($custom != '') { |
|
573 | + $custom .= '/'; |
|
574 | + } |
|
499 | 575 | $custom .= 'SQ='.$squawk; |
500 | 576 | } |
501 | 577 | if ($aircraft_icao != '' && $aircraft_icao != 'NA') { |
502 | - if ($custom != '') $custom .= '/'; |
|
578 | + if ($custom != '') { |
|
579 | + $custom .= '/'; |
|
580 | + } |
|
503 | 581 | $custom .= 'AI='.$aircraft_icao; |
504 | 582 | } |
505 | - if ($custom != '') $custom = ' '.$custom; |
|
583 | + if ($custom != '') { |
|
584 | + $custom = ' '.$custom; |
|
585 | + } |
|
506 | 586 | $this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.' *'.date('His',strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude_real,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
507 | 587 | } |
508 | 588 | } |
@@ -520,26 +600,38 @@ discard block |
||
520 | 600 | //$w = '00'; |
521 | 601 | $custom = ''; |
522 | 602 | if ($ident != '') { |
523 | - if ($custom != '') $custom .= '/'; |
|
603 | + if ($custom != '') { |
|
604 | + $custom .= '/'; |
|
605 | + } |
|
524 | 606 | $custom .= 'CS='.$ident; |
525 | 607 | } |
526 | 608 | if ($typeid != '') { |
527 | - if ($custom != '') $custom .= '/'; |
|
609 | + if ($custom != '') { |
|
610 | + $custom .= '/'; |
|
611 | + } |
|
528 | 612 | $custom .= 'TI='.$typeid; |
529 | 613 | } |
530 | 614 | if ($imo != '') { |
531 | - if ($custom != '') $custom .= '/'; |
|
615 | + if ($custom != '') { |
|
616 | + $custom .= '/'; |
|
617 | + } |
|
532 | 618 | $custom .= 'IMO='.$imo; |
533 | 619 | } |
534 | 620 | if ($arrival_date != '') { |
535 | - if ($custom != '') $custom .= '/'; |
|
621 | + if ($custom != '') { |
|
622 | + $custom .= '/'; |
|
623 | + } |
|
536 | 624 | $custom .= 'AD='.strtotime($arrival_date); |
537 | 625 | } |
538 | 626 | if ($arrival_code != '') { |
539 | - if ($custom != '') $custom .= '/'; |
|
627 | + if ($custom != '') { |
|
628 | + $custom .= '/'; |
|
629 | + } |
|
540 | 630 | $custom .= 'AC='.$arrival_code; |
541 | 631 | } |
542 | - if ($custom != '') $custom = ' '.$custom; |
|
632 | + if ($custom != '') { |
|
633 | + $custom = ' '.$custom; |
|
634 | + } |
|
543 | 635 | $altitude = 0; |
544 | 636 | $this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
545 | 637 | } |