@@ -90,40 +90,40 @@ |
||
90 | 90 | if (!empty($spotter_array)) { |
91 | 91 | foreach($spotter_array as $spotter_item) { |
92 | 92 | array_push($flights, array( |
93 | - "id" => $spotter_item['spotter_id'], |
|
94 | - "ident" => $spotter_item['ident'], |
|
95 | - "registration" => $spotter_item['registration'], |
|
96 | - "aircraft_icao" => $spotter_item['aircraft_type'], |
|
97 | - "aircraft_name" => $spotter_item['aircraft_name'], |
|
98 | - "aircraft_manufacturer" => $spotter_item['aircraft_manufacturer'], |
|
99 | - "airline_name" => $spotter_item['airline_name'], |
|
100 | - "airline_icao" => $spotter_item['airline_icao'], |
|
101 | - "airline_iata" => $spotter_item['airline_iata'], |
|
102 | - "airline_country" => $spotter_item['airline_country'], |
|
103 | - "airline_callsign" => $spotter_item['airline_callsign'], |
|
104 | - "airline_type" => $spotter_item['airline_type'], |
|
105 | - "departure_airport_city" => $spotter_item['departure_airport_city'], |
|
106 | - "departure_airport_country" => $spotter_item['departure_airport_country'], |
|
107 | - "departure_airport_iata" => $spotter_item['departure_airport_iata'], |
|
108 | - "departure_airport_icao" => $spotter_item['departure_airport_icao'], |
|
109 | - "departure_airport_latitude" => $spotter_item['departure_airport_latitude'], |
|
110 | - "departure_airport_longitude" => $spotter_item['departure_airport_longitude'], |
|
111 | - "departure_airport_altitude" => $spotter_item['departure_airport_altitude'], |
|
112 | - "arrival_airport_city" => $spotter_item['arrival_airport_city'], |
|
113 | - "arrival_airport_country" => $spotter_item['arrival_airport_country'], |
|
114 | - "arrival_airport_iata" => $spotter_item['arrival_airport_iata'], |
|
115 | - "arrival_airport_icao" => $spotter_item['arrival_airport_icao'], |
|
116 | - "arrival_airport_latitude" => $spotter_item['arrival_airport_latitude'], |
|
117 | - "arrival_airport_longitude" => $spotter_item['arrival_airport_longitude'], |
|
118 | - "arrival_airport_altitude" => $spotter_item['arrival_airport_altitude'], |
|
119 | - "latitude" => $spotter_item['latitude'], |
|
120 | - "longitude" => $spotter_item['longitude'], |
|
121 | - "altitude" => $spotter_item['altitude'], |
|
122 | - "ground_speed" => $spotter_item['ground_speed'], |
|
123 | - "heading" => $spotter_item['heading'], |
|
124 | - "heading_name" => $spotter_item['heading_name'], |
|
125 | - "waypoints" => $spotter_item['waypoints'], |
|
126 | - "date" => date("c", strtotime($spotter_item['date_iso_8601'])) |
|
93 | + "id" => $spotter_item['spotter_id'], |
|
94 | + "ident" => $spotter_item['ident'], |
|
95 | + "registration" => $spotter_item['registration'], |
|
96 | + "aircraft_icao" => $spotter_item['aircraft_type'], |
|
97 | + "aircraft_name" => $spotter_item['aircraft_name'], |
|
98 | + "aircraft_manufacturer" => $spotter_item['aircraft_manufacturer'], |
|
99 | + "airline_name" => $spotter_item['airline_name'], |
|
100 | + "airline_icao" => $spotter_item['airline_icao'], |
|
101 | + "airline_iata" => $spotter_item['airline_iata'], |
|
102 | + "airline_country" => $spotter_item['airline_country'], |
|
103 | + "airline_callsign" => $spotter_item['airline_callsign'], |
|
104 | + "airline_type" => $spotter_item['airline_type'], |
|
105 | + "departure_airport_city" => $spotter_item['departure_airport_city'], |
|
106 | + "departure_airport_country" => $spotter_item['departure_airport_country'], |
|
107 | + "departure_airport_iata" => $spotter_item['departure_airport_iata'], |
|
108 | + "departure_airport_icao" => $spotter_item['departure_airport_icao'], |
|
109 | + "departure_airport_latitude" => $spotter_item['departure_airport_latitude'], |
|
110 | + "departure_airport_longitude" => $spotter_item['departure_airport_longitude'], |
|
111 | + "departure_airport_altitude" => $spotter_item['departure_airport_altitude'], |
|
112 | + "arrival_airport_city" => $spotter_item['arrival_airport_city'], |
|
113 | + "arrival_airport_country" => $spotter_item['arrival_airport_country'], |
|
114 | + "arrival_airport_iata" => $spotter_item['arrival_airport_iata'], |
|
115 | + "arrival_airport_icao" => $spotter_item['arrival_airport_icao'], |
|
116 | + "arrival_airport_latitude" => $spotter_item['arrival_airport_latitude'], |
|
117 | + "arrival_airport_longitude" => $spotter_item['arrival_airport_longitude'], |
|
118 | + "arrival_airport_altitude" => $spotter_item['arrival_airport_altitude'], |
|
119 | + "latitude" => $spotter_item['latitude'], |
|
120 | + "longitude" => $spotter_item['longitude'], |
|
121 | + "altitude" => $spotter_item['altitude'], |
|
122 | + "ground_speed" => $spotter_item['ground_speed'], |
|
123 | + "heading" => $spotter_item['heading'], |
|
124 | + "heading_name" => $spotter_item['heading_name'], |
|
125 | + "waypoints" => $spotter_item['waypoints'], |
|
126 | + "date" => date("c", strtotime($spotter_item['date_iso_8601'])) |
|
127 | 127 | )); |
128 | 128 | } |
129 | 129 | } |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | } |
91 | 91 | |
92 | 92 | //waypoint plotting |
93 | - /* |
|
93 | + /* |
|
94 | 94 | $output .= '{'; |
95 | 95 | $output .= '"type": "Feature",'; |
96 | 96 | $output .= '"properties": {'; |
@@ -269,8 +269,8 @@ discard block |
||
269 | 269 | $output_time .= (strtotime($spotter_history['date'])*1000).','; |
270 | 270 | } |
271 | 271 | if (isset($output_time)) { |
272 | - $output_time = substr($output_time, 0, -1); |
|
273 | - $output .= '"time": ['.$output_time.'],'; |
|
272 | + $output_time = substr($output_time, 0, -1); |
|
273 | + $output .= '"time": ['.$output_time.'],'; |
|
274 | 274 | } |
275 | 275 | |
276 | 276 | |
@@ -284,8 +284,8 @@ discard block |
||
284 | 284 | $output .= '"coordinates": ['; |
285 | 285 | |
286 | 286 | if (isset($output_history)) { |
287 | - $output_history = substr($output_history, 0, -1); |
|
288 | - $output .= $output_history; |
|
287 | + $output_history = substr($output_history, 0, -1); |
|
288 | + $output .= $output_history; |
|
289 | 289 | } |
290 | 290 | |
291 | 291 | $output .= ']'; |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | ?> |
250 | 250 | <div class="more"> |
251 | 251 | <?php |
252 | - /* |
|
252 | + /* |
|
253 | 253 | if ($year != '' && $month != '') { |
254 | 254 | ?> |
255 | 255 | <a href="<?php print $globalURL; ?>/marine/statistics/type/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | <?php |
261 | 261 | } |
262 | 262 | */ |
263 | - ?> |
|
263 | + ?> |
|
264 | 264 | </div> |
265 | 265 | </div> |
266 | 266 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | ?> |
295 | 295 | <div class="more"> |
296 | 296 | <?php |
297 | - /* |
|
297 | + /* |
|
298 | 298 | if ($year != '' && $month != '') { |
299 | 299 | ?> |
300 | 300 | <a href="<?php print $globalURL; ?>/marine/statistics/type/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | <?php |
306 | 306 | } |
307 | 307 | */ |
308 | - ?> |
|
308 | + ?> |
|
309 | 309 | </div> |
310 | 310 | </div> |
311 | 311 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -404,17 +404,17 @@ discard block |
||
404 | 404 | } |
405 | 405 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
406 | 406 | } else $all = array(); |
407 | - if (empty($all)) { |
|
408 | - $Spotter = new Spotter($this->db); |
|
409 | - $filters = array(); |
|
407 | + if (empty($all)) { |
|
408 | + $Spotter = new Spotter($this->db); |
|
409 | + $filters = array(); |
|
410 | 410 | $filters = array('year' => $year,'month' => $month); |
411 | - if ($filter_name != '') { |
|
412 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
411 | + if ($filter_name != '') { |
|
412 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
413 | 413 | } |
414 | 414 | //$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month); |
415 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
416 | - } |
|
417 | - return $all; |
|
415 | + $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
416 | + } |
|
417 | + return $all; |
|
418 | 418 | } |
419 | 419 | public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
420 | 420 | global $globalStatsFilters; |
@@ -1611,7 +1611,7 @@ discard block |
||
1611 | 1611 | return "error : ".$e->getMessage(); |
1612 | 1612 | } |
1613 | 1613 | } |
1614 | - /* |
|
1614 | + /* |
|
1615 | 1615 | public function getStatsSource($date,$stats_type = '') { |
1616 | 1616 | if ($stats_type == '') { |
1617 | 1617 | $query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name"; |