Ysurac /
FlightAirMap
@@ -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 && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
|
| 884 | + if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $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 && $line['format_source'] != 'aprs' && $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 | } |
@@ -7,16 +7,16 @@ discard block |
||
| 7 | 7 | require_once(dirname(__FILE__).'/class.Source.php'); |
| 8 | 8 | |
| 9 | 9 | class TrackerImport { |
| 10 | - private $all_tracked = array(); |
|
| 11 | - private $last_delete_hourly = 0; |
|
| 12 | - private $last_delete = 0; |
|
| 13 | - private $stats = array(); |
|
| 14 | - private $tmd = 0; |
|
| 15 | - private $source_location = array(); |
|
| 16 | - public $db = null; |
|
| 17 | - public $nb = 0; |
|
| 10 | + private $all_tracked = array(); |
|
| 11 | + private $last_delete_hourly = 0; |
|
| 12 | + private $last_delete = 0; |
|
| 13 | + private $stats = array(); |
|
| 14 | + private $tmd = 0; |
|
| 15 | + private $source_location = array(); |
|
| 16 | + public $db = null; |
|
| 17 | + public $nb = 0; |
|
| 18 | 18 | |
| 19 | - public function __construct($dbc = null) { |
|
| 19 | + public function __construct($dbc = null) { |
|
| 20 | 20 | global $globalBeta; |
| 21 | 21 | $Connection = new Connection($dbc); |
| 22 | 22 | $this->db = $Connection->db(); |
@@ -38,50 +38,50 @@ discard block |
||
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | */ |
| 41 | - } |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - public function checkAll() { |
|
| 43 | + public function checkAll() { |
|
| 44 | 44 | global $globalDebug; |
| 45 | 45 | if ($globalDebug) echo "Update last seen tracked data...\n"; |
| 46 | 46 | foreach ($this->all_tracked as $key => $flight) { |
| 47 | - if (isset($this->all_tracked[$key]['id'])) { |
|
| 47 | + if (isset($this->all_tracked[$key]['id'])) { |
|
| 48 | 48 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
| 49 | - $Tracker = new Tracker($this->db); |
|
| 50 | - $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 51 | - } |
|
| 49 | + $Tracker = new Tracker($this->db); |
|
| 50 | + $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 51 | + } |
|
| 52 | + } |
|
| 52 | 53 | } |
| 53 | - } |
|
| 54 | 54 | |
| 55 | - public function del() { |
|
| 55 | + public function del() { |
|
| 56 | 56 | global $globalDebug; |
| 57 | 57 | // Delete old infos |
| 58 | 58 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 59 | 59 | foreach ($this->all_tracked as $key => $flight) { |
| 60 | - if (isset($flight['lastupdate'])) { |
|
| 61 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 62 | - if (isset($this->all_tracked[$key]['id'])) { |
|
| 63 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 60 | + if (isset($flight['lastupdate'])) { |
|
| 61 | + if ($flight['lastupdate'] < (time()-3000)) { |
|
| 62 | + if (isset($this->all_tracked[$key]['id'])) { |
|
| 63 | + if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 64 | 64 | /* |
| 65 | 65 | $TrackerLive = new TrackerLive(); |
| 66 | 66 | $TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']); |
| 67 | 67 | $TrackerLive->db = null; |
| 68 | 68 | */ |
| 69 | - //$real_arrival = $this->arrival($key); |
|
| 70 | - $Tracker = new Tracker($this->db); |
|
| 71 | - if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
|
| 69 | + //$real_arrival = $this->arrival($key); |
|
| 70 | + $Tracker = new Tracker($this->db); |
|
| 71 | + if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
|
| 72 | 72 | $result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']); |
| 73 | 73 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 74 | 74 | } |
| 75 | 75 | // Put in archive |
| 76 | 76 | // $Tracker->db = null; |
| 77 | - } |
|
| 78 | - unset($this->all_tracked[$key]); |
|
| 79 | - } |
|
| 80 | - } |
|
| 81 | - } |
|
| 82 | - } |
|
| 77 | + } |
|
| 78 | + unset($this->all_tracked[$key]); |
|
| 79 | + } |
|
| 80 | + } |
|
| 81 | + } |
|
| 82 | + } |
|
| 83 | 83 | |
| 84 | - public function add($line) { |
|
| 84 | + public function add($line) { |
|
| 85 | 85 | global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked; |
| 86 | 86 | if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
| 87 | 87 | date_default_timezone_set('UTC'); |
@@ -90,47 +90,47 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | // SBS format is CSV format |
| 92 | 92 | if(is_array($line) && isset($line['ident'])) { |
| 93 | - //print_r($line); |
|
| 94 | - if (isset($line['ident'])) { |
|
| 93 | + //print_r($line); |
|
| 94 | + if (isset($line['ident'])) { |
|
| 95 | 95 | |
| 96 | 96 | |
| 97 | 97 | // Increment message number |
| 98 | 98 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) { |
| 99 | - $current_date = date('Y-m-d'); |
|
| 100 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 101 | - else $source = ''; |
|
| 102 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 103 | - if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 104 | - $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 105 | - $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 106 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 99 | + $current_date = date('Y-m-d'); |
|
| 100 | + if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 101 | + else $source = ''; |
|
| 102 | + if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 103 | + if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 104 | + $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 105 | + $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 106 | + } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | |
| 110 | 110 | $Common = new Common(); |
| 111 | - if (!isset($line['id'])) $id = trim($line['ident']); |
|
| 112 | - else $id = trim($line['id']); |
|
| 111 | + if (!isset($line['id'])) $id = trim($line['ident']); |
|
| 112 | + else $id = trim($line['id']); |
|
| 113 | 113 | |
| 114 | 114 | if (!isset($this->all_tracked[$id])) { |
| 115 | - $this->all_tracked[$id] = array(); |
|
| 116 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0)); |
|
| 117 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => '')); |
|
| 118 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 119 | - if (!isset($line['id'])) { |
|
| 115 | + $this->all_tracked[$id] = array(); |
|
| 116 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0)); |
|
| 117 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => '')); |
|
| 118 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 119 | + if (!isset($line['id'])) { |
|
| 120 | 120 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 121 | 121 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 122 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 123 | - if ($globalAllTracked !== FALSE) $dataFound = true; |
|
| 122 | + } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 123 | + if ($globalAllTracked !== FALSE) $dataFound = true; |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 127 | - if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) { |
|
| 127 | + if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) { |
|
| 128 | 128 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
| 129 | - } else { |
|
| 129 | + } else { |
|
| 130 | 130 | if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
| 131 | 131 | elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
| 132 | 132 | return ''; |
| 133 | - } |
|
| 133 | + } |
|
| 134 | 134 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 135 | 135 | if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!"; |
| 136 | 136 | return ''; |
@@ -147,38 +147,38 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | //if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) { |
| 149 | 149 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) { |
| 150 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 151 | - if ($this->all_tracked[$id]['addedTracker'] == 1) { |
|
| 150 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 151 | + if ($this->all_tracked[$id]['addedTracker'] == 1) { |
|
| 152 | 152 | $timeelapsed = microtime(true); |
| 153 | - $Tracker = new Tracker($this->db); |
|
| 154 | - $fromsource = NULL; |
|
| 155 | - $result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
|
| 153 | + $Tracker = new Tracker($this->db); |
|
| 154 | + $fromsource = NULL; |
|
| 155 | + $result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
|
| 156 | 156 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 157 | 157 | $Tracker->db = null; |
| 158 | 158 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 159 | - } |
|
| 160 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 159 | + } |
|
| 160 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | if (isset($line['speed']) && $line['speed'] != '') { |
| 164 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 165 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 164 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 165 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 166 | 166 | } else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 167 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 168 | - if ($distance > 100 && $distance < 10000) { |
|
| 167 | + $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 168 | + if ($distance > 100 && $distance < 10000) { |
|
| 169 | 169 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 170 | 170 | $speed = $speed*3.6; |
| 171 | 171 | if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
| 172 | 172 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n"; |
| 173 | - } |
|
| 173 | + } |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | - if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 177 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 178 | - else unset($timediff); |
|
| 179 | - if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
|
| 176 | + if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 177 | + if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 178 | + else unset($timediff); |
|
| 179 | + if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
|
| 180 | 180 | if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) { |
| 181 | - if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 181 | + if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 182 | 182 | $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 183 | 183 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 184 | 184 | $this->all_tracked[$id]['putinarchive'] = true; |
@@ -192,160 +192,160 @@ discard block |
||
| 192 | 192 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 193 | 193 | $this->tmd = 0; |
| 194 | 194 | if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
| 195 | - } |
|
| 195 | + } |
|
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 199 | 199 | if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 200 | 200 | if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 201 | - $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
|
| 202 | - $dataFound = true; |
|
| 203 | - $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 201 | + $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
|
| 202 | + $dataFound = true; |
|
| 203 | + $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 204 | 204 | } |
| 205 | 205 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
| 206 | 206 | } |
| 207 | 207 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 208 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 208 | + if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 209 | 209 | if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 210 | 210 | if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 211 | - $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
|
| 212 | - $dataFound = true; |
|
| 213 | - $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 211 | + $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
|
| 212 | + $dataFound = true; |
|
| 213 | + $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 214 | 214 | } |
| 215 | 215 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude'])); |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | - } else if ($globalDebug && $timediff > 20) { |
|
| 218 | + } else if ($globalDebug && $timediff > 20) { |
|
| 219 | 219 | $this->tmd = $this->tmd + 1; |
| 220 | 220 | echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n"; |
| 221 | 221 | echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -"; |
| 222 | 222 | echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
| 223 | 223 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n"; |
| 224 | - } |
|
| 224 | + } |
|
| 225 | 225 | } |
| 226 | 226 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 227 | - if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 228 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 227 | + if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 228 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 229 | 229 | } |
| 230 | 230 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 231 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 231 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 232 | 232 | } |
| 233 | 233 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 234 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 234 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 235 | 235 | } |
| 236 | 236 | if (isset($line['comment']) && $line['comment'] != '') { |
| 237 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment'])); |
|
| 238 | - //$dataFound = true; |
|
| 237 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment'])); |
|
| 238 | + //$dataFound = true; |
|
| 239 | 239 | } |
| 240 | 240 | if (isset($line['type']) && $line['type'] != '') { |
| 241 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 242 | - //$dataFound = true; |
|
| 241 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 242 | + //$dataFound = true; |
|
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 246 | - //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 246 | + //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 247 | 247 | if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true; |
| 248 | 248 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => round($line['altitude']/100))); |
| 249 | 249 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude'])); |
| 250 | 250 | //$dataFound = true; |
| 251 | - //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 251 | + //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 252 | 252 | } |
| 253 | 253 | |
| 254 | 254 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 255 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 255 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | if (isset($line['heading']) && $line['heading'] != '') { |
| 259 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 260 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 261 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 262 | - //$dataFound = true; |
|
| 259 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 260 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 261 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 262 | + //$dataFound = true; |
|
| 263 | 263 | } elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) { |
| 264 | - $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 265 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 266 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 267 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 264 | + $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 265 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 266 | + if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 267 | + if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 268 | 268 | } |
| 269 | 269 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 270 | 270 | |
| 271 | 271 | if ($dataFound === true && isset($this->all_tracked[$id]['ident'])) { |
| 272 | - $this->all_tracked[$id]['lastupdate'] = time(); |
|
| 273 | - if ($this->all_tracked[$id]['addedTracker'] == 0) { |
|
| 274 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 275 | - if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
|
| 272 | + $this->all_tracked[$id]['lastupdate'] = time(); |
|
| 273 | + if ($this->all_tracked[$id]['addedTracker'] == 0) { |
|
| 274 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 275 | + if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
|
| 276 | 276 | if ($globalDebug) echo "Check if aircraft is already in DB..."; |
| 277 | 277 | $timeelapsed = microtime(true); |
| 278 | 278 | $TrackerLive = new TrackerLive($this->db); |
| 279 | 279 | if (isset($line['id'])) { |
| 280 | - $recent_ident = $TrackerLive->checkIdRecent($line['id']); |
|
| 281 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 280 | + $recent_ident = $TrackerLive->checkIdRecent($line['id']); |
|
| 281 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 282 | 282 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 283 | - $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
|
| 284 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 283 | + $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
|
| 284 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 285 | 285 | } else $recent_ident = ''; |
| 286 | 286 | $TrackerLive->db=null; |
| 287 | 287 | |
| 288 | 288 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 289 | 289 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 290 | - } else { |
|
| 290 | + } else { |
|
| 291 | 291 | $recent_ident = ''; |
| 292 | 292 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
| 293 | - } |
|
| 294 | - //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 295 | - if($recent_ident == "") |
|
| 296 | - { |
|
| 293 | + } |
|
| 294 | + //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 295 | + if($recent_ident == "") |
|
| 296 | + { |
|
| 297 | 297 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : "; |
| 298 | 298 | //adds the spotter data for the archive |
| 299 | - $highlight = ''; |
|
| 300 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 301 | - $timeelapsed = microtime(true); |
|
| 302 | - $Tracker = new Tracker($this->db); |
|
| 303 | - $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 304 | - $Tracker->db = null; |
|
| 305 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 306 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 299 | + $highlight = ''; |
|
| 300 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 301 | + $timeelapsed = microtime(true); |
|
| 302 | + $Tracker = new Tracker($this->db); |
|
| 303 | + $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 304 | + $Tracker->db = null; |
|
| 305 | + if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 306 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 307 | 307 | |
| 308 | 308 | |
| 309 | - // Add source stat in DB |
|
| 310 | - $Stats = new Stats($this->db); |
|
| 311 | - if (!empty($this->stats)) { |
|
| 309 | + // Add source stat in DB |
|
| 310 | + $Stats = new Stats($this->db); |
|
| 311 | + if (!empty($this->stats)) { |
|
| 312 | 312 | if ($globalDebug) echo 'Add source stats : '; |
| 313 | - foreach($this->stats as $date => $data) { |
|
| 314 | - foreach($data as $source => $sourced) { |
|
| 315 | - //print_r($sourced); |
|
| 316 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date); |
|
| 317 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date); |
|
| 318 | - if (isset($sourced['msg'])) { |
|
| 319 | - if (time() - $sourced['msg']['date'] > 10) { |
|
| 320 | - $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 321 | - echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date); |
|
| 322 | - unset($this->stats[$date][$source]['msg']); |
|
| 323 | - } |
|
| 324 | - } |
|
| 325 | - } |
|
| 326 | - if ($date != date('Y-m-d')) { |
|
| 327 | - unset($this->stats[$date]); |
|
| 328 | - } |
|
| 329 | - } |
|
| 330 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 313 | + foreach($this->stats as $date => $data) { |
|
| 314 | + foreach($data as $source => $sourced) { |
|
| 315 | + //print_r($sourced); |
|
| 316 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date); |
|
| 317 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date); |
|
| 318 | + if (isset($sourced['msg'])) { |
|
| 319 | + if (time() - $sourced['msg']['date'] > 10) { |
|
| 320 | + $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 321 | + echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date); |
|
| 322 | + unset($this->stats[$date][$source]['msg']); |
|
| 323 | + } |
|
| 324 | + } |
|
| 325 | + } |
|
| 326 | + if ($date != date('Y-m-d')) { |
|
| 327 | + unset($this->stats[$date]); |
|
| 328 | + } |
|
| 329 | + } |
|
| 330 | + if ($globalDebug) echo 'Done'."\n"; |
|
| 331 | 331 | |
| 332 | - } |
|
| 333 | - $Stats->db = null; |
|
| 334 | - */ |
|
| 335 | - $this->del(); |
|
| 332 | + } |
|
| 333 | + $Stats->db = null; |
|
| 334 | + */ |
|
| 335 | + $this->del(); |
|
| 336 | 336 | //$ignoreImport = false; |
| 337 | 337 | $this->all_tracked[$id]['addedTracker'] = 1; |
| 338 | 338 | //print_r($this->all_tracked[$id]); |
| 339 | 339 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 340 | - if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours..."; |
|
| 341 | - //TrackerLive->deleteLiveTrackerDataNotUpdated(); |
|
| 342 | - $TrackerLive = new TrackerLive($this->db); |
|
| 343 | - $TrackerLive->deleteLiveTrackerData(); |
|
| 344 | - $TrackerLive->db=null; |
|
| 345 | - if ($globalDebug) echo " Done\n"; |
|
| 346 | - $this->last_delete = time(); |
|
| 340 | + if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours..."; |
|
| 341 | + //TrackerLive->deleteLiveTrackerDataNotUpdated(); |
|
| 342 | + $TrackerLive = new TrackerLive($this->db); |
|
| 343 | + $TrackerLive->deleteLiveTrackerData(); |
|
| 344 | + $TrackerLive->db=null; |
|
| 345 | + if ($globalDebug) echo " Done\n"; |
|
| 346 | + $this->last_delete = time(); |
|
| 347 | 347 | } |
| 348 | - } else { |
|
| 348 | + } else { |
|
| 349 | 349 | $this->all_tracked[$id]['id'] = $recent_ident; |
| 350 | 350 | $this->all_tracked[$id]['addedTracker'] = 1; |
| 351 | 351 | if (isset($globalDaemon) && !$globalDaemon) { |
@@ -354,16 +354,16 @@ discard block |
||
| 354 | 354 | $Tracker->db = null; |
| 355 | 355 | } |
| 356 | 356 | |
| 357 | - } |
|
| 357 | + } |
|
| 358 | 358 | } |
| 359 | - } |
|
| 360 | - //adds the spotter LIVE data |
|
| 361 | - if ($globalDebug) { |
|
| 359 | + } |
|
| 360 | + //adds the spotter LIVE data |
|
| 361 | + if ($globalDebug) { |
|
| 362 | 362 | echo 'DATA : ident : '.$this->all_tracked[$id]['ident'].' - type : '.$this->all_tracked[$id]['type'].' - Latitude : '.$this->all_tracked[$id]['latitude'].' - Longitude : '.$this->all_tracked[$id]['longitude'].' - Altitude : '.$this->all_tracked[$id]['altitude'].' - Heading : '.$this->all_tracked[$id]['heading'].' - Speed : '.$this->all_tracked[$id]['speed']."\n"; |
| 363 | - } |
|
| 364 | - $ignoreImport = false; |
|
| 363 | + } |
|
| 364 | + $ignoreImport = false; |
|
| 365 | 365 | |
| 366 | - if (!$ignoreImport) { |
|
| 366 | + if (!$ignoreImport) { |
|
| 367 | 367 | if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 368 | 368 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
| 369 | 369 | $timeelapsed = microtime(true); |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | if ($stats_heading == 16) $stats_heading = 0; |
| 402 | 402 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 403 | 403 | for ($i=0;$i<=15;$i++) { |
| 404 | - $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 404 | + $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 405 | 405 | } |
| 406 | 406 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
| 407 | 407 | } else { |
@@ -414,11 +414,11 @@ discard block |
||
| 414 | 414 | //var_dump($this->stats); |
| 415 | 415 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 416 | 416 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 417 | - end($this->stats[$current_date][$source]['hist']); |
|
| 418 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 417 | + end($this->stats[$current_date][$source]['hist']); |
|
| 418 | + $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 419 | 419 | } else $mini = 0; |
| 420 | 420 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 421 | - $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 421 | + $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 422 | 422 | } |
| 423 | 423 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
| 424 | 424 | } else { |
@@ -434,22 +434,22 @@ discard block |
||
| 434 | 434 | |
| 435 | 435 | |
| 436 | 436 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 437 | - if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour..."; |
|
| 438 | - $TrackerLive = new TrackerLive($this->db); |
|
| 439 | - $TrackerLive->deleteLiveTrackerDataNotUpdated(); |
|
| 440 | - $TrackerLive->db = null; |
|
| 441 | - //TrackerLive->deleteLiveTrackerData(); |
|
| 442 | - if ($globalDebug) echo " Done\n"; |
|
| 443 | - $this->last_delete_hourly = time(); |
|
| 437 | + if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour..."; |
|
| 438 | + $TrackerLive = new TrackerLive($this->db); |
|
| 439 | + $TrackerLive->deleteLiveTrackerDataNotUpdated(); |
|
| 440 | + $TrackerLive->db = null; |
|
| 441 | + //TrackerLive->deleteLiveTrackerData(); |
|
| 442 | + if ($globalDebug) echo " Done\n"; |
|
| 443 | + $this->last_delete_hourly = time(); |
|
| 444 | 444 | } |
| 445 | 445 | |
| 446 | - } |
|
| 447 | - //$ignoreImport = false; |
|
| 446 | + } |
|
| 447 | + //$ignoreImport = false; |
|
| 448 | 448 | } |
| 449 | 449 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 450 | 450 | if ($send) return $this->all_tracked[$id]; |
| 451 | - } |
|
| 451 | + } |
|
| 452 | + } |
|
| 452 | 453 | } |
| 453 | - } |
|
| 454 | 454 | } |
| 455 | 455 | ?> |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | if (isset($this->all_tracked[$key]['id'])) { |
| 48 | 48 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
| 49 | 49 | $Tracker = new Tracker($this->db); |
| 50 | - $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 50 | + $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['altitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']); |
|
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | } |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 59 | 59 | foreach ($this->all_tracked as $key => $flight) { |
| 60 | 60 | if (isset($flight['lastupdate'])) { |
| 61 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 61 | + if ($flight['lastupdate'] < (time() - 3000)) { |
|
| 62 | 62 | if (isset($this->all_tracked[$key]['id'])) { |
| 63 | 63 | if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
| 64 | 64 | /* |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | //$real_arrival = $this->arrival($key); |
| 70 | 70 | $Tracker = new Tracker($this->db); |
| 71 | 71 | if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
| 72 | - $result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']); |
|
| 72 | + $result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['altitude'], $this->all_tracked[$key]['speed']); |
|
| 73 | 73 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 74 | 74 | } |
| 75 | 75 | // Put in archive |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | $send = false; |
| 90 | 90 | |
| 91 | 91 | // SBS format is CSV format |
| 92 | - if(is_array($line) && isset($line['ident'])) { |
|
| 92 | + if (is_array($line) && isset($line['ident'])) { |
|
| 93 | 93 | //print_r($line); |
| 94 | 94 | if (isset($line['ident'])) { |
| 95 | 95 | |
@@ -113,33 +113,33 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | if (!isset($this->all_tracked[$id])) { |
| 115 | 115 | $this->all_tracked[$id] = array(); |
| 116 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0)); |
|
| 117 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => '')); |
|
| 118 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 116 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('addedTracker' => 0)); |
|
| 117 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '', 'source_name' => '', 'comment'=> '', 'type' => '', 'noarchive' => false, 'putinarchive' => true, 'over_country' => '')); |
|
| 118 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('lastupdate' => time())); |
|
| 119 | 119 | if (!isset($line['id'])) { |
| 120 | 120 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 121 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 122 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 121 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 122 | + } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $line['id'])); |
|
| 123 | 123 | if ($globalAllTracked !== FALSE) $dataFound = true; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
|
| 126 | + if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
| 127 | 127 | if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) { |
| 128 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
|
| 128 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => $line['datetime'])); |
|
| 129 | 129 | } else { |
| 130 | 130 | if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
| 131 | 131 | elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
| 132 | 132 | return ''; |
| 133 | 133 | } |
| 134 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
|
| 134 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) { |
|
| 135 | 135 | if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!"; |
| 136 | 136 | return ''; |
| 137 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
|
| 137 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) { |
|
| 138 | 138 | if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!"; |
| 139 | 139 | return ''; |
| 140 | 140 | } elseif (!isset($line['datetime'])) { |
| 141 | 141 | date_default_timezone_set('UTC'); |
| 142 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 142 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 143 | 143 | } else { |
| 144 | 144 | if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!"; |
| 145 | 145 | return ''; |
@@ -147,38 +147,38 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | //if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) { |
| 149 | 149 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) { |
| 150 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 150 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => trim($line['ident']))); |
|
| 151 | 151 | if ($this->all_tracked[$id]['addedTracker'] == 1) { |
| 152 | 152 | $timeelapsed = microtime(true); |
| 153 | 153 | $Tracker = new Tracker($this->db); |
| 154 | 154 | $fromsource = NULL; |
| 155 | - $result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
|
| 155 | + $result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $fromsource); |
|
| 156 | 156 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 157 | 157 | $Tracker->db = null; |
| 158 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 158 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 159 | 159 | } |
| 160 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 160 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident'])); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | if (isset($line['speed']) && $line['speed'] != '') { |
| 164 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 165 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 164 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($line['speed']))); |
|
| 165 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed_fromsrc' => true)); |
|
| 166 | 166 | } else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 167 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 167 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm'); |
|
| 168 | 168 | if ($distance > 100 && $distance < 10000) { |
| 169 | 169 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 170 | 170 | $speed = $speed*3.6; |
| 171 | - if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 171 | + if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($speed))); |
|
| 172 | 172 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n"; |
| 173 | 173 | } |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 177 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 177 | + if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time() - $this->all_tracked[$id]['time_last_coord']); |
|
| 178 | 178 | else unset($timediff); |
| 179 | - if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
|
| 179 | + if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')))) { |
|
| 180 | 180 | if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) { |
| 181 | - if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 181 | + if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['livedb_latitude'], $this->all_tracked[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) { |
|
| 182 | 182 | $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 183 | 183 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 184 | 184 | $this->all_tracked[$id]['putinarchive'] = true; |
@@ -186,10 +186,10 @@ discard block |
||
| 186 | 186 | if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
| 187 | 187 | $timeelapsed = microtime(true); |
| 188 | 188 | $Tracker = new Tracker($this->db); |
| 189 | - $all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 189 | + $all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 190 | 190 | if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
| 191 | 191 | $Tracker->db = null; |
| 192 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 192 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 193 | 193 | $this->tmd = 0; |
| 194 | 194 | if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
| 195 | 195 | } |
@@ -197,73 +197,73 @@ discard block |
||
| 197 | 197 | |
| 198 | 198 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 199 | 199 | if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 200 | - if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 200 | + if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 201 | 201 | $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
| 202 | 202 | $dataFound = true; |
| 203 | 203 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 204 | 204 | } |
| 205 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
|
| 205 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('latitude' => $line['latitude'])); |
|
| 206 | 206 | } |
| 207 | 207 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 208 | 208 | if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
| 209 | 209 | if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 210 | - if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 210 | + if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 211 | 211 | $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
| 212 | 212 | $dataFound = true; |
| 213 | 213 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 214 | 214 | } |
| 215 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude'])); |
|
| 215 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('longitude' => $line['longitude'])); |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | } else if ($globalDebug && $timediff > 20) { |
| 219 | 219 | $this->tmd = $this->tmd + 1; |
| 220 | 220 | echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n"; |
| 221 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -"; |
|
| 222 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 221 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')."m -"; |
|
| 222 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 223 | 223 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n"; |
| 224 | 224 | } |
| 225 | 225 | } |
| 226 | 226 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 227 | 227 | if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 228 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 228 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('last_update' => $line['last_update'])); |
|
| 229 | 229 | } |
| 230 | 230 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 231 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 231 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('format_source' => $line['format_source'])); |
|
| 232 | 232 | } |
| 233 | 233 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 234 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 234 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('source_name' => $line['source_name'])); |
|
| 235 | 235 | } |
| 236 | 236 | if (isset($line['comment']) && $line['comment'] != '') { |
| 237 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment'])); |
|
| 237 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('comment' => $line['comment'])); |
|
| 238 | 238 | //$dataFound = true; |
| 239 | 239 | } |
| 240 | 240 | if (isset($line['type']) && $line['type'] != '') { |
| 241 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 241 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $line['type'])); |
|
| 242 | 242 | //$dataFound = true; |
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 246 | 246 | //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 247 | - if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 248 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => round($line['altitude']/100))); |
|
| 249 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude'])); |
|
| 247 | + if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 248 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('altitude' => round($line['altitude']/100))); |
|
| 249 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('altitude_real' => $line['altitude'])); |
|
| 250 | 250 | //$dataFound = true; |
| 251 | 251 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 252 | 252 | } |
| 253 | 253 | |
| 254 | 254 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 255 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 255 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('noarchive' => true)); |
|
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | if (isset($line['heading']) && $line['heading'] != '') { |
| 259 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 260 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 261 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 259 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading'] - round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 260 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($line['heading']))); |
|
| 261 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading_fromsrc' => true)); |
|
| 262 | 262 | //$dataFound = true; |
| 263 | 263 | } elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) { |
| 264 | - $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 265 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 266 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 264 | + $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 265 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($heading))); |
|
| 266 | + if (abs($this->all_tracked[$id]['heading'] - round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 267 | 267 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
| 268 | 268 | } |
| 269 | 269 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
@@ -271,54 +271,54 @@ discard block |
||
| 271 | 271 | if ($dataFound === true && isset($this->all_tracked[$id]['ident'])) { |
| 272 | 272 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 273 | 273 | if ($this->all_tracked[$id]['addedTracker'] == 0) { |
| 274 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 274 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 275 | 275 | if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
| 276 | 276 | if ($globalDebug) echo "Check if aircraft is already in DB..."; |
| 277 | 277 | $timeelapsed = microtime(true); |
| 278 | 278 | $TrackerLive = new TrackerLive($this->db); |
| 279 | 279 | if (isset($line['id'])) { |
| 280 | 280 | $recent_ident = $TrackerLive->checkIdRecent($line['id']); |
| 281 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 281 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 282 | 282 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 283 | 283 | $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
| 284 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 284 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 285 | 285 | } else $recent_ident = ''; |
| 286 | - $TrackerLive->db=null; |
|
| 286 | + $TrackerLive->db = null; |
|
| 287 | 287 | |
| 288 | 288 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 289 | 289 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 290 | 290 | } else { |
| 291 | 291 | $recent_ident = ''; |
| 292 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
|
| 292 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('forcenew' => 0)); |
|
| 293 | 293 | } |
| 294 | 294 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 295 | - if($recent_ident == "") |
|
| 295 | + if ($recent_ident == "") |
|
| 296 | 296 | { |
| 297 | 297 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : "; |
| 298 | 298 | //adds the spotter data for the archive |
| 299 | 299 | $highlight = ''; |
| 300 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 300 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 301 | 301 | $timeelapsed = microtime(true); |
| 302 | 302 | $Tracker = new Tracker($this->db); |
| 303 | - $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 303 | + $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name']); |
|
| 304 | 304 | $Tracker->db = null; |
| 305 | 305 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 306 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 306 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 307 | 307 | |
| 308 | 308 | |
| 309 | 309 | // Add source stat in DB |
| 310 | 310 | $Stats = new Stats($this->db); |
| 311 | 311 | if (!empty($this->stats)) { |
| 312 | 312 | if ($globalDebug) echo 'Add source stats : '; |
| 313 | - foreach($this->stats as $date => $data) { |
|
| 314 | - foreach($data as $source => $sourced) { |
|
| 313 | + foreach ($this->stats as $date => $data) { |
|
| 314 | + foreach ($data as $source => $sourced) { |
|
| 315 | 315 | //print_r($sourced); |
| 316 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date); |
|
| 317 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date); |
|
| 316 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar_tracker', $date); |
|
| 317 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist_tracker', $date); |
|
| 318 | 318 | if (isset($sourced['msg'])) { |
| 319 | 319 | if (time() - $sourced['msg']['date'] > 10) { |
| 320 | 320 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
| 321 | - echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date); |
|
| 321 | + echo $Stats->addStatSource($nbmsg, $source, 'msg_tracker', $date); |
|
| 322 | 322 | unset($this->stats[$date][$source]['msg']); |
| 323 | 323 | } |
| 324 | 324 | } |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | //TrackerLive->deleteLiveTrackerDataNotUpdated(); |
| 342 | 342 | $TrackerLive = new TrackerLive($this->db); |
| 343 | 343 | $TrackerLive->deleteLiveTrackerData(); |
| 344 | - $TrackerLive->db=null; |
|
| 344 | + $TrackerLive->db = null; |
|
| 345 | 345 | if ($globalDebug) echo " Done\n"; |
| 346 | 346 | $this->last_delete = time(); |
| 347 | 347 | } |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | $this->all_tracked[$id]['addedTracker'] = 1; |
| 351 | 351 | if (isset($globalDaemon) && !$globalDaemon) { |
| 352 | 352 | $Tracker = new Tracker($this->db); |
| 353 | - $Tracker->updateLatestTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['altitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']); |
|
| 353 | + $Tracker->updateLatestTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime']); |
|
| 354 | 354 | $Tracker->db = null; |
| 355 | 355 | } |
| 356 | 356 | |
@@ -364,14 +364,14 @@ discard block |
||
| 364 | 364 | $ignoreImport = false; |
| 365 | 365 | |
| 366 | 366 | if (!$ignoreImport) { |
| 367 | - if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 367 | + if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 368 | 368 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
| 369 | 369 | $timeelapsed = microtime(true); |
| 370 | 370 | $TrackerLive = new TrackerLive($this->db); |
| 371 | - $result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 371 | + $result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['comment'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']); |
|
| 372 | 372 | $TrackerLive->db = null; |
| 373 | 373 | $this->all_tracked[$id]['putinarchive'] = false; |
| 374 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 374 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 375 | 375 | |
| 376 | 376 | // Put statistics in $this->stats variable |
| 377 | 377 | |
@@ -388,19 +388,19 @@ discard block |
||
| 388 | 388 | $latitude = $globalCenterLatitude; |
| 389 | 389 | $longitude = $globalCenterLongitude; |
| 390 | 390 | } |
| 391 | - $this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude); |
|
| 391 | + $this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude); |
|
| 392 | 392 | } else { |
| 393 | 393 | $latitude = $this->source_location[$source]['latitude']; |
| 394 | 394 | $longitude = $this->source_location[$source]['longitude']; |
| 395 | 395 | } |
| 396 | - $stats_heading = $Common->getHeading($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 396 | + $stats_heading = $Common->getHeading($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 397 | 397 | //$stats_heading = $stats_heading%22.5; |
| 398 | 398 | $stats_heading = round($stats_heading/22.5); |
| 399 | - $stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 399 | + $stats_distance = $Common->distance($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 400 | 400 | $current_date = date('Y-m-d'); |
| 401 | 401 | if ($stats_heading == 16) $stats_heading = 0; |
| 402 | 402 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 403 | - for ($i=0;$i<=15;$i++) { |
|
| 403 | + for ($i = 0; $i <= 15; $i++) { |
|
| 404 | 404 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
| 405 | 405 | } |
| 406 | 406 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
@@ -415,9 +415,9 @@ discard block |
||
| 415 | 415 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 416 | 416 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 417 | 417 | end($this->stats[$current_date][$source]['hist']); |
| 418 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 418 | + $mini = key($this->stats[$current_date][$source]['hist']) + 10; |
|
| 419 | 419 | } else $mini = 0; |
| 420 | - for ($i=$mini;$i<=$distance;$i+=10) { |
|
| 420 | + for ($i = $mini; $i <= $distance; $i += 10) { |
|
| 421 | 421 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 422 | 422 | } |
| 423 | 423 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 430 | 430 | if ($this->all_tracked[$id]['putinarchive']) $send = true; |
| 431 | 431 | if ($globalDebug) echo $result."\n"; |
| 432 | - } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 432 | + } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n"; |
|
| 433 | 433 | //$this->del(); |
| 434 | 434 | |
| 435 | 435 | |
@@ -42,7 +42,9 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | public function checkAll() { |
| 44 | 44 | global $globalDebug; |
| 45 | - if ($globalDebug) echo "Update last seen tracked data...\n"; |
|
| 45 | + if ($globalDebug) { |
|
| 46 | + echo "Update last seen tracked data...\n"; |
|
| 47 | + } |
|
| 46 | 48 | foreach ($this->all_tracked as $key => $flight) { |
| 47 | 49 | if (isset($this->all_tracked[$key]['id'])) { |
| 48 | 50 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
@@ -55,12 +57,16 @@ discard block |
||
| 55 | 57 | public function del() { |
| 56 | 58 | global $globalDebug; |
| 57 | 59 | // Delete old infos |
| 58 | - if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
|
| 60 | + if ($globalDebug) { |
|
| 61 | + echo 'Delete old values and update latest data...'."\n"; |
|
| 62 | + } |
|
| 59 | 63 | foreach ($this->all_tracked as $key => $flight) { |
| 60 | 64 | if (isset($flight['lastupdate'])) { |
| 61 | 65 | if ($flight['lastupdate'] < (time()-3000)) { |
| 62 | 66 | if (isset($this->all_tracked[$key]['id'])) { |
| 63 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 67 | + if ($globalDebug) { |
|
| 68 | + echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 69 | + } |
|
| 64 | 70 | /* |
| 65 | 71 | $TrackerLive = new TrackerLive(); |
| 66 | 72 | $TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']); |
@@ -70,7 +76,9 @@ discard block |
||
| 70 | 76 | $Tracker = new Tracker($this->db); |
| 71 | 77 | if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
| 72 | 78 | $result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']); |
| 73 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 79 | + if ($globalDebug && $result != 'success') { |
|
| 80 | + echo '!!! ERROR : '.$result."\n"; |
|
| 81 | + } |
|
| 74 | 82 | } |
| 75 | 83 | // Put in archive |
| 76 | 84 | // $Tracker->db = null; |
@@ -83,7 +91,9 @@ discard block |
||
| 83 | 91 | |
| 84 | 92 | public function add($line) { |
| 85 | 93 | global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked; |
| 86 | - if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
|
| 94 | + if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') { |
|
| 95 | + $globalCoordMinChange = '0.02'; |
|
| 96 | + } |
|
| 87 | 97 | date_default_timezone_set('UTC'); |
| 88 | 98 | $dataFound = false; |
| 89 | 99 | $send = false; |
@@ -97,19 +107,29 @@ discard block |
||
| 97 | 107 | // Increment message number |
| 98 | 108 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) { |
| 99 | 109 | $current_date = date('Y-m-d'); |
| 100 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 101 | - else $source = ''; |
|
| 102 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 110 | + if (isset($line['source_name'])) { |
|
| 111 | + $source = $line['source_name']; |
|
| 112 | + } else { |
|
| 113 | + $source = ''; |
|
| 114 | + } |
|
| 115 | + if ($source == '' || $line['format_source'] == 'aprs') { |
|
| 116 | + $source = $line['format_source']; |
|
| 117 | + } |
|
| 103 | 118 | if (!isset($this->stats[$current_date][$source]['msg'])) { |
| 104 | 119 | $this->stats[$current_date][$source]['msg']['date'] = time(); |
| 105 | 120 | $this->stats[$current_date][$source]['msg']['nb'] = 1; |
| 106 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 121 | + } else { |
|
| 122 | + $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 123 | + } |
|
| 107 | 124 | } |
| 108 | 125 | |
| 109 | 126 | |
| 110 | 127 | $Common = new Common(); |
| 111 | - if (!isset($line['id'])) $id = trim($line['ident']); |
|
| 112 | - else $id = trim($line['id']); |
|
| 128 | + if (!isset($line['id'])) { |
|
| 129 | + $id = trim($line['ident']); |
|
| 130 | + } else { |
|
| 131 | + $id = trim($line['id']); |
|
| 132 | + } |
|
| 113 | 133 | |
| 114 | 134 | if (!isset($this->all_tracked[$id])) { |
| 115 | 135 | $this->all_tracked[$id] = array(); |
@@ -117,31 +137,46 @@ discard block |
||
| 117 | 137 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => '')); |
| 118 | 138 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
| 119 | 139 | if (!isset($line['id'])) { |
| 120 | - if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
| 140 | + if (!isset($globalDaemon)) { |
|
| 141 | + $globalDaemon = TRUE; |
|
| 142 | + } |
|
| 121 | 143 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 122 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 123 | - if ($globalAllTracked !== FALSE) $dataFound = true; |
|
| 144 | + } else { |
|
| 145 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 146 | + } |
|
| 147 | + if ($globalAllTracked !== FALSE) { |
|
| 148 | + $dataFound = true; |
|
| 149 | + } |
|
| 124 | 150 | } |
| 125 | 151 | |
| 126 | 152 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 127 | 153 | if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) { |
| 128 | 154 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
| 129 | 155 | } else { |
| 130 | - if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
|
| 131 | - elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
|
| 156 | + if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) { |
|
| 157 | + echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
|
| 158 | + } elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) { |
|
| 159 | + echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
|
| 160 | + } |
|
| 132 | 161 | return ''; |
| 133 | 162 | } |
| 134 | 163 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 135 | - if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!"; |
|
| 164 | + if ($globalDebug) { |
|
| 165 | + echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!"; |
|
| 166 | + } |
|
| 136 | 167 | return ''; |
| 137 | 168 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
| 138 | - if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!"; |
|
| 169 | + if ($globalDebug) { |
|
| 170 | + echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!"; |
|
| 171 | + } |
|
| 139 | 172 | return ''; |
| 140 | 173 | } elseif (!isset($line['datetime'])) { |
| 141 | 174 | date_default_timezone_set('UTC'); |
| 142 | 175 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s'))); |
| 143 | 176 | } else { |
| 144 | - if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!"; |
|
| 177 | + if ($globalDebug) { |
|
| 178 | + echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!"; |
|
| 179 | + } |
|
| 145 | 180 | return ''; |
| 146 | 181 | } |
| 147 | 182 | |
@@ -153,11 +188,17 @@ discard block |
||
| 153 | 188 | $Tracker = new Tracker($this->db); |
| 154 | 189 | $fromsource = NULL; |
| 155 | 190 | $result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
| 156 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 191 | + if ($globalDebug && $result != 'success') { |
|
| 192 | + echo '!!! ERROR : '.$result."\n"; |
|
| 193 | + } |
|
| 157 | 194 | $Tracker->db = null; |
| 158 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 195 | + if ($globalDebugTimeElapsed) { |
|
| 196 | + echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 197 | + } |
|
| 198 | + } |
|
| 199 | + if (!isset($this->all_tracked[$id]['id'])) { |
|
| 200 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 159 | 201 | } |
| 160 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 161 | 202 | } |
| 162 | 203 | |
| 163 | 204 | if (isset($line['speed']) && $line['speed'] != '') { |
@@ -168,14 +209,21 @@ discard block |
||
| 168 | 209 | if ($distance > 100 && $distance < 10000) { |
| 169 | 210 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 170 | 211 | $speed = $speed*3.6; |
| 171 | - if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 172 | - if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n"; |
|
| 212 | + if ($speed < 1000) { |
|
| 213 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 214 | + } |
|
| 215 | + if ($globalDebug) { |
|
| 216 | + echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n"; |
|
| 217 | + } |
|
| 173 | 218 | } |
| 174 | 219 | } |
| 175 | 220 | |
| 176 | 221 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 177 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 178 | - else unset($timediff); |
|
| 222 | + if (isset($this->all_tracked[$id]['time_last_coord'])) { |
|
| 223 | + $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 224 | + } else { |
|
| 225 | + unset($timediff); |
|
| 226 | + } |
|
| 179 | 227 | if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
| 180 | 228 | if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) { |
| 181 | 229 | if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
@@ -183,20 +231,30 @@ discard block |
||
| 183 | 231 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 184 | 232 | $this->all_tracked[$id]['putinarchive'] = true; |
| 185 | 233 | |
| 186 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 234 | + if ($globalDebug) { |
|
| 235 | + echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 236 | + } |
|
| 187 | 237 | $timeelapsed = microtime(true); |
| 188 | 238 | $Tracker = new Tracker($this->db); |
| 189 | 239 | $all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 190 | - if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
|
| 240 | + if (!empty($all_country)) { |
|
| 241 | + $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
|
| 242 | + } |
|
| 191 | 243 | $Tracker->db = null; |
| 192 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 244 | + if ($globalDebugTimeElapsed) { |
|
| 245 | + echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 246 | + } |
|
| 193 | 247 | $this->tmd = 0; |
| 194 | - if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
|
| 248 | + if ($globalDebug) { |
|
| 249 | + echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
|
| 250 | + } |
|
| 195 | 251 | } |
| 196 | 252 | } |
| 197 | 253 | |
| 198 | 254 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 199 | - if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
|
| 255 | + if (!isset($this->all_tracked[$id]['archive_latitude'])) { |
|
| 256 | + $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
|
| 257 | + } |
|
| 200 | 258 | if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 201 | 259 | $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
| 202 | 260 | $dataFound = true; |
@@ -205,8 +263,12 @@ discard block |
||
| 205 | 263 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
| 206 | 264 | } |
| 207 | 265 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 208 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 209 | - if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
|
| 266 | + if ($line['longitude'] > 180) { |
|
| 267 | + $line['longitude'] = $line['longitude'] - 360; |
|
| 268 | + } |
|
| 269 | + if (!isset($this->all_tracked[$id]['archive_longitude'])) { |
|
| 270 | + $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
|
| 271 | + } |
|
| 210 | 272 | if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 211 | 273 | $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
| 212 | 274 | $dataFound = true; |
@@ -224,7 +286,9 @@ discard block |
||
| 224 | 286 | } |
| 225 | 287 | } |
| 226 | 288 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 227 | - if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 289 | + if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) { |
|
| 290 | + $dataFound = true; |
|
| 291 | + } |
|
| 228 | 292 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
| 229 | 293 | } |
| 230 | 294 | if (isset($line['format_source']) && $line['format_source'] != '') { |
@@ -244,7 +308,9 @@ discard block |
||
| 244 | 308 | |
| 245 | 309 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 246 | 310 | //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 247 | - if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 311 | + if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) { |
|
| 312 | + $this->all_tracked[$id]['putinarchive'] = true; |
|
| 313 | + } |
|
| 248 | 314 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => round($line['altitude']/100))); |
| 249 | 315 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude'])); |
| 250 | 316 | //$dataFound = true; |
@@ -256,15 +322,21 @@ discard block |
||
| 256 | 322 | } |
| 257 | 323 | |
| 258 | 324 | if (isset($line['heading']) && $line['heading'] != '') { |
| 259 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 325 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) { |
|
| 326 | + $this->all_tracked[$id]['putinarchive'] = true; |
|
| 327 | + } |
|
| 260 | 328 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
| 261 | 329 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
| 262 | 330 | //$dataFound = true; |
| 263 | 331 | } elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) { |
| 264 | 332 | $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
| 265 | 333 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
| 266 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 267 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 334 | + if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) { |
|
| 335 | + $this->all_tracked[$id]['putinarchive'] = true; |
|
| 336 | + } |
|
| 337 | + if ($globalDebug) { |
|
| 338 | + echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 339 | + } |
|
| 268 | 340 | } |
| 269 | 341 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 270 | 342 | |
@@ -273,20 +345,31 @@ discard block |
||
| 273 | 345 | if ($this->all_tracked[$id]['addedTracker'] == 0) { |
| 274 | 346 | if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 275 | 347 | if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
| 276 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 348 | + if ($globalDebug) { |
|
| 349 | + echo "Check if aircraft is already in DB..."; |
|
| 350 | + } |
|
| 277 | 351 | $timeelapsed = microtime(true); |
| 278 | 352 | $TrackerLive = new TrackerLive($this->db); |
| 279 | 353 | if (isset($line['id'])) { |
| 280 | 354 | $recent_ident = $TrackerLive->checkIdRecent($line['id']); |
| 281 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 355 | + if ($globalDebugTimeElapsed) { |
|
| 356 | + echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 357 | + } |
|
| 282 | 358 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 283 | 359 | $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
| 284 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 285 | - } else $recent_ident = ''; |
|
| 360 | + if ($globalDebugTimeElapsed) { |
|
| 361 | + echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 362 | + } |
|
| 363 | + } else { |
|
| 364 | + $recent_ident = ''; |
|
| 365 | + } |
|
| 286 | 366 | $TrackerLive->db=null; |
| 287 | 367 | |
| 288 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 289 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 368 | + if ($globalDebug && $recent_ident == '') { |
|
| 369 | + echo " Not in DB.\n"; |
|
| 370 | + } elseif ($globalDebug && $recent_ident != '') { |
|
| 371 | + echo " Already in DB.\n"; |
|
| 372 | + } |
|
| 290 | 373 | } else { |
| 291 | 374 | $recent_ident = ''; |
| 292 | 375 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
@@ -294,27 +377,41 @@ discard block |
||
| 294 | 377 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 295 | 378 | if($recent_ident == "") |
| 296 | 379 | { |
| 297 | - if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : "; |
|
| 380 | + if ($globalDebug) { |
|
| 381 | + echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : "; |
|
| 382 | + } |
|
| 298 | 383 | //adds the spotter data for the archive |
| 299 | 384 | $highlight = ''; |
| 300 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 385 | + if (!isset($this->all_tracked[$id]['id'])) { |
|
| 386 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 387 | + } |
|
| 301 | 388 | $timeelapsed = microtime(true); |
| 302 | 389 | $Tracker = new Tracker($this->db); |
| 303 | 390 | $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
| 304 | 391 | $Tracker->db = null; |
| 305 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 306 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 392 | + if ($globalDebug && isset($result)) { |
|
| 393 | + echo $result."\n"; |
|
| 394 | + } |
|
| 395 | + if ($globalDebugTimeElapsed) { |
|
| 396 | + echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 397 | + } |
|
| 307 | 398 | |
| 308 | 399 | |
| 309 | 400 | // Add source stat in DB |
| 310 | 401 | $Stats = new Stats($this->db); |
| 311 | 402 | if (!empty($this->stats)) { |
| 312 | - if ($globalDebug) echo 'Add source stats : '; |
|
| 403 | + if ($globalDebug) { |
|
| 404 | + echo 'Add source stats : '; |
|
| 405 | + } |
|
| 313 | 406 | foreach($this->stats as $date => $data) { |
| 314 | 407 | foreach($data as $source => $sourced) { |
| 315 | 408 | //print_r($sourced); |
| 316 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date); |
|
| 317 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date); |
|
| 409 | + if (isset($sourced['polar'])) { |
|
| 410 | + echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date); |
|
| 411 | + } |
|
| 412 | + if (isset($sourced['hist'])) { |
|
| 413 | + echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date); |
|
| 414 | + } |
|
| 318 | 415 | if (isset($sourced['msg'])) { |
| 319 | 416 | if (time() - $sourced['msg']['date'] > 10) { |
| 320 | 417 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
@@ -327,7 +424,9 @@ discard block |
||
| 327 | 424 | unset($this->stats[$date]); |
| 328 | 425 | } |
| 329 | 426 | } |
| 330 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 427 | + if ($globalDebug) { |
|
| 428 | + echo 'Done'."\n"; |
|
| 429 | + } |
|
| 331 | 430 | |
| 332 | 431 | } |
| 333 | 432 | $Stats->db = null; |
@@ -337,12 +436,16 @@ discard block |
||
| 337 | 436 | $this->all_tracked[$id]['addedTracker'] = 1; |
| 338 | 437 | //print_r($this->all_tracked[$id]); |
| 339 | 438 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 340 | - if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours..."; |
|
| 439 | + if ($globalDebug) { |
|
| 440 | + echo "---- Deleting Live Tracker data older than 9 hours..."; |
|
| 441 | + } |
|
| 341 | 442 | //TrackerLive->deleteLiveTrackerDataNotUpdated(); |
| 342 | 443 | $TrackerLive = new TrackerLive($this->db); |
| 343 | 444 | $TrackerLive->deleteLiveTrackerData(); |
| 344 | 445 | $TrackerLive->db=null; |
| 345 | - if ($globalDebug) echo " Done\n"; |
|
| 446 | + if ($globalDebug) { |
|
| 447 | + echo " Done\n"; |
|
| 448 | + } |
|
| 346 | 449 | $this->last_delete = time(); |
| 347 | 450 | } |
| 348 | 451 | } else { |
@@ -365,19 +468,25 @@ discard block |
||
| 365 | 468 | |
| 366 | 469 | if (!$ignoreImport) { |
| 367 | 470 | if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 368 | - if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
|
| 471 | + if ($globalDebug) { |
|
| 472 | + echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
|
| 473 | + } |
|
| 369 | 474 | $timeelapsed = microtime(true); |
| 370 | 475 | $TrackerLive = new TrackerLive($this->db); |
| 371 | 476 | $result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
| 372 | 477 | $TrackerLive->db = null; |
| 373 | 478 | $this->all_tracked[$id]['putinarchive'] = false; |
| 374 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 479 | + if ($globalDebugTimeElapsed) { |
|
| 480 | + echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 481 | + } |
|
| 375 | 482 | |
| 376 | 483 | // Put statistics in $this->stats variable |
| 377 | 484 | |
| 378 | 485 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') { |
| 379 | 486 | $source = $this->all_tracked[$id]['source_name']; |
| 380 | - if ($source == '') $source = $this->all_tracked[$id]['format_source']; |
|
| 487 | + if ($source == '') { |
|
| 488 | + $source = $this->all_tracked[$id]['format_source']; |
|
| 489 | + } |
|
| 381 | 490 | if (!isset($this->source_location[$source])) { |
| 382 | 491 | $Location = new Source(); |
| 383 | 492 | $coord = $Location->getLocationInfobySourceName($source); |
@@ -398,7 +507,9 @@ discard block |
||
| 398 | 507 | $stats_heading = round($stats_heading/22.5); |
| 399 | 508 | $stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
| 400 | 509 | $current_date = date('Y-m-d'); |
| 401 | - if ($stats_heading == 16) $stats_heading = 0; |
|
| 510 | + if ($stats_heading == 16) { |
|
| 511 | + $stats_heading = 0; |
|
| 512 | + } |
|
| 402 | 513 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 403 | 514 | for ($i=0;$i<=15;$i++) { |
| 404 | 515 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
@@ -416,7 +527,9 @@ discard block |
||
| 416 | 527 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 417 | 528 | end($this->stats[$current_date][$source]['hist']); |
| 418 | 529 | $mini = key($this->stats[$current_date][$source]['hist'])+10; |
| 419 | - } else $mini = 0; |
|
| 530 | + } else { |
|
| 531 | + $mini = 0; |
|
| 532 | + } |
|
| 420 | 533 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 421 | 534 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 422 | 535 | } |
@@ -427,19 +540,29 @@ discard block |
||
| 427 | 540 | } |
| 428 | 541 | |
| 429 | 542 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 430 | - if ($this->all_tracked[$id]['putinarchive']) $send = true; |
|
| 431 | - if ($globalDebug) echo $result."\n"; |
|
| 432 | - } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 543 | + if ($this->all_tracked[$id]['putinarchive']) { |
|
| 544 | + $send = true; |
|
| 545 | + } |
|
| 546 | + if ($globalDebug) { |
|
| 547 | + echo $result."\n"; |
|
| 548 | + } |
|
| 549 | + } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) { |
|
| 550 | + echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 551 | + } |
|
| 433 | 552 | //$this->del(); |
| 434 | 553 | |
| 435 | 554 | |
| 436 | 555 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 437 | - if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour..."; |
|
| 556 | + if ($globalDebug) { |
|
| 557 | + echo "---- Deleting Live Tracker data Not updated since 2 hour..."; |
|
| 558 | + } |
|
| 438 | 559 | $TrackerLive = new TrackerLive($this->db); |
| 439 | 560 | $TrackerLive->deleteLiveTrackerDataNotUpdated(); |
| 440 | 561 | $TrackerLive->db = null; |
| 441 | 562 | //TrackerLive->deleteLiveTrackerData(); |
| 442 | - if ($globalDebug) echo " Done\n"; |
|
| 563 | + if ($globalDebug) { |
|
| 564 | + echo " Done\n"; |
|
| 565 | + } |
|
| 443 | 566 | $this->last_delete_hourly = time(); |
| 444 | 567 | } |
| 445 | 568 | |
@@ -447,7 +570,9 @@ discard block |
||
| 447 | 570 | //$ignoreImport = false; |
| 448 | 571 | } |
| 449 | 572 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 450 | - if ($send) return $this->all_tracked[$id]; |
|
| 573 | + if ($send) { |
|
| 574 | + return $this->all_tracked[$id]; |
|
| 575 | + } |
|
| 451 | 576 | } |
| 452 | 577 | } |
| 453 | 578 | } |
@@ -9,25 +9,25 @@ discard block |
||
| 9 | 9 | require_once(dirname(__FILE__).'/class.Stats.php'); |
| 10 | 10 | require_once(dirname(__FILE__).'/class.Source.php'); |
| 11 | 11 | if (isset($globalServerAPRS) && $globalServerAPRS) { |
| 12 | - require_once(dirname(__FILE__).'/class.APRS.php'); |
|
| 12 | + require_once(dirname(__FILE__).'/class.APRS.php'); |
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | class MarineImport { |
| 16 | - private $all_tracked = array(); |
|
| 17 | - private $last_delete_hourly = 0; |
|
| 18 | - private $last_delete = 0; |
|
| 19 | - private $stats = array(); |
|
| 20 | - private $tmd = 0; |
|
| 21 | - private $source_location = array(); |
|
| 22 | - public $db = null; |
|
| 23 | - public $nb = 0; |
|
| 16 | + private $all_tracked = array(); |
|
| 17 | + private $last_delete_hourly = 0; |
|
| 18 | + private $last_delete = 0; |
|
| 19 | + private $stats = array(); |
|
| 20 | + private $tmd = 0; |
|
| 21 | + private $source_location = array(); |
|
| 22 | + public $db = null; |
|
| 23 | + public $nb = 0; |
|
| 24 | 24 | |
| 25 | - public function __construct($dbc = null) { |
|
| 25 | + public function __construct($dbc = null) { |
|
| 26 | 26 | global $globalBeta, $globalServerAPRS, $APRSMarine, $globalNoDB; |
| 27 | 27 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 28 | - $Connection = new Connection($dbc); |
|
| 29 | - $this->db = $Connection->db(); |
|
| 30 | - date_default_timezone_set('UTC'); |
|
| 28 | + $Connection = new Connection($dbc); |
|
| 29 | + $this->db = $Connection->db(); |
|
| 30 | + date_default_timezone_set('UTC'); |
|
| 31 | 31 | } |
| 32 | 32 | // Get previous source stats |
| 33 | 33 | /* |
@@ -46,55 +46,55 @@ discard block |
||
| 46 | 46 | } |
| 47 | 47 | */ |
| 48 | 48 | if (isset($globalServerAPRS) && $globalServerAPRS) { |
| 49 | - $APRSMarine = new APRSMarine(); |
|
| 50 | - //$APRSSpotter->connect(); |
|
| 49 | + $APRSMarine = new APRSMarine(); |
|
| 50 | + //$APRSSpotter->connect(); |
|
| 51 | + } |
|
| 51 | 52 | } |
| 52 | - } |
|
| 53 | 53 | |
| 54 | - public function checkAll() { |
|
| 54 | + public function checkAll() { |
|
| 55 | 55 | global $globalDebug; |
| 56 | 56 | if ($globalDebug) echo "Update last seen tracked data...\n"; |
| 57 | 57 | foreach ($this->all_tracked as $key => $flight) { |
| 58 | - if (isset($this->all_tracked[$key]['id'])) { |
|
| 58 | + if (isset($this->all_tracked[$key]['id'])) { |
|
| 59 | 59 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
| 60 | - $Marine = new Marine($this->db); |
|
| 61 | - $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 62 | - } |
|
| 60 | + $Marine = new Marine($this->db); |
|
| 61 | + $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 62 | + } |
|
| 63 | + } |
|
| 63 | 64 | } |
| 64 | - } |
|
| 65 | 65 | |
| 66 | - public function del() { |
|
| 66 | + public function del() { |
|
| 67 | 67 | global $globalDebug, $globalNoDB, $globalNoImport; |
| 68 | 68 | // Delete old infos |
| 69 | 69 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 70 | 70 | foreach ($this->all_tracked as $key => $flight) { |
| 71 | - if (isset($flight['lastupdate'])) { |
|
| 72 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 73 | - if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 74 | - if (isset($this->all_tracked[$key]['id'])) { |
|
| 75 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 76 | - /* |
|
| 71 | + if (isset($flight['lastupdate'])) { |
|
| 72 | + if ($flight['lastupdate'] < (time()-3000)) { |
|
| 73 | + if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 74 | + if (isset($this->all_tracked[$key]['id'])) { |
|
| 75 | + if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 76 | + /* |
|
| 77 | 77 | $MarineLive = new MarineLive(); |
| 78 | 78 | $MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']); |
| 79 | 79 | $MarineLive->db = null; |
| 80 | 80 | */ |
| 81 | - //$real_arrival = $this->arrival($key); |
|
| 82 | - $Marine = new Marine($this->db); |
|
| 83 | - if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
|
| 81 | + //$real_arrival = $this->arrival($key); |
|
| 82 | + $Marine = new Marine($this->db); |
|
| 83 | + if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
|
| 84 | 84 | $result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
| 85 | 85 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 86 | - } |
|
| 87 | - // Put in archive |
|
| 86 | + } |
|
| 87 | + // Put in archive |
|
| 88 | 88 | // $Marine->db = null; |
| 89 | 89 | } |
| 90 | - } |
|
| 91 | - unset($this->all_tracked[$key]); |
|
| 92 | - } |
|
| 93 | - } |
|
| 94 | - } |
|
| 95 | - } |
|
| 90 | + } |
|
| 91 | + unset($this->all_tracked[$key]); |
|
| 92 | + } |
|
| 93 | + } |
|
| 94 | + } |
|
| 95 | + } |
|
| 96 | 96 | |
| 97 | - public function add($line) { |
|
| 97 | + public function add($line) { |
|
| 98 | 98 | global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine; |
| 99 | 99 | if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
| 100 | 100 | date_default_timezone_set('UTC'); |
@@ -103,83 +103,83 @@ discard block |
||
| 103 | 103 | |
| 104 | 104 | // SBS format is CSV format |
| 105 | 105 | if(is_array($line) && isset($line['mmsi'])) { |
| 106 | - //print_r($line); |
|
| 107 | - if (isset($line['mmsi'])) { |
|
| 106 | + //print_r($line); |
|
| 107 | + if (isset($line['mmsi'])) { |
|
| 108 | 108 | |
| 109 | 109 | |
| 110 | 110 | // Increment message number |
| 111 | 111 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) { |
| 112 | - $current_date = date('Y-m-d'); |
|
| 113 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 114 | - else $source = ''; |
|
| 115 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 116 | - if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 117 | - $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 118 | - $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 119 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 112 | + $current_date = date('Y-m-d'); |
|
| 113 | + if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 114 | + else $source = ''; |
|
| 115 | + if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 116 | + if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 117 | + $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 118 | + $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 119 | + } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | |
| 123 | 123 | $Common = new Common(); |
| 124 | 124 | $AIS = new AIS(); |
| 125 | - if (!isset($line['id'])) $id = trim($line['mmsi']); |
|
| 126 | - else $id = trim($line['id']); |
|
| 125 | + if (!isset($line['id'])) $id = trim($line['mmsi']); |
|
| 126 | + else $id = trim($line['id']); |
|
| 127 | 127 | |
| 128 | 128 | if (!isset($this->all_tracked[$id])) { |
| 129 | - $this->all_tracked[$id] = array(); |
|
| 130 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0)); |
|
| 131 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => '')); |
|
| 132 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 133 | - if (!isset($line['id'])) { |
|
| 129 | + $this->all_tracked[$id] = array(); |
|
| 130 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0)); |
|
| 131 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => '')); |
|
| 132 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 133 | + if (!isset($line['id'])) { |
|
| 134 | 134 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 135 | 135 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 136 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 137 | - if ($globalAllTracked !== FALSE) $dataFound = true; |
|
| 136 | + } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 137 | + if ($globalAllTracked !== FALSE) $dataFound = true; |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) { |
| 141 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi'])); |
|
| 142 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 141 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi'])); |
|
| 142 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 143 | 143 | $Marine = new Marine($this->db); |
| 144 | 144 | $identity = $Marine->getIdentity($line['mmsi']); |
| 145 | 145 | if (!empty($identity)) { |
| 146 | - $this->all_tracked[$id]['ident'] = $identity['ship_name']; |
|
| 147 | - $this->all_tracked[$id]['type'] = $identity['type']; |
|
| 146 | + $this->all_tracked[$id]['ident'] = $identity['ship_name']; |
|
| 147 | + $this->all_tracked[$id]['type'] = $identity['type']; |
|
| 148 | 148 | } |
| 149 | 149 | //print_r($identity); |
| 150 | 150 | unset($Marine); |
| 151 | 151 | //$dataFound = true; |
| 152 | - } |
|
| 152 | + } |
|
| 153 | 153 | } |
| 154 | 154 | if (isset($line['type_id'])) { |
| 155 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id']))); |
|
| 155 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id']))); |
|
| 156 | 156 | } |
| 157 | 157 | if (isset($line['type']) && $line['type'] != '') { |
| 158 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 158 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 159 | 159 | } |
| 160 | 160 | if (isset($line['mmsi_type']) && $line['mmsi_type'] != '') { |
| 161 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type'])); |
|
| 161 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type'])); |
|
| 162 | 162 | } |
| 163 | 163 | if (isset($line['imo']) && $line['imo'] != '') { |
| 164 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo'])); |
|
| 164 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo'])); |
|
| 165 | 165 | } |
| 166 | 166 | if (isset($line['callsign']) && $line['callsign'] != '') { |
| 167 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign'])); |
|
| 167 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign'])); |
|
| 168 | 168 | } |
| 169 | 169 | if (isset($line['arrival_code']) && $line['arrival_code'] != '') { |
| 170 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code'])); |
|
| 170 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code'])); |
|
| 171 | 171 | } |
| 172 | 172 | if (isset($line['arrival_date']) && $line['arrival_date'] != '') { |
| 173 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date'])); |
|
| 173 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date'])); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | |
| 177 | 177 | //if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) { |
| 178 | 178 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) { |
| 179 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 180 | - if ($this->all_tracked[$id]['addedMarine'] == 1) { |
|
| 179 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 180 | + if ($this->all_tracked[$id]['addedMarine'] == 1) { |
|
| 181 | 181 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 182 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 182 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 183 | 183 | $timeelapsed = microtime(true); |
| 184 | 184 | $Marine = new Marine($this->db); |
| 185 | 185 | $fromsource = NULL; |
@@ -187,20 +187,20 @@ discard block |
||
| 187 | 187 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 188 | 188 | $Marine->db = null; |
| 189 | 189 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 190 | - } |
|
| 190 | + } |
|
| 191 | + } |
|
| 191 | 192 | } |
| 192 | - } |
|
| 193 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 193 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 197 | - if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) { |
|
| 197 | + if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) { |
|
| 198 | 198 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
| 199 | - } else { |
|
| 199 | + } else { |
|
| 200 | 200 | if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n"; |
| 201 | 201 | elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n"; |
| 202 | 202 | return ''; |
| 203 | - } |
|
| 203 | + } |
|
| 204 | 204 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 205 | 205 | if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
| 206 | 206 | return ''; |
@@ -217,24 +217,24 @@ discard block |
||
| 217 | 217 | |
| 218 | 218 | |
| 219 | 219 | if (isset($line['speed'])) { |
| 220 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 221 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 220 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 221 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 222 | 222 | } else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 223 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 224 | - if ($distance > 1000 && $distance < 10000) { |
|
| 223 | + $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 224 | + if ($distance > 1000 && $distance < 10000) { |
|
| 225 | 225 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 226 | 226 | $speed = $speed*3.6; |
| 227 | 227 | if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
| 228 | 228 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n"; |
| 229 | - } |
|
| 229 | + } |
|
| 230 | 230 | } |
| 231 | 231 | |
| 232 | - if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 233 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 234 | - else unset($timediff); |
|
| 235 | - if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
|
| 232 | + if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 233 | + if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 234 | + else unset($timediff); |
|
| 235 | + if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
|
| 236 | 236 | if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) { |
| 237 | - if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 237 | + if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 238 | 238 | $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 239 | 239 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 240 | 240 | $this->all_tracked[$id]['putinarchive'] = true; |
@@ -242,211 +242,211 @@ discard block |
||
| 242 | 242 | if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
| 243 | 243 | $timeelapsed = microtime(true); |
| 244 | 244 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 245 | - $Marine = new Marine($this->db); |
|
| 246 | - $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 247 | - if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
|
| 248 | - $Marine->db = null; |
|
| 249 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 245 | + $Marine = new Marine($this->db); |
|
| 246 | + $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 247 | + if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
|
| 248 | + $Marine->db = null; |
|
| 249 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 250 | 250 | } |
| 251 | 251 | $this->tmd = 0; |
| 252 | 252 | if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
| 253 | - } |
|
| 253 | + } |
|
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 257 | 257 | if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 258 | 258 | if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 259 | - $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
|
| 260 | - $dataFound = true; |
|
| 261 | - $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 259 | + $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
|
| 260 | + $dataFound = true; |
|
| 261 | + $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 262 | 262 | } |
| 263 | 263 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
| 264 | 264 | } |
| 265 | 265 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 266 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 266 | + if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 267 | 267 | if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 268 | 268 | if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 269 | - $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
|
| 270 | - $dataFound = true; |
|
| 271 | - $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 269 | + $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
|
| 270 | + $dataFound = true; |
|
| 271 | + $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 272 | 272 | } |
| 273 | 273 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude'])); |
| 274 | 274 | } |
| 275 | 275 | |
| 276 | - } else if ($globalDebug && $timediff > 20) { |
|
| 276 | + } else if ($globalDebug && $timediff > 20) { |
|
| 277 | 277 | $this->tmd = $this->tmd + 1; |
| 278 | 278 | echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n"; |
| 279 | 279 | echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -"; |
| 280 | 280 | echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
| 281 | 281 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n"; |
| 282 | - } |
|
| 282 | + } |
|
| 283 | 283 | } |
| 284 | 284 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 285 | - if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 286 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 285 | + if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 286 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 287 | 287 | } |
| 288 | 288 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 289 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 289 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 290 | 290 | } |
| 291 | 291 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 292 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 292 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 293 | 293 | } |
| 294 | 294 | if (isset($line['status']) && $line['status'] != '') { |
| 295 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status'])); |
|
| 295 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status'])); |
|
| 296 | 296 | } |
| 297 | 297 | if (isset($line['status_id']) && (!isset($this->all_tracked[$id]['status_id']) || $this->all_tracked[$id]['status_id'] != $line['status_id'])) { |
| 298 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id'])); |
|
| 299 | - if ($this->all_tracked[$id]['addedMarine'] == 1) { |
|
| 298 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id'])); |
|
| 299 | + if ($this->all_tracked[$id]['addedMarine'] == 1) { |
|
| 300 | 300 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 301 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 301 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 302 | 302 | $Marine = new Marine($this->db); |
| 303 | 303 | $Marine->updateStatusMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['status']); |
| 304 | 304 | unset($Marine); |
| 305 | - } |
|
| 305 | + } |
|
| 306 | + } |
|
| 306 | 307 | } |
| 307 | - } |
|
| 308 | 308 | } |
| 309 | 309 | |
| 310 | 310 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 311 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 311 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | if (isset($line['heading']) && $line['heading'] != '') { |
| 315 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 316 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 317 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 318 | - //$dataFound = true; |
|
| 315 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 316 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 317 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 318 | + //$dataFound = true; |
|
| 319 | 319 | } elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) { |
| 320 | - $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 321 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 322 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 323 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 320 | + $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 321 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 322 | + if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 323 | + if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 324 | 324 | } |
| 325 | 325 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 326 | 326 | |
| 327 | 327 | |
| 328 | 328 | |
| 329 | 329 | if ($dataFound === true && isset($this->all_tracked[$id]['mmsi'])) { |
| 330 | - $this->all_tracked[$id]['lastupdate'] = time(); |
|
| 331 | - if ($this->all_tracked[$id]['addedMarine'] == 0) { |
|
| 332 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 333 | - if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
|
| 330 | + $this->all_tracked[$id]['lastupdate'] = time(); |
|
| 331 | + if ($this->all_tracked[$id]['addedMarine'] == 0) { |
|
| 332 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 333 | + if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
|
| 334 | 334 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 335 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 336 | - $timeelapsed = microtime(true); |
|
| 337 | - $MarineLive = new MarineLive($this->db); |
|
| 338 | - if (isset($line['id'])) { |
|
| 335 | + if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 336 | + $timeelapsed = microtime(true); |
|
| 337 | + $MarineLive = new MarineLive($this->db); |
|
| 338 | + if (isset($line['id'])) { |
|
| 339 | 339 | $recent_ident = $MarineLive->checkIdRecent($line['id']); |
| 340 | 340 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 341 | - } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') { |
|
| 341 | + } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') { |
|
| 342 | 342 | $recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']); |
| 343 | 343 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 344 | - } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
|
| 344 | + } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
|
| 345 | 345 | $recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
| 346 | 346 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 347 | - } else $recent_ident = ''; |
|
| 348 | - $MarineLive->db=null; |
|
| 349 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 350 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 347 | + } else $recent_ident = ''; |
|
| 348 | + $MarineLive->db=null; |
|
| 349 | + if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 350 | + elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 351 | 351 | } else $recent_ident = ''; |
| 352 | - } else { |
|
| 352 | + } else { |
|
| 353 | 353 | $recent_ident = ''; |
| 354 | 354 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
| 355 | - } |
|
| 356 | - //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 357 | - if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
|
| 358 | - { |
|
| 355 | + } |
|
| 356 | + //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 357 | + if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
|
| 358 | + { |
|
| 359 | 359 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : "; |
| 360 | 360 | //adds the spotter data for the archive |
| 361 | - $highlight = ''; |
|
| 362 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 363 | - if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
|
| 361 | + $highlight = ''; |
|
| 362 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 363 | + if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
|
| 364 | 364 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 365 | - $timeelapsed = microtime(true); |
|
| 366 | - $Marine = new Marine($this->db); |
|
| 367 | - $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 368 | - $Marine->db = null; |
|
| 369 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 370 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 365 | + $timeelapsed = microtime(true); |
|
| 366 | + $Marine = new Marine($this->db); |
|
| 367 | + $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 368 | + $Marine->db = null; |
|
| 369 | + if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 370 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 371 | 371 | } |
| 372 | - } |
|
| 373 | - if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') { |
|
| 372 | + } |
|
| 373 | + if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') { |
|
| 374 | 374 | // Add source stat in DB |
| 375 | 375 | $Stats = new Stats($this->db); |
| 376 | 376 | if (!empty($this->stats)) { |
| 377 | - if ($globalDebug) echo 'Add source stats : '; |
|
| 378 | - foreach($this->stats as $date => $data) { |
|
| 377 | + if ($globalDebug) echo 'Add source stats : '; |
|
| 378 | + foreach($this->stats as $date => $data) { |
|
| 379 | 379 | foreach($data as $source => $sourced) { |
| 380 | - //print_r($sourced); |
|
| 381 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date); |
|
| 382 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date); |
|
| 383 | - if (isset($sourced['msg'])) { |
|
| 384 | - if (time() - $sourced['msg']['date'] > 10) { |
|
| 385 | - $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 386 | - echo $Stats->addStatSource($nbmsg,$source,'msg_marine',$date); |
|
| 387 | - unset($this->stats[$date][$source]['msg']); |
|
| 388 | - } |
|
| 389 | - } |
|
| 390 | - } |
|
| 391 | - if ($date != date('Y-m-d')) { |
|
| 392 | - unset($this->stats[$date]); |
|
| 393 | - } |
|
| 394 | - } |
|
| 395 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 380 | + //print_r($sourced); |
|
| 381 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date); |
|
| 382 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date); |
|
| 383 | + if (isset($sourced['msg'])) { |
|
| 384 | + if (time() - $sourced['msg']['date'] > 10) { |
|
| 385 | + $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 386 | + echo $Stats->addStatSource($nbmsg,$source,'msg_marine',$date); |
|
| 387 | + unset($this->stats[$date][$source]['msg']); |
|
| 388 | + } |
|
| 389 | + } |
|
| 390 | + } |
|
| 391 | + if ($date != date('Y-m-d')) { |
|
| 392 | + unset($this->stats[$date]); |
|
| 393 | + } |
|
| 394 | + } |
|
| 395 | + if ($globalDebug) echo 'Done'."\n"; |
|
| 396 | 396 | } |
| 397 | 397 | $Stats->db = null; |
| 398 | - } |
|
| 398 | + } |
|
| 399 | 399 | |
| 400 | - $this->del(); |
|
| 400 | + $this->del(); |
|
| 401 | 401 | //$ignoreImport = false; |
| 402 | 402 | $this->all_tracked[$id]['addedMarine'] = 1; |
| 403 | 403 | //print_r($this->all_tracked[$id]); |
| 404 | 404 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 405 | - if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours..."; |
|
| 406 | - //MarineLive->deleteLiveMarineDataNotUpdated(); |
|
| 407 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 405 | + if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours..."; |
|
| 406 | + //MarineLive->deleteLiveMarineDataNotUpdated(); |
|
| 407 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 408 | 408 | $MarineLive = new MarineLive($this->db); |
| 409 | 409 | $MarineLive->deleteLiveMarineData(); |
| 410 | 410 | $MarineLive->db=null; |
| 411 | 411 | if ($globalDebug) echo " Done\n"; |
| 412 | - } |
|
| 413 | - $this->last_delete = time(); |
|
| 412 | + } |
|
| 413 | + $this->last_delete = time(); |
|
| 414 | 414 | } |
| 415 | - } elseif ($recent_ident != '') { |
|
| 415 | + } elseif ($recent_ident != '') { |
|
| 416 | 416 | $this->all_tracked[$id]['id'] = $recent_ident; |
| 417 | 417 | $this->all_tracked[$id]['addedMarine'] = 1; |
| 418 | 418 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 419 | - if (isset($globalDaemon) && !$globalDaemon) { |
|
| 419 | + if (isset($globalDaemon) && !$globalDaemon) { |
|
| 420 | 420 | $Marine = new Marine($this->db); |
| 421 | 421 | $Marine->updateLatestMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']); |
| 422 | 422 | $Marine->db = null; |
| 423 | - } |
|
| 423 | + } |
|
| 424 | 424 | } |
| 425 | 425 | |
| 426 | - } |
|
| 426 | + } |
|
| 427 | + } |
|
| 427 | 428 | } |
| 428 | - } |
|
| 429 | - //adds the spotter LIVE data |
|
| 430 | - if ($globalDebug) { |
|
| 429 | + //adds the spotter LIVE data |
|
| 430 | + if ($globalDebug) { |
|
| 431 | 431 | echo 'DATA : ident : '.$this->all_tracked[$id]['ident'].' - type : '.$this->all_tracked[$id]['type'].' - Latitude : '.$this->all_tracked[$id]['latitude'].' - Longitude : '.$this->all_tracked[$id]['longitude'].' - Heading : '.$this->all_tracked[$id]['heading'].' - Speed : '.$this->all_tracked[$id]['speed']."\n"; |
| 432 | - } |
|
| 433 | - $ignoreImport = false; |
|
| 432 | + } |
|
| 433 | + $ignoreImport = false; |
|
| 434 | 434 | |
| 435 | - if (!$ignoreImport) { |
|
| 435 | + if (!$ignoreImport) { |
|
| 436 | 436 | if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 437 | 437 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
| 438 | 438 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 439 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 439 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 440 | 440 | $timeelapsed = microtime(true); |
| 441 | 441 | $MarineLive = new MarineLive($this->db); |
| 442 | 442 | $result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
| 443 | 443 | $MarineLive->db = null; |
| 444 | 444 | if ($globalDebug) echo $result."\n"; |
| 445 | 445 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 446 | - } |
|
| 446 | + } |
|
| 447 | 447 | } |
| 448 | 448 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) { |
| 449 | - $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 449 | + $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 450 | 450 | } |
| 451 | 451 | $this->all_tracked[$id]['putinarchive'] = false; |
| 452 | 452 | |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | if ($stats_heading == 16) $stats_heading = 0; |
| 479 | 479 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 480 | 480 | for ($i=0;$i<=15;$i++) { |
| 481 | - $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 481 | + $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 482 | 482 | } |
| 483 | 483 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
| 484 | 484 | } else { |
@@ -491,11 +491,11 @@ discard block |
||
| 491 | 491 | //var_dump($this->stats); |
| 492 | 492 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 493 | 493 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 494 | - end($this->stats[$current_date][$source]['hist']); |
|
| 495 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 494 | + end($this->stats[$current_date][$source]['hist']); |
|
| 495 | + $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 496 | 496 | } else $mini = 0; |
| 497 | 497 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 498 | - $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 498 | + $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 499 | 499 | } |
| 500 | 500 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
| 501 | 501 | } else { |
@@ -511,24 +511,24 @@ discard block |
||
| 511 | 511 | |
| 512 | 512 | |
| 513 | 513 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 514 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 514 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 515 | 515 | if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour..."; |
| 516 | 516 | $MarineLive = new MarineLive($this->db); |
| 517 | 517 | $MarineLive->deleteLiveMarineDataNotUpdated(); |
| 518 | 518 | $MarineLive->db = null; |
| 519 | 519 | //MarineLive->deleteLiveMarineData(); |
| 520 | 520 | if ($globalDebug) echo " Done\n"; |
| 521 | - } |
|
| 522 | - $this->last_delete_hourly = time(); |
|
| 521 | + } |
|
| 522 | + $this->last_delete_hourly = time(); |
|
| 523 | 523 | } |
| 524 | 524 | |
| 525 | - } |
|
| 526 | - //$ignoreImport = false; |
|
| 525 | + } |
|
| 526 | + //$ignoreImport = false; |
|
| 527 | 527 | } |
| 528 | 528 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 529 | 529 | if ($send) return $this->all_tracked[$id]; |
| 530 | - } |
|
| 530 | + } |
|
| 531 | + } |
|
| 531 | 532 | } |
| 532 | - } |
|
| 533 | 533 | } |
| 534 | 534 | ?> |
@@ -53,7 +53,9 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | public function checkAll() { |
| 55 | 55 | global $globalDebug; |
| 56 | - if ($globalDebug) echo "Update last seen tracked data...\n"; |
|
| 56 | + if ($globalDebug) { |
|
| 57 | + echo "Update last seen tracked data...\n"; |
|
| 58 | + } |
|
| 57 | 59 | foreach ($this->all_tracked as $key => $flight) { |
| 58 | 60 | if (isset($this->all_tracked[$key]['id'])) { |
| 59 | 61 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
@@ -66,13 +68,17 @@ discard block |
||
| 66 | 68 | public function del() { |
| 67 | 69 | global $globalDebug, $globalNoDB, $globalNoImport; |
| 68 | 70 | // Delete old infos |
| 69 | - if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
|
| 71 | + if ($globalDebug) { |
|
| 72 | + echo 'Delete old values and update latest data...'."\n"; |
|
| 73 | + } |
|
| 70 | 74 | foreach ($this->all_tracked as $key => $flight) { |
| 71 | 75 | if (isset($flight['lastupdate'])) { |
| 72 | 76 | if ($flight['lastupdate'] < (time()-3000)) { |
| 73 | 77 | if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 74 | 78 | if (isset($this->all_tracked[$key]['id'])) { |
| 75 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 79 | + if ($globalDebug) { |
|
| 80 | + echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 81 | + } |
|
| 76 | 82 | /* |
| 77 | 83 | $MarineLive = new MarineLive(); |
| 78 | 84 | $MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']); |
@@ -82,7 +88,9 @@ discard block |
||
| 82 | 88 | $Marine = new Marine($this->db); |
| 83 | 89 | if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
| 84 | 90 | $result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
| 85 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 91 | + if ($globalDebug && $result != 'success') { |
|
| 92 | + echo '!!! ERROR : '.$result."\n"; |
|
| 93 | + } |
|
| 86 | 94 | } |
| 87 | 95 | // Put in archive |
| 88 | 96 | // $Marine->db = null; |
@@ -96,7 +104,9 @@ discard block |
||
| 96 | 104 | |
| 97 | 105 | public function add($line) { |
| 98 | 106 | global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine; |
| 99 | - if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
|
| 107 | + if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') { |
|
| 108 | + $globalCoordMinChange = '0.02'; |
|
| 109 | + } |
|
| 100 | 110 | date_default_timezone_set('UTC'); |
| 101 | 111 | $dataFound = false; |
| 102 | 112 | $send = false; |
@@ -110,20 +120,30 @@ discard block |
||
| 110 | 120 | // Increment message number |
| 111 | 121 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) { |
| 112 | 122 | $current_date = date('Y-m-d'); |
| 113 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 114 | - else $source = ''; |
|
| 115 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 123 | + if (isset($line['source_name'])) { |
|
| 124 | + $source = $line['source_name']; |
|
| 125 | + } else { |
|
| 126 | + $source = ''; |
|
| 127 | + } |
|
| 128 | + if ($source == '' || $line['format_source'] == 'aprs') { |
|
| 129 | + $source = $line['format_source']; |
|
| 130 | + } |
|
| 116 | 131 | if (!isset($this->stats[$current_date][$source]['msg'])) { |
| 117 | 132 | $this->stats[$current_date][$source]['msg']['date'] = time(); |
| 118 | 133 | $this->stats[$current_date][$source]['msg']['nb'] = 1; |
| 119 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 134 | + } else { |
|
| 135 | + $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 136 | + } |
|
| 120 | 137 | } |
| 121 | 138 | |
| 122 | 139 | |
| 123 | 140 | $Common = new Common(); |
| 124 | 141 | $AIS = new AIS(); |
| 125 | - if (!isset($line['id'])) $id = trim($line['mmsi']); |
|
| 126 | - else $id = trim($line['id']); |
|
| 142 | + if (!isset($line['id'])) { |
|
| 143 | + $id = trim($line['mmsi']); |
|
| 144 | + } else { |
|
| 145 | + $id = trim($line['id']); |
|
| 146 | + } |
|
| 127 | 147 | |
| 128 | 148 | if (!isset($this->all_tracked[$id])) { |
| 129 | 149 | $this->all_tracked[$id] = array(); |
@@ -131,10 +151,16 @@ discard block |
||
| 131 | 151 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => '')); |
| 132 | 152 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
| 133 | 153 | if (!isset($line['id'])) { |
| 134 | - if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
| 154 | + if (!isset($globalDaemon)) { |
|
| 155 | + $globalDaemon = TRUE; |
|
| 156 | + } |
|
| 135 | 157 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 136 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 137 | - if ($globalAllTracked !== FALSE) $dataFound = true; |
|
| 158 | + } else { |
|
| 159 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 160 | + } |
|
| 161 | + if ($globalAllTracked !== FALSE) { |
|
| 162 | + $dataFound = true; |
|
| 163 | + } |
|
| 138 | 164 | } |
| 139 | 165 | |
| 140 | 166 | if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) { |
@@ -184,34 +210,49 @@ discard block |
||
| 184 | 210 | $Marine = new Marine($this->db); |
| 185 | 211 | $fromsource = NULL; |
| 186 | 212 | $result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
| 187 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 213 | + if ($globalDebug && $result != 'success') { |
|
| 214 | + echo '!!! ERROR : '.$result."\n"; |
|
| 215 | + } |
|
| 188 | 216 | $Marine->db = null; |
| 189 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 217 | + if ($globalDebugTimeElapsed) { |
|
| 218 | + echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 219 | + } |
|
| 190 | 220 | } |
| 191 | 221 | } |
| 192 | 222 | } |
| 193 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 223 | + if (!isset($this->all_tracked[$id]['id'])) { |
|
| 224 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 225 | + } |
|
| 194 | 226 | } |
| 195 | 227 | |
| 196 | 228 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 197 | 229 | if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) { |
| 198 | 230 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
| 199 | 231 | } else { |
| 200 | - if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n"; |
|
| 201 | - elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 232 | + if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) { |
|
| 233 | + echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n"; |
|
| 234 | + } elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) { |
|
| 235 | + echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 236 | + } |
|
| 202 | 237 | return ''; |
| 203 | 238 | } |
| 204 | 239 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 205 | - if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
|
| 240 | + if ($globalDebug) { |
|
| 241 | + echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
|
| 242 | + } |
|
| 206 | 243 | return ''; |
| 207 | 244 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
| 208 | - if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
|
| 245 | + if ($globalDebug) { |
|
| 246 | + echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
|
| 247 | + } |
|
| 209 | 248 | return ''; |
| 210 | 249 | } elseif (!isset($line['datetime'])) { |
| 211 | 250 | date_default_timezone_set('UTC'); |
| 212 | 251 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s'))); |
| 213 | 252 | } else { |
| 214 | - if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
|
| 253 | + if ($globalDebug) { |
|
| 254 | + echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
|
| 255 | + } |
|
| 215 | 256 | return ''; |
| 216 | 257 | } |
| 217 | 258 | |
@@ -224,14 +265,21 @@ discard block |
||
| 224 | 265 | if ($distance > 1000 && $distance < 10000) { |
| 225 | 266 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 226 | 267 | $speed = $speed*3.6; |
| 227 | - if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 228 | - if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n"; |
|
| 268 | + if ($speed < 1000) { |
|
| 269 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 270 | + } |
|
| 271 | + if ($globalDebug) { |
|
| 272 | + echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n"; |
|
| 273 | + } |
|
| 229 | 274 | } |
| 230 | 275 | } |
| 231 | 276 | |
| 232 | 277 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 233 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 234 | - else unset($timediff); |
|
| 278 | + if (isset($this->all_tracked[$id]['time_last_coord'])) { |
|
| 279 | + $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 280 | + } else { |
|
| 281 | + unset($timediff); |
|
| 282 | + } |
|
| 235 | 283 | if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
| 236 | 284 | if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) { |
| 237 | 285 | if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
@@ -239,22 +287,32 @@ discard block |
||
| 239 | 287 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 240 | 288 | $this->all_tracked[$id]['putinarchive'] = true; |
| 241 | 289 | |
| 242 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 290 | + if ($globalDebug) { |
|
| 291 | + echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 292 | + } |
|
| 243 | 293 | $timeelapsed = microtime(true); |
| 244 | 294 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 245 | 295 | $Marine = new Marine($this->db); |
| 246 | 296 | $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 247 | - if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
|
| 297 | + if (!empty($all_country)) { |
|
| 298 | + $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
|
| 299 | + } |
|
| 248 | 300 | $Marine->db = null; |
| 249 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 301 | + if ($globalDebugTimeElapsed) { |
|
| 302 | + echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 303 | + } |
|
| 250 | 304 | } |
| 251 | 305 | $this->tmd = 0; |
| 252 | - if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
|
| 306 | + if ($globalDebug) { |
|
| 307 | + echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
|
| 308 | + } |
|
| 253 | 309 | } |
| 254 | 310 | } |
| 255 | 311 | |
| 256 | 312 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 257 | - if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
|
| 313 | + if (!isset($this->all_tracked[$id]['archive_latitude'])) { |
|
| 314 | + $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
|
| 315 | + } |
|
| 258 | 316 | if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 259 | 317 | $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
| 260 | 318 | $dataFound = true; |
@@ -263,8 +321,12 @@ discard block |
||
| 263 | 321 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
| 264 | 322 | } |
| 265 | 323 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 266 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 267 | - if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
|
| 324 | + if ($line['longitude'] > 180) { |
|
| 325 | + $line['longitude'] = $line['longitude'] - 360; |
|
| 326 | + } |
|
| 327 | + if (!isset($this->all_tracked[$id]['archive_longitude'])) { |
|
| 328 | + $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
|
| 329 | + } |
|
| 268 | 330 | if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 269 | 331 | $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
| 270 | 332 | $dataFound = true; |
@@ -282,7 +344,9 @@ discard block |
||
| 282 | 344 | } |
| 283 | 345 | } |
| 284 | 346 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 285 | - if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 347 | + if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) { |
|
| 348 | + $dataFound = true; |
|
| 349 | + } |
|
| 286 | 350 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
| 287 | 351 | } |
| 288 | 352 | if (isset($line['format_source']) && $line['format_source'] != '') { |
@@ -312,15 +376,21 @@ discard block |
||
| 312 | 376 | } |
| 313 | 377 | |
| 314 | 378 | if (isset($line['heading']) && $line['heading'] != '') { |
| 315 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 379 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) { |
|
| 380 | + $this->all_tracked[$id]['putinarchive'] = true; |
|
| 381 | + } |
|
| 316 | 382 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
| 317 | 383 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
| 318 | 384 | //$dataFound = true; |
| 319 | 385 | } elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) { |
| 320 | 386 | $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
| 321 | 387 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
| 322 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 323 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 388 | + if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) { |
|
| 389 | + $this->all_tracked[$id]['putinarchive'] = true; |
|
| 390 | + } |
|
| 391 | + if ($globalDebug) { |
|
| 392 | + echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 393 | + } |
|
| 324 | 394 | } |
| 325 | 395 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 326 | 396 | |
@@ -332,23 +402,38 @@ discard block |
||
| 332 | 402 | if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 333 | 403 | if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
| 334 | 404 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 335 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 405 | + if ($globalDebug) { |
|
| 406 | + echo "Check if aircraft is already in DB..."; |
|
| 407 | + } |
|
| 336 | 408 | $timeelapsed = microtime(true); |
| 337 | 409 | $MarineLive = new MarineLive($this->db); |
| 338 | 410 | if (isset($line['id'])) { |
| 339 | 411 | $recent_ident = $MarineLive->checkIdRecent($line['id']); |
| 340 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 412 | + if ($globalDebugTimeElapsed) { |
|
| 413 | + echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 414 | + } |
|
| 341 | 415 | } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') { |
| 342 | 416 | $recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']); |
| 343 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 417 | + if ($globalDebugTimeElapsed) { |
|
| 418 | + echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 419 | + } |
|
| 344 | 420 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 345 | 421 | $recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
| 346 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 347 | - } else $recent_ident = ''; |
|
| 422 | + if ($globalDebugTimeElapsed) { |
|
| 423 | + echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 424 | + } |
|
| 425 | + } else { |
|
| 426 | + $recent_ident = ''; |
|
| 427 | + } |
|
| 348 | 428 | $MarineLive->db=null; |
| 349 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 350 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 351 | - } else $recent_ident = ''; |
|
| 429 | + if ($globalDebug && $recent_ident == '') { |
|
| 430 | + echo " Not in DB.\n"; |
|
| 431 | + } elseif ($globalDebug && $recent_ident != '') { |
|
| 432 | + echo " Already in DB.\n"; |
|
| 433 | + } |
|
| 434 | + } else { |
|
| 435 | + $recent_ident = ''; |
|
| 436 | + } |
|
| 352 | 437 | } else { |
| 353 | 438 | $recent_ident = ''; |
| 354 | 439 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
@@ -356,30 +441,44 @@ discard block |
||
| 356 | 441 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 357 | 442 | if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
| 358 | 443 | { |
| 359 | - if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : "; |
|
| 444 | + if ($globalDebug) { |
|
| 445 | + echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : "; |
|
| 446 | + } |
|
| 360 | 447 | //adds the spotter data for the archive |
| 361 | 448 | $highlight = ''; |
| 362 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 449 | + if (!isset($this->all_tracked[$id]['id'])) { |
|
| 450 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 451 | + } |
|
| 363 | 452 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 364 | 453 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 365 | 454 | $timeelapsed = microtime(true); |
| 366 | 455 | $Marine = new Marine($this->db); |
| 367 | 456 | $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
| 368 | 457 | $Marine->db = null; |
| 369 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 370 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 458 | + if ($globalDebug && isset($result)) { |
|
| 459 | + echo $result."\n"; |
|
| 460 | + } |
|
| 461 | + if ($globalDebugTimeElapsed) { |
|
| 462 | + echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 463 | + } |
|
| 371 | 464 | } |
| 372 | 465 | } |
| 373 | 466 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') { |
| 374 | 467 | // Add source stat in DB |
| 375 | 468 | $Stats = new Stats($this->db); |
| 376 | 469 | if (!empty($this->stats)) { |
| 377 | - if ($globalDebug) echo 'Add source stats : '; |
|
| 470 | + if ($globalDebug) { |
|
| 471 | + echo 'Add source stats : '; |
|
| 472 | + } |
|
| 378 | 473 | foreach($this->stats as $date => $data) { |
| 379 | 474 | foreach($data as $source => $sourced) { |
| 380 | 475 | //print_r($sourced); |
| 381 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date); |
|
| 382 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date); |
|
| 476 | + if (isset($sourced['polar'])) { |
|
| 477 | + echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date); |
|
| 478 | + } |
|
| 479 | + if (isset($sourced['hist'])) { |
|
| 480 | + echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date); |
|
| 481 | + } |
|
| 383 | 482 | if (isset($sourced['msg'])) { |
| 384 | 483 | if (time() - $sourced['msg']['date'] > 10) { |
| 385 | 484 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
@@ -392,7 +491,9 @@ discard block |
||
| 392 | 491 | unset($this->stats[$date]); |
| 393 | 492 | } |
| 394 | 493 | } |
| 395 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 494 | + if ($globalDebug) { |
|
| 495 | + echo 'Done'."\n"; |
|
| 496 | + } |
|
| 396 | 497 | } |
| 397 | 498 | $Stats->db = null; |
| 398 | 499 | } |
@@ -402,13 +503,17 @@ discard block |
||
| 402 | 503 | $this->all_tracked[$id]['addedMarine'] = 1; |
| 403 | 504 | //print_r($this->all_tracked[$id]); |
| 404 | 505 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 405 | - if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours..."; |
|
| 506 | + if ($globalDebug) { |
|
| 507 | + echo "---- Deleting Live Marine data older than 9 hours..."; |
|
| 508 | + } |
|
| 406 | 509 | //MarineLive->deleteLiveMarineDataNotUpdated(); |
| 407 | 510 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 408 | 511 | $MarineLive = new MarineLive($this->db); |
| 409 | 512 | $MarineLive->deleteLiveMarineData(); |
| 410 | 513 | $MarineLive->db=null; |
| 411 | - if ($globalDebug) echo " Done\n"; |
|
| 514 | + if ($globalDebug) { |
|
| 515 | + echo " Done\n"; |
|
| 516 | + } |
|
| 412 | 517 | } |
| 413 | 518 | $this->last_delete = time(); |
| 414 | 519 | } |
@@ -434,15 +539,21 @@ discard block |
||
| 434 | 539 | |
| 435 | 540 | if (!$ignoreImport) { |
| 436 | 541 | if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 437 | - if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
|
| 542 | + if ($globalDebug) { |
|
| 543 | + echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
|
| 544 | + } |
|
| 438 | 545 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 439 | 546 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 440 | 547 | $timeelapsed = microtime(true); |
| 441 | 548 | $MarineLive = new MarineLive($this->db); |
| 442 | 549 | $result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
| 443 | 550 | $MarineLive->db = null; |
| 444 | - if ($globalDebug) echo $result."\n"; |
|
| 445 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 551 | + if ($globalDebug) { |
|
| 552 | + echo $result."\n"; |
|
| 553 | + } |
|
| 554 | + if ($globalDebugTimeElapsed) { |
|
| 555 | + echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 556 | + } |
|
| 446 | 557 | } |
| 447 | 558 | } |
| 448 | 559 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) { |
@@ -454,7 +565,9 @@ discard block |
||
| 454 | 565 | |
| 455 | 566 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') { |
| 456 | 567 | $source = $this->all_tracked[$id]['source_name']; |
| 457 | - if ($source == '') $source = $this->all_tracked[$id]['format_source']; |
|
| 568 | + if ($source == '') { |
|
| 569 | + $source = $this->all_tracked[$id]['format_source']; |
|
| 570 | + } |
|
| 458 | 571 | if (!isset($this->source_location[$source])) { |
| 459 | 572 | $Location = new Source(); |
| 460 | 573 | $coord = $Location->getLocationInfobySourceName($source); |
@@ -475,7 +588,9 @@ discard block |
||
| 475 | 588 | $stats_heading = round($stats_heading/22.5); |
| 476 | 589 | $stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
| 477 | 590 | $current_date = date('Y-m-d'); |
| 478 | - if ($stats_heading == 16) $stats_heading = 0; |
|
| 591 | + if ($stats_heading == 16) { |
|
| 592 | + $stats_heading = 0; |
|
| 593 | + } |
|
| 479 | 594 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 480 | 595 | for ($i=0;$i<=15;$i++) { |
| 481 | 596 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
@@ -493,7 +608,9 @@ discard block |
||
| 493 | 608 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 494 | 609 | end($this->stats[$current_date][$source]['hist']); |
| 495 | 610 | $mini = key($this->stats[$current_date][$source]['hist'])+10; |
| 496 | - } else $mini = 0; |
|
| 611 | + } else { |
|
| 612 | + $mini = 0; |
|
| 613 | + } |
|
| 497 | 614 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 498 | 615 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 499 | 616 | } |
@@ -505,19 +622,27 @@ discard block |
||
| 505 | 622 | |
| 506 | 623 | |
| 507 | 624 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 508 | - if ($this->all_tracked[$id]['putinarchive']) $send = true; |
|
| 509 | - } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 625 | + if ($this->all_tracked[$id]['putinarchive']) { |
|
| 626 | + $send = true; |
|
| 627 | + } |
|
| 628 | + } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) { |
|
| 629 | + echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 630 | + } |
|
| 510 | 631 | //$this->del(); |
| 511 | 632 | |
| 512 | 633 | |
| 513 | 634 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 514 | 635 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 515 | - if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour..."; |
|
| 636 | + if ($globalDebug) { |
|
| 637 | + echo "---- Deleting Live Marine data Not updated since 2 hour..."; |
|
| 638 | + } |
|
| 516 | 639 | $MarineLive = new MarineLive($this->db); |
| 517 | 640 | $MarineLive->deleteLiveMarineDataNotUpdated(); |
| 518 | 641 | $MarineLive->db = null; |
| 519 | 642 | //MarineLive->deleteLiveMarineData(); |
| 520 | - if ($globalDebug) echo " Done\n"; |
|
| 643 | + if ($globalDebug) { |
|
| 644 | + echo " Done\n"; |
|
| 645 | + } |
|
| 521 | 646 | } |
| 522 | 647 | $this->last_delete_hourly = time(); |
| 523 | 648 | } |
@@ -526,7 +651,9 @@ discard block |
||
| 526 | 651 | //$ignoreImport = false; |
| 527 | 652 | } |
| 528 | 653 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 529 | - if ($send) return $this->all_tracked[$id]; |
|
| 654 | + if ($send) { |
|
| 655 | + return $this->all_tracked[$id]; |
|
| 656 | + } |
|
| 530 | 657 | } |
| 531 | 658 | } |
| 532 | 659 | } |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | if (!isset($filter_name)) $filter_name = ''; |
| 22 | -$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 22 | +$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 23 | 23 | if ($type == 'aircraft' && $airline_icao == '' && isset($globalFilter)) { |
| 24 | 24 | if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
| 25 | 25 | } |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | $title = _("Statistics"); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | -$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
|
| 38 | -$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
|
| 37 | +$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT); |
|
| 38 | +$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT); |
|
| 39 | 39 | |
| 40 | 40 | require_once('header.php'); |
| 41 | 41 | |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | date_default_timezone_set('UTC'); |
| 63 | 63 | $lastupdate = strtotime($last_update[0]['value']); |
| 64 | 64 | if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone); |
| 65 | - print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>'; |
|
| 65 | + print '<i>Last update: '.date('Y-m-d G:i:s', $lastupdate).'</i>'; |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | ?> |
@@ -74,30 +74,30 @@ discard block |
||
| 74 | 74 | <?php |
| 75 | 75 | if ($type == 'aircraft') { |
| 76 | 76 | ?> |
| 77 | - <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Flights"); ?></span> |
|
| 78 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 79 | - <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
|
| 80 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 77 | + <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Flights"); ?></span> |
|
| 78 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 79 | + <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
|
| 80 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 81 | 81 | <?php |
| 82 | - if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 82 | + if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 83 | 83 | ?> |
| 84 | - <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span> |
|
| 85 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 84 | + <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Pilots"); ?></span> |
|
| 85 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 86 | 86 | <?php |
| 87 | 87 | } else { |
| 88 | 88 | ?> |
| 89 | - <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span> |
|
| 90 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 89 | + <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Owners"); ?></span> |
|
| 90 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 91 | 91 | <?php |
| 92 | 92 | } |
| 93 | 93 | ?> |
| 94 | - <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
|
| 95 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 94 | + <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
|
| 95 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 96 | 96 | <?php |
| 97 | 97 | if ($airline_icao == '') { |
| 98 | 98 | ?> |
| 99 | - <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span> |
|
| 100 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 99 | + <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name, $year, $month)); ?></span> <?php echo _("Airlines"); ?></span> |
|
| 100 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 101 | 101 | <?php |
| 102 | 102 | } |
| 103 | 103 | ?> |
@@ -105,8 +105,8 @@ discard block |
||
| 105 | 105 | if (!(isset($globalIVAO) && $globalIVAO) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalphpVMS) && $globalphpVMS)) { |
| 106 | 106 | if ($airline_icao == '' || $airline_icao == 'all') { |
| 107 | 107 | ?> |
| 108 | - <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name,$year,$month)); ?></span> <?php echo _("Military"); ?></span> |
|
| 109 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 108 | + <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name, $year, $month)); ?></span> <?php echo _("Military"); ?></span> |
|
| 109 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 110 | 110 | <?php |
| 111 | 111 | } |
| 112 | 112 | } |
@@ -114,22 +114,22 @@ discard block |
||
| 114 | 114 | <?php |
| 115 | 115 | } elseif ($type == 'marine') { |
| 116 | 116 | ?> |
| 117 | - <span><span class="badge"><?php print number_format($Marine->countOverallMarine(array(),$year,$month)); ?></span> <?php echo _("Vessels"); ?></span> |
|
| 118 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 119 | - <span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 120 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 117 | + <span><span class="badge"><?php print number_format($Marine->countOverallMarine(array(), $year, $month)); ?></span> <?php echo _("Vessels"); ?></span> |
|
| 118 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 119 | + <span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 120 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 121 | 121 | <?php |
| 122 | 122 | } elseif ($type == 'tracker') { |
| 123 | 123 | ?> |
| 124 | - <span><span class="badge"><?php print number_format($Tracker->countOverallTracker(array(),$year,$month)); ?></span> <?php echo _("Trackers"); ?></span> |
|
| 125 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 126 | - <span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 127 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 124 | + <span><span class="badge"><?php print number_format($Tracker->countOverallTracker(array(), $year, $month)); ?></span> <?php echo _("Trackers"); ?></span> |
|
| 125 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 126 | + <span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 127 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 128 | 128 | <?php |
| 129 | 129 | } |
| 130 | 130 | ?> |
| 131 | 131 | </p> |
| 132 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 132 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 133 | 133 | <div class="specific-stats"> |
| 134 | 134 | <?php |
| 135 | 135 | if ($type == 'aircraft') { |
@@ -138,12 +138,12 @@ discard block |
||
| 138 | 138 | <div class="col-md-6"> |
| 139 | 139 | <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2> |
| 140 | 140 | <?php |
| 141 | - $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
| 141 | + $aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name, $year, $month); |
|
| 142 | 142 | if (count($aircraft_array) == 0) print _("No data available"); |
| 143 | 143 | else { |
| 144 | 144 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
| 145 | 145 | $aircraft_data = ''; |
| 146 | - foreach($aircraft_array as $aircraft_item) |
|
| 146 | + foreach ($aircraft_array as $aircraft_item) |
|
| 147 | 147 | { |
| 148 | 148 | if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
| 149 | 149 | else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
@@ -173,17 +173,17 @@ discard block |
||
| 173 | 173 | ?> |
| 174 | 174 | </div> |
| 175 | 175 | </div> |
| 176 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 176 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 177 | 177 | <?php |
| 178 | 178 | // echo $airline_icao; |
| 179 | 179 | if ($airline_icao == '' || $airline_icao == 'all') { |
| 180 | - $airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month); |
|
| 180 | + $airline_array = $Stats->countAllAirlines(true, $filter_name, $year, $month); |
|
| 181 | 181 | if (count($airline_array) > 0) { |
| 182 | 182 | print '<div class="col-md-6">'; |
| 183 | 183 | print '<h2>'._("Top 10 Most Common Airline").'</h2>'; |
| 184 | 184 | print '<div id="chart2" class="chart" width="100%"></div><script>'; |
| 185 | 185 | $airline_data = ''; |
| 186 | - foreach($airline_array as $airline_item) |
|
| 186 | + foreach ($airline_array as $airline_item) |
|
| 187 | 187 | { |
| 188 | 188 | $airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],'; |
| 189 | 189 | } |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | } |
| 210 | 210 | ?> |
| 211 | 211 | </div> |
| 212 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 212 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 213 | 213 | <?php |
| 214 | 214 | } |
| 215 | 215 | ?> |
@@ -223,12 +223,12 @@ discard block |
||
| 223 | 223 | <div class="col-md-6"> |
| 224 | 224 | <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2> |
| 225 | 225 | <?php |
| 226 | - $marine_array = $Marine->countAllMarineTypes(true,0,'',array(),$year,$month); |
|
| 226 | + $marine_array = $Marine->countAllMarineTypes(true, 0, '', array(), $year, $month); |
|
| 227 | 227 | if (count($marine_array) == 0) print _("No data available"); |
| 228 | 228 | else { |
| 229 | 229 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
| 230 | 230 | $marine_data = ''; |
| 231 | - foreach($marine_array as $marine_item) |
|
| 231 | + foreach ($marine_array as $marine_item) |
|
| 232 | 232 | { |
| 233 | 233 | $marine_data .= '["'.$marine_item['marine_type'].'",'.$marine_item['marine_type_count'].'],'; |
| 234 | 234 | } |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | ?> |
| 260 | 260 | </div> |
| 261 | 261 | </div> |
| 262 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 262 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 263 | 263 | <!-- </div>--> |
| 264 | 264 | <?php |
| 265 | 265 | } |
@@ -271,12 +271,12 @@ discard block |
||
| 271 | 271 | <div class="col-md-6"> |
| 272 | 272 | <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2> |
| 273 | 273 | <?php |
| 274 | - $tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month); |
|
| 274 | + $tracker_array = $Tracker->countAllTrackerTypes(true, 0, '', array(), $year, $month); |
|
| 275 | 275 | if (count($tracker_array) == 0) print _("No data available"); |
| 276 | 276 | else { |
| 277 | 277 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
| 278 | 278 | $tracker_data = ''; |
| 279 | - foreach($tracker_array as $tracker_item) |
|
| 279 | + foreach ($tracker_array as $tracker_item) |
|
| 280 | 280 | { |
| 281 | 281 | $tracker_data .= '["'.$tracker_item['tracker_type'].'",'.$tracker_item['tracker_type_count'].'],'; |
| 282 | 282 | } |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | ?> |
| 308 | 308 | </div> |
| 309 | 309 | </div> |
| 310 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 310 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 311 | 311 | <!-- </div>--> |
| 312 | 312 | <?php |
| 313 | 313 | } |
@@ -317,8 +317,8 @@ discard block |
||
| 317 | 317 | ?> |
| 318 | 318 | <div class="row column"> |
| 319 | 319 | <?php |
| 320 | - $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month); |
|
| 321 | - if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 320 | + $flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name, $year, $month); |
|
| 321 | + if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 322 | 322 | if (empty($flightover_array)) { |
| 323 | 323 | print '<div class="col-md-12">'; |
| 324 | 324 | } else { |
@@ -327,12 +327,12 @@ discard block |
||
| 327 | 327 | ?> |
| 328 | 328 | <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2> |
| 329 | 329 | <?php |
| 330 | - $pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month); |
|
| 330 | + $pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name, $year, $month); |
|
| 331 | 331 | if (count($pilot_array) == 0) print _("No data available"); |
| 332 | 332 | else { |
| 333 | 333 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
| 334 | 334 | $pilot_data = ''; |
| 335 | - foreach($pilot_array as $pilot_item) |
|
| 335 | + foreach ($pilot_array as $pilot_item) |
|
| 336 | 336 | { |
| 337 | 337 | $pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],'; |
| 338 | 338 | } |
@@ -354,19 +354,19 @@ discard block |
||
| 354 | 354 | ?> |
| 355 | 355 | </div> |
| 356 | 356 | |
| 357 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 357 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 358 | 358 | <?php |
| 359 | 359 | } else { |
| 360 | 360 | ?> |
| 361 | 361 | <div class="col-md-6"> |
| 362 | 362 | <h2><?php echo _("Top 10 Most Common Owners"); ?></h2> |
| 363 | 363 | <?php |
| 364 | - $owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month); |
|
| 364 | + $owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name, $year, $month); |
|
| 365 | 365 | if (count($owner_array) == 0) print _("No data available"); |
| 366 | 366 | else { |
| 367 | 367 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
| 368 | 368 | $owner_data = ''; |
| 369 | - foreach($owner_array as $owner_item) |
|
| 369 | + foreach ($owner_array as $owner_item) |
|
| 370 | 370 | { |
| 371 | 371 | $owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],'; |
| 372 | 372 | } |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | </div> |
| 387 | 387 | </div> |
| 388 | 388 | |
| 389 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 389 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 390 | 390 | <?php |
| 391 | 391 | } |
| 392 | 392 | if (!empty($flightover_array)) { |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
| 401 | 401 | print 'var series = ['; |
| 402 | 402 | $flightover_data = ''; |
| 403 | - foreach($flightover_array as $flightover_item) |
|
| 403 | + foreach ($flightover_array as $flightover_item) |
|
| 404 | 404 | { |
| 405 | 405 | $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],'; |
| 406 | 406 | } |
@@ -446,7 +446,7 @@ discard block |
||
| 446 | 446 | } |
| 447 | 447 | ?> |
| 448 | 448 | </div> |
| 449 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 449 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 450 | 450 | |
| 451 | 451 | |
| 452 | 452 | </div> |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
| 467 | 467 | print 'var series = ['; |
| 468 | 468 | $flightover_data = ''; |
| 469 | - foreach($flightover_array as $flightover_item) |
|
| 469 | + foreach ($flightover_array as $flightover_item) |
|
| 470 | 470 | { |
| 471 | 471 | $flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],'; |
| 472 | 472 | } |
@@ -526,7 +526,7 @@ discard block |
||
| 526 | 526 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
| 527 | 527 | print 'var series = ['; |
| 528 | 528 | $flightover_data = ''; |
| 529 | - foreach($flightover_array as $flightover_item) |
|
| 529 | + foreach ($flightover_array as $flightover_item) |
|
| 530 | 530 | { |
| 531 | 531 | $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],'; |
| 532 | 532 | } |
@@ -579,14 +579,14 @@ discard block |
||
| 579 | 579 | <div class="row column"> |
| 580 | 580 | <div class="col-md-6"> |
| 581 | 581 | <?php |
| 582 | - $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 582 | + $airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name, $year, $month); |
|
| 583 | 583 | if (count($airport_airport_array) > 0) { |
| 584 | 584 | print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>'; |
| 585 | 585 | print '<div id="chart3" class="chart" width="100%"></div><script>'; |
| 586 | 586 | print "\n"; |
| 587 | 587 | print 'var series = ['; |
| 588 | 588 | $airport_data = ''; |
| 589 | - foreach($airport_airport_array as $airport_item) |
|
| 589 | + foreach ($airport_airport_array as $airport_item) |
|
| 590 | 590 | { |
| 591 | 591 | $airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],'; |
| 592 | 592 | } |
@@ -637,18 +637,18 @@ discard block |
||
| 637 | 637 | } |
| 638 | 638 | ?> |
| 639 | 639 | </div> |
| 640 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 640 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 641 | 641 | |
| 642 | 642 | <div class="col-md-6"> |
| 643 | 643 | <?php |
| 644 | - $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 644 | + $airport_airport_array2 = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name, $year, $month); |
|
| 645 | 645 | if (count($airport_airport_array2) > 0) { |
| 646 | 646 | print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>'; |
| 647 | 647 | print '<div id="chart4" class="chart" width="100%"></div><script>'; |
| 648 | 648 | print "\n"; |
| 649 | 649 | print 'var series = ['; |
| 650 | 650 | $airport_data = ''; |
| 651 | - foreach($airport_airport_array2 as $airport_item) |
|
| 651 | + foreach ($airport_airport_array2 as $airport_item) |
|
| 652 | 652 | { |
| 653 | 653 | $airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],'; |
| 654 | 654 | } |
@@ -700,7 +700,7 @@ discard block |
||
| 700 | 700 | ?> |
| 701 | 701 | </div> |
| 702 | 702 | </div> |
| 703 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 703 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 704 | 704 | <?php |
| 705 | 705 | } |
| 706 | 706 | ?> |
@@ -714,19 +714,19 @@ discard block |
||
| 714 | 714 | <div class="col-md-6"> |
| 715 | 715 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
| 716 | 716 | <?php |
| 717 | - $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 717 | + $year_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name); |
|
| 718 | 718 | if (count($year_array) == 0) print _("No data available"); |
| 719 | 719 | else { |
| 720 | 720 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 721 | 721 | $year_data = ''; |
| 722 | 722 | $year_cnt = ''; |
| 723 | - foreach($year_array as $year_item) |
|
| 723 | + foreach ($year_array as $year_item) |
|
| 724 | 724 | { |
| 725 | 725 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 726 | 726 | $year_cnt .= $year_item['date_count'].','; |
| 727 | 727 | } |
| 728 | 728 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 729 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 729 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 730 | 730 | print 'c3.generate({ |
| 731 | 731 | bindto: "#chart8", |
| 732 | 732 | data: { x: "x", |
@@ -739,23 +739,23 @@ discard block |
||
| 739 | 739 | <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 740 | 740 | </div> |
| 741 | 741 | </div> |
| 742 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 742 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 743 | 743 | <div class="col-md-6"> |
| 744 | 744 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 745 | 745 | <?php |
| 746 | - $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name); |
|
| 746 | + $month_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name); |
|
| 747 | 747 | if (count($month_array) == 0) print _("No data available"); |
| 748 | 748 | else { |
| 749 | 749 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 750 | 750 | $month_data = ''; |
| 751 | 751 | $month_cnt = ''; |
| 752 | - foreach($month_array as $month_item) |
|
| 752 | + foreach ($month_array as $month_item) |
|
| 753 | 753 | { |
| 754 | 754 | $month_data .= '"'.$month_item['date_name'].'",'; |
| 755 | 755 | $month_cnt .= $month_item['date_count'].','; |
| 756 | 756 | } |
| 757 | 757 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 758 | - $month_cnt = "['flights',".substr($month_cnt,0,-1)."]"; |
|
| 758 | + $month_cnt = "['flights',".substr($month_cnt, 0, -1)."]"; |
|
| 759 | 759 | print 'c3.generate({ |
| 760 | 760 | bindto: "#chart9", |
| 761 | 761 | data: { x: "x", |
@@ -768,24 +768,24 @@ discard block |
||
| 768 | 768 | <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 769 | 769 | </div> |
| 770 | 770 | </div> |
| 771 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 771 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 772 | 772 | |
| 773 | 773 | <div class="col-md-6"> |
| 774 | 774 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
| 775 | 775 | <?php |
| 776 | - $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 776 | + $date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name); |
|
| 777 | 777 | if (empty($date_array)) print _("No data available"); |
| 778 | 778 | else { |
| 779 | 779 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
| 780 | 780 | $date_data = ''; |
| 781 | 781 | $date_cnt = ''; |
| 782 | - foreach($date_array as $date_item) |
|
| 782 | + foreach ($date_array as $date_item) |
|
| 783 | 783 | { |
| 784 | 784 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 785 | 785 | $date_cnt .= $date_item['date_count'].','; |
| 786 | 786 | } |
| 787 | 787 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 788 | - $date_cnt = "['flights',".substr($date_cnt,0,-1)."]"; |
|
| 788 | + $date_cnt = "['flights',".substr($date_cnt, 0, -1)."]"; |
|
| 789 | 789 | print 'c3.generate({ |
| 790 | 790 | bindto: "#chart5", |
| 791 | 791 | data: { x: "x", |
@@ -798,23 +798,23 @@ discard block |
||
| 798 | 798 | <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 799 | 799 | </div> |
| 800 | 800 | </div> |
| 801 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 801 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 802 | 802 | <div class="col-md-6"> |
| 803 | 803 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 804 | 804 | <?php |
| 805 | - $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 805 | + $hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name); |
|
| 806 | 806 | if (empty($hour_array)) print _("No data available"); |
| 807 | 807 | else { |
| 808 | 808 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
| 809 | 809 | $hour_data = ''; |
| 810 | 810 | $hour_cnt = ''; |
| 811 | - foreach($hour_array as $hour_item) |
|
| 811 | + foreach ($hour_array as $hour_item) |
|
| 812 | 812 | { |
| 813 | 813 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 814 | 814 | $hour_cnt .= $hour_item['hour_count'].','; |
| 815 | 815 | } |
| 816 | 816 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 817 | - $hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]"; |
|
| 817 | + $hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]"; |
|
| 818 | 818 | print 'c3.generate({ |
| 819 | 819 | bindto: "#chart6", |
| 820 | 820 | data: { |
@@ -827,7 +827,7 @@ discard block |
||
| 827 | 827 | <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 828 | 828 | </div> |
| 829 | 829 | </div> |
| 830 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 830 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 831 | 831 | </div> |
| 832 | 832 | <?php |
| 833 | 833 | } |
@@ -845,19 +845,19 @@ discard block |
||
| 845 | 845 | <div class="col-md-6"> |
| 846 | 846 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
| 847 | 847 | <?php |
| 848 | - $year_array = $Marine->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 848 | + $year_array = $Marine->countAllMonthsLastYear(true, $airline_icao, $filter_name); |
|
| 849 | 849 | if (count($year_array) == 0) print _("No data available"); |
| 850 | 850 | else { |
| 851 | 851 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 852 | 852 | $year_data = ''; |
| 853 | 853 | $year_cnt = ''; |
| 854 | - foreach($year_array as $year_item) |
|
| 854 | + foreach ($year_array as $year_item) |
|
| 855 | 855 | { |
| 856 | 856 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 857 | 857 | $year_cnt .= $year_item['date_count'].','; |
| 858 | 858 | } |
| 859 | 859 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 860 | - $year_cnt = "['vessels',".substr($year_cnt,0,-1)."]"; |
|
| 860 | + $year_cnt = "['vessels',".substr($year_cnt, 0, -1)."]"; |
|
| 861 | 861 | print 'c3.generate({ |
| 862 | 862 | bindto: "#chart8", |
| 863 | 863 | data: { x: "x", |
@@ -871,23 +871,23 @@ discard block |
||
| 871 | 871 | </div> |
| 872 | 872 | </div> |
| 873 | 873 | |
| 874 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 874 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 875 | 875 | <div class="col-md-6"> |
| 876 | 876 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 877 | 877 | <?php |
| 878 | - $month_array = $Marine->countAllDatesLastMonth($airline_icao,$filter_name); |
|
| 878 | + $month_array = $Marine->countAllDatesLastMonth($airline_icao, $filter_name); |
|
| 879 | 879 | if (count($month_array) == 0) print _("No data available"); |
| 880 | 880 | else { |
| 881 | 881 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 882 | 882 | $month_data = ''; |
| 883 | 883 | $month_cnt = ''; |
| 884 | - foreach($month_array as $month_item) |
|
| 884 | + foreach ($month_array as $month_item) |
|
| 885 | 885 | { |
| 886 | 886 | $month_data .= '"'.$month_item['date_name'].'",'; |
| 887 | 887 | $month_cnt .= $month_item['date_count'].','; |
| 888 | 888 | } |
| 889 | 889 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 890 | - $month_cnt = "['vessels',".substr($month_cnt,0,-1)."]"; |
|
| 890 | + $month_cnt = "['vessels',".substr($month_cnt, 0, -1)."]"; |
|
| 891 | 891 | print 'c3.generate({ |
| 892 | 892 | bindto: "#chart9", |
| 893 | 893 | data: { x: "x", |
@@ -900,24 +900,24 @@ discard block |
||
| 900 | 900 | <a href="<?php print $globalURL; ?>/marine/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 901 | 901 | </div> |
| 902 | 902 | </div> |
| 903 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 903 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 904 | 904 | |
| 905 | 905 | <div class="col-md-6"> |
| 906 | 906 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
| 907 | 907 | <?php |
| 908 | - $date_array = $Marine->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 908 | + $date_array = $Marine->countAllDatesLast7Days($airline_icao, $filter_name); |
|
| 909 | 909 | if (empty($date_array)) print _("No data available"); |
| 910 | 910 | else { |
| 911 | 911 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
| 912 | 912 | $date_data = ''; |
| 913 | 913 | $date_cnt = ''; |
| 914 | - foreach($date_array as $date_item) |
|
| 914 | + foreach ($date_array as $date_item) |
|
| 915 | 915 | { |
| 916 | 916 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 917 | 917 | $date_cnt .= $date_item['date_count'].','; |
| 918 | 918 | } |
| 919 | 919 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 920 | - $date_cnt = "['vessels',".substr($date_cnt,0,-1)."]"; |
|
| 920 | + $date_cnt = "['vessels',".substr($date_cnt, 0, -1)."]"; |
|
| 921 | 921 | print 'c3.generate({ |
| 922 | 922 | bindto: "#chart5", |
| 923 | 923 | data: { x: "x", |
@@ -930,23 +930,23 @@ discard block |
||
| 930 | 930 | <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 931 | 931 | </div> |
| 932 | 932 | </div> |
| 933 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 933 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 934 | 934 | <div class="col-md-6"> |
| 935 | 935 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 936 | 936 | <?php |
| 937 | - $hour_array = $Marine->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 937 | + $hour_array = $Marine->countAllHours('hour', true, $airline_icao, $filter_name); |
|
| 938 | 938 | if (empty($hour_array)) print _("No data available"); |
| 939 | 939 | else { |
| 940 | 940 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
| 941 | 941 | $hour_data = ''; |
| 942 | 942 | $hour_cnt = ''; |
| 943 | - foreach($hour_array as $hour_item) |
|
| 943 | + foreach ($hour_array as $hour_item) |
|
| 944 | 944 | { |
| 945 | 945 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 946 | 946 | $hour_cnt .= $hour_item['hour_count'].','; |
| 947 | 947 | } |
| 948 | 948 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 949 | - $hour_cnt = "['vessels',".substr($hour_cnt,0,-1)."]"; |
|
| 949 | + $hour_cnt = "['vessels',".substr($hour_cnt, 0, -1)."]"; |
|
| 950 | 950 | print 'c3.generate({ |
| 951 | 951 | bindto: "#chart6", |
| 952 | 952 | data: { |
@@ -959,7 +959,7 @@ discard block |
||
| 959 | 959 | <a href="<?php print $globalURL; ?>/marine/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 960 | 960 | </div> |
| 961 | 961 | </div> |
| 962 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 962 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 963 | 963 | </div> |
| 964 | 964 | <?php |
| 965 | 965 | } |
@@ -983,13 +983,13 @@ discard block |
||
| 983 | 983 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 984 | 984 | $year_data = ''; |
| 985 | 985 | $year_cnt = ''; |
| 986 | - foreach($year_array as $year_item) |
|
| 986 | + foreach ($year_array as $year_item) |
|
| 987 | 987 | { |
| 988 | 988 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 989 | 989 | $year_cnt .= $year_item['date_count'].','; |
| 990 | 990 | } |
| 991 | 991 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 992 | - $year_cnt = "['trackers',".substr($year_cnt,0,-1)."]"; |
|
| 992 | + $year_cnt = "['trackers',".substr($year_cnt, 0, -1)."]"; |
|
| 993 | 993 | print 'c3.generate({ |
| 994 | 994 | bindto: "#chart8", |
| 995 | 995 | data: { x: "x", |
@@ -1003,7 +1003,7 @@ discard block |
||
| 1003 | 1003 | </div> |
| 1004 | 1004 | </div> |
| 1005 | 1005 | |
| 1006 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1006 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1007 | 1007 | <div class="col-md-6"> |
| 1008 | 1008 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 1009 | 1009 | <?php |
@@ -1013,13 +1013,13 @@ discard block |
||
| 1013 | 1013 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 1014 | 1014 | $month_data = ''; |
| 1015 | 1015 | $month_cnt = ''; |
| 1016 | - foreach($month_array as $month_item) |
|
| 1016 | + foreach ($month_array as $month_item) |
|
| 1017 | 1017 | { |
| 1018 | 1018 | $month_data .= '"'.$month_item['date_name'].'",'; |
| 1019 | 1019 | $month_cnt .= $month_item['date_count'].','; |
| 1020 | 1020 | } |
| 1021 | 1021 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 1022 | - $month_cnt = "['trackers',".substr($month_cnt,0,-1)."]"; |
|
| 1022 | + $month_cnt = "['trackers',".substr($month_cnt, 0, -1)."]"; |
|
| 1023 | 1023 | print 'c3.generate({ |
| 1024 | 1024 | bindto: "#chart9", |
| 1025 | 1025 | data: { x: "x", |
@@ -1032,7 +1032,7 @@ discard block |
||
| 1032 | 1032 | <a href="<?php print $globalURL; ?>/tracker/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1033 | 1033 | </div> |
| 1034 | 1034 | </div> |
| 1035 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1035 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1036 | 1036 | |
| 1037 | 1037 | <div class="col-md-6"> |
| 1038 | 1038 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
@@ -1043,13 +1043,13 @@ discard block |
||
| 1043 | 1043 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
| 1044 | 1044 | $date_data = ''; |
| 1045 | 1045 | $date_cnt = ''; |
| 1046 | - foreach($date_array as $date_item) |
|
| 1046 | + foreach ($date_array as $date_item) |
|
| 1047 | 1047 | { |
| 1048 | 1048 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 1049 | 1049 | $date_cnt .= $date_item['date_count'].','; |
| 1050 | 1050 | } |
| 1051 | 1051 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 1052 | - $date_cnt = "['trackers',".substr($date_cnt,0,-1)."]"; |
|
| 1052 | + $date_cnt = "['trackers',".substr($date_cnt, 0, -1)."]"; |
|
| 1053 | 1053 | print 'c3.generate({ |
| 1054 | 1054 | bindto: "#chart5", |
| 1055 | 1055 | data: { x: "x", |
@@ -1062,23 +1062,23 @@ discard block |
||
| 1062 | 1062 | <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1063 | 1063 | </div> |
| 1064 | 1064 | </div> |
| 1065 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1065 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1066 | 1066 | <div class="col-md-6"> |
| 1067 | 1067 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 1068 | 1068 | <?php |
| 1069 | - $hour_array = $Tracker->countAllHours('hour',true); |
|
| 1069 | + $hour_array = $Tracker->countAllHours('hour', true); |
|
| 1070 | 1070 | if (empty($hour_array)) print _("No data available"); |
| 1071 | 1071 | else { |
| 1072 | 1072 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
| 1073 | 1073 | $hour_data = ''; |
| 1074 | 1074 | $hour_cnt = ''; |
| 1075 | - foreach($hour_array as $hour_item) |
|
| 1075 | + foreach ($hour_array as $hour_item) |
|
| 1076 | 1076 | { |
| 1077 | 1077 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 1078 | 1078 | $hour_cnt .= $hour_item['hour_count'].','; |
| 1079 | 1079 | } |
| 1080 | 1080 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 1081 | - $hour_cnt = "['trackers',".substr($hour_cnt,0,-1)."]"; |
|
| 1081 | + $hour_cnt = "['trackers',".substr($hour_cnt, 0, -1)."]"; |
|
| 1082 | 1082 | print 'c3.generate({ |
| 1083 | 1083 | bindto: "#chart6", |
| 1084 | 1084 | data: { |
@@ -1091,7 +1091,7 @@ discard block |
||
| 1091 | 1091 | <a href="<?php print $globalURL; ?>/tracker/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1092 | 1092 | </div> |
| 1093 | 1093 | </div> |
| 1094 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1094 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1095 | 1095 | </div> |
| 1096 | 1096 | <?php |
| 1097 | 1097 | } |
@@ -1115,13 +1115,13 @@ discard block |
||
| 1115 | 1115 | print '<div id="chart32" class="chart" width="100%"></div><script>'; |
| 1116 | 1116 | $year_data = ''; |
| 1117 | 1117 | $year_cnt = ''; |
| 1118 | - foreach($year_array as $year_item) |
|
| 1118 | + foreach ($year_array as $year_item) |
|
| 1119 | 1119 | { |
| 1120 | 1120 | $year_data .= '"'.$year_item['year'].'-01-01",'; |
| 1121 | 1121 | $year_cnt .= $year_item['count'].','; |
| 1122 | 1122 | } |
| 1123 | 1123 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 1124 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 1124 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 1125 | 1125 | print 'c3.generate({ |
| 1126 | 1126 | bindto: "#chart32", |
| 1127 | 1127 | data: { x: "x", |
@@ -1134,7 +1134,7 @@ discard block |
||
| 1134 | 1134 | <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1135 | 1135 | </div> |
| 1136 | 1136 | </div> |
| 1137 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1137 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1138 | 1138 | |
| 1139 | 1139 | <div class="row column"> |
| 1140 | 1140 | <div class="col-md-6"> |
@@ -1146,13 +1146,13 @@ discard block |
||
| 1146 | 1146 | print '<div id="chart33" class="chart" width="100%"></div><script>'; |
| 1147 | 1147 | $year_data = ''; |
| 1148 | 1148 | $year_cnt = ''; |
| 1149 | - foreach($year_array as $year_item) |
|
| 1149 | + foreach ($year_array as $year_item) |
|
| 1150 | 1150 | { |
| 1151 | 1151 | $year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",'; |
| 1152 | 1152 | $year_cnt .= $year_item['count'].','; |
| 1153 | 1153 | } |
| 1154 | 1154 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 1155 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 1155 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 1156 | 1156 | print 'c3.generate({ |
| 1157 | 1157 | bindto: "#chart33", |
| 1158 | 1158 | data: { x: "x", |
@@ -1165,7 +1165,7 @@ discard block |
||
| 1165 | 1165 | <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1166 | 1166 | </div> |
| 1167 | 1167 | </div> |
| 1168 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1168 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1169 | 1169 | <br/> |
| 1170 | 1170 | <?php |
| 1171 | 1171 | } |
@@ -1181,19 +1181,19 @@ discard block |
||
| 1181 | 1181 | //$polar = $Stats->getStatsSource(date('Y-m-d'),'polar'); |
| 1182 | 1182 | if ($year == '' && $month == '') { |
| 1183 | 1183 | if ($type == 'aircraft') { |
| 1184 | - $polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d')); |
|
| 1184 | + $polar = $Stats->getStatsSource('polar', date('Y'), date('m'), date('d')); |
|
| 1185 | 1185 | } elseif ($type == 'marine') { |
| 1186 | - $polar = $Stats->getStatsSource('polar_marine',date('Y'),date('m'),date('d')); |
|
| 1186 | + $polar = $Stats->getStatsSource('polar_marine', date('Y'), date('m'), date('d')); |
|
| 1187 | 1187 | } elseif ($type == 'tracker') { |
| 1188 | - $polar = $Stats->getStatsSource('polar_tracker',date('Y'),date('m'),date('d')); |
|
| 1188 | + $polar = $Stats->getStatsSource('polar_tracker', date('Y'), date('m'), date('d')); |
|
| 1189 | 1189 | } |
| 1190 | 1190 | } else { |
| 1191 | 1191 | if ($type == 'aircraft') { |
| 1192 | - $polar = $Stats->getStatsSource('polar',$year,$month); |
|
| 1192 | + $polar = $Stats->getStatsSource('polar', $year, $month); |
|
| 1193 | 1193 | } elseif ($type == 'marine') { |
| 1194 | - $polar = $Stats->getStatsSource('polar_marine',$year,$month); |
|
| 1194 | + $polar = $Stats->getStatsSource('polar_marine', $year, $month); |
|
| 1195 | 1195 | } elseif ($type == 'tracker') { |
| 1196 | - $polar = $Stats->getStatsSource('polar_tracker',$year,$month); |
|
| 1196 | + $polar = $Stats->getStatsSource('polar_tracker', $year, $month); |
|
| 1197 | 1197 | } |
| 1198 | 1198 | } |
| 1199 | 1199 | if (!empty($polar)) { |
@@ -1202,7 +1202,7 @@ discard block |
||
| 1202 | 1202 | unset($polar_data); |
| 1203 | 1203 | $Spotter = new Spotter(); |
| 1204 | 1204 | $data = json_decode($eachpolar['source_data']); |
| 1205 | - foreach($data as $value => $key) { |
|
| 1205 | + foreach ($data as $value => $key) { |
|
| 1206 | 1206 | $direction = $Spotter->parseDirection(($value*22.5)); |
| 1207 | 1207 | $distance = $key; |
| 1208 | 1208 | $unit = 'km'; |
@@ -1222,7 +1222,7 @@ discard block |
||
| 1222 | 1222 | ?> |
| 1223 | 1223 | <div class="col-md-6"> |
| 1224 | 1224 | <h4><?php print $eachpolar['source_name']; ?></h4> |
| 1225 | - <div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
|
| 1225 | + <div id="polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
|
| 1226 | 1226 | <script> |
| 1227 | 1227 | (function() { |
| 1228 | 1228 | var margin = {top: 100, right: 100, bottom: 100, left: 100}, |
@@ -1246,7 +1246,7 @@ discard block |
||
| 1246 | 1246 | color: color, |
| 1247 | 1247 | unit: '<?php echo $unit; ?>' |
| 1248 | 1248 | }; |
| 1249 | - RadarChart("#polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions); |
|
| 1249 | + RadarChart("#polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions); |
|
| 1250 | 1250 | })(); |
| 1251 | 1251 | </script> |
| 1252 | 1252 | </div> |
@@ -1261,19 +1261,19 @@ discard block |
||
| 1261 | 1261 | //$msg = $Stats->getStatsSource(date('Y-m-d'),'msg'); |
| 1262 | 1262 | if ($year == '' && $month == '') { |
| 1263 | 1263 | if ($type == 'aircraft') { |
| 1264 | - $msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d')); |
|
| 1264 | + $msg = $Stats->getStatsSource('msg', date('Y'), date('m'), date('d')); |
|
| 1265 | 1265 | } elseif ($type == 'marine') { |
| 1266 | - $msg = $Stats->getStatsSource('msg_marine',date('Y'),date('m'),date('d')); |
|
| 1266 | + $msg = $Stats->getStatsSource('msg_marine', date('Y'), date('m'), date('d')); |
|
| 1267 | 1267 | } elseif ($type == 'tracker') { |
| 1268 | - $msg = $Stats->getStatsSource('msg_tracker',date('Y'),date('m'),date('d')); |
|
| 1268 | + $msg = $Stats->getStatsSource('msg_tracker', date('Y'), date('m'), date('d')); |
|
| 1269 | 1269 | } |
| 1270 | 1270 | } else { |
| 1271 | 1271 | if ($type == 'aircraft') { |
| 1272 | - $msg = $Stats->getStatsSource('msg',$year,$month); |
|
| 1272 | + $msg = $Stats->getStatsSource('msg', $year, $month); |
|
| 1273 | 1273 | } elseif ($type == 'marine') { |
| 1274 | - $msg = $Stats->getStatsSource('msg_marine',$year,$month); |
|
| 1274 | + $msg = $Stats->getStatsSource('msg_marine', $year, $month); |
|
| 1275 | 1275 | } elseif ($type == 'tracker') { |
| 1276 | - $msg = $Stats->getStatsSource('msg_tracker',$year,$month); |
|
| 1276 | + $msg = $Stats->getStatsSource('msg_tracker', $year, $month); |
|
| 1277 | 1277 | } |
| 1278 | 1278 | } |
| 1279 | 1279 | if (!empty($msg)) { |
@@ -1281,13 +1281,13 @@ discard block |
||
| 1281 | 1281 | foreach ($msg as $eachmsg) { |
| 1282 | 1282 | //$eachmsg = $msg[0]; |
| 1283 | 1283 | $data = $eachmsg['source_data']; |
| 1284 | - if ($data > 500) $max = (round(($data+100)/100))*100; |
|
| 1284 | + if ($data > 500) $max = (round(($data + 100)/100))*100; |
|
| 1285 | 1285 | else $max = 500; |
| 1286 | 1286 | ?> |
| 1287 | - <div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
|
| 1287 | + <div id="msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
|
| 1288 | 1288 | <script> |
| 1289 | 1289 | var g = new JustGage({ |
| 1290 | - id: "msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>", |
|
| 1290 | + id: "msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>", |
|
| 1291 | 1291 | value: <?php echo $data; ?>, |
| 1292 | 1292 | min: 0, |
| 1293 | 1293 | max: <?php print $max; ?>, |
@@ -1309,19 +1309,19 @@ discard block |
||
| 1309 | 1309 | //$hist = $Stats->getStatsSource(date('Y-m-d'),'hist'); |
| 1310 | 1310 | if ($year == '' && $month == '') { |
| 1311 | 1311 | if ($type == 'aircraft') { |
| 1312 | - $hist = $Stats->getStatsSource('hist',date('Y'),date('m'),date('d')); |
|
| 1312 | + $hist = $Stats->getStatsSource('hist', date('Y'), date('m'), date('d')); |
|
| 1313 | 1313 | } elseif ($type == 'marine') { |
| 1314 | - $hist = $Stats->getStatsSource('hist_marine',date('Y'),date('m'),date('d')); |
|
| 1314 | + $hist = $Stats->getStatsSource('hist_marine', date('Y'), date('m'), date('d')); |
|
| 1315 | 1315 | } elseif ($type == 'tracker') { |
| 1316 | - $hist = $Stats->getStatsSource('hist_tracker',date('Y'),date('m'),date('d')); |
|
| 1316 | + $hist = $Stats->getStatsSource('hist_tracker', date('Y'), date('m'), date('d')); |
|
| 1317 | 1317 | } |
| 1318 | 1318 | } else { |
| 1319 | 1319 | if ($type == 'aircraft') { |
| 1320 | - $hist = $Stats->getStatsSource('hist',$year,$month); |
|
| 1320 | + $hist = $Stats->getStatsSource('hist', $year, $month); |
|
| 1321 | 1321 | } elseif ($type == 'marine') { |
| 1322 | - $hist = $Stats->getStatsSource('hist_marine',$year,$month); |
|
| 1322 | + $hist = $Stats->getStatsSource('hist_marine', $year, $month); |
|
| 1323 | 1323 | } elseif ($type == 'tracker') { |
| 1324 | - $hist = $Stats->getStatsSource('hist_tracker',$year,$month); |
|
| 1324 | + $hist = $Stats->getStatsSource('hist_tracker', $year, $month); |
|
| 1325 | 1325 | } |
| 1326 | 1326 | } |
| 1327 | 1327 | foreach ($hist as $hists) { |
@@ -1331,7 +1331,7 @@ discard block |
||
| 1331 | 1331 | $source = $hists['source_name']; |
| 1332 | 1332 | $hist_array = json_decode($hists['source_data']); |
| 1333 | 1333 | $unit = 'km'; |
| 1334 | - foreach($hist_array as $distance => $nb) |
|
| 1334 | + foreach ($hist_array as $distance => $nb) |
|
| 1335 | 1335 | { |
| 1336 | 1336 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 1337 | 1337 | $distance = round($distance*0.539957); |
@@ -1352,18 +1352,18 @@ discard block |
||
| 1352 | 1352 | $nb_data = "['flights',".substr($nb_data, 0, -1)."]"; |
| 1353 | 1353 | ?> |
| 1354 | 1354 | <div class="col-md-6"> |
| 1355 | - <h2><?php echo sprintf(_("Distance for %s"),$source); ?></h2> |
|
| 1355 | + <h2><?php echo sprintf(_("Distance for %s"), $source); ?></h2> |
|
| 1356 | 1356 | <?php |
| 1357 | - print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
| 1357 | + print '<div id="charthist-'.str_replace(' ', '_', strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
| 1358 | 1358 | print 'c3.generate({ |
| 1359 | - bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'", |
|
| 1359 | + bindto: "#charthist-'.str_replace(' ', '_', strtolower($source)).'", |
|
| 1360 | 1360 | data: { x: "x", |
| 1361 | 1361 | columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 1362 | 1362 | axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});'; |
| 1363 | 1363 | print '</script>'; |
| 1364 | 1364 | ?> |
| 1365 | 1365 | </div> |
| 1366 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1366 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1367 | 1367 | <?php |
| 1368 | 1368 | } |
| 1369 | 1369 | ?> |
