Ysurac /
FlightAirMap
@@ -16,33 +16,33 @@ discard block |
||
| 16 | 16 | if (isset($globalFilterName)) $this->filter_name = $globalFilterName; |
| 17 | 17 | $Connection = new Connection($dbc); |
| 18 | 18 | $this->db = $Connection->db(); |
| 19 | - } |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | 21 | public function addLastStatsUpdate($type,$stats_date) { |
| 22 | - $query = "DELETE FROM config WHERE name = :type; |
|
| 22 | + $query = "DELETE FROM config WHERE name = :type; |
|
| 23 | 23 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
| 24 | - $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 25 | - try { |
|
| 26 | - $sth = $this->db->prepare($query); |
|
| 27 | - $sth->execute($query_values); |
|
| 28 | - } catch(PDOException $e) { |
|
| 29 | - return "error : ".$e->getMessage(); |
|
| 30 | - } |
|
| 31 | - } |
|
| 24 | + $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 25 | + try { |
|
| 26 | + $sth = $this->db->prepare($query); |
|
| 27 | + $sth->execute($query_values); |
|
| 28 | + } catch(PDOException $e) { |
|
| 29 | + return "error : ".$e->getMessage(); |
|
| 30 | + } |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | 33 | public function getLastStatsUpdate($type = 'last_update_stats') { |
| 34 | - $query = "SELECT value FROM config WHERE name = :type"; |
|
| 35 | - try { |
|
| 36 | - $sth = $this->db->prepare($query); |
|
| 37 | - $sth->execute(array(':type' => $type)); |
|
| 38 | - } catch(PDOException $e) { |
|
| 39 | - echo "error : ".$e->getMessage(); |
|
| 40 | - } |
|
| 41 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 42 | - return $all; |
|
| 43 | - } |
|
| 44 | - public function deleteStats($filter_name = '') { |
|
| 45 | - /* |
|
| 34 | + $query = "SELECT value FROM config WHERE name = :type"; |
|
| 35 | + try { |
|
| 36 | + $sth = $this->db->prepare($query); |
|
| 37 | + $sth->execute(array(':type' => $type)); |
|
| 38 | + } catch(PDOException $e) { |
|
| 39 | + echo "error : ".$e->getMessage(); |
|
| 40 | + } |
|
| 41 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 42 | + return $all; |
|
| 43 | + } |
|
| 44 | + public function deleteStats($filter_name = '') { |
|
| 45 | + /* |
|
| 46 | 46 | $query = "DELETE FROM config WHERE name = 'last_update_stats'"; |
| 47 | 47 | try { |
| 48 | 48 | $sth = $this->db->prepare($query); |
@@ -51,109 +51,109 @@ discard block |
||
| 51 | 51 | return "error : ".$e->getMessage(); |
| 52 | 52 | } |
| 53 | 53 | */ |
| 54 | - $query = "DELETE FROM stats WHERE filter_name = :filter_name;DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_airport WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_flight WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;"; |
|
| 55 | - try { |
|
| 56 | - $sth = $this->db->prepare($query); |
|
| 57 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 58 | - } catch(PDOException $e) { |
|
| 59 | - return "error : ".$e->getMessage(); |
|
| 60 | - } |
|
| 61 | - } |
|
| 62 | - public function deleteOldStats($filter_name = '') { |
|
| 63 | - if ($filter_name == '') { |
|
| 64 | - $query = "DELETE FROM config WHERE name = 'last_update_stats'"; |
|
| 65 | - } else { |
|
| 66 | - $query = "DELETE FROM config WHERE name = 'last_update_stats_".$filter_name."'"; |
|
| 67 | - } |
|
| 68 | - try { |
|
| 69 | - $sth = $this->db->prepare($query); |
|
| 70 | - $sth->execute(); |
|
| 71 | - } catch(PDOException $e) { |
|
| 72 | - return "error : ".$e->getMessage(); |
|
| 73 | - } |
|
| 54 | + $query = "DELETE FROM stats WHERE filter_name = :filter_name;DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_airport WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_flight WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;"; |
|
| 55 | + try { |
|
| 56 | + $sth = $this->db->prepare($query); |
|
| 57 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 58 | + } catch(PDOException $e) { |
|
| 59 | + return "error : ".$e->getMessage(); |
|
| 60 | + } |
|
| 61 | + } |
|
| 62 | + public function deleteOldStats($filter_name = '') { |
|
| 63 | + if ($filter_name == '') { |
|
| 64 | + $query = "DELETE FROM config WHERE name = 'last_update_stats'"; |
|
| 65 | + } else { |
|
| 66 | + $query = "DELETE FROM config WHERE name = 'last_update_stats_".$filter_name."'"; |
|
| 67 | + } |
|
| 68 | + try { |
|
| 69 | + $sth = $this->db->prepare($query); |
|
| 70 | + $sth->execute(); |
|
| 71 | + } catch(PDOException $e) { |
|
| 72 | + return "error : ".$e->getMessage(); |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - $query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;"; |
|
| 76 | - try { |
|
| 77 | - $sth = $this->db->prepare($query); |
|
| 78 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 79 | - } catch(PDOException $e) { |
|
| 80 | - return "error : ".$e->getMessage(); |
|
| 81 | - } |
|
| 82 | - } |
|
| 75 | + $query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;"; |
|
| 76 | + try { |
|
| 77 | + $sth = $this->db->prepare($query); |
|
| 78 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 79 | + } catch(PDOException $e) { |
|
| 80 | + return "error : ".$e->getMessage(); |
|
| 81 | + } |
|
| 82 | + } |
|
| 83 | 83 | public function getAllAirlineNames($filter_name = '') { |
| 84 | 84 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 85 | - $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC"; |
|
| 86 | - try { |
|
| 87 | - $sth = $this->db->prepare($query); |
|
| 88 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 89 | - } catch(PDOException $e) { |
|
| 90 | - echo "error : ".$e->getMessage(); |
|
| 91 | - } |
|
| 92 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 93 | - return $all; |
|
| 94 | - } |
|
| 85 | + $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC"; |
|
| 86 | + try { |
|
| 87 | + $sth = $this->db->prepare($query); |
|
| 88 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 89 | + } catch(PDOException $e) { |
|
| 90 | + echo "error : ".$e->getMessage(); |
|
| 91 | + } |
|
| 92 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 93 | + return $all; |
|
| 94 | + } |
|
| 95 | 95 | public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
| 96 | 96 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 97 | - $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
|
| 98 | - try { |
|
| 99 | - $sth = $this->db->prepare($query); |
|
| 100 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 101 | - } catch(PDOException $e) { |
|
| 102 | - echo "error : ".$e->getMessage(); |
|
| 103 | - } |
|
| 104 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 105 | - return $all; |
|
| 106 | - } |
|
| 97 | + $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
|
| 98 | + try { |
|
| 99 | + $sth = $this->db->prepare($query); |
|
| 100 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 101 | + } catch(PDOException $e) { |
|
| 102 | + echo "error : ".$e->getMessage(); |
|
| 103 | + } |
|
| 104 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 105 | + return $all; |
|
| 106 | + } |
|
| 107 | 107 | public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
| 108 | 108 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 109 | - $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
|
| 110 | - try { |
|
| 111 | - $sth = $this->db->prepare($query); |
|
| 112 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 113 | - } catch(PDOException $e) { |
|
| 114 | - echo "error : ".$e->getMessage(); |
|
| 115 | - } |
|
| 116 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 117 | - return $all; |
|
| 118 | - } |
|
| 109 | + $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
|
| 110 | + try { |
|
| 111 | + $sth = $this->db->prepare($query); |
|
| 112 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 113 | + } catch(PDOException $e) { |
|
| 114 | + echo "error : ".$e->getMessage(); |
|
| 115 | + } |
|
| 116 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 117 | + return $all; |
|
| 118 | + } |
|
| 119 | 119 | public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
| 120 | 120 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 121 | - $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
|
| 122 | - try { |
|
| 123 | - $sth = $this->db->prepare($query); |
|
| 124 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 125 | - } catch(PDOException $e) { |
|
| 126 | - echo "error : ".$e->getMessage(); |
|
| 127 | - } |
|
| 128 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 129 | - return $all; |
|
| 130 | - } |
|
| 121 | + $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
|
| 122 | + try { |
|
| 123 | + $sth = $this->db->prepare($query); |
|
| 124 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 125 | + } catch(PDOException $e) { |
|
| 126 | + echo "error : ".$e->getMessage(); |
|
| 127 | + } |
|
| 128 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 129 | + return $all; |
|
| 130 | + } |
|
| 131 | 131 | |
| 132 | 132 | public function getAllOwnerNames($stats_airline = '',$filter_name = '') { |
| 133 | 133 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 134 | - $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
|
| 135 | - try { |
|
| 136 | - $sth = $this->db->prepare($query); |
|
| 137 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 138 | - } catch(PDOException $e) { |
|
| 139 | - echo "error : ".$e->getMessage(); |
|
| 140 | - } |
|
| 141 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 142 | - return $all; |
|
| 143 | - } |
|
| 134 | + $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
|
| 135 | + try { |
|
| 136 | + $sth = $this->db->prepare($query); |
|
| 137 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 138 | + } catch(PDOException $e) { |
|
| 139 | + echo "error : ".$e->getMessage(); |
|
| 140 | + } |
|
| 141 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 142 | + return $all; |
|
| 143 | + } |
|
| 144 | 144 | |
| 145 | 145 | public function getAllPilotNames($stats_airline = '',$filter_name = '') { |
| 146 | 146 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 147 | - $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
|
| 148 | - try { |
|
| 149 | - $sth = $this->db->prepare($query); |
|
| 150 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 151 | - } catch(PDOException $e) { |
|
| 152 | - echo "error : ".$e->getMessage(); |
|
| 153 | - } |
|
| 154 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 155 | - return $all; |
|
| 156 | - } |
|
| 147 | + $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
|
| 148 | + try { |
|
| 149 | + $sth = $this->db->prepare($query); |
|
| 150 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 151 | + } catch(PDOException $e) { |
|
| 152 | + echo "error : ".$e->getMessage(); |
|
| 153 | + } |
|
| 154 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 155 | + return $all; |
|
| 156 | + } |
|
| 157 | 157 | |
| 158 | 158 | |
| 159 | 159 | public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
@@ -170,16 +170,16 @@ discard block |
||
| 170 | 170 | } |
| 171 | 171 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 172 | 172 | } else $all = array(); |
| 173 | - if (empty($all)) { |
|
| 174 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 175 | - if ($filter_name != '') { |
|
| 176 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 177 | - } |
|
| 178 | - $Spotter = new Spotter($this->db); |
|
| 179 | - //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month); |
|
| 180 | - $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters); |
|
| 181 | - } |
|
| 182 | - return $all; |
|
| 173 | + if (empty($all)) { |
|
| 174 | + $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 175 | + if ($filter_name != '') { |
|
| 176 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 177 | + } |
|
| 178 | + $Spotter = new Spotter($this->db); |
|
| 179 | + //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month); |
|
| 180 | + $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters); |
|
| 181 | + } |
|
| 182 | + return $all; |
|
| 183 | 183 | } |
| 184 | 184 | public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') { |
| 185 | 185 | global $globalStatsFilters; |
@@ -195,17 +195,17 @@ discard block |
||
| 195 | 195 | } |
| 196 | 196 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 197 | 197 | } else $all = array(); |
| 198 | - if (empty($all)) { |
|
| 199 | - $Spotter = new Spotter($this->db); |
|
| 200 | - $filters = array(); |
|
| 201 | - $filters = array('year' => $year,'month' => $month); |
|
| 202 | - if ($filter_name != '') { |
|
| 203 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 204 | - } |
|
| 205 | - //$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month); |
|
| 206 | - $all = $Spotter->countAllAirlineCountries($limit,$filters); |
|
| 207 | - } |
|
| 208 | - return $all; |
|
| 198 | + if (empty($all)) { |
|
| 199 | + $Spotter = new Spotter($this->db); |
|
| 200 | + $filters = array(); |
|
| 201 | + $filters = array('year' => $year,'month' => $month); |
|
| 202 | + if ($filter_name != '') { |
|
| 203 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 204 | + } |
|
| 205 | + //$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month); |
|
| 206 | + $all = $Spotter->countAllAirlineCountries($limit,$filters); |
|
| 207 | + } |
|
| 208 | + return $all; |
|
| 209 | 209 | } |
| 210 | 210 | public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 211 | 211 | global $globalStatsFilters; |
@@ -247,39 +247,39 @@ discard block |
||
| 247 | 247 | } |
| 248 | 248 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 249 | 249 | } else $all = array(); |
| 250 | - if (empty($all)) { |
|
| 250 | + if (empty($all)) { |
|
| 251 | 251 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 252 | 252 | if ($filter_name != '') { |
| 253 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 253 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 254 | 254 | } |
| 255 | 255 | $Spotter = new Spotter($this->db); |
| 256 | 256 | //$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month); |
| 257 | 257 | $all = $Spotter->countAllArrivalCountries($limit,$filters); |
| 258 | - } |
|
| 259 | - return $all; |
|
| 258 | + } |
|
| 259 | + return $all; |
|
| 260 | 260 | } |
| 261 | 261 | public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
| 262 | 262 | global $globalStatsFilters; |
| 263 | 263 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 264 | 264 | if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
| 265 | 265 | else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC"; |
| 266 | - try { |
|
| 267 | - $sth = $this->db->prepare($query); |
|
| 268 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 269 | - } catch(PDOException $e) { |
|
| 270 | - echo "error : ".$e->getMessage(); |
|
| 271 | - } |
|
| 272 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 273 | - if (empty($all)) { |
|
| 266 | + try { |
|
| 267 | + $sth = $this->db->prepare($query); |
|
| 268 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 269 | + } catch(PDOException $e) { |
|
| 270 | + echo "error : ".$e->getMessage(); |
|
| 271 | + } |
|
| 272 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 273 | + if (empty($all)) { |
|
| 274 | 274 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 275 | 275 | if ($filter_name != '') { |
| 276 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 276 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 277 | 277 | } |
| 278 | 278 | $Spotter = new Spotter($this->db); |
| 279 | 279 | //$all = $Spotter->countAllDepartureCountries($filters,$year,$month); |
| 280 | 280 | $all = $Spotter->countAllDepartureCountries($filters); |
| 281 | - } |
|
| 282 | - return $all; |
|
| 281 | + } |
|
| 282 | + return $all; |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') { |
@@ -305,17 +305,17 @@ discard block |
||
| 305 | 305 | } |
| 306 | 306 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 307 | 307 | } else $all = array(); |
| 308 | - if (empty($all)) { |
|
| 309 | - $Spotter = new Spotter($this->db); |
|
| 310 | - $filters = array(); |
|
| 308 | + if (empty($all)) { |
|
| 309 | + $Spotter = new Spotter($this->db); |
|
| 310 | + $filters = array(); |
|
| 311 | 311 | $filters = array('year' => $year,'month' => $month); |
| 312 | - if ($filter_name != '') { |
|
| 313 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 312 | + if ($filter_name != '') { |
|
| 313 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 314 | 314 | } |
| 315 | 315 | //$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month); |
| 316 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 317 | - } |
|
| 318 | - return $all; |
|
| 316 | + $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 317 | + } |
|
| 318 | + return $all; |
|
| 319 | 319 | } |
| 320 | 320 | public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 321 | 321 | global $globalStatsFilters; |
@@ -331,16 +331,16 @@ discard block |
||
| 331 | 331 | } |
| 332 | 332 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 333 | 333 | } else $all = array(); |
| 334 | - if (empty($all)) { |
|
| 334 | + if (empty($all)) { |
|
| 335 | 335 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 336 | 336 | if ($filter_name != '') { |
| 337 | 337 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 338 | 338 | } |
| 339 | - $Spotter = new Spotter($this->db); |
|
| 340 | - //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month); |
|
| 341 | - $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters); |
|
| 342 | - } |
|
| 343 | - return $all; |
|
| 339 | + $Spotter = new Spotter($this->db); |
|
| 340 | + //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month); |
|
| 341 | + $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters); |
|
| 342 | + } |
|
| 343 | + return $all; |
|
| 344 | 344 | } |
| 345 | 345 | public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 346 | 346 | global $globalStatsFilters; |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | echo "error : ".$e->getMessage(); |
| 382 | 382 | } |
| 383 | 383 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 384 | - /* |
|
| 384 | + /* |
|
| 385 | 385 | if (empty($all)) { |
| 386 | 386 | $Spotter = new Spotter($this->db); |
| 387 | 387 | $all = $Spotter->countAllFlightOverCountries($limit); |
@@ -433,16 +433,16 @@ discard block |
||
| 433 | 433 | } |
| 434 | 434 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 435 | 435 | } else $all = array(); |
| 436 | - if (empty($all)) { |
|
| 436 | + if (empty($all)) { |
|
| 437 | 437 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 438 | 438 | if ($filter_name != '') { |
| 439 | 439 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 440 | 440 | } |
| 441 | - $Spotter = new Spotter($this->db); |
|
| 442 | - //$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month); |
|
| 443 | - $all = $Spotter->countAllOwners($limit,0,'',$filters); |
|
| 444 | - } |
|
| 445 | - return $all; |
|
| 441 | + $Spotter = new Spotter($this->db); |
|
| 442 | + //$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month); |
|
| 443 | + $all = $Spotter->countAllOwners($limit,0,'',$filters); |
|
| 444 | + } |
|
| 445 | + return $all; |
|
| 446 | 446 | } |
| 447 | 447 | public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 448 | 448 | global $globalStatsFilters; |
@@ -458,35 +458,35 @@ discard block |
||
| 458 | 458 | } |
| 459 | 459 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 460 | 460 | } else $all = array(); |
| 461 | - if (empty($all)) { |
|
| 461 | + if (empty($all)) { |
|
| 462 | 462 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 463 | - if ($filter_name != '') { |
|
| 464 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 463 | + if ($filter_name != '') { |
|
| 464 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 465 | 465 | } |
| 466 | - $Spotter = new Spotter($this->db); |
|
| 466 | + $Spotter = new Spotter($this->db); |
|
| 467 | 467 | // $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month); |
| 468 | 468 | // $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month); |
| 469 | - $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters); |
|
| 470 | - $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters); |
|
| 471 | - $all = array(); |
|
| 472 | - foreach ($pall as $value) { |
|
| 473 | - $icao = $value['airport_departure_icao']; |
|
| 474 | - $all[$icao] = $value; |
|
| 475 | - } |
|
| 469 | + $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters); |
|
| 470 | + $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters); |
|
| 471 | + $all = array(); |
|
| 472 | + foreach ($pall as $value) { |
|
| 473 | + $icao = $value['airport_departure_icao']; |
|
| 474 | + $all[$icao] = $value; |
|
| 475 | + } |
|
| 476 | 476 | |
| 477 | - foreach ($dall as $value) { |
|
| 478 | - $icao = $value['airport_departure_icao']; |
|
| 479 | - if (isset($all[$icao])) { |
|
| 480 | - $all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 481 | - } else $all[$icao] = $value; |
|
| 482 | - } |
|
| 483 | - $count = array(); |
|
| 484 | - foreach ($all as $key => $row) { |
|
| 485 | - $count[$key] = $row['airport_departure_icao_count']; |
|
| 486 | - } |
|
| 487 | - array_multisort($count,SORT_DESC,$all); |
|
| 488 | - } |
|
| 489 | - return $all; |
|
| 477 | + foreach ($dall as $value) { |
|
| 478 | + $icao = $value['airport_departure_icao']; |
|
| 479 | + if (isset($all[$icao])) { |
|
| 480 | + $all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 481 | + } else $all[$icao] = $value; |
|
| 482 | + } |
|
| 483 | + $count = array(); |
|
| 484 | + foreach ($all as $key => $row) { |
|
| 485 | + $count[$key] = $row['airport_departure_icao_count']; |
|
| 486 | + } |
|
| 487 | + array_multisort($count,SORT_DESC,$all); |
|
| 488 | + } |
|
| 489 | + return $all; |
|
| 490 | 490 | } |
| 491 | 491 | public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 492 | 492 | global $globalStatsFilters; |
@@ -512,26 +512,26 @@ discard block |
||
| 512 | 512 | // $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month); |
| 513 | 513 | $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters); |
| 514 | 514 | $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters); |
| 515 | - $all = array(); |
|
| 516 | - foreach ($pall as $value) { |
|
| 517 | - $icao = $value['airport_arrival_icao']; |
|
| 518 | - $all[$icao] = $value; |
|
| 519 | - } |
|
| 515 | + $all = array(); |
|
| 516 | + foreach ($pall as $value) { |
|
| 517 | + $icao = $value['airport_arrival_icao']; |
|
| 518 | + $all[$icao] = $value; |
|
| 519 | + } |
|
| 520 | 520 | |
| 521 | - foreach ($dall as $value) { |
|
| 522 | - $icao = $value['airport_arrival_icao']; |
|
| 523 | - if (isset($all[$icao])) { |
|
| 524 | - $all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 525 | - } else $all[$icao] = $value; |
|
| 526 | - } |
|
| 527 | - $count = array(); |
|
| 528 | - foreach ($all as $key => $row) { |
|
| 529 | - $count[$key] = $row['airport_arrival_icao_count']; |
|
| 530 | - } |
|
| 531 | - array_multisort($count,SORT_DESC,$all); |
|
| 532 | - } |
|
| 521 | + foreach ($dall as $value) { |
|
| 522 | + $icao = $value['airport_arrival_icao']; |
|
| 523 | + if (isset($all[$icao])) { |
|
| 524 | + $all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 525 | + } else $all[$icao] = $value; |
|
| 526 | + } |
|
| 527 | + $count = array(); |
|
| 528 | + foreach ($all as $key => $row) { |
|
| 529 | + $count[$key] = $row['airport_arrival_icao_count']; |
|
| 530 | + } |
|
| 531 | + array_multisort($count,SORT_DESC,$all); |
|
| 532 | + } |
|
| 533 | 533 | |
| 534 | - return $all; |
|
| 534 | + return $all; |
|
| 535 | 535 | } |
| 536 | 536 | public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
| 537 | 537 | global $globalDBdriver, $globalStatsFilters; |
@@ -544,23 +544,23 @@ discard block |
||
| 544 | 544 | else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 545 | 545 | } |
| 546 | 546 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 547 | - try { |
|
| 548 | - $sth = $this->db->prepare($query); |
|
| 549 | - $sth->execute($query_data); |
|
| 550 | - } catch(PDOException $e) { |
|
| 551 | - echo "error : ".$e->getMessage(); |
|
| 552 | - } |
|
| 553 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 554 | - if (empty($all)) { |
|
| 547 | + try { |
|
| 548 | + $sth = $this->db->prepare($query); |
|
| 549 | + $sth->execute($query_data); |
|
| 550 | + } catch(PDOException $e) { |
|
| 551 | + echo "error : ".$e->getMessage(); |
|
| 552 | + } |
|
| 553 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 554 | + if (empty($all)) { |
|
| 555 | 555 | $filters = array('airlines' => array($stats_airline)); |
| 556 | 556 | if ($filter_name != '') { |
| 557 | 557 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 558 | 558 | } |
| 559 | - $Spotter = new Spotter($this->db); |
|
| 560 | - $all = $Spotter->countAllMonthsLastYear($filters); |
|
| 561 | - } |
|
| 559 | + $Spotter = new Spotter($this->db); |
|
| 560 | + $all = $Spotter->countAllMonthsLastYear($filters); |
|
| 561 | + } |
|
| 562 | 562 | |
| 563 | - return $all; |
|
| 563 | + return $all; |
|
| 564 | 564 | } |
| 565 | 565 | |
| 566 | 566 | public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
@@ -568,22 +568,22 @@ discard block |
||
| 568 | 568 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 569 | 569 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 570 | 570 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 571 | - try { |
|
| 572 | - $sth = $this->db->prepare($query); |
|
| 573 | - $sth->execute($query_data); |
|
| 574 | - } catch(PDOException $e) { |
|
| 575 | - echo "error : ".$e->getMessage(); |
|
| 576 | - } |
|
| 577 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 578 | - if (empty($all)) { |
|
| 571 | + try { |
|
| 572 | + $sth = $this->db->prepare($query); |
|
| 573 | + $sth->execute($query_data); |
|
| 574 | + } catch(PDOException $e) { |
|
| 575 | + echo "error : ".$e->getMessage(); |
|
| 576 | + } |
|
| 577 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 578 | + if (empty($all)) { |
|
| 579 | 579 | $filters = array('airlines' => array($stats_airline)); |
| 580 | 580 | if ($filter_name != '') { |
| 581 | 581 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 582 | 582 | } |
| 583 | - $Spotter = new Spotter($this->db); |
|
| 584 | - $all = $Spotter->countAllDatesLastMonth($filters); |
|
| 585 | - } |
|
| 586 | - return $all; |
|
| 583 | + $Spotter = new Spotter($this->db); |
|
| 584 | + $all = $Spotter->countAllDatesLastMonth($filters); |
|
| 585 | + } |
|
| 586 | + return $all; |
|
| 587 | 587 | } |
| 588 | 588 | public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
| 589 | 589 | global $globalDBdriver, $globalStatsFilters; |
@@ -594,66 +594,66 @@ discard block |
||
| 594 | 594 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 595 | 595 | } |
| 596 | 596 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 597 | - try { |
|
| 598 | - $sth = $this->db->prepare($query); |
|
| 599 | - $sth->execute($query_data); |
|
| 600 | - } catch(PDOException $e) { |
|
| 601 | - echo "error : ".$e->getMessage(); |
|
| 602 | - } |
|
| 603 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 604 | - if (empty($all)) { |
|
| 597 | + try { |
|
| 598 | + $sth = $this->db->prepare($query); |
|
| 599 | + $sth->execute($query_data); |
|
| 600 | + } catch(PDOException $e) { |
|
| 601 | + echo "error : ".$e->getMessage(); |
|
| 602 | + } |
|
| 603 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 604 | + if (empty($all)) { |
|
| 605 | 605 | $filters = array('airlines' => array($stats_airline)); |
| 606 | 606 | if ($filter_name != '') { |
| 607 | 607 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 608 | 608 | } |
| 609 | - $Spotter = new Spotter($this->db); |
|
| 610 | - $all = $Spotter->countAllDatesLast7Days($filters); |
|
| 611 | - } |
|
| 612 | - return $all; |
|
| 609 | + $Spotter = new Spotter($this->db); |
|
| 610 | + $all = $Spotter->countAllDatesLast7Days($filters); |
|
| 611 | + } |
|
| 612 | + return $all; |
|
| 613 | 613 | } |
| 614 | 614 | public function countAllDates($stats_airline = '',$filter_name = '') { |
| 615 | 615 | global $globalStatsFilters; |
| 616 | 616 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 617 | 617 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 618 | 618 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 619 | - try { |
|
| 620 | - $sth = $this->db->prepare($query); |
|
| 621 | - $sth->execute($query_data); |
|
| 622 | - } catch(PDOException $e) { |
|
| 623 | - echo "error : ".$e->getMessage(); |
|
| 624 | - } |
|
| 625 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 626 | - if (empty($all)) { |
|
| 619 | + try { |
|
| 620 | + $sth = $this->db->prepare($query); |
|
| 621 | + $sth->execute($query_data); |
|
| 622 | + } catch(PDOException $e) { |
|
| 623 | + echo "error : ".$e->getMessage(); |
|
| 624 | + } |
|
| 625 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 626 | + if (empty($all)) { |
|
| 627 | 627 | $filters = array('airlines' => array($stats_airline)); |
| 628 | 628 | if ($filter_name != '') { |
| 629 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 629 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 630 | 630 | } |
| 631 | - $Spotter = new Spotter($this->db); |
|
| 632 | - $all = $Spotter->countAllDates($filters); |
|
| 633 | - } |
|
| 634 | - return $all; |
|
| 631 | + $Spotter = new Spotter($this->db); |
|
| 632 | + $all = $Spotter->countAllDates($filters); |
|
| 633 | + } |
|
| 634 | + return $all; |
|
| 635 | 635 | } |
| 636 | 636 | public function countAllDatesByAirlines($filter_name = '') { |
| 637 | 637 | global $globalStatsFilters; |
| 638 | 638 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 639 | 639 | $query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name"; |
| 640 | 640 | $query_data = array('filter_name' => $filter_name); |
| 641 | - try { |
|
| 642 | - $sth = $this->db->prepare($query); |
|
| 643 | - $sth->execute($query_data); |
|
| 644 | - } catch(PDOException $e) { |
|
| 645 | - echo "error : ".$e->getMessage(); |
|
| 646 | - } |
|
| 647 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 648 | - if (empty($all)) { |
|
| 649 | - $filters = array(); |
|
| 650 | - if ($filter_name != '') { |
|
| 651 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 641 | + try { |
|
| 642 | + $sth = $this->db->prepare($query); |
|
| 643 | + $sth->execute($query_data); |
|
| 644 | + } catch(PDOException $e) { |
|
| 645 | + echo "error : ".$e->getMessage(); |
|
| 646 | + } |
|
| 647 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 648 | + if (empty($all)) { |
|
| 649 | + $filters = array(); |
|
| 650 | + if ($filter_name != '') { |
|
| 651 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 652 | 652 | } |
| 653 | - $Spotter = new Spotter($this->db); |
|
| 654 | - $all = $Spotter->countAllDatesByAirlines($filters); |
|
| 655 | - } |
|
| 656 | - return $all; |
|
| 653 | + $Spotter = new Spotter($this->db); |
|
| 654 | + $all = $Spotter->countAllDatesByAirlines($filters); |
|
| 655 | + } |
|
| 656 | + return $all; |
|
| 657 | 657 | } |
| 658 | 658 | public function countAllMonths($stats_airline = '',$filter_name = '') { |
| 659 | 659 | global $globalStatsFilters, $globalDBdriver; |
@@ -663,24 +663,24 @@ discard block |
||
| 663 | 663 | } else { |
| 664 | 664 | $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 665 | 665 | } |
| 666 | - try { |
|
| 667 | - $sth = $this->db->prepare($query); |
|
| 668 | - $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 669 | - } catch(PDOException $e) { |
|
| 670 | - echo "error : ".$e->getMessage(); |
|
| 671 | - } |
|
| 672 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 666 | + try { |
|
| 667 | + $sth = $this->db->prepare($query); |
|
| 668 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 669 | + } catch(PDOException $e) { |
|
| 670 | + echo "error : ".$e->getMessage(); |
|
| 671 | + } |
|
| 672 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 673 | 673 | |
| 674 | - if (empty($all)) { |
|
| 674 | + if (empty($all)) { |
|
| 675 | 675 | $filters = array('airlines' => array($stats_airline)); |
| 676 | 676 | if ($filter_name != '') { |
| 677 | 677 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 678 | 678 | } |
| 679 | - $Spotter = new Spotter($this->db); |
|
| 680 | - $all = $Spotter->countAllMonths($filters); |
|
| 681 | - } |
|
| 679 | + $Spotter = new Spotter($this->db); |
|
| 680 | + $all = $Spotter->countAllMonths($filters); |
|
| 681 | + } |
|
| 682 | 682 | |
| 683 | - return $all; |
|
| 683 | + return $all; |
|
| 684 | 684 | } |
| 685 | 685 | public function countFatalitiesLast12Months() { |
| 686 | 686 | global $globalStatsFilters, $globalDBdriver; |
@@ -689,19 +689,19 @@ discard block |
||
| 689 | 689 | } else { |
| 690 | 690 | $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year, EXTRACT(MONTH FROM stats_date) as month,cnt as count FROM stats WHERE stats_type = 'fatalities_bymonth' ORDER BY stats_date"; |
| 691 | 691 | } |
| 692 | - try { |
|
| 693 | - $sth = $this->db->prepare($query); |
|
| 694 | - $sth->execute(); |
|
| 695 | - } catch(PDOException $e) { |
|
| 696 | - echo "error : ".$e->getMessage(); |
|
| 697 | - } |
|
| 698 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 692 | + try { |
|
| 693 | + $sth = $this->db->prepare($query); |
|
| 694 | + $sth->execute(); |
|
| 695 | + } catch(PDOException $e) { |
|
| 696 | + echo "error : ".$e->getMessage(); |
|
| 697 | + } |
|
| 698 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 699 | 699 | |
| 700 | - if (empty($all)) { |
|
| 701 | - $Accident = new Accident($this->db); |
|
| 702 | - $all = $Accident->countFatalitiesLast12Months(); |
|
| 703 | - } |
|
| 704 | - return $all; |
|
| 700 | + if (empty($all)) { |
|
| 701 | + $Accident = new Accident($this->db); |
|
| 702 | + $all = $Accident->countFatalitiesLast12Months(); |
|
| 703 | + } |
|
| 704 | + return $all; |
|
| 705 | 705 | } |
| 706 | 706 | public function countFatalitiesByYear() { |
| 707 | 707 | global $globalStatsFilters, $globalDBdriver; |
@@ -710,40 +710,40 @@ discard block |
||
| 710 | 710 | } else { |
| 711 | 711 | $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year, cnt as count FROM stats WHERE stats_type = 'fatalities_byyear' ORDER BY stats_date"; |
| 712 | 712 | } |
| 713 | - try { |
|
| 714 | - $sth = $this->db->prepare($query); |
|
| 715 | - $sth->execute(); |
|
| 716 | - } catch(PDOException $e) { |
|
| 717 | - echo "error : ".$e->getMessage(); |
|
| 718 | - } |
|
| 719 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 713 | + try { |
|
| 714 | + $sth = $this->db->prepare($query); |
|
| 715 | + $sth->execute(); |
|
| 716 | + } catch(PDOException $e) { |
|
| 717 | + echo "error : ".$e->getMessage(); |
|
| 718 | + } |
|
| 719 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 720 | 720 | |
| 721 | - if (empty($all)) { |
|
| 722 | - $Accident = new Accident($this->db); |
|
| 723 | - $all = $Accident->countFatalitiesByYear(); |
|
| 724 | - } |
|
| 725 | - return $all; |
|
| 721 | + if (empty($all)) { |
|
| 722 | + $Accident = new Accident($this->db); |
|
| 723 | + $all = $Accident->countFatalitiesByYear(); |
|
| 724 | + } |
|
| 725 | + return $all; |
|
| 726 | 726 | } |
| 727 | 727 | public function countAllMilitaryMonths($filter_name = '') { |
| 728 | 728 | global $globalStatsFilters; |
| 729 | 729 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 730 | - $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name"; |
|
| 731 | - try { |
|
| 732 | - $sth = $this->db->prepare($query); |
|
| 733 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 734 | - } catch(PDOException $e) { |
|
| 735 | - echo "error : ".$e->getMessage(); |
|
| 736 | - } |
|
| 737 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 738 | - if (empty($all)) { |
|
| 739 | - $filters = array(); |
|
| 740 | - if ($filter_name != '') { |
|
| 741 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 730 | + $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name"; |
|
| 731 | + try { |
|
| 732 | + $sth = $this->db->prepare($query); |
|
| 733 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 734 | + } catch(PDOException $e) { |
|
| 735 | + echo "error : ".$e->getMessage(); |
|
| 736 | + } |
|
| 737 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 738 | + if (empty($all)) { |
|
| 739 | + $filters = array(); |
|
| 740 | + if ($filter_name != '') { |
|
| 741 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 742 | 742 | } |
| 743 | - $Spotter = new Spotter($this->db); |
|
| 744 | - $all = $Spotter->countAllMilitaryMonths($filters); |
|
| 745 | - } |
|
| 746 | - return $all; |
|
| 743 | + $Spotter = new Spotter($this->db); |
|
| 744 | + $all = $Spotter->countAllMilitaryMonths($filters); |
|
| 745 | + } |
|
| 746 | + return $all; |
|
| 747 | 747 | } |
| 748 | 748 | public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
| 749 | 749 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
@@ -759,22 +759,22 @@ discard block |
||
| 759 | 759 | } |
| 760 | 760 | } |
| 761 | 761 | if ($orderby == 'count') $query .= " ORDER BY hour_count DESC"; |
| 762 | - try { |
|
| 763 | - $sth = $this->db->prepare($query); |
|
| 764 | - $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 765 | - } catch(PDOException $e) { |
|
| 766 | - echo "error : ".$e->getMessage(); |
|
| 767 | - } |
|
| 768 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 769 | - if (empty($all)) { |
|
| 762 | + try { |
|
| 763 | + $sth = $this->db->prepare($query); |
|
| 764 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 765 | + } catch(PDOException $e) { |
|
| 766 | + echo "error : ".$e->getMessage(); |
|
| 767 | + } |
|
| 768 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 769 | + if (empty($all)) { |
|
| 770 | 770 | $filters = array('airlines' => array($stats_airline)); |
| 771 | 771 | if ($filter_name != '') { |
| 772 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 772 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 773 | 773 | } |
| 774 | - $Spotter = new Spotter($this->db); |
|
| 775 | - $all = $Spotter->countAllHours($orderby,$filters); |
|
| 776 | - } |
|
| 777 | - return $all; |
|
| 774 | + $Spotter = new Spotter($this->db); |
|
| 775 | + $all = $Spotter->countAllHours($orderby,$filters); |
|
| 776 | + } |
|
| 777 | + return $all; |
|
| 778 | 778 | } |
| 779 | 779 | |
| 780 | 780 | public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') { |
@@ -799,10 +799,10 @@ discard block |
||
| 799 | 799 | if ($year == '') $year = date('Y'); |
| 800 | 800 | $all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month); |
| 801 | 801 | if (empty($all)) { |
| 802 | - $filters = array(); |
|
| 802 | + $filters = array(); |
|
| 803 | 803 | $filters = array('year' => $year,'month' => $month); |
| 804 | - if ($filter_name != '') { |
|
| 805 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 804 | + if ($filter_name != '') { |
|
| 805 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 806 | 806 | } |
| 807 | 807 | $Spotter = new Spotter($this->db); |
| 808 | 808 | //$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month); |
@@ -866,10 +866,10 @@ discard block |
||
| 866 | 866 | $all = $result[0]['nb_airline']; |
| 867 | 867 | } else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
| 868 | 868 | if (empty($all)) { |
| 869 | - $filters = array(); |
|
| 869 | + $filters = array(); |
|
| 870 | 870 | $filters = array('year' => $year,'month' => $month); |
| 871 | - if ($filter_name != '') { |
|
| 872 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 871 | + if ($filter_name != '') { |
|
| 872 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 873 | 873 | } |
| 874 | 874 | $Spotter = new Spotter($this->db); |
| 875 | 875 | //$all = $Spotter->countOverallAirlines($filters,$year,$month); |
@@ -939,44 +939,44 @@ discard block |
||
| 939 | 939 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 940 | 940 | $query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date"; |
| 941 | 941 | $query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
| 942 | - try { |
|
| 943 | - $sth = $this->db->prepare($query); |
|
| 944 | - $sth->execute($query_values); |
|
| 945 | - } catch(PDOException $e) { |
|
| 946 | - echo "error : ".$e->getMessage(); |
|
| 947 | - } |
|
| 948 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 949 | - return $all; |
|
| 942 | + try { |
|
| 943 | + $sth = $this->db->prepare($query); |
|
| 944 | + $sth->execute($query_values); |
|
| 945 | + } catch(PDOException $e) { |
|
| 946 | + echo "error : ".$e->getMessage(); |
|
| 947 | + } |
|
| 948 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 949 | + return $all; |
|
| 950 | 950 | } |
| 951 | 951 | public function getStats($type,$stats_airline = '', $filter_name = '') { |
| 952 | 952 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 953 | - $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
|
| 954 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 955 | - try { |
|
| 956 | - $sth = $this->db->prepare($query); |
|
| 957 | - $sth->execute($query_values); |
|
| 958 | - } catch(PDOException $e) { |
|
| 959 | - echo "error : ".$e->getMessage(); |
|
| 960 | - } |
|
| 961 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 962 | - return $all; |
|
| 963 | - } |
|
| 953 | + $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
|
| 954 | + $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 955 | + try { |
|
| 956 | + $sth = $this->db->prepare($query); |
|
| 957 | + $sth->execute($query_values); |
|
| 958 | + } catch(PDOException $e) { |
|
| 959 | + echo "error : ".$e->getMessage(); |
|
| 960 | + } |
|
| 961 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 962 | + return $all; |
|
| 963 | + } |
|
| 964 | 964 | public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
| 965 | 965 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 966 | - $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 967 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 968 | - try { |
|
| 969 | - $sth = $this->db->prepare($query); |
|
| 970 | - $sth->execute($query_values); |
|
| 971 | - } catch(PDOException $e) { |
|
| 972 | - echo "error : ".$e->getMessage(); |
|
| 973 | - } |
|
| 974 | - } |
|
| 966 | + $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 967 | + $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 968 | + try { |
|
| 969 | + $sth = $this->db->prepare($query); |
|
| 970 | + $sth->execute($query_values); |
|
| 971 | + } catch(PDOException $e) { |
|
| 972 | + echo "error : ".$e->getMessage(); |
|
| 973 | + } |
|
| 974 | + } |
|
| 975 | 975 | public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
| 976 | 976 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 977 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 978 | - if ($globalDBdriver == 'mysql') { |
|
| 979 | - if ($month == '') { |
|
| 977 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 978 | + if ($globalDBdriver == 'mysql') { |
|
| 979 | + if ($month == '') { |
|
| 980 | 980 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 981 | 981 | $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 982 | 982 | } else { |
@@ -991,165 +991,165 @@ discard block |
||
| 991 | 991 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 992 | 992 | $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
| 993 | 993 | } |
| 994 | - } |
|
| 995 | - try { |
|
| 996 | - $sth = $this->db->prepare($query); |
|
| 997 | - $sth->execute($query_values); |
|
| 998 | - } catch(PDOException $e) { |
|
| 999 | - echo "error : ".$e->getMessage(); |
|
| 1000 | - } |
|
| 1001 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1002 | - return $all[0]['total']; |
|
| 1003 | - } |
|
| 994 | + } |
|
| 995 | + try { |
|
| 996 | + $sth = $this->db->prepare($query); |
|
| 997 | + $sth->execute($query_values); |
|
| 998 | + } catch(PDOException $e) { |
|
| 999 | + echo "error : ".$e->getMessage(); |
|
| 1000 | + } |
|
| 1001 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1002 | + return $all[0]['total']; |
|
| 1003 | + } |
|
| 1004 | 1004 | public function getStatsTotal($type, $stats_airline = '', $filter_name = '') { |
| 1005 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1005 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1006 | 1006 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1007 | - if ($globalDBdriver == 'mysql') { |
|
| 1007 | + if ($globalDBdriver == 'mysql') { |
|
| 1008 | 1008 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1009 | 1009 | } else { |
| 1010 | 1010 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1011 | - } |
|
| 1012 | - $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1013 | - try { |
|
| 1014 | - $sth = $this->db->prepare($query); |
|
| 1015 | - $sth->execute($query_values); |
|
| 1016 | - } catch(PDOException $e) { |
|
| 1017 | - echo "error : ".$e->getMessage(); |
|
| 1018 | - } |
|
| 1019 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1020 | - return $all[0]['total']; |
|
| 1021 | - } |
|
| 1011 | + } |
|
| 1012 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1013 | + try { |
|
| 1014 | + $sth = $this->db->prepare($query); |
|
| 1015 | + $sth->execute($query_values); |
|
| 1016 | + } catch(PDOException $e) { |
|
| 1017 | + echo "error : ".$e->getMessage(); |
|
| 1018 | + } |
|
| 1019 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1020 | + return $all[0]['total']; |
|
| 1021 | + } |
|
| 1022 | 1022 | public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') { |
| 1023 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1023 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1024 | 1024 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1025 | - if ($globalDBdriver == 'mysql') { |
|
| 1025 | + if ($globalDBdriver == 'mysql') { |
|
| 1026 | 1026 | $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1027 | - } else { |
|
| 1027 | + } else { |
|
| 1028 | 1028 | $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1029 | - } |
|
| 1030 | - try { |
|
| 1031 | - $sth = $this->db->prepare($query); |
|
| 1032 | - $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 1033 | - } catch(PDOException $e) { |
|
| 1034 | - echo "error : ".$e->getMessage(); |
|
| 1035 | - } |
|
| 1036 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1037 | - return $all[0]['total']; |
|
| 1038 | - } |
|
| 1029 | + } |
|
| 1030 | + try { |
|
| 1031 | + $sth = $this->db->prepare($query); |
|
| 1032 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 1033 | + } catch(PDOException $e) { |
|
| 1034 | + echo "error : ".$e->getMessage(); |
|
| 1035 | + } |
|
| 1036 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1037 | + return $all[0]['total']; |
|
| 1038 | + } |
|
| 1039 | 1039 | public function getStatsAirlineTotal($filter_name = '') { |
| 1040 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1040 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1041 | 1041 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1042 | - if ($globalDBdriver == 'mysql') { |
|
| 1042 | + if ($globalDBdriver == 'mysql') { |
|
| 1043 | 1043 | $query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name"; |
| 1044 | - } else { |
|
| 1044 | + } else { |
|
| 1045 | 1045 | $query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name"; |
| 1046 | - } |
|
| 1047 | - try { |
|
| 1048 | - $sth = $this->db->prepare($query); |
|
| 1049 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1050 | - } catch(PDOException $e) { |
|
| 1051 | - echo "error : ".$e->getMessage(); |
|
| 1052 | - } |
|
| 1053 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1054 | - return $all[0]['total']; |
|
| 1055 | - } |
|
| 1046 | + } |
|
| 1047 | + try { |
|
| 1048 | + $sth = $this->db->prepare($query); |
|
| 1049 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1050 | + } catch(PDOException $e) { |
|
| 1051 | + echo "error : ".$e->getMessage(); |
|
| 1052 | + } |
|
| 1053 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1054 | + return $all[0]['total']; |
|
| 1055 | + } |
|
| 1056 | 1056 | public function getStatsOwnerTotal($filter_name = '') { |
| 1057 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1057 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1058 | 1058 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1059 | - if ($globalDBdriver == 'mysql') { |
|
| 1059 | + if ($globalDBdriver == 'mysql') { |
|
| 1060 | 1060 | $query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name"; |
| 1061 | 1061 | } else { |
| 1062 | 1062 | $query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name"; |
| 1063 | - } |
|
| 1064 | - try { |
|
| 1065 | - $sth = $this->db->prepare($query); |
|
| 1066 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1067 | - } catch(PDOException $e) { |
|
| 1068 | - echo "error : ".$e->getMessage(); |
|
| 1069 | - } |
|
| 1070 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1071 | - return $all[0]['total']; |
|
| 1072 | - } |
|
| 1063 | + } |
|
| 1064 | + try { |
|
| 1065 | + $sth = $this->db->prepare($query); |
|
| 1066 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1067 | + } catch(PDOException $e) { |
|
| 1068 | + echo "error : ".$e->getMessage(); |
|
| 1069 | + } |
|
| 1070 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1071 | + return $all[0]['total']; |
|
| 1072 | + } |
|
| 1073 | 1073 | public function getStatsOwner($owner_name,$filter_name = '') { |
| 1074 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1074 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1075 | 1075 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1076 | 1076 | $query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name"; |
| 1077 | - try { |
|
| 1078 | - $sth = $this->db->prepare($query); |
|
| 1079 | - $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name)); |
|
| 1080 | - } catch(PDOException $e) { |
|
| 1081 | - echo "error : ".$e->getMessage(); |
|
| 1082 | - } |
|
| 1083 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1084 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1085 | - else return 0; |
|
| 1086 | - } |
|
| 1077 | + try { |
|
| 1078 | + $sth = $this->db->prepare($query); |
|
| 1079 | + $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name)); |
|
| 1080 | + } catch(PDOException $e) { |
|
| 1081 | + echo "error : ".$e->getMessage(); |
|
| 1082 | + } |
|
| 1083 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1084 | + if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1085 | + else return 0; |
|
| 1086 | + } |
|
| 1087 | 1087 | public function getStatsPilotTotal($filter_name = '') { |
| 1088 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1088 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1089 | 1089 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1090 | - if ($globalDBdriver == 'mysql') { |
|
| 1091 | - $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 1092 | - } else { |
|
| 1093 | - $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 1094 | - } |
|
| 1095 | - try { |
|
| 1096 | - $sth = $this->db->prepare($query); |
|
| 1097 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1098 | - } catch(PDOException $e) { |
|
| 1099 | - echo "error : ".$e->getMessage(); |
|
| 1100 | - } |
|
| 1101 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1102 | - return $all[0]['total']; |
|
| 1103 | - } |
|
| 1090 | + if ($globalDBdriver == 'mysql') { |
|
| 1091 | + $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 1092 | + } else { |
|
| 1093 | + $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 1094 | + } |
|
| 1095 | + try { |
|
| 1096 | + $sth = $this->db->prepare($query); |
|
| 1097 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1098 | + } catch(PDOException $e) { |
|
| 1099 | + echo "error : ".$e->getMessage(); |
|
| 1100 | + } |
|
| 1101 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1102 | + return $all[0]['total']; |
|
| 1103 | + } |
|
| 1104 | 1104 | public function getStatsPilot($pilot,$filter_name = '') { |
| 1105 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1105 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1106 | 1106 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1107 | 1107 | $query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)"; |
| 1108 | - try { |
|
| 1109 | - $sth = $this->db->prepare($query); |
|
| 1110 | - $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot)); |
|
| 1111 | - } catch(PDOException $e) { |
|
| 1112 | - echo "error : ".$e->getMessage(); |
|
| 1113 | - } |
|
| 1114 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1115 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1116 | - else return 0; |
|
| 1117 | - } |
|
| 1108 | + try { |
|
| 1109 | + $sth = $this->db->prepare($query); |
|
| 1110 | + $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot)); |
|
| 1111 | + } catch(PDOException $e) { |
|
| 1112 | + echo "error : ".$e->getMessage(); |
|
| 1113 | + } |
|
| 1114 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1115 | + if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1116 | + else return 0; |
|
| 1117 | + } |
|
| 1118 | 1118 | |
| 1119 | 1119 | public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1120 | 1120 | global $globalDBdriver; |
| 1121 | 1121 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1122 | 1122 | if ($globalDBdriver == 'mysql') { |
| 1123 | 1123 | $query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt"; |
| 1124 | - } else { |
|
| 1124 | + } else { |
|
| 1125 | 1125 | $query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1126 | 1126 | } |
| 1127 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1128 | - try { |
|
| 1129 | - $sth = $this->db->prepare($query); |
|
| 1130 | - $sth->execute($query_values); |
|
| 1131 | - } catch(PDOException $e) { |
|
| 1132 | - return "error : ".$e->getMessage(); |
|
| 1133 | - } |
|
| 1134 | - } |
|
| 1127 | + $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1128 | + try { |
|
| 1129 | + $sth = $this->db->prepare($query); |
|
| 1130 | + $sth->execute($query_values); |
|
| 1131 | + } catch(PDOException $e) { |
|
| 1132 | + return "error : ".$e->getMessage(); |
|
| 1133 | + } |
|
| 1134 | + } |
|
| 1135 | 1135 | public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1136 | 1136 | global $globalDBdriver; |
| 1137 | 1137 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1138 | 1138 | if ($globalDBdriver == 'mysql') { |
| 1139 | 1139 | $query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
| 1140 | 1140 | } else { |
| 1141 | - //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
|
| 1141 | + //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
|
| 1142 | 1142 | $query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1143 | - } |
|
| 1144 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1145 | - try { |
|
| 1146 | - $sth = $this->db->prepare($query); |
|
| 1147 | - $sth->execute($query_values); |
|
| 1148 | - } catch(PDOException $e) { |
|
| 1149 | - return "error : ".$e->getMessage(); |
|
| 1150 | - } |
|
| 1151 | - } |
|
| 1152 | - /* |
|
| 1143 | + } |
|
| 1144 | + $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1145 | + try { |
|
| 1146 | + $sth = $this->db->prepare($query); |
|
| 1147 | + $sth->execute($query_values); |
|
| 1148 | + } catch(PDOException $e) { |
|
| 1149 | + return "error : ".$e->getMessage(); |
|
| 1150 | + } |
|
| 1151 | + } |
|
| 1152 | + /* |
|
| 1153 | 1153 | public function getStatsSource($date,$stats_type = '') { |
| 1154 | 1154 | if ($stats_type == '') { |
| 1155 | 1155 | $query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name"; |
@@ -1218,25 +1218,25 @@ discard block |
||
| 1218 | 1218 | $query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data"; |
| 1219 | 1219 | } else { |
| 1220 | 1220 | $query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; |
| 1221 | - } |
|
| 1222 | - $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 1223 | - try { |
|
| 1224 | - $sth = $this->db->prepare($query); |
|
| 1225 | - $sth->execute($query_values); |
|
| 1226 | - } catch(PDOException $e) { |
|
| 1227 | - return "error : ".$e->getMessage(); |
|
| 1228 | - } |
|
| 1229 | - } |
|
| 1230 | - public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
|
| 1231 | - $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
|
| 1232 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1233 | - try { |
|
| 1234 | - $sth = $this->db->prepare($query); |
|
| 1235 | - $sth->execute($query_values); |
|
| 1236 | - } catch(PDOException $e) { |
|
| 1237 | - return "error : ".$e->getMessage(); |
|
| 1238 | - } |
|
| 1239 | - } |
|
| 1221 | + } |
|
| 1222 | + $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 1223 | + try { |
|
| 1224 | + $sth = $this->db->prepare($query); |
|
| 1225 | + $sth->execute($query_values); |
|
| 1226 | + } catch(PDOException $e) { |
|
| 1227 | + return "error : ".$e->getMessage(); |
|
| 1228 | + } |
|
| 1229 | + } |
|
| 1230 | + public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
|
| 1231 | + $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
|
| 1232 | + $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1233 | + try { |
|
| 1234 | + $sth = $this->db->prepare($query); |
|
| 1235 | + $sth->execute($query_values); |
|
| 1236 | + } catch(PDOException $e) { |
|
| 1237 | + return "error : ".$e->getMessage(); |
|
| 1238 | + } |
|
| 1239 | + } |
|
| 1240 | 1240 | public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) { |
| 1241 | 1241 | global $globalDBdriver; |
| 1242 | 1242 | if ($globalDBdriver == 'mysql') { |
@@ -1252,14 +1252,14 @@ discard block |
||
| 1252 | 1252 | $query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1253 | 1253 | } |
| 1254 | 1254 | } |
| 1255 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1256 | - try { |
|
| 1257 | - $sth = $this->db->prepare($query); |
|
| 1258 | - $sth->execute($query_values); |
|
| 1259 | - } catch(PDOException $e) { |
|
| 1260 | - return "error : ".$e->getMessage(); |
|
| 1261 | - } |
|
| 1262 | - } |
|
| 1255 | + $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1256 | + try { |
|
| 1257 | + $sth = $this->db->prepare($query); |
|
| 1258 | + $sth->execute($query_values); |
|
| 1259 | + } catch(PDOException $e) { |
|
| 1260 | + return "error : ".$e->getMessage(); |
|
| 1261 | + } |
|
| 1262 | + } |
|
| 1263 | 1263 | public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) { |
| 1264 | 1264 | global $globalDBdriver; |
| 1265 | 1265 | if ($globalDBdriver == 'mysql') { |
@@ -1275,14 +1275,14 @@ discard block |
||
| 1275 | 1275 | $query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; |
| 1276 | 1276 | } |
| 1277 | 1277 | } |
| 1278 | - $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1279 | - try { |
|
| 1280 | - $sth = $this->db->prepare($query); |
|
| 1281 | - $sth->execute($query_values); |
|
| 1282 | - } catch(PDOException $e) { |
|
| 1283 | - return "error : ".$e->getMessage(); |
|
| 1284 | - } |
|
| 1285 | - } |
|
| 1278 | + $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1279 | + try { |
|
| 1280 | + $sth = $this->db->prepare($query); |
|
| 1281 | + $sth->execute($query_values); |
|
| 1282 | + } catch(PDOException $e) { |
|
| 1283 | + return "error : ".$e->getMessage(); |
|
| 1284 | + } |
|
| 1285 | + } |
|
| 1286 | 1286 | public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) { |
| 1287 | 1287 | global $globalDBdriver; |
| 1288 | 1288 | if ($globalDBdriver == 'mysql') { |
@@ -1298,14 +1298,14 @@ discard block |
||
| 1298 | 1298 | $query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; |
| 1299 | 1299 | } |
| 1300 | 1300 | } |
| 1301 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao); |
|
| 1302 | - try { |
|
| 1303 | - $sth = $this->db->prepare($query); |
|
| 1304 | - $sth->execute($query_values); |
|
| 1305 | - } catch(PDOException $e) { |
|
| 1306 | - return "error : ".$e->getMessage(); |
|
| 1307 | - } |
|
| 1308 | - } |
|
| 1301 | + $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao); |
|
| 1302 | + try { |
|
| 1303 | + $sth = $this->db->prepare($query); |
|
| 1304 | + $sth->execute($query_values); |
|
| 1305 | + } catch(PDOException $e) { |
|
| 1306 | + return "error : ".$e->getMessage(); |
|
| 1307 | + } |
|
| 1308 | + } |
|
| 1309 | 1309 | public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
| 1310 | 1310 | global $globalDBdriver; |
| 1311 | 1311 | if ($globalDBdriver == 'mysql') { |
@@ -1321,14 +1321,14 @@ discard block |
||
| 1321 | 1321 | $query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1322 | 1322 | } |
| 1323 | 1323 | } |
| 1324 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1325 | - try { |
|
| 1326 | - $sth = $this->db->prepare($query); |
|
| 1327 | - $sth->execute($query_values); |
|
| 1328 | - } catch(PDOException $e) { |
|
| 1329 | - return "error : ".$e->getMessage(); |
|
| 1330 | - } |
|
| 1331 | - } |
|
| 1324 | + $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1325 | + try { |
|
| 1326 | + $sth = $this->db->prepare($query); |
|
| 1327 | + $sth->execute($query_values); |
|
| 1328 | + } catch(PDOException $e) { |
|
| 1329 | + return "error : ".$e->getMessage(); |
|
| 1330 | + } |
|
| 1331 | + } |
|
| 1332 | 1332 | public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) { |
| 1333 | 1333 | global $globalDBdriver; |
| 1334 | 1334 | if ($globalDBdriver == 'mysql') { |
@@ -1344,14 +1344,14 @@ discard block |
||
| 1344 | 1344 | $query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; |
| 1345 | 1345 | } |
| 1346 | 1346 | } |
| 1347 | - $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1348 | - try { |
|
| 1349 | - $sth = $this->db->prepare($query); |
|
| 1350 | - $sth->execute($query_values); |
|
| 1351 | - } catch(PDOException $e) { |
|
| 1352 | - return "error : ".$e->getMessage(); |
|
| 1353 | - } |
|
| 1354 | - } |
|
| 1347 | + $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1348 | + try { |
|
| 1349 | + $sth = $this->db->prepare($query); |
|
| 1350 | + $sth->execute($query_values); |
|
| 1351 | + } catch(PDOException $e) { |
|
| 1352 | + return "error : ".$e->getMessage(); |
|
| 1353 | + } |
|
| 1354 | + } |
|
| 1355 | 1355 | public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) { |
| 1356 | 1356 | global $globalDBdriver; |
| 1357 | 1357 | if ($globalDBdriver == 'mysql') { |
@@ -1367,14 +1367,14 @@ discard block |
||
| 1367 | 1367 | $query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1368 | 1368 | } |
| 1369 | 1369 | } |
| 1370 | - $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1371 | - try { |
|
| 1372 | - $sth = $this->db->prepare($query); |
|
| 1373 | - $sth->execute($query_values); |
|
| 1374 | - } catch(PDOException $e) { |
|
| 1375 | - return "error : ".$e->getMessage(); |
|
| 1376 | - } |
|
| 1377 | - } |
|
| 1370 | + $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1371 | + try { |
|
| 1372 | + $sth = $this->db->prepare($query); |
|
| 1373 | + $sth->execute($query_values); |
|
| 1374 | + } catch(PDOException $e) { |
|
| 1375 | + return "error : ".$e->getMessage(); |
|
| 1376 | + } |
|
| 1377 | + } |
|
| 1378 | 1378 | public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) { |
| 1379 | 1379 | global $globalDBdriver; |
| 1380 | 1380 | if ($globalDBdriver == 'mysql') { |
@@ -1390,14 +1390,14 @@ discard block |
||
| 1390 | 1390 | $query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; |
| 1391 | 1391 | } |
| 1392 | 1392 | } |
| 1393 | - $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source); |
|
| 1394 | - try { |
|
| 1395 | - $sth = $this->db->prepare($query); |
|
| 1396 | - $sth->execute($query_values); |
|
| 1397 | - } catch(PDOException $e) { |
|
| 1398 | - return "error : ".$e->getMessage(); |
|
| 1399 | - } |
|
| 1400 | - } |
|
| 1393 | + $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source); |
|
| 1394 | + try { |
|
| 1395 | + $sth = $this->db->prepare($query); |
|
| 1396 | + $sth->execute($query_values); |
|
| 1397 | + } catch(PDOException $e) { |
|
| 1398 | + return "error : ".$e->getMessage(); |
|
| 1399 | + } |
|
| 1400 | + } |
|
| 1401 | 1401 | public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) { |
| 1402 | 1402 | global $globalDBdriver; |
| 1403 | 1403 | if ($airport_icao != '') { |
@@ -1421,8 +1421,8 @@ discard block |
||
| 1421 | 1421 | } catch(PDOException $e) { |
| 1422 | 1422 | return "error : ".$e->getMessage(); |
| 1423 | 1423 | } |
| 1424 | - } |
|
| 1425 | - } |
|
| 1424 | + } |
|
| 1425 | + } |
|
| 1426 | 1426 | public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') { |
| 1427 | 1427 | global $globalDBdriver; |
| 1428 | 1428 | if ($airport_icao != '') { |
@@ -1438,8 +1438,8 @@ discard block |
||
| 1438 | 1438 | } catch(PDOException $e) { |
| 1439 | 1439 | return "error : ".$e->getMessage(); |
| 1440 | 1440 | } |
| 1441 | - } |
|
| 1442 | - } |
|
| 1441 | + } |
|
| 1442 | + } |
|
| 1443 | 1443 | public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) { |
| 1444 | 1444 | global $globalDBdriver; |
| 1445 | 1445 | if ($airport_icao != '') { |
@@ -1456,15 +1456,15 @@ discard block |
||
| 1456 | 1456 | $query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; |
| 1457 | 1457 | } |
| 1458 | 1458 | } |
| 1459 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 1459 | + $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 1460 | 1460 | try { |
| 1461 | - $sth = $this->db->prepare($query); |
|
| 1462 | - $sth->execute($query_values); |
|
| 1463 | - } catch(PDOException $e) { |
|
| 1464 | - return "error : ".$e->getMessage(); |
|
| 1465 | - } |
|
| 1466 | - } |
|
| 1467 | - } |
|
| 1461 | + $sth = $this->db->prepare($query); |
|
| 1462 | + $sth->execute($query_values); |
|
| 1463 | + } catch(PDOException $e) { |
|
| 1464 | + return "error : ".$e->getMessage(); |
|
| 1465 | + } |
|
| 1466 | + } |
|
| 1467 | + } |
|
| 1468 | 1468 | public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') { |
| 1469 | 1469 | global $globalDBdriver; |
| 1470 | 1470 | if ($airport_icao != '') { |
@@ -1480,46 +1480,46 @@ discard block |
||
| 1480 | 1480 | } catch(PDOException $e) { |
| 1481 | 1481 | return "error : ".$e->getMessage(); |
| 1482 | 1482 | } |
| 1483 | - } |
|
| 1484 | - } |
|
| 1483 | + } |
|
| 1484 | + } |
|
| 1485 | 1485 | |
| 1486 | 1486 | public function deleteStat($id) { |
| 1487 | - $query = "DELETE FROM stats WHERE stats_id = :id"; |
|
| 1488 | - $query_values = array(':id' => $id); |
|
| 1489 | - try { |
|
| 1490 | - $sth = $this->db->prepare($query); |
|
| 1491 | - $sth->execute($query_values); |
|
| 1492 | - } catch(PDOException $e) { |
|
| 1493 | - return "error : ".$e->getMessage(); |
|
| 1494 | - } |
|
| 1495 | - } |
|
| 1487 | + $query = "DELETE FROM stats WHERE stats_id = :id"; |
|
| 1488 | + $query_values = array(':id' => $id); |
|
| 1489 | + try { |
|
| 1490 | + $sth = $this->db->prepare($query); |
|
| 1491 | + $sth->execute($query_values); |
|
| 1492 | + } catch(PDOException $e) { |
|
| 1493 | + return "error : ".$e->getMessage(); |
|
| 1494 | + } |
|
| 1495 | + } |
|
| 1496 | 1496 | public function deleteStatFlight($type) { |
| 1497 | - $query = "DELETE FROM stats_flight WHERE stats_type = :type"; |
|
| 1498 | - $query_values = array(':type' => $type); |
|
| 1499 | - try { |
|
| 1500 | - $sth = $this->db->prepare($query); |
|
| 1501 | - $sth->execute($query_values); |
|
| 1502 | - } catch(PDOException $e) { |
|
| 1503 | - return "error : ".$e->getMessage(); |
|
| 1504 | - } |
|
| 1505 | - } |
|
| 1497 | + $query = "DELETE FROM stats_flight WHERE stats_type = :type"; |
|
| 1498 | + $query_values = array(':type' => $type); |
|
| 1499 | + try { |
|
| 1500 | + $sth = $this->db->prepare($query); |
|
| 1501 | + $sth->execute($query_values); |
|
| 1502 | + } catch(PDOException $e) { |
|
| 1503 | + return "error : ".$e->getMessage(); |
|
| 1504 | + } |
|
| 1505 | + } |
|
| 1506 | 1506 | public function deleteStatAirport($type) { |
| 1507 | - $query = "DELETE FROM stats_airport WHERE stats_type = :type"; |
|
| 1508 | - $query_values = array(':type' => $type); |
|
| 1509 | - try { |
|
| 1510 | - $sth = $this->db->prepare($query); |
|
| 1511 | - $sth->execute($query_values); |
|
| 1512 | - } catch(PDOException $e) { |
|
| 1513 | - return "error : ".$e->getMessage(); |
|
| 1514 | - } |
|
| 1515 | - } |
|
| 1507 | + $query = "DELETE FROM stats_airport WHERE stats_type = :type"; |
|
| 1508 | + $query_values = array(':type' => $type); |
|
| 1509 | + try { |
|
| 1510 | + $sth = $this->db->prepare($query); |
|
| 1511 | + $sth->execute($query_values); |
|
| 1512 | + } catch(PDOException $e) { |
|
| 1513 | + return "error : ".$e->getMessage(); |
|
| 1514 | + } |
|
| 1515 | + } |
|
| 1516 | 1516 | |
| 1517 | - public function addOldStats() { |
|
| 1518 | - global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear; |
|
| 1519 | - $Common = new Common(); |
|
| 1520 | - $Connection = new Connection(); |
|
| 1521 | - date_default_timezone_set('UTC'); |
|
| 1522 | - $last_update = $this->getLastStatsUpdate('last_update_stats'); |
|
| 1517 | + public function addOldStats() { |
|
| 1518 | + global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear; |
|
| 1519 | + $Common = new Common(); |
|
| 1520 | + $Connection = new Connection(); |
|
| 1521 | + date_default_timezone_set('UTC'); |
|
| 1522 | + $last_update = $this->getLastStatsUpdate('last_update_stats'); |
|
| 1523 | 1523 | if ($globalDebug) echo 'Update stats !'."\n"; |
| 1524 | 1524 | if (isset($last_update[0]['value'])) { |
| 1525 | 1525 | $last_update_day = $last_update[0]['value']; |
@@ -1566,24 +1566,24 @@ discard block |
||
| 1566 | 1566 | if ($globalDebug) echo 'Count all departure airports...'."\n"; |
| 1567 | 1567 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
| 1568 | 1568 | if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
| 1569 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 1569 | + $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 1570 | 1570 | if ($globalDebug) echo 'Order departure airports...'."\n"; |
| 1571 | - $alldata = array(); |
|
| 1571 | + $alldata = array(); |
|
| 1572 | 1572 | |
| 1573 | - foreach ($pall as $value) { |
|
| 1574 | - $icao = $value['airport_departure_icao']; |
|
| 1575 | - $alldata[$icao] = $value; |
|
| 1576 | - } |
|
| 1577 | - foreach ($dall as $value) { |
|
| 1578 | - $icao = $value['airport_departure_icao']; |
|
| 1579 | - if (isset($alldata[$icao])) { |
|
| 1580 | - $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1581 | - } else $alldata[$icao] = $value; |
|
| 1582 | - } |
|
| 1583 | - $count = array(); |
|
| 1584 | - foreach ($alldata as $key => $row) { |
|
| 1585 | - $count[$key] = $row['airport_departure_icao_count']; |
|
| 1586 | - } |
|
| 1573 | + foreach ($pall as $value) { |
|
| 1574 | + $icao = $value['airport_departure_icao']; |
|
| 1575 | + $alldata[$icao] = $value; |
|
| 1576 | + } |
|
| 1577 | + foreach ($dall as $value) { |
|
| 1578 | + $icao = $value['airport_departure_icao']; |
|
| 1579 | + if (isset($alldata[$icao])) { |
|
| 1580 | + $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1581 | + } else $alldata[$icao] = $value; |
|
| 1582 | + } |
|
| 1583 | + $count = array(); |
|
| 1584 | + foreach ($alldata as $key => $row) { |
|
| 1585 | + $count[$key] = $row['airport_departure_icao_count']; |
|
| 1586 | + } |
|
| 1587 | 1587 | array_multisort($count,SORT_DESC,$alldata); |
| 1588 | 1588 | foreach ($alldata as $number) { |
| 1589 | 1589 | echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset); |
@@ -1591,25 +1591,25 @@ discard block |
||
| 1591 | 1591 | if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
| 1592 | 1592 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
| 1593 | 1593 | if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
| 1594 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 1594 | + $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 1595 | 1595 | if ($globalDebug) echo 'Order arrival airports...'."\n"; |
| 1596 | - $alldata = array(); |
|
| 1597 | - foreach ($pall as $value) { |
|
| 1598 | - $icao = $value['airport_arrival_icao']; |
|
| 1599 | - $alldata[$icao] = $value; |
|
| 1600 | - } |
|
| 1601 | - foreach ($dall as $value) { |
|
| 1602 | - $icao = $value['airport_arrival_icao']; |
|
| 1603 | - if (isset($alldata[$icao])) { |
|
| 1604 | - $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1605 | - } else $alldata[$icao] = $value; |
|
| 1606 | - } |
|
| 1607 | - $count = array(); |
|
| 1608 | - foreach ($alldata as $key => $row) { |
|
| 1609 | - $count[$key] = $row['airport_arrival_icao_count']; |
|
| 1610 | - } |
|
| 1611 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1612 | - foreach ($alldata as $number) { |
|
| 1596 | + $alldata = array(); |
|
| 1597 | + foreach ($pall as $value) { |
|
| 1598 | + $icao = $value['airport_arrival_icao']; |
|
| 1599 | + $alldata[$icao] = $value; |
|
| 1600 | + } |
|
| 1601 | + foreach ($dall as $value) { |
|
| 1602 | + $icao = $value['airport_arrival_icao']; |
|
| 1603 | + if (isset($alldata[$icao])) { |
|
| 1604 | + $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1605 | + } else $alldata[$icao] = $value; |
|
| 1606 | + } |
|
| 1607 | + $count = array(); |
|
| 1608 | + foreach ($alldata as $key => $row) { |
|
| 1609 | + $count[$key] = $row['airport_arrival_icao_count']; |
|
| 1610 | + } |
|
| 1611 | + array_multisort($count,SORT_DESC,$alldata); |
|
| 1612 | + foreach ($alldata as $number) { |
|
| 1613 | 1613 | echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset); |
| 1614 | 1614 | } |
| 1615 | 1615 | if ($Connection->tableExists('countries')) { |
@@ -1682,8 +1682,8 @@ discard block |
||
| 1682 | 1682 | // $pall = $Spotter->getLast7DaysAirportsDeparture(); |
| 1683 | 1683 | // $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
| 1684 | 1684 | $pall = $Spotter->getLast7DaysAirportsDeparture(); |
| 1685 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
|
| 1686 | - /* |
|
| 1685 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
|
| 1686 | + /* |
|
| 1687 | 1687 | $alldata = array(); |
| 1688 | 1688 | foreach ($pall as $value) { |
| 1689 | 1689 | $icao = $value['departure_airport_icao']; |
@@ -1702,29 +1702,29 @@ discard block |
||
| 1702 | 1702 | } |
| 1703 | 1703 | array_multisort($count,SORT_DESC,$alldata); |
| 1704 | 1704 | */ |
| 1705 | - foreach ($dall as $value) { |
|
| 1706 | - $icao = $value['departure_airport_icao']; |
|
| 1707 | - $ddate = $value['date']; |
|
| 1708 | - $find = false; |
|
| 1709 | - foreach ($pall as $pvalue) { |
|
| 1710 | - if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1711 | - $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1712 | - $find = true; |
|
| 1713 | - break; |
|
| 1714 | - } |
|
| 1715 | - } |
|
| 1716 | - if ($find === false) { |
|
| 1717 | - $pall[] = $value; |
|
| 1718 | - } |
|
| 1719 | - } |
|
| 1720 | - $alldata = $pall; |
|
| 1705 | + foreach ($dall as $value) { |
|
| 1706 | + $icao = $value['departure_airport_icao']; |
|
| 1707 | + $ddate = $value['date']; |
|
| 1708 | + $find = false; |
|
| 1709 | + foreach ($pall as $pvalue) { |
|
| 1710 | + if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1711 | + $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1712 | + $find = true; |
|
| 1713 | + break; |
|
| 1714 | + } |
|
| 1715 | + } |
|
| 1716 | + if ($find === false) { |
|
| 1717 | + $pall[] = $value; |
|
| 1718 | + } |
|
| 1719 | + } |
|
| 1720 | + $alldata = $pall; |
|
| 1721 | 1721 | foreach ($alldata as $number) { |
| 1722 | 1722 | $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']); |
| 1723 | 1723 | } |
| 1724 | 1724 | echo '...Arrival'."\n"; |
| 1725 | 1725 | $pall = $Spotter->getLast7DaysAirportsArrival(); |
| 1726 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival(); |
|
| 1727 | - /* |
|
| 1726 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival(); |
|
| 1727 | + /* |
|
| 1728 | 1728 | $alldata = array(); |
| 1729 | 1729 | foreach ($pall as $value) { |
| 1730 | 1730 | $icao = $value['arrival_airport_icao']; |
@@ -1744,22 +1744,22 @@ discard block |
||
| 1744 | 1744 | */ |
| 1745 | 1745 | |
| 1746 | 1746 | |
| 1747 | - foreach ($dall as $value) { |
|
| 1748 | - $icao = $value['arrival_airport_icao']; |
|
| 1749 | - $ddate = $value['date']; |
|
| 1750 | - $find = false; |
|
| 1751 | - foreach ($pall as $pvalue) { |
|
| 1752 | - if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1753 | - $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1754 | - $find = true; |
|
| 1755 | - break; |
|
| 1756 | - } |
|
| 1757 | - } |
|
| 1758 | - if ($find === false) { |
|
| 1759 | - $pall[] = $value; |
|
| 1760 | - } |
|
| 1761 | - } |
|
| 1762 | - $alldata = $pall; |
|
| 1747 | + foreach ($dall as $value) { |
|
| 1748 | + $icao = $value['arrival_airport_icao']; |
|
| 1749 | + $ddate = $value['date']; |
|
| 1750 | + $find = false; |
|
| 1751 | + foreach ($pall as $pvalue) { |
|
| 1752 | + if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1753 | + $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1754 | + $find = true; |
|
| 1755 | + break; |
|
| 1756 | + } |
|
| 1757 | + } |
|
| 1758 | + if ($find === false) { |
|
| 1759 | + $pall[] = $value; |
|
| 1760 | + } |
|
| 1761 | + } |
|
| 1762 | + $alldata = $pall; |
|
| 1763 | 1763 | foreach ($alldata as $number) { |
| 1764 | 1764 | $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']); |
| 1765 | 1765 | } |
@@ -1834,51 +1834,51 @@ discard block |
||
| 1834 | 1834 | if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
| 1835 | 1835 | $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
| 1836 | 1836 | if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
| 1837 | - $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1837 | + $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1838 | 1838 | if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
| 1839 | - //$alldata = array(); |
|
| 1840 | - foreach ($dall as $value) { |
|
| 1841 | - $icao = $value['airport_departure_icao']; |
|
| 1842 | - $dicao = $value['airline_icao']; |
|
| 1843 | - $find = false; |
|
| 1844 | - foreach ($pall as $pvalue) { |
|
| 1845 | - if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1846 | - $pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1847 | - $find = true; |
|
| 1848 | - break; |
|
| 1849 | - } |
|
| 1850 | - } |
|
| 1851 | - if ($find === false) { |
|
| 1852 | - $pall[] = $value; |
|
| 1853 | - } |
|
| 1854 | - } |
|
| 1855 | - $alldata = $pall; |
|
| 1839 | + //$alldata = array(); |
|
| 1840 | + foreach ($dall as $value) { |
|
| 1841 | + $icao = $value['airport_departure_icao']; |
|
| 1842 | + $dicao = $value['airline_icao']; |
|
| 1843 | + $find = false; |
|
| 1844 | + foreach ($pall as $pvalue) { |
|
| 1845 | + if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1846 | + $pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1847 | + $find = true; |
|
| 1848 | + break; |
|
| 1849 | + } |
|
| 1850 | + } |
|
| 1851 | + if ($find === false) { |
|
| 1852 | + $pall[] = $value; |
|
| 1853 | + } |
|
| 1854 | + } |
|
| 1855 | + $alldata = $pall; |
|
| 1856 | 1856 | foreach ($alldata as $number) { |
| 1857 | 1857 | echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset); |
| 1858 | 1858 | } |
| 1859 | 1859 | if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
| 1860 | 1860 | $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
| 1861 | 1861 | if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
| 1862 | - $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1862 | + $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1863 | 1863 | if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
| 1864 | - //$alldata = array(); |
|
| 1865 | - foreach ($dall as $value) { |
|
| 1866 | - $icao = $value['airport_arrival_icao']; |
|
| 1867 | - $dicao = $value['airline_icao']; |
|
| 1868 | - $find = false; |
|
| 1869 | - foreach ($pall as $pvalue) { |
|
| 1870 | - if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1871 | - $pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1872 | - $find = true; |
|
| 1873 | - break; |
|
| 1874 | - } |
|
| 1875 | - } |
|
| 1876 | - if ($find === false) { |
|
| 1877 | - $pall[] = $value; |
|
| 1878 | - } |
|
| 1879 | - } |
|
| 1880 | - $alldata = $pall; |
|
| 1881 | - foreach ($alldata as $number) { |
|
| 1864 | + //$alldata = array(); |
|
| 1865 | + foreach ($dall as $value) { |
|
| 1866 | + $icao = $value['airport_arrival_icao']; |
|
| 1867 | + $dicao = $value['airline_icao']; |
|
| 1868 | + $find = false; |
|
| 1869 | + foreach ($pall as $pvalue) { |
|
| 1870 | + if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1871 | + $pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1872 | + $find = true; |
|
| 1873 | + break; |
|
| 1874 | + } |
|
| 1875 | + } |
|
| 1876 | + if ($find === false) { |
|
| 1877 | + $pall[] = $value; |
|
| 1878 | + } |
|
| 1879 | + } |
|
| 1880 | + $alldata = $pall; |
|
| 1881 | + foreach ($alldata as $number) { |
|
| 1882 | 1882 | if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset); |
| 1883 | 1883 | } |
| 1884 | 1884 | if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
@@ -1911,47 +1911,47 @@ discard block |
||
| 1911 | 1911 | } |
| 1912 | 1912 | if ($globalDebug) echo '...Departure'."\n"; |
| 1913 | 1913 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
| 1914 | - $dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines(); |
|
| 1915 | - foreach ($dall as $value) { |
|
| 1916 | - $icao = $value['departure_airport_icao']; |
|
| 1917 | - $airline = $value['airline_icao']; |
|
| 1918 | - $ddate = $value['date']; |
|
| 1919 | - $find = false; |
|
| 1920 | - foreach ($pall as $pvalue) { |
|
| 1921 | - if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) { |
|
| 1922 | - $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1923 | - $find = true; |
|
| 1924 | - break; |
|
| 1925 | - } |
|
| 1926 | - } |
|
| 1927 | - if ($find === false) { |
|
| 1928 | - $pall[] = $value; |
|
| 1929 | - } |
|
| 1930 | - } |
|
| 1931 | - $alldata = $pall; |
|
| 1914 | + $dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines(); |
|
| 1915 | + foreach ($dall as $value) { |
|
| 1916 | + $icao = $value['departure_airport_icao']; |
|
| 1917 | + $airline = $value['airline_icao']; |
|
| 1918 | + $ddate = $value['date']; |
|
| 1919 | + $find = false; |
|
| 1920 | + foreach ($pall as $pvalue) { |
|
| 1921 | + if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) { |
|
| 1922 | + $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1923 | + $find = true; |
|
| 1924 | + break; |
|
| 1925 | + } |
|
| 1926 | + } |
|
| 1927 | + if ($find === false) { |
|
| 1928 | + $pall[] = $value; |
|
| 1929 | + } |
|
| 1930 | + } |
|
| 1931 | + $alldata = $pall; |
|
| 1932 | 1932 | foreach ($alldata as $number) { |
| 1933 | 1933 | $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']); |
| 1934 | 1934 | } |
| 1935 | 1935 | if ($globalDebug) echo '...Arrival'."\n"; |
| 1936 | 1936 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
| 1937 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines(); |
|
| 1938 | - foreach ($dall as $value) { |
|
| 1939 | - $icao = $value['arrival_airport_icao']; |
|
| 1940 | - $airline = $value['airline_icao']; |
|
| 1941 | - $ddate = $value['date']; |
|
| 1942 | - $find = false; |
|
| 1943 | - foreach ($pall as $pvalue) { |
|
| 1944 | - if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) { |
|
| 1945 | - $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1946 | - $find = true; |
|
| 1947 | - break; |
|
| 1948 | - } |
|
| 1949 | - } |
|
| 1950 | - if ($find === false) { |
|
| 1951 | - $pall[] = $value; |
|
| 1952 | - } |
|
| 1953 | - } |
|
| 1954 | - $alldata = $pall; |
|
| 1937 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines(); |
|
| 1938 | + foreach ($dall as $value) { |
|
| 1939 | + $icao = $value['arrival_airport_icao']; |
|
| 1940 | + $airline = $value['airline_icao']; |
|
| 1941 | + $ddate = $value['date']; |
|
| 1942 | + $find = false; |
|
| 1943 | + foreach ($pall as $pvalue) { |
|
| 1944 | + if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) { |
|
| 1945 | + $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1946 | + $find = true; |
|
| 1947 | + break; |
|
| 1948 | + } |
|
| 1949 | + } |
|
| 1950 | + if ($find === false) { |
|
| 1951 | + $pall[] = $value; |
|
| 1952 | + } |
|
| 1953 | + } |
|
| 1954 | + $alldata = $pall; |
|
| 1955 | 1955 | foreach ($alldata as $number) { |
| 1956 | 1956 | $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']); |
| 1957 | 1957 | } |
@@ -2036,44 +2036,44 @@ discard block |
||
| 2036 | 2036 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset); |
| 2037 | 2037 | } |
| 2038 | 2038 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter); |
| 2039 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2040 | - $alldata = array(); |
|
| 2041 | - foreach ($pall as $value) { |
|
| 2042 | - $icao = $value['airport_departure_icao']; |
|
| 2043 | - $alldata[$icao] = $value; |
|
| 2044 | - } |
|
| 2045 | - foreach ($dall as $value) { |
|
| 2046 | - $icao = $value['airport_departure_icao']; |
|
| 2047 | - if (isset($alldata[$icao])) { |
|
| 2048 | - $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 2049 | - } else $alldata[$icao] = $value; |
|
| 2050 | - } |
|
| 2051 | - $count = array(); |
|
| 2052 | - foreach ($alldata as $key => $row) { |
|
| 2053 | - $count[$key] = $row['airport_departure_icao_count']; |
|
| 2054 | - } |
|
| 2039 | + $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2040 | + $alldata = array(); |
|
| 2041 | + foreach ($pall as $value) { |
|
| 2042 | + $icao = $value['airport_departure_icao']; |
|
| 2043 | + $alldata[$icao] = $value; |
|
| 2044 | + } |
|
| 2045 | + foreach ($dall as $value) { |
|
| 2046 | + $icao = $value['airport_departure_icao']; |
|
| 2047 | + if (isset($alldata[$icao])) { |
|
| 2048 | + $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 2049 | + } else $alldata[$icao] = $value; |
|
| 2050 | + } |
|
| 2051 | + $count = array(); |
|
| 2052 | + foreach ($alldata as $key => $row) { |
|
| 2053 | + $count[$key] = $row['airport_departure_icao_count']; |
|
| 2054 | + } |
|
| 2055 | 2055 | array_multisort($count,SORT_DESC,$alldata); |
| 2056 | 2056 | foreach ($alldata as $number) { |
| 2057 | - echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset); |
|
| 2057 | + echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset); |
|
| 2058 | 2058 | } |
| 2059 | 2059 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter); |
| 2060 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2060 | + $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2061 | 2061 | $alldata = array(); |
| 2062 | - foreach ($pall as $value) { |
|
| 2063 | - $icao = $value['airport_arrival_icao']; |
|
| 2064 | - $alldata[$icao] = $value; |
|
| 2065 | - } |
|
| 2066 | - foreach ($dall as $value) { |
|
| 2067 | - $icao = $value['airport_arrival_icao']; |
|
| 2068 | - if (isset($alldata[$icao])) { |
|
| 2069 | - $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 2070 | - } else $alldata[$icao] = $value; |
|
| 2071 | - } |
|
| 2072 | - $count = array(); |
|
| 2073 | - foreach ($alldata as $key => $row) { |
|
| 2074 | - $count[$key] = $row['airport_arrival_icao_count']; |
|
| 2075 | - } |
|
| 2076 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2062 | + foreach ($pall as $value) { |
|
| 2063 | + $icao = $value['airport_arrival_icao']; |
|
| 2064 | + $alldata[$icao] = $value; |
|
| 2065 | + } |
|
| 2066 | + foreach ($dall as $value) { |
|
| 2067 | + $icao = $value['airport_arrival_icao']; |
|
| 2068 | + if (isset($alldata[$icao])) { |
|
| 2069 | + $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 2070 | + } else $alldata[$icao] = $value; |
|
| 2071 | + } |
|
| 2072 | + $count = array(); |
|
| 2073 | + foreach ($alldata as $key => $row) { |
|
| 2074 | + $count[$key] = $row['airport_arrival_icao_count']; |
|
| 2075 | + } |
|
| 2076 | + array_multisort($count,SORT_DESC,$alldata); |
|
| 2077 | 2077 | foreach ($alldata as $number) { |
| 2078 | 2078 | echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset); |
| 2079 | 2079 | } |
@@ -2106,45 +2106,45 @@ discard block |
||
| 2106 | 2106 | } |
| 2107 | 2107 | echo '...Departure'."\n"; |
| 2108 | 2108 | $pall = $Spotter->getLast7DaysAirportsDeparture('',$filter); |
| 2109 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 2109 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 2110 | 2110 | foreach ($dall as $value) { |
| 2111 | - $icao = $value['departure_airport_icao']; |
|
| 2112 | - $ddate = $value['date']; |
|
| 2113 | - $find = false; |
|
| 2114 | - foreach ($pall as $pvalue) { |
|
| 2115 | - if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 2116 | - $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 2117 | - $find = true; |
|
| 2118 | - break; |
|
| 2119 | - } |
|
| 2120 | - } |
|
| 2121 | - if ($find === false) { |
|
| 2122 | - $pall[] = $value; |
|
| 2123 | - } |
|
| 2124 | - } |
|
| 2125 | - $alldata = $pall; |
|
| 2111 | + $icao = $value['departure_airport_icao']; |
|
| 2112 | + $ddate = $value['date']; |
|
| 2113 | + $find = false; |
|
| 2114 | + foreach ($pall as $pvalue) { |
|
| 2115 | + if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 2116 | + $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 2117 | + $find = true; |
|
| 2118 | + break; |
|
| 2119 | + } |
|
| 2120 | + } |
|
| 2121 | + if ($find === false) { |
|
| 2122 | + $pall[] = $value; |
|
| 2123 | + } |
|
| 2124 | + } |
|
| 2125 | + $alldata = $pall; |
|
| 2126 | 2126 | foreach ($alldata as $number) { |
| 2127 | 2127 | $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name); |
| 2128 | 2128 | } |
| 2129 | 2129 | echo '...Arrival'."\n"; |
| 2130 | 2130 | $pall = $Spotter->getLast7DaysAirportsArrival('',$filter); |
| 2131 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 2131 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 2132 | 2132 | foreach ($dall as $value) { |
| 2133 | 2133 | $icao = $value['arrival_airport_icao']; |
| 2134 | 2134 | $ddate = $value['date']; |
| 2135 | - $find = false; |
|
| 2135 | + $find = false; |
|
| 2136 | 2136 | foreach ($pall as $pvalue) { |
| 2137 | - if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 2138 | - $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 2139 | - $find = true; |
|
| 2140 | - break; |
|
| 2141 | - } |
|
| 2142 | - } |
|
| 2143 | - if ($find === false) { |
|
| 2144 | - $pall[] = $value; |
|
| 2145 | - } |
|
| 2146 | - } |
|
| 2147 | - $alldata = $pall; |
|
| 2137 | + if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 2138 | + $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 2139 | + $find = true; |
|
| 2140 | + break; |
|
| 2141 | + } |
|
| 2142 | + } |
|
| 2143 | + if ($find === false) { |
|
| 2144 | + $pall[] = $value; |
|
| 2145 | + } |
|
| 2146 | + } |
|
| 2147 | + $alldata = $pall; |
|
| 2148 | 2148 | foreach ($alldata as $number) { |
| 2149 | 2149 | $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name); |
| 2150 | 2150 | } |
@@ -516,8 +516,8 @@ discard block |
||
| 516 | 516 | } |
| 517 | 517 | } |
| 518 | 518 | <?php |
| 519 | - } else { |
|
| 520 | - ?> |
|
| 519 | + } else { |
|
| 520 | + ?> |
|
| 521 | 521 | if (map.getZoom() > 7) { |
| 522 | 522 | var style = { |
| 523 | 523 | "color": "#1a3151", |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | layer_marine_data.addLayer(layer); |
| 537 | 537 | } |
| 538 | 538 | <?php |
| 539 | - } |
|
| 539 | + } |
|
| 540 | 540 | ?> |
| 541 | 541 | } |
| 542 | 542 | } |
@@ -517,8 +517,8 @@ discard block |
||
| 517 | 517 | } |
| 518 | 518 | } |
| 519 | 519 | <?php |
| 520 | - } else { |
|
| 521 | - ?> |
|
| 520 | + } else { |
|
| 521 | + ?> |
|
| 522 | 522 | if (map.getZoom() > 7) { |
| 523 | 523 | var style = { |
| 524 | 524 | "color": "#1a3151", |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | layer_tracker_data.addLayer(layer); |
| 538 | 538 | } |
| 539 | 539 | <?php |
| 540 | - } |
|
| 540 | + } |
|
| 541 | 541 | ?> |
| 542 | 542 | } |
| 543 | 543 | } |
@@ -352,10 +352,10 @@ discard block |
||
| 352 | 352 | }); |
| 353 | 353 | update_locationsLayer(); |
| 354 | 354 | <?php |
| 355 | - // Add support for custom json via $globalMapJson |
|
| 356 | - if (isset($globalMapJson) && is_array($globalMapJson)) { |
|
| 355 | + // Add support for custom json via $globalMapJson |
|
| 356 | + if (isset($globalMapJson) && is_array($globalMapJson)) { |
|
| 357 | 357 | foreach ($globalMapJson as $json) { |
| 358 | - if (isset($json['url'])) { |
|
| 358 | + if (isset($json['url'])) { |
|
| 359 | 359 | ?> |
| 360 | 360 | update_genLayer('<?php print $json['url']; ?>'); |
| 361 | 361 | <?php |
@@ -364,9 +364,9 @@ discard block |
||
| 364 | 364 | setInterval(function(){update_genLayer('<?php print $json['url']; ?>')}, <?php print $json['refresh']; ?>); |
| 365 | 365 | <?php |
| 366 | 366 | } |
| 367 | - } |
|
| 367 | + } |
|
| 368 | + } |
|
| 368 | 369 | } |
| 369 | - } |
|
| 370 | 370 | |
| 371 | 371 | ?> |
| 372 | 372 | //adds the bootstrap tooltip to the map icons |
@@ -34,30 +34,30 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | |
| 36 | 36 | function quaternionrotate($heading, $attitude = 0, $bank = 0) { |
| 37 | - // Assuming the angles are in radians. |
|
| 38 | - $c1 = cos($heading/2); |
|
| 39 | - $s1 = sin($heading/2); |
|
| 40 | - $c2 = cos($attitude/2); |
|
| 41 | - $s2 = sin($attitude/2); |
|
| 42 | - $c3 = cos($bank/2); |
|
| 43 | - $s3 = sin($bank/2); |
|
| 44 | - $c1c2 = $c1*$c2; |
|
| 45 | - $s1s2 = $s1*$s2; |
|
| 46 | - $w =$c1c2*$c3 - $s1s2*$s3; |
|
| 47 | - $x =$c1c2*$s3 + $s1s2*$c3; |
|
| 48 | - $y =$s1*$c2*$c3 + $c1*$s2*$s3; |
|
| 49 | - $z =$c1*$s2*$c3 - $s1*$c2*$s3; |
|
| 50 | - return array('x' => $x,'y' => $y,'z' => $z,'w' => $w); |
|
| 37 | + // Assuming the angles are in radians. |
|
| 38 | + $c1 = cos($heading/2); |
|
| 39 | + $s1 = sin($heading/2); |
|
| 40 | + $c2 = cos($attitude/2); |
|
| 41 | + $s2 = sin($attitude/2); |
|
| 42 | + $c3 = cos($bank/2); |
|
| 43 | + $s3 = sin($bank/2); |
|
| 44 | + $c1c2 = $c1*$c2; |
|
| 45 | + $s1s2 = $s1*$s2; |
|
| 46 | + $w =$c1c2*$c3 - $s1s2*$s3; |
|
| 47 | + $x =$c1c2*$s3 + $s1s2*$c3; |
|
| 48 | + $y =$s1*$c2*$c3 + $c1*$s2*$s3; |
|
| 49 | + $z =$c1*$s2*$c3 - $s1*$c2*$s3; |
|
| 50 | + return array('x' => $x,'y' => $y,'z' => $z,'w' => $w); |
|
| 51 | 51 | // return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365'); |
| 52 | 52 | |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | |
| 56 | 56 | if (isset($_GET['download'])) { |
| 57 | - if ($_GET['download'] == "true") |
|
| 58 | - { |
|
| 57 | + if ($_GET['download'] == "true") |
|
| 58 | + { |
|
| 59 | 59 | header('Content-disposition: attachment; filename="flightairmap.json"'); |
| 60 | - } |
|
| 60 | + } |
|
| 61 | 61 | } |
| 62 | 62 | header('Content-Type: text/javascript'); |
| 63 | 63 | |
@@ -220,10 +220,10 @@ discard block |
||
| 220 | 220 | $image = "images/placeholder_thumb.png"; |
| 221 | 221 | } |
| 222 | 222 | |
| 223 | - if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id']; |
|
| 224 | - elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid']; |
|
| 225 | - elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id']; |
|
| 226 | - if ($prev_flightaware_id != $id) { |
|
| 223 | + if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id']; |
|
| 224 | + elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid']; |
|
| 225 | + elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id']; |
|
| 226 | + if ($prev_flightaware_id != $id) { |
|
| 227 | 227 | if ($prev_flightaware_id != '') { |
| 228 | 228 | $output .= ']'; |
| 229 | 229 | $output .= '}'; |
@@ -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($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) { |
|
| 383 | + if ((!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> |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | <div id="showdetails" class="showdetails"></div> |
| 37 | 37 | <div id="infobox" class="infobox"><h4><?php echo _("Aircrafts detected"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div> |
| 38 | 38 | <?php |
| 39 | - if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
| 39 | + if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
| 40 | 40 | |
| 41 | 41 | ?> |
| 42 | 42 | <script src="<?php echo $globalURL; ?>/js/map.3d.js.php"></script> |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script> |
| 57 | 57 | <?php |
| 58 | 58 | } |
| 59 | - } |
|
| 59 | + } |
|
| 60 | 60 | ?> |
| 61 | 61 | <div id="dialog" title="<?php echo _("Session has timed-out"); ?>"> |
| 62 | 62 | <p><?php echo _("In order to save data consumption web page times out after 30 minutes. Close this dialog to continue."); ?></p> |
@@ -70,34 +70,34 @@ discard block |
||
| 70 | 70 | <li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li> |
| 71 | 71 | <li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li> |
| 72 | 72 | <?php |
| 73 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 73 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 74 | 74 | if (isset($globalArchive) && $globalArchive == TRUE) { |
| 75 | 75 | ?> |
| 76 | 76 | <li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li> |
| 77 | 77 | <?php |
| 78 | 78 | } |
| 79 | - } |
|
| 79 | + } |
|
| 80 | 80 | ?> |
| 81 | 81 | <li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li> |
| 82 | 82 | <li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li> |
| 83 | 83 | <li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li> |
| 84 | 84 | <?php |
| 85 | - if (isset($globalMap3D) && $globalMap3D) { |
|
| 85 | + if (isset($globalMap3D) && $globalMap3D) { |
|
| 86 | 86 | if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
| 87 | 87 | ?> |
| 88 | 88 | <li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li> |
| 89 | 89 | <?php |
| 90 | - } else { |
|
| 91 | - if (isset($globalMapSatellites) && $globalMapSatellites) { |
|
| 90 | + } else { |
|
| 91 | + if (isset($globalMapSatellites) && $globalMapSatellites) { |
|
| 92 | 92 | ?> |
| 93 | 93 | <li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li> |
| 94 | 94 | <?php |
| 95 | - } |
|
| 95 | + } |
|
| 96 | 96 | ?> |
| 97 | 97 | <li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li> |
| 98 | 98 | <?php |
| 99 | 99 | } |
| 100 | - } |
|
| 100 | + } |
|
| 101 | 101 | ?> |
| 102 | 102 | </ul> |
| 103 | 103 | |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | ?> |
| 172 | 172 | </div> |
| 173 | 173 | <?php |
| 174 | - if (isset($globalArchive) && $globalArchive == TRUE) { |
|
| 174 | + if (isset($globalArchive) && $globalArchive == TRUE) { |
|
| 175 | 175 | ?> |
| 176 | 176 | <div class="sidebar-pane" id="archive"> |
| 177 | 177 | <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | </form> |
| 232 | 232 | </div> |
| 233 | 233 | <?php |
| 234 | - } |
|
| 234 | + } |
|
| 235 | 235 | ?> |
| 236 | 236 | <div class="sidebar-pane" id="settings"> |
| 237 | 237 | <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -242,56 +242,56 @@ discard block |
||
| 242 | 242 | <?php |
| 243 | 243 | if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
| 244 | 244 | else $MapType = $_COOKIE['MapType']; |
| 245 | - ?> |
|
| 245 | + ?> |
|
| 246 | 246 | <?php |
| 247 | 247 | if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
| 248 | - ?> |
|
| 248 | + ?> |
|
| 249 | 249 | <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
| 250 | 250 | <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
| 251 | 251 | <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
| 252 | 252 | <?php |
| 253 | 253 | } |
| 254 | - ?> |
|
| 254 | + ?> |
|
| 255 | 255 | <?php |
| 256 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 257 | - ?> |
|
| 256 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 257 | + ?> |
|
| 258 | 258 | <?php |
| 259 | - if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
|
| 260 | - ?> |
|
| 259 | + if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
|
| 260 | + ?> |
|
| 261 | 261 | <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
| 262 | 262 | <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
| 263 | 263 | <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
| 264 | 264 | <?php |
| 265 | - } |
|
| 266 | - ?> |
|
| 265 | + } |
|
| 266 | + ?> |
|
| 267 | 267 | <?php |
| 268 | - if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
|
| 269 | - ?> |
|
| 268 | + if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
|
| 269 | + ?> |
|
| 270 | 270 | <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
| 271 | 271 | <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
| 272 | 272 | <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
| 273 | 273 | <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
| 274 | 274 | <?php |
| 275 | - } |
|
| 276 | - ?> |
|
| 275 | + } |
|
| 276 | + ?> |
|
| 277 | 277 | <?php |
| 278 | - if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
|
| 279 | - ?> |
|
| 278 | + if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
|
| 279 | + ?> |
|
| 280 | 280 | <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
| 281 | 281 | <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
| 282 | 282 | <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
| 283 | 283 | <?php |
| 284 | - } |
|
| 285 | - ?> |
|
| 284 | + } |
|
| 285 | + ?> |
|
| 286 | 286 | <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
| 287 | 287 | <?php |
| 288 | 288 | } |
| 289 | - ?> |
|
| 289 | + ?> |
|
| 290 | 290 | <?php |
| 291 | - if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
| 291 | + if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
| 292 | 292 | if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
| 293 | 293 | else $MapBoxId = $_COOKIE['MapTypeId']; |
| 294 | - ?> |
|
| 294 | + ?> |
|
| 295 | 295 | <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
| 296 | 296 | <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
| 297 | 297 | <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option> |
@@ -305,13 +305,13 @@ discard block |
||
| 305 | 305 | <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
| 306 | 306 | <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
| 307 | 307 | <?php |
| 308 | - } |
|
| 309 | - ?> |
|
| 308 | + } |
|
| 309 | + ?> |
|
| 310 | 310 | <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
| 311 | 311 | </select> |
| 312 | 312 | </li> |
| 313 | 313 | <?php |
| 314 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 314 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 315 | 315 | ?> |
| 316 | 316 | <li><?php echo _("Type of Terrain:"); ?> |
| 317 | 317 | <select class="selectpicker" onchange="terrainType(this);"> |
@@ -321,10 +321,10 @@ discard block |
||
| 321 | 321 | </select> |
| 322 | 322 | </li> |
| 323 | 323 | <?php |
| 324 | - } |
|
| 324 | + } |
|
| 325 | 325 | ?> |
| 326 | 326 | <?php |
| 327 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 327 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 328 | 328 | ?> |
| 329 | 329 | |
| 330 | 330 | <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li> |
@@ -332,59 +332,59 @@ discard block |
||
| 332 | 332 | <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || !isset($_COOKIE['MapRoute'])) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li> |
| 333 | 333 | <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li> |
| 334 | 334 | <?php |
| 335 | - } |
|
| 335 | + } |
|
| 336 | 336 | ?> |
| 337 | 337 | <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true') print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li> |
| 338 | 338 | <?php |
| 339 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 339 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 340 | 340 | ?> |
| 341 | 341 | <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li> |
| 342 | 342 | <?php |
| 343 | - } |
|
| 344 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 343 | + } |
|
| 344 | + if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 345 | 345 | ?> |
| 346 | 346 | <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li> |
| 347 | 347 | <?php |
| 348 | - } |
|
| 348 | + } |
|
| 349 | 349 | ?> |
| 350 | 350 | |
| 351 | 351 | <?php |
| 352 | 352 | if (function_exists('array_column')) { |
| 353 | - if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
| 354 | - ?> |
|
| 353 | + if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
| 354 | + ?> |
|
| 355 | 355 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
| 356 | 356 | <?php |
| 357 | - } |
|
| 357 | + } |
|
| 358 | 358 | } elseif (isset($globalSources)) { |
| 359 | - $dispolar = false; |
|
| 360 | - foreach ($globalSources as $testsource) { |
|
| 361 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 362 | - } |
|
| 363 | - if ($dispolar) { |
|
| 364 | - ?> |
|
| 359 | + $dispolar = false; |
|
| 360 | + foreach ($globalSources as $testsource) { |
|
| 361 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 362 | + } |
|
| 363 | + if ($dispolar) { |
|
| 364 | + ?> |
|
| 365 | 365 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
| 366 | 366 | <?php |
| 367 | - } |
|
| 368 | - } |
|
| 369 | - ?> |
|
| 367 | + } |
|
| 368 | + } |
|
| 369 | + ?> |
|
| 370 | 370 | <?php |
| 371 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 371 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 372 | 372 | ?> |
| 373 | 373 | |
| 374 | 374 | <?php |
| 375 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 376 | - ?> |
|
| 375 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 376 | + ?> |
|
| 377 | 377 | <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
| 378 | 378 | <?php |
| 379 | 379 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
| 380 | - ?> |
|
| 380 | + ?> |
|
| 381 | 381 | <li><?php echo _("Aircraft icon color:"); ?> |
| 382 | 382 | <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>"> |
| 383 | 383 | </li> |
| 384 | 384 | <?php |
| 385 | - } |
|
| 386 | - } |
|
| 387 | - ?> |
|
| 385 | + } |
|
| 386 | + } |
|
| 387 | + ?> |
|
| 388 | 388 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
| 389 | 389 | <div class="range"> |
| 390 | 390 | <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>"> |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | </div> |
| 393 | 393 | </li> |
| 394 | 394 | <?php |
| 395 | - } |
|
| 395 | + } |
|
| 396 | 396 | ?> |
| 397 | 397 | <li><?php echo _("Distance unit:"); ?> |
| 398 | 398 | <select class="selectpicker" onchange="unitdistance(this);"> |
@@ -425,16 +425,16 @@ discard block |
||
| 425 | 425 | <ul> |
| 426 | 426 | <?php |
| 427 | 427 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
| 428 | - ?> |
|
| 428 | + ?> |
|
| 429 | 429 | <?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
| 430 | 430 | <?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
| 431 | 431 | <?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
| 432 | 432 | <?php |
| 433 | 433 | } |
| 434 | - ?> |
|
| 434 | + ?> |
|
| 435 | 435 | <?php |
| 436 | 436 | if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
| 437 | - ?> |
|
| 437 | + ?> |
|
| 438 | 438 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
| 439 | 439 | <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
| 440 | 440 | <?php } ?> |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | <?php } ?> |
| 444 | 444 | <?php |
| 445 | 445 | } |
| 446 | - ?> |
|
| 446 | + ?> |
|
| 447 | 447 | <li><?php echo _("Display airlines:"); ?> |
| 448 | 448 | <br/> |
| 449 | 449 | <select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines"> |
@@ -463,14 +463,14 @@ discard block |
||
| 463 | 463 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
| 464 | 464 | } |
| 465 | 465 | } |
| 466 | - ?> |
|
| 466 | + ?> |
|
| 467 | 467 | </select> |
| 468 | 468 | </li> |
| 469 | 469 | <?php |
| 470 | 470 | $Spotter = new Spotter(); |
| 471 | 471 | $allalliancenames = $Spotter->getAllAllianceNames(); |
| 472 | 472 | if (!empty($allalliancenames)) { |
| 473 | - ?> |
|
| 473 | + ?> |
|
| 474 | 474 | <li><?php echo _("Display alliance:"); ?> |
| 475 | 475 | <br/> |
| 476 | 476 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
@@ -484,15 +484,15 @@ discard block |
||
| 484 | 484 | echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>'; |
| 485 | 485 | } |
| 486 | 486 | } |
| 487 | - ?> |
|
| 487 | + ?> |
|
| 488 | 488 | </select> |
| 489 | 489 | </li> |
| 490 | 490 | <?php |
| 491 | 491 | } |
| 492 | - ?> |
|
| 492 | + ?> |
|
| 493 | 493 | <?php |
| 494 | 494 | if (isset($globalAPRS) && $globalAPRS) { |
| 495 | - ?> |
|
| 495 | + ?> |
|
| 496 | 496 | <li><?php echo _("Display APRS sources name:"); ?> |
| 497 | 497 | <select class="selectpicker" multiple onchange="sources(this);"> |
| 498 | 498 | <?php |
@@ -504,15 +504,15 @@ discard block |
||
| 504 | 504 | echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>'; |
| 505 | 505 | } |
| 506 | 506 | } |
| 507 | - ?> |
|
| 507 | + ?> |
|
| 508 | 508 | </select> |
| 509 | 509 | </li> |
| 510 | 510 | <?php |
| 511 | 511 | } |
| 512 | - ?> |
|
| 512 | + ?> |
|
| 513 | 513 | <?php |
| 514 | 514 | if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
| 515 | - ?> |
|
| 515 | + ?> |
|
| 516 | 516 | <li><?php echo _("Display airlines of type:"); ?><br/> |
| 517 | 517 | <select class="selectpicker" onchange="airlinestype(this);"> |
| 518 | 518 | <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | </li> |
| 524 | 524 | <?php |
| 525 | 525 | } |
| 526 | - ?> |
|
| 526 | + ?> |
|
| 527 | 527 | <li> |
| 528 | 528 | <?php echo _("Display flight with ident:"); ?> |
| 529 | 529 | <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | </form> |
| 537 | 537 | </div> |
| 538 | 538 | <?php |
| 539 | - if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 539 | + if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 540 | 540 | ?> |
| 541 | 541 | <div class="sidebar-pane" id="satellites"> |
| 542 | 542 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -576,14 +576,14 @@ discard block |
||
| 576 | 576 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
| 577 | 577 | } |
| 578 | 578 | } |
| 579 | - ?> |
|
| 579 | + ?> |
|
| 580 | 580 | </select> |
| 581 | 581 | </li> |
| 582 | 582 | </ul> |
| 583 | 583 | </form> |
| 584 | 584 | </div> |
| 585 | 585 | <?php |
| 586 | - } |
|
| 586 | + } |
|
| 587 | 587 | ?> |
| 588 | 588 | </div> |
| 589 | 589 | </div> |
@@ -4,31 +4,31 @@ discard block |
||
| 4 | 4 | $hex = str_replace("#", "", $hex); |
| 5 | 5 | $color = array(); |
| 6 | 6 | if (strlen($hex) == 3) { |
| 7 | - $color['r'] = hexdec(substr($hex, 0, 1) . substr($hex,0,1)); |
|
| 8 | - $color['g'] = hexdec(substr($hex, 1, 1) . substr($hex,1,1)); |
|
| 9 | - $color['b'] = hexdec(substr($hex, 2, 1) . substr($hex,2,1)); |
|
| 7 | + $color['r'] = hexdec(substr($hex, 0, 1) . substr($hex,0,1)); |
|
| 8 | + $color['g'] = hexdec(substr($hex, 1, 1) . substr($hex,1,1)); |
|
| 9 | + $color['b'] = hexdec(substr($hex, 2, 1) . substr($hex,2,1)); |
|
| 10 | 10 | } else if (strlen($hex) == 6) { |
| 11 | - $color['r'] = hexdec(substr($hex, 0, 2)); |
|
| 12 | - $color['g'] = hexdec(substr($hex, 2, 2)); |
|
| 13 | - $color['b'] = hexdec(substr($hex, 4, 2)); |
|
| 11 | + $color['r'] = hexdec(substr($hex, 0, 2)); |
|
| 12 | + $color['g'] = hexdec(substr($hex, 2, 2)); |
|
| 13 | + $color['b'] = hexdec(substr($hex, 4, 2)); |
|
| 14 | 14 | } |
| 15 | 15 | return $color; |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | |
| 19 | 19 | if (!isset($_GET['color']) || $_GET['color'] == '' || !preg_match('/^([a-fA-F0-9]){3}(([a-fA-F0-9]){3})?\b/',$_GET['color'])) { |
| 20 | - exit(0); |
|
| 20 | + exit(0); |
|
| 21 | 21 | } |
| 22 | 22 | $color = $_GET['color']; |
| 23 | 23 | if (!isset($_GET['filename']) || !preg_match('/^[a-z0-9-_]+\.png$/', strtolower($_GET['filename']))) { |
| 24 | - echo "Incorrect filename"; |
|
| 25 | - exit(0); |
|
| 24 | + echo "Incorrect filename"; |
|
| 25 | + exit(0); |
|
| 26 | 26 | } |
| 27 | 27 | $filename = $_GET['filename']; |
| 28 | 28 | if (file_exists(dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.$color.'-'.$filename)) { |
| 29 | - header('Content-type: image/png'); |
|
| 30 | - readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.$color.'-'.$filename); |
|
| 31 | - exit(0); |
|
| 29 | + header('Content-type: image/png'); |
|
| 30 | + readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.$color.'-'.$filename); |
|
| 31 | + exit(0); |
|
| 32 | 32 | } |
| 33 | 33 | if (isset($_GET['tracker'])) { |
| 34 | 34 | $original = dirname(__FILE__).DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.'vehicules'.DIRECTORY_SEPARATOR.$filename; |
@@ -38,66 +38,66 @@ discard block |
||
| 38 | 38 | $original = dirname(__FILE__).DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.'aircrafts'.DIRECTORY_SEPARATOR.'new'.DIRECTORY_SEPARATOR.$filename; |
| 39 | 39 | } |
| 40 | 40 | if (!file_exists($original)) { |
| 41 | - echo "File not found"; |
|
| 41 | + echo "File not found"; |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 45 | - $image = imagecreatefrompng($original); |
|
| 46 | - $index = imagecolorexact($image,26,49,81); |
|
| 47 | - if ($index < 0) { |
|
| 45 | + $image = imagecreatefrompng($original); |
|
| 46 | + $index = imagecolorexact($image,26,49,81); |
|
| 47 | + if ($index < 0) { |
|
| 48 | 48 | $index = imagecolorexact($image,25,49,79); |
| 49 | - } |
|
| 50 | - if ($index < 0) { |
|
| 49 | + } |
|
| 50 | + if ($index < 0) { |
|
| 51 | 51 | $index = imagecolorexact($image,0,0,0); |
| 52 | - } |
|
| 53 | - $c = hexToRGB($color); |
|
| 54 | - imagecolorset($image,$index,$c['r'],$c['g'],$c['b']); |
|
| 52 | + } |
|
| 53 | + $c = hexToRGB($color); |
|
| 54 | + imagecolorset($image,$index,$c['r'],$c['g'],$c['b']); |
|
| 55 | 55 | /* |
| 56 | 56 | $ig = imagecolorat($image, 0, 0); |
| 57 | 57 | imagecolortransparent($image, $ig); |
| 58 | 58 | */ |
| 59 | 59 | |
| 60 | - header('Content-type: image/png'); |
|
| 61 | - if (isset($_GET['resize']) && function_exists('imagecopyresampled')) { |
|
| 60 | + header('Content-type: image/png'); |
|
| 61 | + if (isset($_GET['resize']) && function_exists('imagecopyresampled')) { |
|
| 62 | 62 | $resize = filter_input(INPUT_GET,'resize',FILTER_SANITIZE_NUMBER_INT); |
| 63 | 63 | $newimg = imagecreatetruecolor($resize,$resize); |
| 64 | - imagealphablending($newimg, false); |
|
| 64 | + imagealphablending($newimg, false); |
|
| 65 | 65 | imagesavealpha($newimg, true); |
| 66 | 66 | imagecopyresampled($newimg,$image,0,0,0,0,15,15,imagesx($image),imagesy($image)); |
| 67 | 67 | if (isset($_GET['heading'])) { |
| 68 | - $heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT); |
|
| 69 | - $rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127)); |
|
| 70 | - imagealphablending($rotation, false); |
|
| 71 | - imagesavealpha($rotation, true); |
|
| 72 | - imagepng($rotation); |
|
| 73 | - imagedestroy($newimg); |
|
| 74 | - imagedestroy($image); |
|
| 75 | - imagedestroy($rotation); |
|
| 68 | + $heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT); |
|
| 69 | + $rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127)); |
|
| 70 | + imagealphablending($rotation, false); |
|
| 71 | + imagesavealpha($rotation, true); |
|
| 72 | + imagepng($rotation); |
|
| 73 | + imagedestroy($newimg); |
|
| 74 | + imagedestroy($image); |
|
| 75 | + imagedestroy($rotation); |
|
| 76 | 76 | |
| 77 | 77 | } else { |
| 78 | - imagepng($newimg); |
|
| 79 | - imagedestroy($newimg); |
|
| 80 | - imagedestroy($image); |
|
| 81 | - } |
|
| 82 | - } else { |
|
| 78 | + imagepng($newimg); |
|
| 79 | + imagedestroy($newimg); |
|
| 80 | + imagedestroy($image); |
|
| 81 | + } |
|
| 82 | + } else { |
|
| 83 | 83 | imagealphablending($image, false); |
| 84 | - imagesavealpha($image, true); |
|
| 84 | + imagesavealpha($image, true); |
|
| 85 | 85 | imagepng($image); |
| 86 | 86 | imagepng($image); |
| 87 | 87 | if (is_writable('cache')) { |
| 88 | - imagepng($image,dirname(__FILE__).DIRECTORY_SEPARATOR.'cache/'.$color.'-'.$filename); |
|
| 88 | + imagepng($image,dirname(__FILE__).DIRECTORY_SEPARATOR.'cache/'.$color.'-'.$filename); |
|
| 89 | + } |
|
| 90 | + imagedestroy($image); |
|
| 89 | 91 | } |
| 90 | - imagedestroy($image); |
|
| 91 | - } |
|
| 92 | 92 | } else { |
| 93 | - header('Content-type: image/png'); |
|
| 94 | - if (isset($_GET['tracker'])) { |
|
| 95 | - readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename); |
|
| 96 | - } elseif (isset($_GET['marine'])) { |
|
| 97 | - readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename); |
|
| 98 | - } else { |
|
| 99 | - if ($color == 'FF0000') readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename); |
|
| 93 | + header('Content-type: image/png'); |
|
| 94 | + if (isset($_GET['tracker'])) { |
|
| 95 | + readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename); |
|
| 96 | + } elseif (isset($_GET['marine'])) { |
|
| 97 | + readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename); |
|
| 98 | + } else { |
|
| 99 | + if ($color == 'FF0000') readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename); |
|
| 100 | 100 | else readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/'.$filename); |
| 101 | - } |
|
| 101 | + } |
|
| 102 | 102 | } |
| 103 | 103 | ?> |
| 104 | 104 | \ No newline at end of file |
@@ -4,23 +4,23 @@ discard block |
||
| 4 | 4 | $tracker = false; |
| 5 | 5 | $marine = false; |
| 6 | 6 | if (isset($_GET['tracker'])) { |
| 7 | - $tracker = true; |
|
| 7 | + $tracker = true; |
|
| 8 | 8 | } |
| 9 | 9 | if (isset($_GET['marine'])) { |
| 10 | - $marine = true; |
|
| 10 | + $marine = true; |
|
| 11 | 11 | } |
| 12 | 12 | if ($tracker) { |
| 13 | - require_once('require/class.Tracker.php'); |
|
| 14 | - require_once('require/class.TrackerLive.php'); |
|
| 15 | - //require_once('require/class.TrackerArchive.php'); |
|
| 13 | + require_once('require/class.Tracker.php'); |
|
| 14 | + require_once('require/class.TrackerLive.php'); |
|
| 15 | + //require_once('require/class.TrackerArchive.php'); |
|
| 16 | 16 | } elseif ($marine) { |
| 17 | - require_once('require/class.Marine.php'); |
|
| 18 | - require_once('require/class.MarineLive.php'); |
|
| 19 | - //require_once('require/class.MarineArchive.php'); |
|
| 17 | + require_once('require/class.Marine.php'); |
|
| 18 | + require_once('require/class.MarineLive.php'); |
|
| 19 | + //require_once('require/class.MarineArchive.php'); |
|
| 20 | 20 | } else { |
| 21 | - require_once('require/class.Spotter.php'); |
|
| 22 | - require_once('require/class.SpotterLive.php'); |
|
| 23 | - require_once('require/class.SpotterArchive.php'); |
|
| 21 | + require_once('require/class.Spotter.php'); |
|
| 22 | + require_once('require/class.SpotterLive.php'); |
|
| 23 | + require_once('require/class.SpotterArchive.php'); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | $begintime = microtime(true); |
@@ -40,10 +40,10 @@ discard block |
||
| 40 | 40 | $Common = new Common(); |
| 41 | 41 | |
| 42 | 42 | if (isset($_GET['download'])) { |
| 43 | - if ($_GET['download'] == "true") |
|
| 44 | - { |
|
| 43 | + if ($_GET['download'] == "true") |
|
| 44 | + { |
|
| 45 | 45 | header('Content-disposition: attachment; filename="flightairmap.json"'); |
| 46 | - } |
|
| 46 | + } |
|
| 47 | 47 | } |
| 48 | 48 | header('Content-Type: text/javascript'); |
| 49 | 49 | |
@@ -488,8 +488,8 @@ discard block |
||
| 488 | 488 | |
| 489 | 489 | if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') |
| 490 | 490 | || (!isset($_COOKIE['flightpath']) |
| 491 | - && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) |
|
| 492 | - || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))) |
|
| 491 | + && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) |
|
| 492 | + || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))) |
|
| 493 | 493 | || (isset($history) && $history == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])) { |
| 494 | 494 | if ($tracker) { |
| 495 | 495 | $spotter_history_array = $TrackerLive->getAllLiveTrackerDataById($spotter_item['famtrackid']); |
@@ -502,19 +502,19 @@ discard block |
||
| 502 | 502 | $spotter_history_array = $SpotterLive->getAllLiveSpotterDataById($spotter_item['flightaware_id']); |
| 503 | 503 | } |
| 504 | 504 | } |
| 505 | - $d = false; |
|
| 505 | + $d = false; |
|
| 506 | 506 | foreach ($spotter_history_array as $key => $spotter_history) |
| 507 | 507 | { |
| 508 | 508 | if (isset($spotter_history['altitude'])) { |
| 509 | 509 | $alt = round($spotter_history['altitude']/10)*10; |
| 510 | 510 | if (!isset($prev_alt) || $prev_alt != $alt) { |
| 511 | - if (isset($prev_alt)) { |
|
| 511 | + if (isset($prev_alt)) { |
|
| 512 | 512 | $output_history .= '['.$spotter_history['longitude'].', '.$spotter_history['latitude'].', '.$spotter_history['altitude'].']'; |
| 513 | 513 | $output_history .= ']}},'; |
| 514 | 514 | $output .= $output_history; |
| 515 | - } |
|
| 516 | - if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": ['; |
|
| 517 | - else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": ['; |
|
| 515 | + } |
|
| 516 | + if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": ['; |
|
| 517 | + else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": ['; |
|
| 518 | 518 | } |
| 519 | 519 | $output_history .= '['; |
| 520 | 520 | $output_history .= $spotter_history['longitude'].', '; |
@@ -532,38 +532,38 @@ discard block |
||
| 532 | 532 | $output_history .= $spotter_history['latitude']; |
| 533 | 533 | $output_history .= '],'; |
| 534 | 534 | } |
| 535 | - //} |
|
| 535 | + //} |
|
| 536 | 536 | } |
| 537 | 537 | if (isset($output_history)) { |
| 538 | - $output_history = substr($output_history, 0, -1); |
|
| 539 | - $output_history .= ']}},'; |
|
| 540 | - $output .= $output_history; |
|
| 541 | - unset($prev_alt); |
|
| 542 | - unset($output_history); |
|
| 538 | + $output_history = substr($output_history, 0, -1); |
|
| 539 | + $output_history .= ']}},'; |
|
| 540 | + $output .= $output_history; |
|
| 541 | + unset($prev_alt); |
|
| 542 | + unset($output_history); |
|
| 543 | 543 | } |
| 544 | 544 | } |
| 545 | 545 | |
| 546 | 546 | if (isset($history) && $history == $spotter_item['ident'] && isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA' && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) { |
| 547 | - $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": ['; |
|
| 548 | - if (isset($spotter_item['departure_airport_latitude'])) { |
|
| 547 | + $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": ['; |
|
| 548 | + if (isset($spotter_item['departure_airport_latitude'])) { |
|
| 549 | 549 | $output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],'; |
| 550 | - } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') { |
|
| 550 | + } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') { |
|
| 551 | 551 | $dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']); |
| 552 | 552 | if (isset($dairport[0]['latitude'])) { |
| 553 | - $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],'; |
|
| 553 | + $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],'; |
|
| 554 | 554 | } |
| 555 | - } |
|
| 556 | - if (isset($spotter_item['arrival_airport_latitude'])) { |
|
| 555 | + } |
|
| 556 | + if (isset($spotter_item['arrival_airport_latitude'])) { |
|
| 557 | 557 | $output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']'; |
| 558 | - } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') { |
|
| 558 | + } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') { |
|
| 559 | 559 | $aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']); |
| 560 | 560 | if (isset($aairport[0]['latitude'])) { |
| 561 | - $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']'; |
|
| 561 | + $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']'; |
|
| 562 | 562 | } |
| 563 | - } |
|
| 564 | - $output_air .= ']}},'; |
|
| 565 | - $output .= $output_air; |
|
| 566 | - unset($output_air); |
|
| 563 | + } |
|
| 564 | + $output_air .= ']}},'; |
|
| 565 | + $output .= $output_air; |
|
| 566 | + unset($output_air); |
|
| 567 | 567 | } |
| 568 | 568 | } |
| 569 | 569 | $output = substr($output, 0, -1); |
