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,18 +234,18 @@ 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 | - $source = $line['source_name']; |
|
| 244 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 245 | - if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 246 | - $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 247 | - $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 248 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 242 | + $current_date = date('Y-m-d'); |
|
| 243 | + $source = $line['source_name']; |
|
| 244 | + if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 245 | + if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 246 | + $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 247 | + $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 248 | + } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | /* |
@@ -261,49 +261,49 @@ discard block |
||
| 261 | 261 | //$this->db = $dbc; |
| 262 | 262 | |
| 263 | 263 | //$hex = trim($line['hex']); |
| 264 | - if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 265 | - else $id = trim($line['id']); |
|
| 264 | + if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 265 | + else $id = trim($line['id']); |
|
| 266 | 266 | |
| 267 | 267 | if (!isset($this->all_flights[$id])) { |
| 268 | - $this->all_flights[$id] = array(); |
|
| 269 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 270 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
|
| 271 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 272 | - if (!isset($line['id'])) { |
|
| 268 | + $this->all_flights[$id] = array(); |
|
| 269 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 270 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
|
| 271 | + if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 272 | + if (!isset($line['id'])) { |
|
| 273 | 273 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 274 | 274 | // if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi'))); |
| 275 | 275 | // if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
| 276 | 276 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 277 | - //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 278 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 279 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 277 | + //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 278 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 279 | + if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 280 | 280 | } |
| 281 | 281 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 282 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 282 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | //print_r($this->all_flights); |
| 286 | 286 | if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) { |
| 287 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 288 | - //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 287 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 288 | + //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 289 | 289 | //$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 290 | - //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 291 | - 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') { |
|
| 290 | + //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 291 | + 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') { |
|
| 292 | 292 | $timeelapsed = microtime(true); |
| 293 | 293 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 294 | - $Spotter = new Spotter($this->db); |
|
| 295 | - if (isset($this->all_flights[$id]['source_type'])) { |
|
| 294 | + $Spotter = new Spotter($this->db); |
|
| 295 | + if (isset($this->all_flights[$id]['source_type'])) { |
|
| 296 | 296 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']); |
| 297 | - } else { |
|
| 297 | + } else { |
|
| 298 | 298 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 299 | - } |
|
| 300 | - $Spotter->db = null; |
|
| 301 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 302 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 299 | + } |
|
| 300 | + $Spotter->db = null; |
|
| 301 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 302 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 303 | 303 | } |
| 304 | - } |
|
| 305 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 306 | - if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 304 | + } |
|
| 305 | + if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 306 | + if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 307 | 307 | } |
| 308 | 308 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
| 309 | 309 | $icao = $line['aircraft_icao']; |
@@ -333,9 +333,9 @@ discard block |
||
| 333 | 333 | } |
| 334 | 334 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 335 | 335 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 336 | - if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
|
| 336 | + if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
|
| 337 | 337 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 338 | - } else { |
|
| 338 | + } else { |
|
| 339 | 339 | 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"; |
| 340 | 340 | 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"; |
| 341 | 341 | /* |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | print_r($line); |
| 345 | 345 | */ |
| 346 | 346 | return ''; |
| 347 | - } |
|
| 347 | + } |
|
| 348 | 348 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 349 | 349 | if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 350 | 350 | return ''; |
@@ -360,36 +360,36 @@ discard block |
||
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') { |
| 363 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 363 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 364 | 364 | } |
| 365 | 365 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 366 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 366 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 367 | 367 | } |
| 368 | 368 | if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
| 369 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id'])); |
|
| 369 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id'])); |
|
| 370 | 370 | } |
| 371 | 371 | if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
| 372 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name'])); |
|
| 372 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name'])); |
|
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | 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'])) { |
| 376 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 377 | - if ($this->all_flights[$id]['addedSpotter'] == 1) { |
|
| 376 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 377 | + if ($this->all_flights[$id]['addedSpotter'] == 1) { |
|
| 378 | 378 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 379 | - $timeelapsed = microtime(true); |
|
| 380 | - $Spotter = new Spotter($this->db); |
|
| 381 | - $fromsource = NULL; |
|
| 382 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 383 | - elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 384 | - elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
|
| 385 | - elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
| 386 | - elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
| 387 | - $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 388 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 389 | - $Spotter->db = null; |
|
| 390 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 391 | - } |
|
| 392 | - } |
|
| 379 | + $timeelapsed = microtime(true); |
|
| 380 | + $Spotter = new Spotter($this->db); |
|
| 381 | + $fromsource = NULL; |
|
| 382 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 383 | + elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 384 | + elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
|
| 385 | + elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
| 386 | + elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
| 387 | + $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 388 | + if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 389 | + $Spotter->db = null; |
|
| 390 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 391 | + } |
|
| 392 | + } |
|
| 393 | 393 | |
| 394 | 394 | /* |
| 395 | 395 | if (!isset($line['id'])) { |
@@ -399,104 +399,104 @@ discard block |
||
| 399 | 399 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 400 | 400 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 401 | 401 | */ |
| 402 | - 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'])); |
|
| 402 | + 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 | 403 | |
| 404 | - //$putinarchive = true; |
|
| 405 | - if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
|
| 404 | + //$putinarchive = true; |
|
| 405 | + if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
|
| 406 | 406 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
| 407 | - } |
|
| 408 | - if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
|
| 407 | + } |
|
| 408 | + if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
|
| 409 | 409 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
| 410 | - } |
|
| 411 | - if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
|
| 412 | - $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' => '')); |
|
| 413 | - } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
|
| 410 | + } |
|
| 411 | + if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
|
| 412 | + $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' => '')); |
|
| 413 | + } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
|
| 414 | 414 | $timeelapsed = microtime(true); |
| 415 | 415 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 416 | 416 | $Spotter = new Spotter($this->db); |
| 417 | 417 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 418 | 418 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 419 | - $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' => '')); |
|
| 419 | + $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 | 420 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 421 | - } |
|
| 422 | - } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
|
| 421 | + } |
|
| 422 | + } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
|
| 423 | 423 | $timeelapsed = microtime(true); |
| 424 | 424 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 425 | - $Spotter = new Spotter($this->db); |
|
| 426 | - $route = $Spotter->getRouteInfo(trim($line['ident'])); |
|
| 427 | - if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) { |
|
| 425 | + $Spotter = new Spotter($this->db); |
|
| 426 | + $route = $Spotter->getRouteInfo(trim($line['ident'])); |
|
| 427 | + if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) { |
|
| 428 | 428 | $Translation = new Translation($this->db); |
| 429 | 429 | $ident = $Translation->checkTranslation(trim($line['ident'])); |
| 430 | 430 | $route = $Spotter->getRouteInfo($ident); |
| 431 | 431 | $Translation->db = null; |
| 432 | - } |
|
| 433 | - $Spotter->db = null; |
|
| 434 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 435 | - } |
|
| 432 | + } |
|
| 433 | + $Spotter->db = null; |
|
| 434 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 435 | + } |
|
| 436 | 436 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 437 | - //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
|
| 438 | - if ($route['fromairport_icao'] != $route['toairport_icao']) { |
|
| 437 | + //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
|
| 438 | + if ($route['fromairport_icao'] != $route['toairport_icao']) { |
|
| 439 | 439 | // $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'])); |
| 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 | - } |
|
| 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 | + } |
|
| 442 | 442 | } |
| 443 | 443 | if (!isset($globalFork)) $globalFork = TRUE; |
| 444 | 444 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 445 | 445 | if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
| 446 | 446 | } |
| 447 | - } |
|
| 447 | + } |
|
| 448 | 448 | } |
| 449 | 449 | |
| 450 | 450 | if (isset($line['speed']) && $line['speed'] != '') { |
| 451 | 451 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
| 452 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 453 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 454 | - //$dataFound = true; |
|
| 452 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 453 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 454 | + //$dataFound = true; |
|
| 455 | 455 | } 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'])) { |
| 456 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 457 | - if ($distance > 1000 && $distance < 10000) { |
|
| 458 | - // use datetime |
|
| 456 | + $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 457 | + if ($distance > 1000 && $distance < 10000) { |
|
| 458 | + // use datetime |
|
| 459 | 459 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 460 | 460 | $speed = $speed*3.6; |
| 461 | 461 | if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
| 462 | 462 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
| 463 | - } |
|
| 463 | + } |
|
| 464 | 464 | } |
| 465 | 465 | |
| 466 | 466 | |
| 467 | 467 | |
| 468 | - if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 469 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 470 | - else unset($timediff); |
|
| 471 | - 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')))) { |
|
| 468 | + if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 469 | + if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 470 | + else unset($timediff); |
|
| 471 | + 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')))) { |
|
| 472 | 472 | 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'])) { |
| 473 | - 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'])) { |
|
| 473 | + 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 | 474 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 475 | 475 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 476 | 476 | $this->all_flights[$id]['putinarchive'] = true; |
| 477 | 477 | $this->tmd = 0; |
| 478 | 478 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 479 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 480 | - $timeelapsed = microtime(true); |
|
| 481 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 479 | + if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 480 | + $timeelapsed = microtime(true); |
|
| 481 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 482 | 482 | $Spotter = new Spotter($this->db); |
| 483 | 483 | $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 484 | 484 | if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
| 485 | 485 | $Spotter->db = null; |
| 486 | 486 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 487 | 487 | if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
| 488 | - } |
|
| 488 | + } |
|
| 489 | + } |
|
| 489 | 490 | } |
| 490 | - } |
|
| 491 | 491 | } |
| 492 | 492 | |
| 493 | 493 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 494 | - //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) { |
|
| 494 | + //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 | 495 | if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 496 | 496 | 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') { |
| 497 | - $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
|
| 498 | - $dataFound = true; |
|
| 499 | - $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 497 | + $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
|
| 498 | + $dataFound = true; |
|
| 499 | + $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 500 | 500 | } |
| 501 | 501 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 502 | 502 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
@@ -507,20 +507,20 @@ discard block |
||
| 507 | 507 | //$putinarchive = true; |
| 508 | 508 | } |
| 509 | 509 | */ |
| 510 | - /* |
|
| 510 | + /* |
|
| 511 | 511 | } elseif (isset($this->all_flights[$id]['latitude'])) { |
| 512 | 512 | 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"; |
| 513 | 513 | } |
| 514 | 514 | */ |
| 515 | 515 | } |
| 516 | 516 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 517 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 518 | - //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) { |
|
| 517 | + if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 518 | + //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) { |
|
| 519 | 519 | if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 520 | 520 | 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') { |
| 521 | - $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
|
| 522 | - $dataFound = true; |
|
| 523 | - $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 521 | + $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
|
| 522 | + $dataFound = true; |
|
| 523 | + $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 524 | 524 | } |
| 525 | 525 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 526 | 526 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
@@ -538,95 +538,95 @@ discard block |
||
| 538 | 538 | */ |
| 539 | 539 | } |
| 540 | 540 | |
| 541 | - } else if ($globalDebug && $timediff > 30) { |
|
| 541 | + } else if ($globalDebug && $timediff > 30) { |
|
| 542 | 542 | $this->tmd = $this->tmd + 1; |
| 543 | 543 | echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
| 544 | 544 | echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
| 545 | 545 | echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
| 546 | 546 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
| 547 | - } |
|
| 547 | + } |
|
| 548 | 548 | } |
| 549 | 549 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 550 | - if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 551 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 550 | + if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 551 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 552 | 552 | } |
| 553 | 553 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 554 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 555 | - //$dataFound = true; |
|
| 554 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 555 | + //$dataFound = true; |
|
| 556 | 556 | } |
| 557 | 557 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 558 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 558 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 559 | 559 | } |
| 560 | 560 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 561 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 561 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 562 | 562 | } |
| 563 | 563 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 564 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 565 | - //$dataFound = true; |
|
| 564 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 565 | + //$dataFound = true; |
|
| 566 | 566 | } |
| 567 | 567 | if (isset($line['ground']) && $line['ground'] != '') { |
| 568 | - if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
|
| 568 | + if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
|
| 569 | 569 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 570 | 570 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 571 | 571 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 572 | 572 | 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'))); |
| 573 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 573 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 574 | 574 | 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'])); |
| 575 | - } |
|
| 576 | - if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 577 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 578 | - //$dataFound = true; |
|
| 575 | + } |
|
| 576 | + if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 577 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 578 | + //$dataFound = true; |
|
| 579 | 579 | } |
| 580 | 580 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 581 | - 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'])) { |
|
| 582 | - if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 583 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 584 | - $highlight = ''; |
|
| 585 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 586 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 587 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 588 | - if ($highlight != '') { |
|
| 581 | + 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'])) { |
|
| 582 | + if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 583 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 584 | + $highlight = ''; |
|
| 585 | + if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 586 | + if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 587 | + if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 588 | + if ($highlight != '') { |
|
| 589 | 589 | $timeelapsed = microtime(true); |
| 590 | 590 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 591 | - $Spotter = new Spotter($this->db); |
|
| 592 | - $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 593 | - $Spotter->db = null; |
|
| 594 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 591 | + $Spotter = new Spotter($this->db); |
|
| 592 | + $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 593 | + $Spotter->db = null; |
|
| 594 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 595 | 595 | } |
| 596 | 596 | //$putinarchive = true; |
| 597 | 597 | //$highlight = ''; |
| 598 | - } |
|
| 598 | + } |
|
| 599 | 599 | |
| 600 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 601 | - //$dataFound = true; |
|
| 600 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 601 | + //$dataFound = true; |
|
| 602 | 602 | } |
| 603 | 603 | |
| 604 | 604 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 605 | - //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 605 | + //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 606 | 606 | 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; |
| 607 | 607 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
| 608 | 608 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
| 609 | 609 | //$dataFound = true; |
| 610 | - //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 610 | + //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 614 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 614 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 615 | 615 | } |
| 616 | 616 | |
| 617 | 617 | if (isset($line['heading']) && $line['heading'] != '') { |
| 618 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 619 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 620 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 621 | - //$dataFound = true; |
|
| 618 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 619 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 620 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 621 | + //$dataFound = true; |
|
| 622 | 622 | } 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']) { |
| 623 | - $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']); |
|
| 624 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 625 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 626 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
| 623 | + $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']); |
|
| 624 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 625 | + if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 626 | + if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
| 627 | 627 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 628 | - // If not enough messages and ACARS set heading to 0 |
|
| 629 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 628 | + // If not enough messages and ACARS set heading to 0 |
|
| 629 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 630 | 630 | } |
| 631 | 631 | if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 632 | 632 | elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
@@ -637,125 +637,125 @@ discard block |
||
| 637 | 637 | //if ($dataFound == true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['ident'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 638 | 638 | //if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 639 | 639 | if ($dataFound === true && isset($this->all_flights[$id]['hex'])) { |
| 640 | - $this->all_flights[$id]['lastupdate'] = time(); |
|
| 641 | - if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
|
| 642 | - 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'])) { |
|
| 643 | - //print_r($this->all_flights); |
|
| 644 | - //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
|
| 645 | - //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
|
| 646 | - if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
|
| 640 | + $this->all_flights[$id]['lastupdate'] = time(); |
|
| 641 | + if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
|
| 642 | + 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'])) { |
|
| 643 | + //print_r($this->all_flights); |
|
| 644 | + //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
|
| 645 | + //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
|
| 646 | + if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
|
| 647 | 647 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 648 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 649 | - $timeelapsed = microtime(true); |
|
| 650 | - $SpotterLive = new SpotterLive($this->db); |
|
| 651 | - 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')) { |
|
| 648 | + if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 649 | + $timeelapsed = microtime(true); |
|
| 650 | + $SpotterLive = new SpotterLive($this->db); |
|
| 651 | + 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')) { |
|
| 652 | 652 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 653 | 653 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 654 | - } elseif (isset($line['id'])) { |
|
| 654 | + } elseif (isset($line['id'])) { |
|
| 655 | 655 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 656 | 656 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 657 | - } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
|
| 657 | + } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
|
| 658 | 658 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 659 | 659 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 660 | - } else $recent_ident = ''; |
|
| 661 | - $SpotterLive->db=null; |
|
| 662 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 663 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 660 | + } else $recent_ident = ''; |
|
| 661 | + $SpotterLive->db=null; |
|
| 662 | + if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 663 | + elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 664 | 664 | } else $recent_ident = ''; |
| 665 | - } else { |
|
| 665 | + } else { |
|
| 666 | 666 | $recent_ident = ''; |
| 667 | 667 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
| 668 | - } |
|
| 669 | - //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 670 | - if($recent_ident == "") |
|
| 671 | - { |
|
| 668 | + } |
|
| 669 | + //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 670 | + if($recent_ident == "") |
|
| 671 | + { |
|
| 672 | 672 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
| 673 | 673 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 674 | 674 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 675 | 675 | //adds the spotter data for the archive |
| 676 | 676 | $ignoreImport = false; |
| 677 | 677 | foreach($globalAirportIgnore as $airportIgnore) { |
| 678 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 678 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 679 | 679 | $ignoreImport = true; |
| 680 | - } |
|
| 680 | + } |
|
| 681 | 681 | } |
| 682 | 682 | if (count($globalAirportAccept) > 0) { |
| 683 | - $ignoreImport = true; |
|
| 684 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 683 | + $ignoreImport = true; |
|
| 684 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 685 | 685 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 686 | - $ignoreImport = false; |
|
| 686 | + $ignoreImport = false; |
|
| 687 | + } |
|
| 687 | 688 | } |
| 688 | - } |
|
| 689 | 689 | } |
| 690 | 690 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 691 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 691 | + foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 692 | 692 | 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)) { |
| 693 | - $ignoreImport = true; |
|
| 693 | + $ignoreImport = true; |
|
| 694 | + } |
|
| 694 | 695 | } |
| 695 | - } |
|
| 696 | 696 | } |
| 697 | 697 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 698 | - $ignoreImport = true; |
|
| 699 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 698 | + $ignoreImport = true; |
|
| 699 | + foreach($globalAirlineAccept as $airlineAccept) { |
|
| 700 | 700 | 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)) { |
| 701 | - $ignoreImport = false; |
|
| 701 | + $ignoreImport = false; |
|
| 702 | + } |
|
| 702 | 703 | } |
| 703 | - } |
|
| 704 | 704 | } |
| 705 | 705 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 706 | - $ignoreImport = true; |
|
| 707 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 706 | + $ignoreImport = true; |
|
| 707 | + foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 708 | 708 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 709 | - $ignoreImport = false; |
|
| 709 | + $ignoreImport = false; |
|
| 710 | + } |
|
| 710 | 711 | } |
| 711 | - } |
|
| 712 | 712 | } |
| 713 | 713 | |
| 714 | 714 | if (!$ignoreImport) { |
| 715 | - $highlight = ''; |
|
| 716 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 717 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 718 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 719 | - 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'))); |
|
| 720 | - $timeelapsed = microtime(true); |
|
| 721 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 715 | + $highlight = ''; |
|
| 716 | + if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 717 | + if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 718 | + if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 719 | + 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'))); |
|
| 720 | + $timeelapsed = microtime(true); |
|
| 721 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 722 | 722 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 723 | - $Spotter = new Spotter($this->db); |
|
| 724 | - $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']); |
|
| 725 | - $Spotter->db = null; |
|
| 726 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 723 | + $Spotter = new Spotter($this->db); |
|
| 724 | + $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']); |
|
| 725 | + $Spotter->db = null; |
|
| 726 | + if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 727 | + } |
|
| 727 | 728 | } |
| 728 | - } |
|
| 729 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 730 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 729 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 730 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 731 | 731 | |
| 732 | - // Add source stat in DB |
|
| 733 | - $Stats = new Stats($this->db); |
|
| 734 | - if (!empty($this->stats)) { |
|
| 732 | + // Add source stat in DB |
|
| 733 | + $Stats = new Stats($this->db); |
|
| 734 | + if (!empty($this->stats)) { |
|
| 735 | 735 | if ($globalDebug) echo 'Add source stats : '; |
| 736 | - foreach($this->stats as $date => $data) { |
|
| 737 | - foreach($data as $source => $sourced) { |
|
| 738 | - //print_r($sourced); |
|
| 739 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 740 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 741 | - if (isset($sourced['msg'])) { |
|
| 742 | - if (time() - $sourced['msg']['date'] > 10) { |
|
| 743 | - $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 744 | - echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 745 | - unset($this->stats[$date][$source]['msg']); |
|
| 746 | - } |
|
| 747 | - } |
|
| 748 | - } |
|
| 749 | - if ($date != date('Y-m-d')) { |
|
| 750 | - unset($this->stats[$date]); |
|
| 751 | - } |
|
| 752 | - } |
|
| 753 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 754 | - |
|
| 755 | - } |
|
| 756 | - $Stats->db = null; |
|
| 757 | - } |
|
| 758 | - $this->del(); |
|
| 736 | + foreach($this->stats as $date => $data) { |
|
| 737 | + foreach($data as $source => $sourced) { |
|
| 738 | + //print_r($sourced); |
|
| 739 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 740 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 741 | + if (isset($sourced['msg'])) { |
|
| 742 | + if (time() - $sourced['msg']['date'] > 10) { |
|
| 743 | + $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 744 | + echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 745 | + unset($this->stats[$date][$source]['msg']); |
|
| 746 | + } |
|
| 747 | + } |
|
| 748 | + } |
|
| 749 | + if ($date != date('Y-m-d')) { |
|
| 750 | + unset($this->stats[$date]); |
|
| 751 | + } |
|
| 752 | + } |
|
| 753 | + if ($globalDebug) echo 'Done'."\n"; |
|
| 754 | + |
|
| 755 | + } |
|
| 756 | + $Stats->db = null; |
|
| 757 | + } |
|
| 758 | + $this->del(); |
|
| 759 | 759 | } elseif ($globalDebug) echo 'Ignore data'."\n"; |
| 760 | 760 | //$ignoreImport = false; |
| 761 | 761 | $this->all_flights[$id]['addedSpotter'] = 1; |
@@ -773,41 +773,41 @@ discard block |
||
| 773 | 773 | */ |
| 774 | 774 | //SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']); |
| 775 | 775 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 776 | - if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 777 | - //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
|
| 778 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 776 | + if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 777 | + //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
|
| 778 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 779 | 779 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 780 | - $SpotterLive = new SpotterLive($this->db); |
|
| 781 | - $SpotterLive->deleteLiveSpotterData(); |
|
| 782 | - $SpotterLive->db=null; |
|
| 780 | + $SpotterLive = new SpotterLive($this->db); |
|
| 781 | + $SpotterLive->deleteLiveSpotterData(); |
|
| 782 | + $SpotterLive->db=null; |
|
| 783 | + } |
|
| 783 | 784 | } |
| 784 | - } |
|
| 785 | - if ($globalDebug) echo " Done\n"; |
|
| 786 | - $this->last_delete = time(); |
|
| 785 | + if ($globalDebug) echo " Done\n"; |
|
| 786 | + $this->last_delete = time(); |
|
| 787 | 787 | } |
| 788 | - } else { |
|
| 788 | + } else { |
|
| 789 | 789 | 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')) { |
| 790 | - $this->all_flights[$id]['id'] = $recent_ident; |
|
| 791 | - $this->all_flights[$id]['addedSpotter'] = 1; |
|
| 790 | + $this->all_flights[$id]['id'] = $recent_ident; |
|
| 791 | + $this->all_flights[$id]['addedSpotter'] = 1; |
|
| 792 | 792 | } |
| 793 | 793 | if (isset($globalDaemon) && !$globalDaemon) { |
| 794 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 794 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 795 | 795 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 796 | - $Spotter = new Spotter($this->db); |
|
| 797 | - $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']); |
|
| 798 | - $Spotter->db = null; |
|
| 796 | + $Spotter = new Spotter($this->db); |
|
| 797 | + $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']); |
|
| 798 | + $Spotter->db = null; |
|
| 799 | + } |
|
| 799 | 800 | } |
| 800 | - } |
|
| 801 | 801 | } |
| 802 | 802 | |
| 803 | - } |
|
| 803 | + } |
|
| 804 | + } |
|
| 804 | 805 | } |
| 805 | - } |
|
| 806 | - //adds the spotter LIVE data |
|
| 807 | - //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed); |
|
| 808 | - //echo "\nAdd in Live !! \n"; |
|
| 809 | - //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"; |
|
| 810 | - if ($globalDebug) { |
|
| 806 | + //adds the spotter LIVE data |
|
| 807 | + //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed); |
|
| 808 | + //echo "\nAdd in Live !! \n"; |
|
| 809 | + //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"; |
|
| 810 | + if ($globalDebug) { |
|
| 811 | 811 | if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) { |
| 812 | 812 | 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"; |
| 813 | 813 | 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"; |
@@ -815,60 +815,60 @@ discard block |
||
| 815 | 815 | 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"; |
| 816 | 816 | 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"; |
| 817 | 817 | } |
| 818 | - } |
|
| 819 | - $ignoreImport = false; |
|
| 820 | - if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
|
| 821 | - if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
|
| 818 | + } |
|
| 819 | + $ignoreImport = false; |
|
| 820 | + if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
|
| 821 | + if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
|
| 822 | 822 | |
| 823 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 824 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 825 | - $ignoreImport = true; |
|
| 823 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 824 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 825 | + $ignoreImport = true; |
|
| 826 | 826 | } |
| 827 | - } |
|
| 828 | - if (count($globalAirportAccept) > 0) { |
|
| 829 | - $ignoreImport = true; |
|
| 830 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 831 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 827 | + } |
|
| 828 | + if (count($globalAirportAccept) > 0) { |
|
| 829 | + $ignoreImport = true; |
|
| 830 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 831 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 832 | 832 | $ignoreImport = false; |
| 833 | - } |
|
| 833 | + } |
|
| 834 | + } |
|
| 834 | 835 | } |
| 835 | - } |
|
| 836 | - if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
|
| 836 | + if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
|
| 837 | 837 | foreach($globalAirlineIgnore as $airlineIgnore) { |
| 838 | - 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)) { |
|
| 838 | + 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 | 839 | $ignoreImport = true; |
| 840 | - } |
|
| 840 | + } |
|
| 841 | 841 | } |
| 842 | - } |
|
| 843 | - if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
|
| 842 | + } |
|
| 843 | + if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
|
| 844 | 844 | $ignoreImport = true; |
| 845 | 845 | foreach($globalAirlineAccept as $airlineAccept) { |
| 846 | - 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)) { |
|
| 846 | + 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 | 847 | $ignoreImport = false; |
| 848 | - } |
|
| 848 | + } |
|
| 849 | + } |
|
| 849 | 850 | } |
| 850 | - } |
|
| 851 | - if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
|
| 851 | + if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
|
| 852 | 852 | $ignoreImport = true; |
| 853 | 853 | foreach($globalPilotIdAccept as $pilotIdAccept) { |
| 854 | - if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
|
| 855 | - $ignoreImport = false; |
|
| 856 | - } |
|
| 854 | + if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
|
| 855 | + $ignoreImport = false; |
|
| 856 | + } |
|
| 857 | + } |
|
| 857 | 858 | } |
| 858 | - } |
|
| 859 | 859 | |
| 860 | - if (!$ignoreImport) { |
|
| 860 | + if (!$ignoreImport) { |
|
| 861 | 861 | 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'])) { |
| 862 | 862 | 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'))); |
| 863 | 863 | $timeelapsed = microtime(true); |
| 864 | 864 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 865 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 865 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 866 | 866 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
| 867 | 867 | $SpotterLive = new SpotterLive($this->db); |
| 868 | 868 | $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']); |
| 869 | 869 | $SpotterLive->db = null; |
| 870 | 870 | if ($globalDebug) echo $result."\n"; |
| 871 | - } |
|
| 871 | + } |
|
| 872 | 872 | } |
| 873 | 873 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 874 | 874 | $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']); |
@@ -880,7 +880,7 @@ discard block |
||
| 880 | 880 | //if ($line['format_source'] != 'aprs') { |
| 881 | 881 | //if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) { |
| 882 | 882 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 883 | - if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
|
| 883 | + if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
|
| 884 | 884 | $source = $this->all_flights[$id]['source_name']; |
| 885 | 885 | if ($source == '') $source = $this->all_flights[$id]['format_source']; |
| 886 | 886 | if (!isset($this->source_location[$source])) { |
@@ -906,7 +906,7 @@ discard block |
||
| 906 | 906 | if ($stats_heading == 16) $stats_heading = 0; |
| 907 | 907 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 908 | 908 | for ($i=0;$i<=15;$i++) { |
| 909 | - $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 909 | + $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 910 | 910 | } |
| 911 | 911 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
| 912 | 912 | } else { |
@@ -919,17 +919,17 @@ discard block |
||
| 919 | 919 | //var_dump($this->stats); |
| 920 | 920 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 921 | 921 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 922 | - end($this->stats[$current_date][$source]['hist']); |
|
| 923 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 922 | + end($this->stats[$current_date][$source]['hist']); |
|
| 923 | + $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 924 | 924 | } else $mini = 0; |
| 925 | 925 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 926 | - $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 926 | + $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 927 | 927 | } |
| 928 | 928 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
| 929 | 929 | } else { |
| 930 | 930 | $this->stats[$current_date][$source]['hist'][$distance] += 1; |
| 931 | 931 | } |
| 932 | - } |
|
| 932 | + } |
|
| 933 | 933 | } |
| 934 | 934 | |
| 935 | 935 | $this->all_flights[$id]['lastupdate'] = time(); |
@@ -939,7 +939,7 @@ discard block |
||
| 939 | 939 | //$this->del(); |
| 940 | 940 | |
| 941 | 941 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 942 | - if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 942 | + if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 943 | 943 | if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
| 944 | 944 | $SpotterLive = new SpotterLive($this->db); |
| 945 | 945 | $SpotterLive->deleteLiveSpotterDataNotUpdated(); |
@@ -947,19 +947,19 @@ discard block |
||
| 947 | 947 | //SpotterLive->deleteLiveSpotterData(); |
| 948 | 948 | if ($globalDebug) echo " Done\n"; |
| 949 | 949 | $this->last_delete_hourly = time(); |
| 950 | - } else { |
|
| 950 | + } else { |
|
| 951 | 951 | $this->del(); |
| 952 | 952 | $this->last_delete_hourly = time(); |
| 953 | - } |
|
| 953 | + } |
|
| 954 | 954 | } |
| 955 | 955 | |
| 956 | - } |
|
| 957 | - //$ignoreImport = false; |
|
| 956 | + } |
|
| 957 | + //$ignoreImport = false; |
|
| 958 | 958 | } |
| 959 | 959 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 960 | 960 | if ($send) return $this->all_flights[$id]; |
| 961 | - } |
|
| 961 | + } |
|
| 962 | + } |
|
| 962 | 963 | } |
| 963 | - } |
|
| 964 | 964 | } |
| 965 | 965 | ?> |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | // When button "Remove all filters" is clicked |
| 29 | 29 | if (isset($_POST['removefilters'])) { |
| 30 | 30 | $allfilters = array_filter(array_keys($_COOKIE),function($key) { |
| 31 | - return strpos($key,'filter_') === 0; |
|
| 31 | + return strpos($key,'filter_') === 0; |
|
| 32 | 32 | }); |
| 33 | 33 | foreach ($allfilters as $filt) { |
| 34 | 34 | unset($_COOKIE[$filt]); |
@@ -168,17 +168,17 @@ discard block |
||
| 168 | 168 | } |
| 169 | 169 | ?> |
| 170 | 170 | <?php |
| 171 | - if (isset($_POST['archive'])) { |
|
| 171 | + if (isset($_POST['archive'])) { |
|
| 172 | 172 | ?> |
| 173 | 173 | <script src="<?php print $globalURL; ?>/js/map.common.js"></script> |
| 174 | 174 | <?php |
| 175 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 175 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 176 | 176 | ?> |
| 177 | 177 | |
| 178 | 178 | <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>&archive&begindate=<?php print strtotime($_POST['start_date']); ?>&enddate=<?php print strtotime($_POST['end_date']); ?>&archivespeed=<?php print $_POST['archivespeed']; ?>"></script> |
| 179 | 179 | <?php |
| 180 | - } |
|
| 181 | - } else { |
|
| 180 | + } |
|
| 181 | + } else { |
|
| 182 | 182 | ?> |
| 183 | 183 | <?php |
| 184 | 184 | /* if (isset($globalBeta) && $globalBeta) { |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | */ |
| 191 | 191 | ?> |
| 192 | 192 | <?php |
| 193 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 193 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 194 | 194 | ?> |
| 195 | 195 | <?php |
| 196 | 196 | // if (isset($globalBeta) && $globalBeta) { |
@@ -217,13 +217,13 @@ discard block |
||
| 217 | 217 | <script src="<?php print $globalURL; ?>/js/map-marine.2d.js.php?<?php print time(); ?>"></script> |
| 218 | 218 | <?php |
| 219 | 219 | } |
| 220 | - } |
|
| 220 | + } |
|
| 221 | 221 | ?> |
| 222 | 222 | <?php |
| 223 | 223 | // } |
| 224 | 224 | ?> |
| 225 | 225 | <?php |
| 226 | - } |
|
| 226 | + } |
|
| 227 | 227 | } |
| 228 | 228 | ?> |
| 229 | 229 | <?php |
@@ -380,15 +380,15 @@ discard block |
||
| 380 | 380 | <li><a href="<?php print $globalURL; ?>/airline"><?php echo _("Airlines"); ?></a></li> |
| 381 | 381 | <li><a href="<?php print $globalURL; ?>/airport"><?php echo _("Airports"); ?></a></li> |
| 382 | 382 | <?php |
| 383 | - if ((!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) { |
|
| 383 | + if ((!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) { |
|
| 384 | 384 | ?> |
| 385 | 385 | <li><a href="<?php print $globalURL; ?>/owner"><?php echo _("Owners"); ?></a></li> |
| 386 | 386 | <?php |
| 387 | - } else { |
|
| 387 | + } else { |
|
| 388 | 388 | ?> |
| 389 | 389 | <li><a href="<?php print $globalURL; ?>/pilot"><?php echo _("Pilots"); ?></a></li> |
| 390 | 390 | <?php |
| 391 | - } |
|
| 391 | + } |
|
| 392 | 392 | ?> |
| 393 | 393 | <li><hr /></li> |
| 394 | 394 | <li><a href="<?php print $globalURL; ?>/currently"><?php echo _("Current Activity"); ?></a></li> |
@@ -396,34 +396,34 @@ discard block |
||
| 396 | 396 | <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li> |
| 397 | 397 | <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li> |
| 398 | 398 | <?php |
| 399 | - if ($globalACARS) { |
|
| 400 | - if (isset($globalDemo) && $globalDemo) { |
|
| 401 | - ?> |
|
| 399 | + if ($globalACARS) { |
|
| 400 | + if (isset($globalDemo) && $globalDemo) { |
|
| 401 | + ?> |
|
| 402 | 402 | <li><hr /></li> |
| 403 | 403 | <li><i><?php echo _('ACARS data not available publicly'); ?></i></li> |
| 404 | 404 | <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li> |
| 405 | 405 | <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li> |
| 406 | 406 | <?php |
| 407 | - } else { |
|
| 408 | - ?> |
|
| 407 | + } else { |
|
| 408 | + ?> |
|
| 409 | 409 | <li><hr /></li> |
| 410 | 410 | <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li> |
| 411 | 411 | <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li> |
| 412 | 412 | <?php |
| 413 | - } |
|
| 414 | - } |
|
| 415 | - ?> |
|
| 413 | + } |
|
| 414 | + } |
|
| 415 | + ?> |
|
| 416 | 416 | <?php |
| 417 | - if (isset($globalAccidents) && $globalAccidents) { |
|
| 418 | - ?> |
|
| 417 | + if (isset($globalAccidents) && $globalAccidents) { |
|
| 418 | + ?> |
|
| 419 | 419 | <li><hr /></li> |
| 420 | 420 | <li><a href="<?php print $globalURL; ?>/accident-latest"><?php echo _("Latest accident"); ?></a></li> |
| 421 | 421 | <li><a href="<?php print $globalURL; ?>/accident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Accident"); ?></a></li> |
| 422 | 422 | <li><a href="<?php print $globalURL; ?>/incident-latest"><?php echo _("Latest incident"); ?></a></li> |
| 423 | 423 | <li><a href="<?php print $globalURL; ?>/incident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Incident"); ?></a></li> |
| 424 | 424 | <?php |
| 425 | - } |
|
| 426 | - ?> |
|
| 425 | + } |
|
| 426 | + ?> |
|
| 427 | 427 | <li><hr /></li> |
| 428 | 428 | <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li> |
| 429 | 429 | <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li> |
@@ -465,14 +465,14 @@ discard block |
||
| 465 | 465 | <form> |
| 466 | 466 | <select class="selectpicker" data-width="120px" onchange="language(this);"> |
| 467 | 467 | <?php |
| 468 | - $Language = new Language(); |
|
| 469 | - $alllang = $Language->getLanguages(); |
|
| 470 | - foreach ($alllang as $key => $lang) { |
|
| 471 | - print '<option value="'.$key.'"'; |
|
| 472 | - if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected '; |
|
| 473 | - print '>'.$lang[0].'</option>'; |
|
| 474 | - } |
|
| 475 | - ?> |
|
| 468 | + $Language = new Language(); |
|
| 469 | + $alllang = $Language->getLanguages(); |
|
| 470 | + foreach ($alllang as $key => $lang) { |
|
| 471 | + print '<option value="'.$key.'"'; |
|
| 472 | + if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected '; |
|
| 473 | + print '>'.$lang[0].'</option>'; |
|
| 474 | + } |
|
| 475 | + ?> |
|
| 476 | 476 | </select> |
| 477 | 477 | </form> |
| 478 | 478 | </div> |
@@ -503,18 +503,18 @@ discard block |
||
| 503 | 503 | ?> |
| 504 | 504 | <div class="top-header clear" role="main"> |
| 505 | 505 | <?php |
| 506 | - if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) { |
|
| 506 | + if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) { |
|
| 507 | 507 | ?> |
| 508 | 508 | <div id="archive-map"></div> |
| 509 | 509 | <?php |
| 510 | - } |
|
| 510 | + } |
|
| 511 | 511 | ?> |
| 512 | 512 | </div> |
| 513 | 513 | <?php |
| 514 | 514 | } |
| 515 | 515 | if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false)) |
| 516 | 516 | { |
| 517 | - ?> |
|
| 517 | + ?> |
|
| 518 | 518 | <div class="top-header clear" role="main"> |
| 519 | 519 | <div id="map"></div> |
| 520 | 520 | <link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" /> |
@@ -525,15 +525,15 @@ discard block |
||
| 525 | 525 | var zoom = 13; |
| 526 | 526 | //create the map |
| 527 | 527 | <?php |
| 528 | - if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
| 528 | + if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) { |
|
| 529 | 529 | ?> |
| 530 | 530 | map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom); |
| 531 | 531 | <?php |
| 532 | - } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) { |
|
| 532 | + } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) { |
|
| 533 | 533 | ?> |
| 534 | 534 | map = L.map('map', { zoomControl:true }); |
| 535 | 535 | <?php |
| 536 | - } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
| 536 | + } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) { |
|
| 537 | 537 | ?> |
| 538 | 538 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]); |
| 539 | 539 | var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map); |
@@ -541,22 +541,22 @@ discard block |
||
| 541 | 541 | var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map); |
| 542 | 542 | var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map); |
| 543 | 543 | <?php |
| 544 | - } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) { |
|
| 544 | + } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) { |
|
| 545 | 545 | ?> |
| 546 | 546 | map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]); |
| 547 | 547 | <?php |
| 548 | - } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) { |
|
| 548 | + } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) { |
|
| 549 | 549 | ?> |
| 550 | 550 | map = L.map('map', { zoomControl:true }); |
| 551 | 551 | <?php |
| 552 | - } |
|
| 552 | + } |
|
| 553 | 553 | ?> |
| 554 | 554 | //initialize the layer group for the aircrft markers |
| 555 | 555 | var layer_data = L.layerGroup(); |
| 556 | 556 | |
| 557 | 557 | //a few title layers |
| 558 | 558 | <?php |
| 559 | - if ($globalMapProvider == 'Mapbox') { |
|
| 559 | + if ($globalMapProvider == 'Mapbox') { |
|
| 560 | 560 | ?> |
| 561 | 561 | L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', { |
| 562 | 562 | maxZoom: 18, |
@@ -567,7 +567,7 @@ discard block |
||
| 567 | 567 | token : '<?php print $globalMapboxToken; ?>' |
| 568 | 568 | }).addTo(map); |
| 569 | 569 | <?php |
| 570 | - } elseif ($globalMapProvider == 'OpenStreetMap') { |
|
| 570 | + } elseif ($globalMapProvider == 'OpenStreetMap') { |
|
| 571 | 571 | ?> |
| 572 | 572 | L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { |
| 573 | 573 | maxZoom: 18, |
@@ -575,7 +575,7 @@ discard block |
||
| 575 | 575 | '<a href="http://www.openstreetmap.org/copyright">Open Database Licence</a>' |
| 576 | 576 | }).addTo(map); |
| 577 | 577 | <?php |
| 578 | - } elseif ($globalMapProvider == 'MapQuest-OSM') { |
|
| 578 | + } elseif ($globalMapProvider == 'MapQuest-OSM') { |
|
| 579 | 579 | ?> |
| 580 | 580 | L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', { |
| 581 | 581 | maxZoom: 18, |
@@ -584,7 +584,7 @@ discard block |
||
| 584 | 584 | 'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>' |
| 585 | 585 | }).addTo(map); |
| 586 | 586 | <?php |
| 587 | - } elseif ($globalMapProvider == 'MapQuest-Aerial') { |
|
| 587 | + } elseif ($globalMapProvider == 'MapQuest-Aerial') { |
|
| 588 | 588 | ?> |
| 589 | 589 | L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', { |
| 590 | 590 | maxZoom: 18, |
@@ -593,27 +593,27 @@ discard block |
||
| 593 | 593 | 'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>, Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency"' |
| 594 | 594 | }).addTo(map); |
| 595 | 595 | <?php |
| 596 | - } elseif ($globalMapProvider == 'Google-Roadmap') { |
|
| 596 | + } elseif ($globalMapProvider == 'Google-Roadmap') { |
|
| 597 | 597 | ?> |
| 598 | 598 | var googleLayer = new L.Google('ROADMAP'); |
| 599 | 599 | map.addLayer(googleLayer); |
| 600 | 600 | <?php |
| 601 | - } elseif ($globalMapProvider == 'Google-Satellite') { |
|
| 601 | + } elseif ($globalMapProvider == 'Google-Satellite') { |
|
| 602 | 602 | ?> |
| 603 | 603 | var googleLayer = new L.Google('SATELLITE'); |
| 604 | 604 | map.addLayer(googleLayer); |
| 605 | 605 | <?php |
| 606 | - } elseif ($globalMapProvider == 'Google-Hybrid') { |
|
| 606 | + } elseif ($globalMapProvider == 'Google-Hybrid') { |
|
| 607 | 607 | ?> |
| 608 | 608 | var googleLayer = new L.Google('HYBRID'); |
| 609 | 609 | map.addLayer(googleLayer); |
| 610 | 610 | <?php |
| 611 | - } elseif ($globalMapProvider == 'Google-Terrain') { |
|
| 611 | + } elseif ($globalMapProvider == 'Google-Terrain') { |
|
| 612 | 612 | ?> |
| 613 | 613 | var googleLayer = new L.Google('Terrain'); |
| 614 | 614 | map.addLayer(googleLayer); |
| 615 | 615 | <?php |
| 616 | - } |
|
| 616 | + } |
|
| 617 | 617 | ?> |
| 618 | 618 | </script> |
| 619 | 619 | </div> |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone); |
| 52 | 52 | print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>'; |
| 53 | 53 | } |
| 54 | - ?> |
|
| 54 | + ?> |
|
| 55 | 55 | </div> |
| 56 | 56 | <?php include('statistics-sub-menu.php'); ?> |
| 57 | 57 | <p class="global-stats"> |
@@ -60,23 +60,23 @@ discard block |
||
| 60 | 60 | <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
| 61 | 61 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 62 | 62 | <?php |
| 63 | - if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 63 | + if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 64 | 64 | ?> |
| 65 | 65 | <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span> |
| 66 | 66 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 67 | 67 | <?php |
| 68 | - } else { |
|
| 69 | - ?> |
|
| 68 | + } else { |
|
| 69 | + ?> |
|
| 70 | 70 | <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span> |
| 71 | 71 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 72 | 72 | <?php |
| 73 | - } |
|
| 74 | - ?> |
|
| 73 | + } |
|
| 74 | + ?> |
|
| 75 | 75 | <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
| 76 | 76 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 77 | 77 | <?php |
| 78 | - if ($airline_icao == '') { |
|
| 79 | - ?> |
|
| 78 | + if ($airline_icao == '') { |
|
| 79 | + ?> |
|
| 80 | 80 | <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span> |
| 81 | 81 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 82 | 82 | <?php |
@@ -99,88 +99,88 @@ discard block |
||
| 99 | 99 | <div class="col-md-6"> |
| 100 | 100 | <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2> |
| 101 | 101 | <?php |
| 102 | - $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
| 103 | - if (count($aircraft_array) == 0) print _("No data available"); |
|
| 104 | - else { |
|
| 105 | - print '<div id="chart1" class="chart" width="100%"></div><script>'; |
|
| 106 | - $aircraft_data = ''; |
|
| 107 | - foreach($aircraft_array as $aircraft_item) |
|
| 108 | - { |
|
| 109 | - $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
| 110 | - } |
|
| 111 | - $aircraft_data = substr($aircraft_data, 0, -1); |
|
| 112 | - print 'var series = ['.$aircraft_data.'];'; |
|
| 113 | - print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 114 | - print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);'; |
|
| 115 | - print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 116 | - print 'var aircraftype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 117 | - print 'dataset'; |
|
| 118 | - print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 119 | - print '</script>'; |
|
| 120 | - } |
|
| 121 | - ?> |
|
| 102 | + $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
| 103 | + if (count($aircraft_array) == 0) print _("No data available"); |
|
| 104 | + else { |
|
| 105 | + print '<div id="chart1" class="chart" width="100%"></div><script>'; |
|
| 106 | + $aircraft_data = ''; |
|
| 107 | + foreach($aircraft_array as $aircraft_item) |
|
| 108 | + { |
|
| 109 | + $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
| 110 | + } |
|
| 111 | + $aircraft_data = substr($aircraft_data, 0, -1); |
|
| 112 | + print 'var series = ['.$aircraft_data.'];'; |
|
| 113 | + print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 114 | + print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);'; |
|
| 115 | + print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 116 | + print 'var aircraftype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 117 | + print 'dataset'; |
|
| 118 | + print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 119 | + print '</script>'; |
|
| 120 | + } |
|
| 121 | + ?> |
|
| 122 | 122 | <div class="more"> |
| 123 | 123 | <?php |
| 124 | - if ($year != '' && $month != '') { |
|
| 125 | - ?> |
|
| 124 | + if ($year != '' && $month != '') { |
|
| 125 | + ?> |
|
| 126 | 126 | <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 127 | 127 | <?php |
| 128 | - } else { |
|
| 129 | - ?> |
|
| 128 | + } else { |
|
| 129 | + ?> |
|
| 130 | 130 | <a href="<?php print $globalURL; ?>/statistics/aircraft<?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> |
| 131 | 131 | <?php |
| 132 | - } |
|
| 133 | - ?> |
|
| 132 | + } |
|
| 133 | + ?> |
|
| 134 | 134 | </div> |
| 135 | 135 | </div> |
| 136 | 136 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 137 | 137 | <?php |
| 138 | 138 | // echo $airline_icao; |
| 139 | - if ($airline_icao == '' || $airline_icao == 'all') { |
|
| 139 | + if ($airline_icao == '' || $airline_icao == 'all') { |
|
| 140 | 140 | $airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month); |
| 141 | 141 | if (count($airline_array) > 0) { |
| 142 | - print '<div class="col-md-6">'; |
|
| 143 | - print '<h2>'._("Top 10 Most Common Airline").'</h2>'; |
|
| 144 | - print '<div id="chart2" class="chart" width="100%"></div><script>'; |
|
| 145 | - $airline_data = ''; |
|
| 146 | - foreach($airline_array as $airline_item) |
|
| 147 | - { |
|
| 142 | + print '<div class="col-md-6">'; |
|
| 143 | + print '<h2>'._("Top 10 Most Common Airline").'</h2>'; |
|
| 144 | + print '<div id="chart2" class="chart" width="100%"></div><script>'; |
|
| 145 | + $airline_data = ''; |
|
| 146 | + foreach($airline_array as $airline_item) |
|
| 147 | + { |
|
| 148 | 148 | $airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],'; |
| 149 | - } |
|
| 150 | - $airline_data = substr($airline_data, 0, -1); |
|
| 151 | - print 'var series = ['.$airline_data.'];'; |
|
| 152 | - print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 153 | - print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 154 | - print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 155 | - print 'var airlinescnt = new d3pie("chart2",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 156 | - print 'dataset'; |
|
| 157 | - print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 158 | - print '</script>'; |
|
| 159 | - if ($year != '' && $month != '') { |
|
| 149 | + } |
|
| 150 | + $airline_data = substr($airline_data, 0, -1); |
|
| 151 | + print 'var series = ['.$airline_data.'];'; |
|
| 152 | + print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 153 | + print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 154 | + print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 155 | + print 'var airlinescnt = new d3pie("chart2",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 156 | + print 'dataset'; |
|
| 157 | + print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 158 | + print '</script>'; |
|
| 159 | + if ($year != '' && $month != '') { |
|
| 160 | 160 | print '<div class="more"><a href="'.$globalURL.'/statistics/airline'; |
| 161 | 161 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 162 | 162 | print '/'.$year.'/'.$month.'/" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 163 | - } else { |
|
| 163 | + } else { |
|
| 164 | 164 | print '<div class="more"><a href="'.$globalURL.'/statistics/airline'; |
| 165 | 165 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 166 | 166 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 167 | - } |
|
| 168 | - print '</div>'; |
|
| 167 | + } |
|
| 168 | + print '</div>'; |
|
| 169 | 169 | } |
| 170 | 170 | ?> |
| 171 | 171 | </div> |
| 172 | 172 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 173 | 173 | <?php |
| 174 | - } |
|
| 174 | + } |
|
| 175 | 175 | ?> |
| 176 | 176 | <div class="row column"> |
| 177 | 177 | <?php |
| 178 | - $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month); |
|
| 179 | - if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 178 | + $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month); |
|
| 179 | + if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 180 | 180 | if (empty($flightover_array)) { |
| 181 | - print '<div class="col-md-12">'; |
|
| 181 | + print '<div class="col-md-12">'; |
|
| 182 | 182 | } else { |
| 183 | - print '<div class="col-md-6">'; |
|
| 183 | + print '<div class="col-md-6">'; |
|
| 184 | 184 | } |
| 185 | 185 | ?> |
| 186 | 186 | <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2> |
@@ -188,23 +188,23 @@ discard block |
||
| 188 | 188 | $pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month); |
| 189 | 189 | if (count($pilot_array) == 0) print _("No data available"); |
| 190 | 190 | else { |
| 191 | - print '<div id="chart7" class="chart" width="100%"></div><script>'; |
|
| 192 | - $pilot_data = ''; |
|
| 193 | - foreach($pilot_array as $pilot_item) |
|
| 194 | - { |
|
| 191 | + print '<div id="chart7" class="chart" width="100%"></div><script>'; |
|
| 192 | + $pilot_data = ''; |
|
| 193 | + foreach($pilot_array as $pilot_item) |
|
| 194 | + { |
|
| 195 | 195 | $pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],'; |
| 196 | - } |
|
| 197 | - $pilot_data = substr($pilot_data, 0, -1); |
|
| 198 | - print 'var series = ['.$pilot_data.'];'; |
|
| 199 | - print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 200 | - print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 201 | - print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 202 | - print 'var pilotcnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 203 | - print 'dataset'; |
|
| 204 | - print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 205 | - print '</script>'; |
|
| 206 | - } |
|
| 207 | - print '<div class="more">'; |
|
| 196 | + } |
|
| 197 | + $pilot_data = substr($pilot_data, 0, -1); |
|
| 198 | + print 'var series = ['.$pilot_data.'];'; |
|
| 199 | + print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 200 | + print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 201 | + print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 202 | + print 'var pilotcnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 203 | + print 'dataset'; |
|
| 204 | + print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 205 | + print '</script>'; |
|
| 206 | + } |
|
| 207 | + print '<div class="more">'; |
|
| 208 | 208 | print '<a href="'.$globalURL.'/statistics/pilot'; |
| 209 | 209 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 210 | 210 | print'" class="btn btn-default btn" role="button">'._("See full statistic").'»</a>'; |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | |
| 215 | 215 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 216 | 216 | <?php |
| 217 | - } else { |
|
| 217 | + } else { |
|
| 218 | 218 | ?> |
| 219 | 219 | <div class="col-md-6"> |
| 220 | 220 | <h2><?php echo _("Top 10 Most Common Owners"); ?></h2> |
@@ -222,21 +222,21 @@ discard block |
||
| 222 | 222 | $owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month); |
| 223 | 223 | if (count($owner_array) == 0) print _("No data available"); |
| 224 | 224 | else { |
| 225 | - print '<div id="chart7" class="chart" width="100%"></div><script>'; |
|
| 226 | - $owner_data = ''; |
|
| 227 | - foreach($owner_array as $owner_item) |
|
| 228 | - { |
|
| 225 | + print '<div id="chart7" class="chart" width="100%"></div><script>'; |
|
| 226 | + $owner_data = ''; |
|
| 227 | + foreach($owner_array as $owner_item) |
|
| 228 | + { |
|
| 229 | 229 | $owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],'; |
| 230 | - } |
|
| 231 | - $owner_data = substr($owner_data, 0, -1); |
|
| 232 | - print 'var series = ['.$owner_data.'];'; |
|
| 233 | - print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 234 | - print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 235 | - print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 236 | - print 'var ownercnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 237 | - print 'dataset'; |
|
| 238 | - print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 239 | - print '</script>'; |
|
| 230 | + } |
|
| 231 | + $owner_data = substr($owner_data, 0, -1); |
|
| 232 | + print 'var series = ['.$owner_data.'];'; |
|
| 233 | + print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 234 | + print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 235 | + print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 236 | + print 'var ownercnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 237 | + print 'dataset'; |
|
| 238 | + print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 239 | + print '</script>'; |
|
| 240 | 240 | } |
| 241 | 241 | ?> |
| 242 | 242 | <div class="more"> |
@@ -246,8 +246,8 @@ discard block |
||
| 246 | 246 | |
| 247 | 247 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 248 | 248 | <?php |
| 249 | - } |
|
| 250 | - if (!empty($flightover_array)) { |
|
| 249 | + } |
|
| 250 | + if (!empty($flightover_array)) { |
|
| 251 | 251 | ?> |
| 252 | 252 | <div class="col-md-6"> |
| 253 | 253 | <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2> |
@@ -255,20 +255,20 @@ discard block |
||
| 255 | 255 | //$flightover_array = $Stats->countAllFlightOverCountries(); |
| 256 | 256 | if (count($flightover_array) == 0) print _("No data available"); |
| 257 | 257 | else { |
| 258 | - print '<div id="chart10" class="chart" width="100%"></div><script>'; |
|
| 259 | - print 'var series = ['; |
|
| 260 | - $flightover_data = ''; |
|
| 261 | - foreach($flightover_array as $flightover_item) |
|
| 262 | - { |
|
| 258 | + print '<div id="chart10" class="chart" width="100%"></div><script>'; |
|
| 259 | + print 'var series = ['; |
|
| 260 | + $flightover_data = ''; |
|
| 261 | + foreach($flightover_array as $flightover_item) |
|
| 262 | + { |
|
| 263 | 263 | $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],'; |
| 264 | - } |
|
| 265 | - $flightover_data = substr($flightover_data, 0, -1); |
|
| 266 | - print $flightover_data; |
|
| 267 | - print '];'; |
|
| 268 | - print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 269 | - print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 270 | - print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});'; |
|
| 271 | - print 'new Datamap({ |
|
| 264 | + } |
|
| 265 | + $flightover_data = substr($flightover_data, 0, -1); |
|
| 266 | + print $flightover_data; |
|
| 267 | + print '];'; |
|
| 268 | + print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 269 | + print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 270 | + print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});'; |
|
| 271 | + print 'new Datamap({ |
|
| 272 | 272 | element: document.getElementById("chart10"), |
| 273 | 273 | projection: "mercator", // big world map |
| 274 | 274 | fills: { defaultFill: "#F5F5F5" }, |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | } |
| 294 | 294 | } |
| 295 | 295 | });"; |
| 296 | - print '</script>'; |
|
| 296 | + print '</script>'; |
|
| 297 | 297 | } |
| 298 | 298 | ?> |
| 299 | 299 | <div class="more"> |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | </div> |
| 302 | 302 | </div> |
| 303 | 303 | <?php |
| 304 | - } |
|
| 304 | + } |
|
| 305 | 305 | ?> |
| 306 | 306 | </div> |
| 307 | 307 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -311,13 +311,13 @@ discard block |
||
| 311 | 311 | <div class="row column"> |
| 312 | 312 | <div class="col-md-6"> |
| 313 | 313 | <?php |
| 314 | - $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 315 | - if (count($airport_airport_array) > 0) { |
|
| 314 | + $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 315 | + if (count($airport_airport_array) > 0) { |
|
| 316 | 316 | print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>'; |
| 317 | 317 | print '<div id="chart3" class="chart" width="100%"></div><script>'; |
| 318 | - print "\n"; |
|
| 319 | - print 'var series = ['; |
|
| 320 | - $airport_data = ''; |
|
| 318 | + print "\n"; |
|
| 319 | + print 'var series = ['; |
|
| 320 | + $airport_data = ''; |
|
| 321 | 321 | foreach($airport_airport_array as $airport_item) |
| 322 | 322 | { |
| 323 | 323 | $airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],'; |
@@ -366,20 +366,20 @@ discard block |
||
| 366 | 366 | print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure'; |
| 367 | 367 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 368 | 368 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 369 | - } |
|
| 369 | + } |
|
| 370 | 370 | ?> |
| 371 | 371 | </div> |
| 372 | 372 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 373 | 373 | |
| 374 | 374 | <div class="col-md-6"> |
| 375 | 375 | <?php |
| 376 | - $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 377 | - if (count($airport_airport_array2) > 0) { |
|
| 376 | + $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 377 | + if (count($airport_airport_array2) > 0) { |
|
| 378 | 378 | print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>'; |
| 379 | 379 | print '<div id="chart4" class="chart" width="100%"></div><script>'; |
| 380 | - print "\n"; |
|
| 381 | - print 'var series = ['; |
|
| 382 | - $airport_data = ''; |
|
| 380 | + print "\n"; |
|
| 381 | + print 'var series = ['; |
|
| 382 | + $airport_data = ''; |
|
| 383 | 383 | foreach($airport_airport_array2 as $airport_item) |
| 384 | 384 | { |
| 385 | 385 | $airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],'; |
@@ -429,28 +429,28 @@ discard block |
||
| 429 | 429 | print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival'; |
| 430 | 430 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 431 | 431 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 432 | - } |
|
| 432 | + } |
|
| 433 | 433 | ?> |
| 434 | 434 | </div> |
| 435 | 435 | </div> |
| 436 | 436 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 437 | 437 | <?php |
| 438 | - if ($year == '' && $month == '') { |
|
| 438 | + if ($year == '' && $month == '') { |
|
| 439 | 439 | ?> |
| 440 | 440 | <div class="row column"> |
| 441 | 441 | <div class="col-md-6"> |
| 442 | 442 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
| 443 | 443 | <?php |
| 444 | - $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 445 | - if (count($year_array) == 0) print _("No data available"); |
|
| 446 | - else { |
|
| 444 | + $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 445 | + if (count($year_array) == 0) print _("No data available"); |
|
| 446 | + else { |
|
| 447 | 447 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 448 | 448 | $year_data = ''; |
| 449 | 449 | $year_cnt = ''; |
| 450 | 450 | foreach($year_array as $year_item) |
| 451 | 451 | { |
| 452 | - $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
|
| 453 | - $year_cnt .= $year_item['date_count'].','; |
|
| 452 | + $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
|
| 453 | + $year_cnt .= $year_item['date_count'].','; |
|
| 454 | 454 | } |
| 455 | 455 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 456 | 456 | $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
@@ -460,8 +460,8 @@ discard block |
||
| 460 | 460 | columns: ['.$year_data.','.$year_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 461 | 461 | axis: { x: { type: "timeseries", localtime: false,tick: { format: "%Y-%m"}}, y: { label: "# of Flights"}},legend: { show: false }});'; |
| 462 | 462 | print '</script>'; |
| 463 | - } |
|
| 464 | - ?> |
|
| 463 | + } |
|
| 464 | + ?> |
|
| 465 | 465 | <div class="more"> |
| 466 | 466 | <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> |
| 467 | 467 | </div> |
@@ -470,16 +470,16 @@ discard block |
||
| 470 | 470 | <div class="col-md-6"> |
| 471 | 471 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 472 | 472 | <?php |
| 473 | - $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name); |
|
| 474 | - if (count($month_array) == 0) print _("No data available"); |
|
| 475 | - else { |
|
| 476 | - print '<div id="chart9" class="chart" width="100%"></div><script>'; |
|
| 477 | - $month_data = ''; |
|
| 473 | + $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name); |
|
| 474 | + if (count($month_array) == 0) print _("No data available"); |
|
| 475 | + else { |
|
| 476 | + print '<div id="chart9" class="chart" width="100%"></div><script>'; |
|
| 477 | + $month_data = ''; |
|
| 478 | 478 | $month_cnt = ''; |
| 479 | 479 | foreach($month_array as $month_item) |
| 480 | 480 | { |
| 481 | - $month_data .= '"'.$month_item['date_name'].'",'; |
|
| 482 | - $month_cnt .= $month_item['date_count'].','; |
|
| 481 | + $month_data .= '"'.$month_item['date_name'].'",'; |
|
| 482 | + $month_cnt .= $month_item['date_count'].','; |
|
| 483 | 483 | } |
| 484 | 484 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 485 | 485 | $month_cnt = "['flights',".substr($month_cnt,0,-1)."]"; |
@@ -489,9 +489,9 @@ discard block |
||
| 489 | 489 | columns: ['.$month_data.','.$month_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 490 | 490 | axis: { x: { type: "timeseries", localtime: false,tick: { format: "%Y-%m-%d"}}, y: { label: "# of Flights"}},legend: { show: false }});'; |
| 491 | 491 | |
| 492 | - print '</script>'; |
|
| 493 | - } |
|
| 494 | - ?> |
|
| 492 | + print '</script>'; |
|
| 493 | + } |
|
| 494 | + ?> |
|
| 495 | 495 | <div class="more"> |
| 496 | 496 | <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> |
| 497 | 497 | </div> |
@@ -501,16 +501,16 @@ discard block |
||
| 501 | 501 | <div class="col-md-6"> |
| 502 | 502 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
| 503 | 503 | <?php |
| 504 | - $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 505 | - if (empty($date_array)) print _("No data available"); |
|
| 506 | - else { |
|
| 507 | - print '<div id="chart5" class="chart" width="100%"></div><script>'; |
|
| 508 | - $date_data = ''; |
|
| 504 | + $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 505 | + if (empty($date_array)) print _("No data available"); |
|
| 506 | + else { |
|
| 507 | + print '<div id="chart5" class="chart" width="100%"></div><script>'; |
|
| 508 | + $date_data = ''; |
|
| 509 | 509 | $date_cnt = ''; |
| 510 | 510 | foreach($date_array as $date_item) |
| 511 | 511 | { |
| 512 | - $date_data .= '"'.$date_item['date_name'].'",'; |
|
| 513 | - $date_cnt .= $date_item['date_count'].','; |
|
| 512 | + $date_data .= '"'.$date_item['date_name'].'",'; |
|
| 513 | + $date_cnt .= $date_item['date_count'].','; |
|
| 514 | 514 | } |
| 515 | 515 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 516 | 516 | $date_cnt = "['flights',".substr($date_cnt,0,-1)."]"; |
@@ -520,9 +520,9 @@ discard block |
||
| 520 | 520 | columns: ['.$date_data.','.$date_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 521 | 521 | axis: { x: { type: "timeseries",tick: { format: "%Y-%m-%d"}}, y: { label: "# of Flights"}},legend: { show: false }});'; |
| 522 | 522 | |
| 523 | - print '</script>'; |
|
| 524 | - } |
|
| 525 | - ?> |
|
| 523 | + print '</script>'; |
|
| 524 | + } |
|
| 525 | + ?> |
|
| 526 | 526 | <div class="more"> |
| 527 | 527 | <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> |
| 528 | 528 | </div> |
@@ -531,16 +531,16 @@ discard block |
||
| 531 | 531 | <div class="col-md-6"> |
| 532 | 532 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 533 | 533 | <?php |
| 534 | - $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 535 | - if (empty($hour_array)) print _("No data available"); |
|
| 536 | - else { |
|
| 537 | - print '<div id="chart6" class="chart" width="100%"></div><script>'; |
|
| 538 | - $hour_data = ''; |
|
| 534 | + $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 535 | + if (empty($hour_array)) print _("No data available"); |
|
| 536 | + else { |
|
| 537 | + print '<div id="chart6" class="chart" width="100%"></div><script>'; |
|
| 538 | + $hour_data = ''; |
|
| 539 | 539 | $hour_cnt = ''; |
| 540 | 540 | foreach($hour_array as $hour_item) |
| 541 | 541 | { |
| 542 | - $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
|
| 543 | - $hour_cnt .= $hour_item['hour_count'].','; |
|
| 542 | + $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
|
| 543 | + $hour_cnt .= $hour_item['hour_count'].','; |
|
| 544 | 544 | } |
| 545 | 545 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 546 | 546 | $hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]"; |
@@ -550,9 +550,9 @@ discard block |
||
| 550 | 550 | columns: ['.$hour_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 551 | 551 | axis: { x: { type: "category", categories: '.$hour_data.'},y: { label: "# of Flights"}},legend: { show: false }});'; |
| 552 | 552 | |
| 553 | - print '</script>'; |
|
| 554 | - } |
|
| 555 | - ?> |
|
| 553 | + print '</script>'; |
|
| 554 | + } |
|
| 555 | + ?> |
|
| 556 | 556 | <div class="more"> |
| 557 | 557 | <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> |
| 558 | 558 | </div> |
@@ -560,26 +560,26 @@ discard block |
||
| 560 | 560 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 561 | 561 | </div> |
| 562 | 562 | <?php |
| 563 | - } |
|
| 563 | + } |
|
| 564 | 564 | ?> |
| 565 | 565 | |
| 566 | 566 | <?php |
| 567 | - if (($airline_icao == '' || $airline_icao == 'all') && $year == '' && $month == '' && isset($globalAccidents) && $globalAccidents) { |
|
| 567 | + if (($airline_icao == '' || $airline_icao == 'all') && $year == '' && $month == '' && isset($globalAccidents) && $globalAccidents) { |
|
| 568 | 568 | ?> |
| 569 | 569 | <div class="row column"> |
| 570 | 570 | <div class="col-md-6"> |
| 571 | 571 | <h2><?php echo _("Fatalities by Years"); ?></h2> |
| 572 | 572 | <?php |
| 573 | - $year_array = $Stats->countFatalitiesByYear(); |
|
| 574 | - if (count($year_array) == 0) print _("No data available"); |
|
| 575 | - else { |
|
| 573 | + $year_array = $Stats->countFatalitiesByYear(); |
|
| 574 | + if (count($year_array) == 0) print _("No data available"); |
|
| 575 | + else { |
|
| 576 | 576 | print '<div id="chart32" class="chart" width="100%"></div><script>'; |
| 577 | - $year_data = ''; |
|
| 577 | + $year_data = ''; |
|
| 578 | 578 | $year_cnt = ''; |
| 579 | 579 | foreach($year_array as $year_item) |
| 580 | 580 | { |
| 581 | - $year_data .= '"'.$year_item['year'].'-01-01",'; |
|
| 582 | - $year_cnt .= $year_item['count'].','; |
|
| 581 | + $year_data .= '"'.$year_item['year'].'-01-01",'; |
|
| 582 | + $year_cnt .= $year_item['count'].','; |
|
| 583 | 583 | } |
| 584 | 584 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 585 | 585 | $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
@@ -590,8 +590,8 @@ discard block |
||
| 590 | 590 | axis: { x: { type: "timeseries",tick: { format: "%Y"}}, y: { label: "# of Fatalities"}},legend: { show: false }});'; |
| 591 | 591 | |
| 592 | 592 | print '</script>'; |
| 593 | - } |
|
| 594 | - ?> |
|
| 593 | + } |
|
| 594 | + ?> |
|
| 595 | 595 | <div class="more"> |
| 596 | 596 | <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 597 | 597 | </div> |
@@ -602,16 +602,16 @@ discard block |
||
| 602 | 602 | <div class="col-md-6"> |
| 603 | 603 | <h2><?php echo _("Fatalities last 12 Months"); ?></h2> |
| 604 | 604 | <?php |
| 605 | - $year_array = $Stats->countFatalitiesLast12Months(); |
|
| 606 | - if (count($year_array) == 0) print _("No data available"); |
|
| 607 | - else { |
|
| 605 | + $year_array = $Stats->countFatalitiesLast12Months(); |
|
| 606 | + if (count($year_array) == 0) print _("No data available"); |
|
| 607 | + else { |
|
| 608 | 608 | print '<div id="chart33" class="chart" width="100%"></div><script>'; |
| 609 | - $year_data = ''; |
|
| 609 | + $year_data = ''; |
|
| 610 | 610 | $year_cnt = ''; |
| 611 | 611 | foreach($year_array as $year_item) |
| 612 | 612 | { |
| 613 | - $year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",'; |
|
| 614 | - $year_cnt .= $year_item['count'].','; |
|
| 613 | + $year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",'; |
|
| 614 | + $year_cnt .= $year_item['count'].','; |
|
| 615 | 615 | } |
| 616 | 616 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 617 | 617 | $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
@@ -621,8 +621,8 @@ discard block |
||
| 621 | 621 | columns: ['.$year_data.','.$year_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 622 | 622 | axis: { x: { type: "timeseries",tick: { format: "%Y-%m"}}, y: { label: "# of Fatalities"}},legend: { show: false }});'; |
| 623 | 623 | print '</script>'; |
| 624 | - } |
|
| 625 | - ?> |
|
| 624 | + } |
|
| 625 | + ?> |
|
| 626 | 626 | <div class="more"> |
| 627 | 627 | <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 628 | 628 | </div> |
@@ -630,30 +630,30 @@ discard block |
||
| 630 | 630 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 631 | 631 | <br/> |
| 632 | 632 | <?php |
| 633 | - } |
|
| 633 | + } |
|
| 634 | 634 | ?> |
| 635 | 635 | |
| 636 | 636 | <?php |
| 637 | - if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '' && $year == '' && $month == '') { |
|
| 637 | + if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '' && $year == '' && $month == '') { |
|
| 638 | 638 | ?> |
| 639 | 639 | <div class="row column"> |
| 640 | 640 | <?php |
| 641 | - //$polar = $Stats->getStatsSource(date('Y-m-d'),'polar'); |
|
| 642 | - if ($year == '' && $month == '') { |
|
| 643 | - $polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d')); |
|
| 644 | - } else { |
|
| 645 | - $polar = $Stats->getStatsSource('polar',$year,$month); |
|
| 646 | - } |
|
| 647 | - if (!empty($polar)) { |
|
| 648 | - print '<h2>'._("Coverage pattern").'</h2>'; |
|
| 649 | - foreach ($polar as $eachpolar) { |
|
| 650 | - unset($polar_data); |
|
| 651 | - $Spotter = new Spotter(); |
|
| 652 | - $data = json_decode($eachpolar['source_data']); |
|
| 653 | - foreach($data as $value => $key) { |
|
| 654 | - $direction = $Spotter->parseDirection(($value*22.5)); |
|
| 655 | - $distance = $key; |
|
| 656 | - $unit = 'km'; |
|
| 641 | + //$polar = $Stats->getStatsSource(date('Y-m-d'),'polar'); |
|
| 642 | + if ($year == '' && $month == '') { |
|
| 643 | + $polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d')); |
|
| 644 | + } else { |
|
| 645 | + $polar = $Stats->getStatsSource('polar',$year,$month); |
|
| 646 | + } |
|
| 647 | + if (!empty($polar)) { |
|
| 648 | + print '<h2>'._("Coverage pattern").'</h2>'; |
|
| 649 | + foreach ($polar as $eachpolar) { |
|
| 650 | + unset($polar_data); |
|
| 651 | + $Spotter = new Spotter(); |
|
| 652 | + $data = json_decode($eachpolar['source_data']); |
|
| 653 | + foreach($data as $value => $key) { |
|
| 654 | + $direction = $Spotter->parseDirection(($value*22.5)); |
|
| 655 | + $distance = $key; |
|
| 656 | + $unit = 'km'; |
|
| 657 | 657 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 658 | 658 | $distance = round($distance*0.539957); |
| 659 | 659 | $unit = 'nm'; |
@@ -664,10 +664,10 @@ discard block |
||
| 664 | 664 | $distance = $distance; |
| 665 | 665 | $unit = 'km'; |
| 666 | 666 | } |
| 667 | - if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 668 | - else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 669 | - } |
|
| 670 | - ?> |
|
| 667 | + if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 668 | + else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 669 | + } |
|
| 670 | + ?> |
|
| 671 | 671 | <div class="col-md-6"> |
| 672 | 672 | <h4><?php print $eachpolar['source_name']; ?></h4> |
| 673 | 673 | <div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
@@ -699,27 +699,27 @@ discard block |
||
| 699 | 699 | </script> |
| 700 | 700 | </div> |
| 701 | 701 | <?php |
| 702 | - } |
|
| 703 | - } |
|
| 704 | - ?> |
|
| 702 | + } |
|
| 703 | + } |
|
| 704 | + ?> |
|
| 705 | 705 | </div> |
| 706 | 706 | <div class="row column"> |
| 707 | 707 | <div class="col-md-6"> |
| 708 | 708 | <?php |
| 709 | - //$msg = $Stats->getStatsSource(date('Y-m-d'),'msg'); |
|
| 710 | - if ($year == '' && $month == '') { |
|
| 711 | - $msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d')); |
|
| 712 | - } else { |
|
| 713 | - $msg = $Stats->getStatsSource('msg',$year,$month); |
|
| 714 | - } |
|
| 715 | - if (!empty($msg)) { |
|
| 716 | - print '<h2>'._("Messages received").'</h2>'; |
|
| 717 | - foreach ($msg as $eachmsg) { |
|
| 718 | - //$eachmsg = $msg[0]; |
|
| 719 | - $data = $eachmsg['source_data']; |
|
| 720 | - if ($data > 500) $max = (round(($data+100)/100))*100; |
|
| 721 | - else $max = 500; |
|
| 722 | - ?> |
|
| 709 | + //$msg = $Stats->getStatsSource(date('Y-m-d'),'msg'); |
|
| 710 | + if ($year == '' && $month == '') { |
|
| 711 | + $msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d')); |
|
| 712 | + } else { |
|
| 713 | + $msg = $Stats->getStatsSource('msg',$year,$month); |
|
| 714 | + } |
|
| 715 | + if (!empty($msg)) { |
|
| 716 | + print '<h2>'._("Messages received").'</h2>'; |
|
| 717 | + foreach ($msg as $eachmsg) { |
|
| 718 | + //$eachmsg = $msg[0]; |
|
| 719 | + $data = $eachmsg['source_data']; |
|
| 720 | + if ($data > 500) $max = (round(($data+100)/100))*100; |
|
| 721 | + else $max = 500; |
|
| 722 | + ?> |
|
| 723 | 723 | <div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
| 724 | 724 | <script> |
| 725 | 725 | var g = new JustGage({ |
@@ -735,9 +735,9 @@ discard block |
||
| 735 | 735 | }); |
| 736 | 736 | </script> |
| 737 | 737 | <?php |
| 738 | - } |
|
| 739 | - } |
|
| 740 | - ?> |
|
| 738 | + } |
|
| 739 | + } |
|
| 740 | + ?> |
|
| 741 | 741 | </div> |
| 742 | 742 | </div> |
| 743 | 743 | <div class="row column"> |
@@ -775,26 +775,26 @@ discard block |
||
| 775 | 775 | //$hist_data = substr($hist_data, 0, -1); |
| 776 | 776 | $distance_data = "['x',".substr($distance_data, 0, -1)."]"; |
| 777 | 777 | $nb_data = "['flights',".substr($nb_data, 0, -1)."]"; |
| 778 | - ?> |
|
| 778 | + ?> |
|
| 779 | 779 | <div class="col-md-6"> |
| 780 | 780 | <h2><?php echo sprintf(_("Flights Distance for %s"),$source); ?></h2> |
| 781 | 781 | <?php |
| 782 | - print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
| 783 | - print 'c3.generate({ |
|
| 782 | + print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
| 783 | + print 'c3.generate({ |
|
| 784 | 784 | bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'", |
| 785 | 785 | data: { x: "x", |
| 786 | 786 | columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 787 | 787 | axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});'; |
| 788 | - print '</script>'; |
|
| 789 | - ?> |
|
| 788 | + print '</script>'; |
|
| 789 | + ?> |
|
| 790 | 790 | </div> |
| 791 | 791 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 792 | 792 | <?php |
| 793 | - } |
|
| 794 | - ?> |
|
| 793 | + } |
|
| 794 | + ?> |
|
| 795 | 795 | </div> |
| 796 | 796 | <?php |
| 797 | - } |
|
| 797 | + } |
|
| 798 | 798 | ?> |
| 799 | 799 | </div> |
| 800 | 800 | </div> |
@@ -12,11 +12,11 @@ discard block |
||
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | - * Gets the images based on the aircraft registration |
|
| 16 | - * |
|
| 17 | - * @return Array the images list |
|
| 18 | - * |
|
| 19 | - */ |
|
| 15 | + * Gets the images based on the aircraft registration |
|
| 16 | + * |
|
| 17 | + * @return Array the images list |
|
| 18 | + * |
|
| 19 | + */ |
|
| 20 | 20 | public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
| 21 | 21 | { |
| 22 | 22 | $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
@@ -37,11 +37,11 @@ discard block |
||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
| 40 | - * Gets the images based on the ship name |
|
| 41 | - * |
|
| 42 | - * @return Array the images list |
|
| 43 | - * |
|
| 44 | - */ |
|
| 40 | + * Gets the images based on the ship name |
|
| 41 | + * |
|
| 42 | + * @return Array the images list |
|
| 43 | + * |
|
| 44 | + */ |
|
| 45 | 45 | public function getMarineImage($mmsi,$imo = '',$name = '') |
| 46 | 46 | { |
| 47 | 47 | $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
@@ -68,11 +68,11 @@ discard block |
||
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
| 71 | - * Gets the image copyright based on the Exif data |
|
| 72 | - * |
|
| 73 | - * @return String image copyright |
|
| 74 | - * |
|
| 75 | - */ |
|
| 71 | + * Gets the image copyright based on the Exif data |
|
| 72 | + * |
|
| 73 | + * @return String image copyright |
|
| 74 | + * |
|
| 75 | + */ |
|
| 76 | 76 | public function getExifCopyright($url) { |
| 77 | 77 | $exif = exif_read_data($url); |
| 78 | 78 | $copyright = ''; |
@@ -87,11 +87,11 @@ discard block |
||
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | /** |
| 90 | - * Adds the images based on the aircraft registration |
|
| 91 | - * |
|
| 92 | - * @return String either success or error |
|
| 93 | - * |
|
| 94 | - */ |
|
| 90 | + * Adds the images based on the aircraft registration |
|
| 91 | + * |
|
| 92 | + * @return String either success or error |
|
| 93 | + * |
|
| 94 | + */ |
|
| 95 | 95 | public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
| 96 | 96 | { |
| 97 | 97 | global $globalDebug,$globalAircraftImageFetch; |
@@ -119,11 +119,11 @@ discard block |
||
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | /** |
| 122 | - * Adds the images based on the marine name |
|
| 123 | - * |
|
| 124 | - * @return String either success or error |
|
| 125 | - * |
|
| 126 | - */ |
|
| 122 | + * Adds the images based on the marine name |
|
| 123 | + * |
|
| 124 | + * @return String either success or error |
|
| 125 | + * |
|
| 126 | + */ |
|
| 127 | 127 | public function addMarineImage($mmsi,$imo = '',$name = '') |
| 128 | 128 | { |
| 129 | 129 | global $globalDebug,$globalMarineImageFetch; |
@@ -160,12 +160,12 @@ discard block |
||
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
| 163 | - * Gets the aircraft image |
|
| 164 | - * |
|
| 165 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 166 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 167 | - * |
|
| 168 | - */ |
|
| 163 | + * Gets the aircraft image |
|
| 164 | + * |
|
| 165 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 166 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 167 | + * |
|
| 168 | + */ |
|
| 169 | 169 | public function findAircraftImage($aircraft_registration, $aircraft_icao = '', $airline_icao = '') |
| 170 | 170 | { |
| 171 | 171 | global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA; |
@@ -209,14 +209,14 @@ discard block |
||
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | /** |
| 212 | - * Gets the vessel image |
|
| 213 | - * |
|
| 214 | - * @param String $mmsi the vessel mmsi |
|
| 215 | - * @param String $imo the vessel imo |
|
| 216 | - * @param String $name the vessel name |
|
| 217 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 218 | - * |
|
| 219 | - */ |
|
| 212 | + * Gets the vessel image |
|
| 213 | + * |
|
| 214 | + * @param String $mmsi the vessel mmsi |
|
| 215 | + * @param String $imo the vessel imo |
|
| 216 | + * @param String $name the vessel name |
|
| 217 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 218 | + * |
|
| 219 | + */ |
|
| 220 | 220 | public function findMarineImage($mmsi,$imo = '',$name = '') |
| 221 | 221 | { |
| 222 | 222 | global $globalMarineImageSources; |
@@ -250,13 +250,13 @@ discard block |
||
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | /** |
| 253 | - * Gets the aircraft image from Planespotters |
|
| 254 | - * |
|
| 255 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 256 | - * @param String $aircraft_name type of the aircraft |
|
| 257 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 258 | - * |
|
| 259 | - */ |
|
| 253 | + * Gets the aircraft image from Planespotters |
|
| 254 | + * |
|
| 255 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 256 | + * @param String $aircraft_name type of the aircraft |
|
| 257 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 258 | + * |
|
| 259 | + */ |
|
| 260 | 260 | public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') { |
| 261 | 261 | $Common = new Common(); |
| 262 | 262 | // If aircraft registration is only number, also check with aircraft model |
@@ -283,13 +283,13 @@ discard block |
||
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | /** |
| 286 | - * Gets the aircraft image from Deviantart |
|
| 287 | - * |
|
| 288 | - * @param String $registration the registration of the aircraft |
|
| 289 | - * @param String $name type of the aircraft |
|
| 290 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 291 | - * |
|
| 292 | - */ |
|
| 286 | + * Gets the aircraft image from Deviantart |
|
| 287 | + * |
|
| 288 | + * @param String $registration the registration of the aircraft |
|
| 289 | + * @param String $name type of the aircraft |
|
| 290 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 291 | + * |
|
| 292 | + */ |
|
| 293 | 293 | public function fromDeviantart($type,$registration, $name='') { |
| 294 | 294 | $Common = new Common(); |
| 295 | 295 | if ($type == 'aircraft') { |
@@ -321,13 +321,13 @@ discard block |
||
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | /** |
| 324 | - * Gets the aircraft image from JetPhotos |
|
| 325 | - * |
|
| 326 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 327 | - * @param String $aircraft_name type of the aircraft |
|
| 328 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 329 | - * |
|
| 330 | - */ |
|
| 324 | + * Gets the aircraft image from JetPhotos |
|
| 325 | + * |
|
| 326 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 327 | + * @param String $aircraft_name type of the aircraft |
|
| 328 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 329 | + * |
|
| 330 | + */ |
|
| 331 | 331 | public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') { |
| 332 | 332 | $Common = new Common(); |
| 333 | 333 | $url= 'http://jetphotos.net/showphotos.php?displaymode=2®search='.$aircraft_registration; |
@@ -363,13 +363,13 @@ discard block |
||
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | /** |
| 366 | - * Gets the aircraft image from PlanePictures |
|
| 367 | - * |
|
| 368 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 369 | - * @param String $aircraft_name type of the aircraft |
|
| 370 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 371 | - * |
|
| 372 | - */ |
|
| 366 | + * Gets the aircraft image from PlanePictures |
|
| 367 | + * |
|
| 368 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 369 | + * @param String $aircraft_name type of the aircraft |
|
| 370 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 371 | + * |
|
| 372 | + */ |
|
| 373 | 373 | public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') { |
| 374 | 374 | $Common = new Common(); |
| 375 | 375 | $url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2'; |
@@ -397,13 +397,13 @@ discard block |
||
| 397 | 397 | } |
| 398 | 398 | |
| 399 | 399 | /** |
| 400 | - * Gets the aircraft image from Flickr |
|
| 401 | - * |
|
| 402 | - * @param String $registration the registration of the aircraft |
|
| 403 | - * @param String $name type of the aircraft |
|
| 404 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 405 | - * |
|
| 406 | - */ |
|
| 400 | + * Gets the aircraft image from Flickr |
|
| 401 | + * |
|
| 402 | + * @param String $registration the registration of the aircraft |
|
| 403 | + * @param String $name type of the aircraft |
|
| 404 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 405 | + * |
|
| 406 | + */ |
|
| 407 | 407 | public function fromFlickr($type,$registration,$name='') { |
| 408 | 408 | $Common = new Common(); |
| 409 | 409 | if ($type == 'aircraft') { |
@@ -446,13 +446,13 @@ discard block |
||
| 446 | 446 | } |
| 447 | 447 | |
| 448 | 448 | /** |
| 449 | - * Gets the aircraft image from Bing |
|
| 450 | - * |
|
| 451 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 452 | - * @param String $aircraft_name type of the aircraft |
|
| 453 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 454 | - * |
|
| 455 | - */ |
|
| 449 | + * Gets the aircraft image from Bing |
|
| 450 | + * |
|
| 451 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 452 | + * @param String $aircraft_name type of the aircraft |
|
| 453 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 454 | + * |
|
| 455 | + */ |
|
| 456 | 456 | public function fromBing($type,$aircraft_registration,$aircraft_name='') { |
| 457 | 457 | global $globalImageBingKey; |
| 458 | 458 | $Common = new Common(); |
@@ -478,13 +478,13 @@ discard block |
||
| 478 | 478 | } |
| 479 | 479 | |
| 480 | 480 | /** |
| 481 | - * Gets the aircraft image from airport-data |
|
| 482 | - * |
|
| 483 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 484 | - * @param String $aircraft_name type of the aircraft |
|
| 485 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 486 | - * |
|
| 487 | - */ |
|
| 481 | + * Gets the aircraft image from airport-data |
|
| 482 | + * |
|
| 483 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 484 | + * @param String $aircraft_name type of the aircraft |
|
| 485 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 486 | + * |
|
| 487 | + */ |
|
| 488 | 488 | public function fromAirportData($type,$aircraft_registration,$aircraft_name='') { |
| 489 | 489 | $Common = new Common(); |
| 490 | 490 | $url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration; |
@@ -503,13 +503,13 @@ discard block |
||
| 503 | 503 | } |
| 504 | 504 | |
| 505 | 505 | /** |
| 506 | - * Gets image from WikiMedia |
|
| 507 | - * |
|
| 508 | - * @param String $registration the registration of the aircraft/mmsi |
|
| 509 | - * @param String $name name |
|
| 510 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 511 | - * |
|
| 512 | - */ |
|
| 506 | + * Gets image from WikiMedia |
|
| 507 | + * |
|
| 508 | + * @param String $registration the registration of the aircraft/mmsi |
|
| 509 | + * @param String $name name |
|
| 510 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 511 | + * |
|
| 512 | + */ |
|
| 513 | 513 | public function fromWikimedia($type,$registration,$name='') { |
| 514 | 514 | $Common = new Common(); |
| 515 | 515 | if ($type == 'aircraft') { |
@@ -564,13 +564,13 @@ discard block |
||
| 564 | 564 | } |
| 565 | 565 | |
| 566 | 566 | /** |
| 567 | - * Gets the aircraft image from custom url |
|
| 568 | - * |
|
| 569 | - * @param String $registration the registration of the aircraft |
|
| 570 | - * @param String $name type of the aircraft |
|
| 571 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 572 | - * |
|
| 573 | - */ |
|
| 567 | + * Gets the aircraft image from custom url |
|
| 568 | + * |
|
| 569 | + * @param String $registration the registration of the aircraft |
|
| 570 | + * @param String $name type of the aircraft |
|
| 571 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 572 | + * |
|
| 573 | + */ |
|
| 574 | 574 | public function fromCustomSource($type,$registration,$name='') { |
| 575 | 575 | global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug; |
| 576 | 576 | //$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true); |
