@@ -3,8 +3,8 @@ discard block |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | if (!isset($_GET['country'])) { |
6 | - header('Location: '.$globalURL.'/country'); |
|
7 | - die(); |
|
6 | + header('Location: '.$globalURL.'/country'); |
|
7 | + die(); |
|
8 | 8 | } |
9 | 9 | $Spotter = new Spotter(); |
10 | 10 | $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))); |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | function drawChart() { |
62 | 62 | var data = google.visualization.arrayToDataTable([ |
63 | 63 | ["'._("Hour").'", "'._("# of Flights").'"], '; |
64 | - $hour_data = ''; |
|
64 | + $hour_data = ''; |
|
65 | 65 | foreach($hour_array as $hour_item) |
66 | 66 | { |
67 | 67 | $hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],'; |
@@ -11,10 +11,10 @@ discard block |
||
11 | 11 | $Common = new Common(); |
12 | 12 | |
13 | 13 | if (isset($_GET['download'])) { |
14 | - if ($_GET['download'] == "true") |
|
15 | - { |
|
14 | + if ($_GET['download'] == "true") |
|
15 | + { |
|
16 | 16 | header('Content-disposition: attachment; filename="flightairmap.json"'); |
17 | - } |
|
17 | + } |
|
18 | 18 | } |
19 | 19 | header('Content-Type: text/javascript'); |
20 | 20 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | } |
114 | 114 | |
115 | 115 | //waypoint plotting |
116 | - /* |
|
116 | + /* |
|
117 | 117 | $output .= '{'; |
118 | 118 | $output .= '"type": "Feature",'; |
119 | 119 | $output .= '"properties": {'; |
@@ -343,29 +343,29 @@ discard block |
||
343 | 343 | if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || (!isset($_COOKIE['flightpath']) && (!isset($globalMapHistory) || $globalMapHistory || $allhistory) |
344 | 344 | || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))) |
345 | 345 | || (isset($history) && $history == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])) { |
346 | - if ($from_archive) { |
|
347 | - $spotter_history_array = $SpotterArchive->getAllArchiveSpotterDataById($spotter_item['flightaware_id']); |
|
348 | - } else { |
|
349 | - $spotter_history_array = $SpotterLive->getAllLiveSpotterDataById($spotter_item['flightaware_id']); |
|
350 | - } |
|
351 | - $d = false; |
|
346 | + if ($from_archive) { |
|
347 | + $spotter_history_array = $SpotterArchive->getAllArchiveSpotterDataById($spotter_item['flightaware_id']); |
|
348 | + } else { |
|
349 | + $spotter_history_array = $SpotterLive->getAllLiveSpotterDataById($spotter_item['flightaware_id']); |
|
350 | + } |
|
351 | + $d = false; |
|
352 | 352 | foreach ($spotter_history_array as $key => $spotter_history) |
353 | 353 | { |
354 | - /* |
|
354 | + /* |
|
355 | 355 | if (abs($spotter_history['longitude']-$spotter_item['longitude']) > 200 || $d==true) { |
356 | 356 | if ($d == false) $d = true; |
357 | 357 | } else { |
358 | 358 | */ |
359 | 359 | $alt = round($spotter_history['altitude']/10)*10; |
360 | 360 | if (!isset($prev_alt) || $prev_alt != $alt) { |
361 | - if (isset($prev_alt)) { |
|
361 | + if (isset($prev_alt)) { |
|
362 | 362 | //$output_history .= '['.$spotter_history['longitude'].', '.$spotter_history['latitude'].','.$spotter_history['altitude'].']'; |
363 | 363 | $output_history .= '['.$spotter_history['longitude'].', '.$spotter_history['latitude'].']'; |
364 | 364 | $output_history .= ']}},'; |
365 | 365 | $output .= $output_history; |
366 | - } |
|
367 | - if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": ['; |
|
368 | - else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": ['; |
|
366 | + } |
|
367 | + if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": ['; |
|
368 | + else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": ['; |
|
369 | 369 | } |
370 | 370 | $output_history .= '['; |
371 | 371 | $output_history .= $spotter_history['longitude'].', '; |
@@ -373,41 +373,41 @@ discard block |
||
373 | 373 | //$output_history .= $spotter_history['altitude']; |
374 | 374 | $output_history .= '],'; |
375 | 375 | $prev_alt = $alt; |
376 | - //} |
|
376 | + //} |
|
377 | 377 | } |
378 | 378 | if (isset($output_history)) { |
379 | - $output_history = substr($output_history, 0, -1); |
|
380 | - $output_history .= ']}},'; |
|
381 | - $output .= $output_history; |
|
382 | - unset($prev_alt); |
|
383 | - unset($output_history); |
|
379 | + $output_history = substr($output_history, 0, -1); |
|
380 | + $output_history .= ']}},'; |
|
381 | + $output .= $output_history; |
|
382 | + unset($prev_alt); |
|
383 | + unset($output_history); |
|
384 | 384 | } |
385 | 385 | } |
386 | 386 | |
387 | 387 | 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))))) { |
388 | - $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": ['; |
|
389 | - if (isset($spotter_item['departure_airport_latitude'])) { |
|
388 | + $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": ['; |
|
389 | + if (isset($spotter_item['departure_airport_latitude'])) { |
|
390 | 390 | $output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],'; |
391 | - } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') { |
|
391 | + } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') { |
|
392 | 392 | $dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']); |
393 | 393 | //print_r($dairport); |
394 | 394 | //echo $spotter_item['departure_airport']; |
395 | 395 | if (isset($dairport[0]['latitude'])) { |
396 | - $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],'; |
|
396 | + $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],'; |
|
397 | 397 | } |
398 | - } |
|
399 | - if (isset($spotter_item['arrival_airport_latitude'])) { |
|
398 | + } |
|
399 | + if (isset($spotter_item['arrival_airport_latitude'])) { |
|
400 | 400 | $output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']'; |
401 | - } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') { |
|
401 | + } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') { |
|
402 | 402 | //print_r($aairport); |
403 | 403 | $aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']); |
404 | 404 | if (isset($aairport[0]['latitude'])) { |
405 | - $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']'; |
|
405 | + $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']'; |
|
406 | + } |
|
406 | 407 | } |
407 | - } |
|
408 | - $output_air .= ']}},'; |
|
409 | - $output .= $output_air; |
|
410 | - unset($output_air); |
|
408 | + $output_air .= ']}},'; |
|
409 | + $output .= $output_air; |
|
410 | + unset($output_air); |
|
411 | 411 | } |
412 | 412 | } |
413 | 413 | $output = substr($output, 0, -1); |
@@ -3,8 +3,8 @@ discard block |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | if (!isset($_GET['airport'])) { |
6 | - header('Location: '.$globalURL.'/airport'); |
|
7 | - die(); |
|
6 | + header('Location: '.$globalURL.'/airport'); |
|
7 | + die(); |
|
8 | 8 | } |
9 | 9 | $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING); |
10 | 10 | $Spotter = new Spotter(); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | function drawChart() { |
67 | 67 | var data = google.visualization.arrayToDataTable([ |
68 | 68 | ["'._("Hour").'", "'._("# of Flights").'"], '; |
69 | - $hour_data = ''; |
|
69 | + $hour_data = ''; |
|
70 | 70 | foreach($hour_array as $hour_item) |
71 | 71 | { |
72 | 72 | $hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],'; |
@@ -3,8 +3,8 @@ discard block |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | if (!isset($_GET['aircraft_type'])) { |
6 | - header('Location: '.$globalURL.'/aircraft'); |
|
7 | - die(); |
|
6 | + header('Location: '.$globalURL.'/aircraft'); |
|
7 | + die(); |
|
8 | 8 | } |
9 | 9 | |
10 | 10 | $aircraft_type = filter_input(FILTER_INPUT,'aircraft_type',FILTER_SANITIZE_STRING); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | function drawChart() { |
61 | 61 | var data = google.visualization.arrayToDataTable([ |
62 | 62 | ["'._("Country").'", "'._("# of times").'"], '; |
63 | - $country_data = ''; |
|
63 | + $country_data = ''; |
|
64 | 64 | foreach($airport_country_array as $airport_item) |
65 | 65 | { |
66 | 66 | $country_data .= '[ "'.$airport_item['arrival_airport_country'].'",'.$airport_item['airport_arrival_country_count'].'],'; |
@@ -89,7 +89,7 @@ |
||
89 | 89 | function drawChart6() { |
90 | 90 | var data = google.visualization.arrayToDataTable([ |
91 | 91 | ["Hour","'._("Altitude").'","'._("Speed").'"], '; |
92 | - $altitude_data = ''; |
|
92 | + $altitude_data = ''; |
|
93 | 93 | foreach($all_data as $data) |
94 | 94 | { |
95 | 95 | $altitude_data .= '[ "'.date("G:i",strtotime($data['date']." UTC")).'",'.$data['altitude'].','.$data['ground_speed'].'],'; |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | <div class="info column"> |
12 | 12 | <h1>About <?php print $globalName; ?></h1> |
13 | 13 | <?php |
14 | - if ($globalName == 'FlightAirMap') { |
|
14 | + if ($globalName == 'FlightAirMap') { |
|
15 | 15 | ?> |
16 | 16 | <p>This is an open source project displaying <u>most</u> (mostly <a href="http://en.wikipedia.org/wiki/Instrument_flight_rules" target="_blank">IFR</a>) flights that have flown near this site area. |
17 | 17 | <?php if ($globalADSBHUB) { ?> Some ADS-B sources come from <a href="http://www.adsbhub.net">ADSBHUB.net</a>.<?php } ?> |
@@ -27,18 +27,18 @@ discard block |
||
27 | 27 | |
28 | 28 | <br /><br /> |
29 | 29 | <?php |
30 | - } else { |
|
30 | + } else { |
|
31 | 31 | ?> |
32 | 32 | <p>This project use <a href="http://www.flightairmap.fr/">FlightAirMap</a> (<a href="https://github.com/Ysurac/FlightAirMap/">source</a>) by Ycarus from <a href="http://www.zugaina.com/">Zugaina</a>.</p> |
33 | 33 | <?php |
34 | - } |
|
34 | + } |
|
35 | 35 | ?> |
36 | 36 | <a name="source"></a> |
37 | 37 | <h3>Source & Credits</h3> |
38 | 38 | |
39 | 39 | <?php |
40 | 40 | if ($globalFlightAware) { |
41 | - ?> |
|
41 | + ?> |
|
42 | 42 | <p>The data from FlightAware is coming from multiple sources. Not every aircraft is tracked on FlightAware, especially not older aircrafts as well as government aircrafts, however most modern airliners will work. You can learn more about how it works on <a href="http://flightaware.com/adsb/" target="_blank">FlightAware's ADS-B</a> page. Also, not every aircraft is shown to have flown exactly at that minute as seen on this site (aka real-time). There is a 5 minute delay on some of the sources.</p> |
43 | 43 | <?php } ?> |
44 | 44 | <p>None of this project would have been possible without the help and contributions of these organizations and people:</p> |
@@ -5,55 +5,55 @@ discard block |
||
5 | 5 | $Spotter = new Spotter(); |
6 | 6 | |
7 | 7 | if (isset($_GET['start_date'])) { |
8 | - //for the date manipulation into the query |
|
9 | - if($_GET['start_date'] != "" && $_GET['end_date'] != ""){ |
|
10 | - $start_date = $_GET['start_date'].":00"; |
|
11 | - $end_date = $_GET['end_date'].":00"; |
|
12 | - $sql_date = $start_date.",".$end_date; |
|
13 | - } else if($_GET['start_date'] != ""){ |
|
14 | - $start_date = $_GET['start_date'].":00"; |
|
15 | - $sql_date = $start_date; |
|
16 | - } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
|
17 | - $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00"; |
|
18 | - $sql_date = $end_date; |
|
19 | - } else $sql_date = ''; |
|
8 | + //for the date manipulation into the query |
|
9 | + if($_GET['start_date'] != "" && $_GET['end_date'] != ""){ |
|
10 | + $start_date = $_GET['start_date'].":00"; |
|
11 | + $end_date = $_GET['end_date'].":00"; |
|
12 | + $sql_date = $start_date.",".$end_date; |
|
13 | + } else if($_GET['start_date'] != ""){ |
|
14 | + $start_date = $_GET['start_date'].":00"; |
|
15 | + $sql_date = $start_date; |
|
16 | + } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
|
17 | + $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00"; |
|
18 | + $sql_date = $end_date; |
|
19 | + } else $sql_date = ''; |
|
20 | 20 | } else $sql_date = ''; |
21 | 21 | |
22 | 22 | if (isset($_GET['highest_altitude'])) { |
23 | - //for altitude manipulation |
|
24 | - if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){ |
|
25 | - $end_altitude = $_GET['highest_altitude']; |
|
26 | - $start_altitude = $_GET['lowest_altitude']; |
|
27 | - $sql_altitude = $start_altitude.",".$end_altitude; |
|
28 | - } else if($_GET['highest_altitude'] != ""){ |
|
29 | - $end_altitude = $_GET['highest_altitude']; |
|
30 | - $sql_altitude = $end_altitude; |
|
31 | - } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
|
32 | - $start_altitude = $_GET['lowest_altitude'].",60000"; |
|
33 | - $sql_altitude = $start_altitude; |
|
34 | - } else $sql_altitude = ''; |
|
23 | + //for altitude manipulation |
|
24 | + if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){ |
|
25 | + $end_altitude = $_GET['highest_altitude']; |
|
26 | + $start_altitude = $_GET['lowest_altitude']; |
|
27 | + $sql_altitude = $start_altitude.",".$end_altitude; |
|
28 | + } else if($_GET['highest_altitude'] != ""){ |
|
29 | + $end_altitude = $_GET['highest_altitude']; |
|
30 | + $sql_altitude = $end_altitude; |
|
31 | + } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
|
32 | + $start_altitude = $_GET['lowest_altitude'].",60000"; |
|
33 | + $sql_altitude = $start_altitude; |
|
34 | + } else $sql_altitude = ''; |
|
35 | 35 | } else $sql_altitude = ''; |
36 | 36 | |
37 | 37 | //calculuation for the pagination |
38 | 38 | if(!isset($_GET['limit'])) |
39 | 39 | { |
40 | - if (!isset($_GET['number_results'])) |
|
41 | - { |
|
42 | - $limit_start = 0; |
|
43 | - $limit_end = 25; |
|
44 | - $absolute_difference = 25; |
|
45 | - } else { |
|
46 | - if ($_GET['number_results'] > 1000){ |
|
47 | - $_GET['number_results'] = 1000; |
|
48 | - } |
|
49 | - $limit_start = 0; |
|
50 | - $limit_end = $_GET['number_results']; |
|
51 | - $absolute_difference = $_GET['number_results']; |
|
52 | - } |
|
40 | + if (!isset($_GET['number_results'])) |
|
41 | + { |
|
42 | + $limit_start = 0; |
|
43 | + $limit_end = 25; |
|
44 | + $absolute_difference = 25; |
|
45 | + } else { |
|
46 | + if ($_GET['number_results'] > 1000){ |
|
47 | + $_GET['number_results'] = 1000; |
|
48 | + } |
|
49 | + $limit_start = 0; |
|
50 | + $limit_end = $_GET['number_results']; |
|
51 | + $absolute_difference = $_GET['number_results']; |
|
52 | + } |
|
53 | 53 | } else { |
54 | - $limit_explode = explode(",", $_GET['limit']); |
|
55 | - $limit_start = $limit_explode[0]; |
|
56 | - $limit_end = $limit_explode[1]; |
|
54 | + $limit_explode = explode(",", $_GET['limit']); |
|
55 | + $limit_start = $limit_explode[0]; |
|
56 | + $limit_end = $limit_explode[1]; |
|
57 | 57 | } |
58 | 58 | $absolute_difference = abs($limit_start - $limit_end); |
59 | 59 | $limit_next = $limit_end + $absolute_difference; |
@@ -96,41 +96,41 @@ discard block |
||
96 | 96 | foreach($spotter_array as $spotter_item) |
97 | 97 | { |
98 | 98 | |
99 | - $output .= $spotter_item['spotter_id'].','; |
|
100 | - $output .= $spotter_item['ident'].','; |
|
101 | - $output .= $spotter_item['registration'].','; |
|
102 | - $output .= $spotter_item['aircraft_type'].','; |
|
103 | - $output .= $spotter_item['aircraft_name'].','; |
|
104 | - $output .= $spotter_item['aircraft_manufacturer'].','; |
|
105 | - $output .= $spotter_item['airline_name'].','; |
|
106 | - $output .= $spotter_item['airline_icao'].','; |
|
107 | - $output .= $spotter_item['airline_iata'].','; |
|
108 | - $output .= $spotter_item['airline_country'].','; |
|
109 | - $output .= $spotter_item['airline_callsign'].','; |
|
110 | - $output .= $spotter_item['airline_type'].','; |
|
111 | - $output .= $spotter_item['departure_airport_city'].','; |
|
112 | - $output .= $spotter_item['departure_airport_country'].','; |
|
113 | - $output .= $spotter_item['departure_airport_iata'].','; |
|
114 | - $output .= $spotter_item['departure_airport_icao'].','; |
|
115 | - $output .= $spotter_item['departure_airport_latitude'].','; |
|
116 | - $output .= $spotter_item['departure_airport_longitude'].','; |
|
117 | - $output .= $spotter_item['departure_airport_altitude'].','; |
|
118 | - $output .= $spotter_item['arrival_airport_city'].','; |
|
119 | - $output .= $spotter_item['arrival_airport_country'].','; |
|
120 | - $output .= $spotter_item['arrival_airport_iata'].','; |
|
121 | - $output .= $spotter_item['arrival_airport_icao'].','; |
|
122 | - $output .= $spotter_item['arrival_airport_latitude'].','; |
|
123 | - $output .= $spotter_item['arrival_airport_longitude'].','; |
|
124 | - $output .= $spotter_item['arrival_airport_altitude'].','; |
|
125 | - $output .= $spotter_item['latitude'].','; |
|
126 | - $output .= $spotter_item['longitude'].','; |
|
127 | - $output .= $spotter_item['altitude'].','; |
|
128 | - $output .= $spotter_item['ground_speed'].','; |
|
129 | - $output .= $spotter_item['heading'].','; |
|
130 | - $output .= $spotter_item['heading_name'].','; |
|
131 | - $output .= $spotter_item['waypoints'].','; |
|
132 | - $output .= date("c", strtotime($spotter_item['date_iso_8601'])); |
|
133 | - $output .= "\n"; |
|
99 | + $output .= $spotter_item['spotter_id'].','; |
|
100 | + $output .= $spotter_item['ident'].','; |
|
101 | + $output .= $spotter_item['registration'].','; |
|
102 | + $output .= $spotter_item['aircraft_type'].','; |
|
103 | + $output .= $spotter_item['aircraft_name'].','; |
|
104 | + $output .= $spotter_item['aircraft_manufacturer'].','; |
|
105 | + $output .= $spotter_item['airline_name'].','; |
|
106 | + $output .= $spotter_item['airline_icao'].','; |
|
107 | + $output .= $spotter_item['airline_iata'].','; |
|
108 | + $output .= $spotter_item['airline_country'].','; |
|
109 | + $output .= $spotter_item['airline_callsign'].','; |
|
110 | + $output .= $spotter_item['airline_type'].','; |
|
111 | + $output .= $spotter_item['departure_airport_city'].','; |
|
112 | + $output .= $spotter_item['departure_airport_country'].','; |
|
113 | + $output .= $spotter_item['departure_airport_iata'].','; |
|
114 | + $output .= $spotter_item['departure_airport_icao'].','; |
|
115 | + $output .= $spotter_item['departure_airport_latitude'].','; |
|
116 | + $output .= $spotter_item['departure_airport_longitude'].','; |
|
117 | + $output .= $spotter_item['departure_airport_altitude'].','; |
|
118 | + $output .= $spotter_item['arrival_airport_city'].','; |
|
119 | + $output .= $spotter_item['arrival_airport_country'].','; |
|
120 | + $output .= $spotter_item['arrival_airport_iata'].','; |
|
121 | + $output .= $spotter_item['arrival_airport_icao'].','; |
|
122 | + $output .= $spotter_item['arrival_airport_latitude'].','; |
|
123 | + $output .= $spotter_item['arrival_airport_longitude'].','; |
|
124 | + $output .= $spotter_item['arrival_airport_altitude'].','; |
|
125 | + $output .= $spotter_item['latitude'].','; |
|
126 | + $output .= $spotter_item['longitude'].','; |
|
127 | + $output .= $spotter_item['altitude'].','; |
|
128 | + $output .= $spotter_item['ground_speed'].','; |
|
129 | + $output .= $spotter_item['heading'].','; |
|
130 | + $output .= $spotter_item['heading_name'].','; |
|
131 | + $output .= $spotter_item['waypoints'].','; |
|
132 | + $output .= date("c", strtotime($spotter_item['date_iso_8601'])); |
|
133 | + $output .= "\n"; |
|
134 | 134 | } |
135 | 135 | } |
136 | 136 |
@@ -4,55 +4,55 @@ discard block |
||
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | $Spotter = new Spotter(); |
6 | 6 | if (isset($_GET['start_date'])) { |
7 | - //for the date manipulation into the query |
|
8 | - if($_GET['start_date'] != "" && $_GET['end_date'] != ""){ |
|
9 | - $start_date = $_GET['start_date'].":00"; |
|
10 | - $end_date = $_GET['end_date'].":00"; |
|
11 | - $sql_date = $start_date.",".$end_date; |
|
12 | - } else if($_GET['start_date'] != ""){ |
|
13 | - $start_date = $_GET['start_date'].":00"; |
|
14 | - $sql_date = $start_date; |
|
15 | - } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
|
16 | - $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00"; |
|
17 | - $sql_date = $end_date; |
|
18 | - } else $sql_date = ''; |
|
7 | + //for the date manipulation into the query |
|
8 | + if($_GET['start_date'] != "" && $_GET['end_date'] != ""){ |
|
9 | + $start_date = $_GET['start_date'].":00"; |
|
10 | + $end_date = $_GET['end_date'].":00"; |
|
11 | + $sql_date = $start_date.",".$end_date; |
|
12 | + } else if($_GET['start_date'] != ""){ |
|
13 | + $start_date = $_GET['start_date'].":00"; |
|
14 | + $sql_date = $start_date; |
|
15 | + } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
|
16 | + $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00"; |
|
17 | + $sql_date = $end_date; |
|
18 | + } else $sql_date = ''; |
|
19 | 19 | } else $sql_date = ''; |
20 | 20 | |
21 | 21 | if (isset($_GET['highest_altitude'])) { |
22 | - //for altitude manipulation |
|
23 | - if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){ |
|
24 | - $end_altitude = $_GET['highest_altitude']; |
|
25 | - $start_altitude = $_GET['lowest_altitude']; |
|
26 | - $sql_altitude = $start_altitude.",".$end_altitude; |
|
27 | - } else if($_GET['highest_altitude'] != ""){ |
|
28 | - $end_altitude = $_GET['highest_altitude']; |
|
29 | - $sql_altitude = $end_altitude; |
|
30 | - } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
|
31 | - $start_altitude = $_GET['lowest_altitude'].",60000"; |
|
32 | - $sql_altitude = $start_altitude; |
|
33 | - } else $sql_altitude = ''; |
|
22 | + //for altitude manipulation |
|
23 | + if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){ |
|
24 | + $end_altitude = $_GET['highest_altitude']; |
|
25 | + $start_altitude = $_GET['lowest_altitude']; |
|
26 | + $sql_altitude = $start_altitude.",".$end_altitude; |
|
27 | + } else if($_GET['highest_altitude'] != ""){ |
|
28 | + $end_altitude = $_GET['highest_altitude']; |
|
29 | + $sql_altitude = $end_altitude; |
|
30 | + } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
|
31 | + $start_altitude = $_GET['lowest_altitude'].",60000"; |
|
32 | + $sql_altitude = $start_altitude; |
|
33 | + } else $sql_altitude = ''; |
|
34 | 34 | } else $sql_altitude = ''; |
35 | 35 | |
36 | 36 | //calculuation for the pagination |
37 | 37 | if(!isset($_GET['limit'])) |
38 | 38 | { |
39 | - if (!isset($_GET['number_results'])) |
|
40 | - { |
|
41 | - $limit_start = 0; |
|
42 | - $limit_end = 25; |
|
43 | - $absolute_difference = 25; |
|
44 | - } else { |
|
45 | - if ($_GET['number_results'] > 1000){ |
|
46 | - $_GET['number_results'] = 1000; |
|
47 | - } |
|
48 | - $limit_start = 0; |
|
49 | - $limit_end = $_GET['number_results']; |
|
50 | - $absolute_difference = $_GET['number_results']; |
|
51 | - } |
|
39 | + if (!isset($_GET['number_results'])) |
|
40 | + { |
|
41 | + $limit_start = 0; |
|
42 | + $limit_end = 25; |
|
43 | + $absolute_difference = 25; |
|
44 | + } else { |
|
45 | + if ($_GET['number_results'] > 1000){ |
|
46 | + $_GET['number_results'] = 1000; |
|
47 | + } |
|
48 | + $limit_start = 0; |
|
49 | + $limit_end = $_GET['number_results']; |
|
50 | + $absolute_difference = $_GET['number_results']; |
|
51 | + } |
|
52 | 52 | } else { |
53 | - $limit_explode = explode(",", $_GET['limit']); |
|
54 | - $limit_start = $limit_explode[0]; |
|
55 | - $limit_end = $limit_explode[1]; |
|
53 | + $limit_explode = explode(",", $_GET['limit']); |
|
54 | + $limit_start = $limit_explode[0]; |
|
55 | + $limit_end = $limit_explode[1]; |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | $absolute_difference = abs($limit_start - $limit_end); |
@@ -90,22 +90,22 @@ discard block |
||
90 | 90 | |
91 | 91 | $output = '<?xml version="1.0" encoding="UTF-8"?>'; |
92 | 92 | $output .= '<kml xmlns="http://www.opengis.net/kml/2.2">'; |
93 | - $output .= '<Document>'; |
|
94 | - $output .= '<Style id="departureAirport">'; |
|
95 | - $output .= '<IconStyle>'; |
|
96 | - $output .= '<Icon>'; |
|
97 | - $output .= '<href>http://www.flightairmap.fr/images/kml_departure_airport.png</href>'; |
|
98 | - $output .= '</Icon>'; |
|
99 | - $output .= '</IconStyle>'; |
|
100 | - $output .= '</Style>'; |
|
101 | - $output .= '<Style id="arrivalAirport">'; |
|
102 | - $output .= '<IconStyle>'; |
|
103 | - $output .= '<Icon>'; |
|
104 | - $output .= '<href>http://www.flightairmap.fr/images/kml_arrival_airport.png</href>'; |
|
105 | - $output .= '</Icon>'; |
|
106 | - $output .= '</IconStyle>'; |
|
107 | - $output .= '</Style>'; |
|
108 | - $output .= '<Style id="route">'; |
|
93 | + $output .= '<Document>'; |
|
94 | + $output .= '<Style id="departureAirport">'; |
|
95 | + $output .= '<IconStyle>'; |
|
96 | + $output .= '<Icon>'; |
|
97 | + $output .= '<href>http://www.flightairmap.fr/images/kml_departure_airport.png</href>'; |
|
98 | + $output .= '</Icon>'; |
|
99 | + $output .= '</IconStyle>'; |
|
100 | + $output .= '</Style>'; |
|
101 | + $output .= '<Style id="arrivalAirport">'; |
|
102 | + $output .= '<IconStyle>'; |
|
103 | + $output .= '<Icon>'; |
|
104 | + $output .= '<href>http://www.flightairmap.fr/images/kml_arrival_airport.png</href>'; |
|
105 | + $output .= '</Icon>'; |
|
106 | + $output .= '</IconStyle>'; |
|
107 | + $output .= '</Style>'; |
|
108 | + $output .= '<Style id="route">'; |
|
109 | 109 | $output .= '<LineStyle>'; |
110 | 110 | $output .= '<color>7f0000ff</color>'; |
111 | 111 | $output .= '<width>2</width>'; |
@@ -113,10 +113,10 @@ discard block |
||
113 | 113 | $output .= '</LineStyle>'; |
114 | 114 | $output .= '</Style>'; |
115 | 115 | |
116 | - if (!empty($spotter_array)) |
|
116 | + if (!empty($spotter_array)) |
|
117 | 117 | { |
118 | - foreach($spotter_array as $spotter_item) |
|
119 | - { |
|
118 | + foreach($spotter_array as $spotter_item) |
|
119 | + { |
|
120 | 120 | |
121 | 121 | |
122 | 122 | $altitude = $spotter_item['altitude'].'00'; |
@@ -127,12 +127,12 @@ discard block |
||
127 | 127 | $output .= '<styleUrl>#route</styleUrl>'; |
128 | 128 | $output .= '<LineString>'; |
129 | 129 | $output .= '<coordinates>'; |
130 | - $waypoint_pieces = explode(' ', $spotter_item['waypoints']); |
|
130 | + $waypoint_pieces = explode(' ', $spotter_item['waypoints']); |
|
131 | 131 | $waypoint_pieces = array_chunk($waypoint_pieces, 2); |
132 | 132 | |
133 | 133 | foreach ($waypoint_pieces as $waypoint_coordinate) |
134 | 134 | { |
135 | - $output .= $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' '; |
|
135 | + $output .= $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' '; |
|
136 | 136 | |
137 | 137 | } |
138 | 138 | $output .= '</coordinates>'; |
@@ -144,38 +144,38 @@ discard block |
||
144 | 144 | //departure airport |
145 | 145 | $output .= '<Placemark>'; |
146 | 146 | $output .= '<name>'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].')</name>'; |
147 | - $output .= '<description><![CDATA[ '; |
|
148 | - $output .= '<div class="ge-balloon">'; |
|
149 | - $output .= '<div class="ge-row">'; |
|
150 | - $output .= '<span>Name</span>'; |
|
151 | - $output .= $spotter_item['departure_airport_name']; |
|
152 | - $output .= '</div>'; |
|
153 | - $output .= '<div class="ge-row">'; |
|
154 | - $output .= '<span>City</span>'; |
|
155 | - $output .= $spotter_item['departure_airport_city']; |
|
156 | - $output .= '</div>'; |
|
157 | - $output .= '<div class="ge-row">'; |
|
158 | - $output .= '<span>Country</span>'; |
|
159 | - $output .= $spotter_item['departure_airport_country']; |
|
160 | - $output .= '</div>'; |
|
161 | - $output .= '<div class="ge-row">'; |
|
162 | - $output .= '<span>ICAO</span>'; |
|
163 | - $output .= $spotter_item['departure_airport_icao']; |
|
164 | - $output .= '</div>'; |
|
165 | - $output .= '<div class="ge-row">'; |
|
166 | - $output .= '<span>IATA</span>'; |
|
167 | - $output .= $spotter_item['departure_airport_iata']; |
|
168 | - $output .= '</div>'; |
|
169 | - $output .= '<div class="ge-row">'; |
|
170 | - $output .= '<span>Coordinates</span>'; |
|
171 | - $output .= $spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_longitude']; |
|
172 | - $output .= '</div>'; |
|
173 | - $output .= '<div class="ge-row">'; |
|
174 | - $output .= '<span>Altitude</span>'; |
|
175 | - $output .= $spotter_item['departure_airport_altitude']; |
|
176 | - $output .= '</div>'; |
|
177 | - $output .= '</div>'; |
|
178 | - $output .= ' ]]></description>'; |
|
147 | + $output .= '<description><![CDATA[ '; |
|
148 | + $output .= '<div class="ge-balloon">'; |
|
149 | + $output .= '<div class="ge-row">'; |
|
150 | + $output .= '<span>Name</span>'; |
|
151 | + $output .= $spotter_item['departure_airport_name']; |
|
152 | + $output .= '</div>'; |
|
153 | + $output .= '<div class="ge-row">'; |
|
154 | + $output .= '<span>City</span>'; |
|
155 | + $output .= $spotter_item['departure_airport_city']; |
|
156 | + $output .= '</div>'; |
|
157 | + $output .= '<div class="ge-row">'; |
|
158 | + $output .= '<span>Country</span>'; |
|
159 | + $output .= $spotter_item['departure_airport_country']; |
|
160 | + $output .= '</div>'; |
|
161 | + $output .= '<div class="ge-row">'; |
|
162 | + $output .= '<span>ICAO</span>'; |
|
163 | + $output .= $spotter_item['departure_airport_icao']; |
|
164 | + $output .= '</div>'; |
|
165 | + $output .= '<div class="ge-row">'; |
|
166 | + $output .= '<span>IATA</span>'; |
|
167 | + $output .= $spotter_item['departure_airport_iata']; |
|
168 | + $output .= '</div>'; |
|
169 | + $output .= '<div class="ge-row">'; |
|
170 | + $output .= '<span>Coordinates</span>'; |
|
171 | + $output .= $spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_longitude']; |
|
172 | + $output .= '</div>'; |
|
173 | + $output .= '<div class="ge-row">'; |
|
174 | + $output .= '<span>Altitude</span>'; |
|
175 | + $output .= $spotter_item['departure_airport_altitude']; |
|
176 | + $output .= '</div>'; |
|
177 | + $output .= '</div>'; |
|
178 | + $output .= ' ]]></description>'; |
|
179 | 179 | $output .= '<styleUrl>#departureAirport</styleUrl>'; |
180 | 180 | $output .= '<Point>'; |
181 | 181 | $output .= '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>'; |
@@ -186,38 +186,38 @@ discard block |
||
186 | 186 | //arrival airport |
187 | 187 | $output .= '<Placemark>'; |
188 | 188 | $output .= '<name>'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</name>'; |
189 | - $output .= '<description><![CDATA[ '; |
|
190 | - $output .= '<div class="ge-balloon">'; |
|
191 | - $output .= '<div class="ge-row">'; |
|
192 | - $output .= '<span>Name</span>'; |
|
193 | - $output .= $spotter_item['arrival_airport_name']; |
|
194 | - $output .= '</div>'; |
|
195 | - $output .= '<div class="ge-row">'; |
|
196 | - $output .= '<span>City</span>'; |
|
197 | - $output .= $spotter_item['arrival_airport_city']; |
|
198 | - $output .= '</div>'; |
|
199 | - $output .= '<div class="ge-row">'; |
|
200 | - $output .= '<span>Country</span>'; |
|
201 | - $output .= $spotter_item['arrival_airport_country']; |
|
202 | - $output .= '</div>'; |
|
203 | - $output .= '<div class="ge-row">'; |
|
204 | - $output .= '<span>ICAO</span>'; |
|
205 | - $output .= $spotter_item['arrival_airport_icao']; |
|
206 | - $output .= '</div>'; |
|
207 | - $output .= '<div class="ge-row">'; |
|
208 | - $output .= '<span>IATA</span>'; |
|
209 | - $output .= $spotter_item['arrival_airport_iata']; |
|
210 | - $output .= '</div>'; |
|
211 | - $output .= '<div class="ge-row">'; |
|
212 | - $output .= '<span>Coordinates</span>'; |
|
213 | - $output .= $spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_longitude']; |
|
214 | - $output .= '</div>'; |
|
215 | - $output .= '<div class="ge-row">'; |
|
216 | - $output .= '<span>Altitude</span>'; |
|
217 | - $output .= $spotter_item['arrival_airport_altitude']; |
|
218 | - $output .= '</div>'; |
|
219 | - $output .= '</div>'; |
|
220 | - $output .= ' ]]></description>'; |
|
189 | + $output .= '<description><![CDATA[ '; |
|
190 | + $output .= '<div class="ge-balloon">'; |
|
191 | + $output .= '<div class="ge-row">'; |
|
192 | + $output .= '<span>Name</span>'; |
|
193 | + $output .= $spotter_item['arrival_airport_name']; |
|
194 | + $output .= '</div>'; |
|
195 | + $output .= '<div class="ge-row">'; |
|
196 | + $output .= '<span>City</span>'; |
|
197 | + $output .= $spotter_item['arrival_airport_city']; |
|
198 | + $output .= '</div>'; |
|
199 | + $output .= '<div class="ge-row">'; |
|
200 | + $output .= '<span>Country</span>'; |
|
201 | + $output .= $spotter_item['arrival_airport_country']; |
|
202 | + $output .= '</div>'; |
|
203 | + $output .= '<div class="ge-row">'; |
|
204 | + $output .= '<span>ICAO</span>'; |
|
205 | + $output .= $spotter_item['arrival_airport_icao']; |
|
206 | + $output .= '</div>'; |
|
207 | + $output .= '<div class="ge-row">'; |
|
208 | + $output .= '<span>IATA</span>'; |
|
209 | + $output .= $spotter_item['arrival_airport_iata']; |
|
210 | + $output .= '</div>'; |
|
211 | + $output .= '<div class="ge-row">'; |
|
212 | + $output .= '<span>Coordinates</span>'; |
|
213 | + $output .= $spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_longitude']; |
|
214 | + $output .= '</div>'; |
|
215 | + $output .= '<div class="ge-row">'; |
|
216 | + $output .= '<span>Altitude</span>'; |
|
217 | + $output .= $spotter_item['arrival_airport_altitude']; |
|
218 | + $output .= '</div>'; |
|
219 | + $output .= '</div>'; |
|
220 | + $output .= ' ]]></description>'; |
|
221 | 221 | $output .= '<styleUrl>#arrivalAirport</styleUrl>'; |
222 | 222 | $output .= '<Point>'; |
223 | 223 | $output .= '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>'; |
@@ -230,41 +230,41 @@ discard block |
||
230 | 230 | $output .= '<Placemark>'; |
231 | 231 | $output .= '<name>'.$spotter_item['ident'].' - '.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'</name>'; |
232 | 232 | $output .= '<description><![CDATA[ '; |
233 | - $output .= '<div class="ge-balloon">'; |
|
234 | - if ($spotter_item['image_thumbnail'] != "") |
|
235 | - { |
|
236 | - $output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click on image to see Flight profile" title="Click on image to see Flight profile" class="ge-image" /></a>'; |
|
237 | - } |
|
238 | - $output .= '<div class="ge-row">'; |
|
239 | - $output .= '<span>Ident</span>'; |
|
240 | - $output .= '<a href="'.$globalURL.'/ident/'.$spotter_item['ident'].'" target="_blank">'.$spotter_item['ident'].'</a>'; |
|
241 | - $output .= '</div>'; |
|
242 | - $output .= '<div class="ge-row">'; |
|
243 | - $output .= '<span>Registration</span>'; |
|
244 | - $output .= '<a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a>'; |
|
245 | - $output .= '</div>'; |
|
246 | - $output .= '<div class="ge-row">'; |
|
247 | - $output .= '<span>Aircraft</span>'; |
|
248 | - $output .= '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" target="_blank">'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>'; |
|
249 | - $output .= '</div>'; |
|
250 | - $output .= '<div class="ge-row">'; |
|
251 | - $output .= '<span>Airline</span>'; |
|
252 | - $output .= '<a href="'.$globalURL.'/airline/'.$spotter_item['airline_icao'].'" target="_blank">'.$spotter_item['airline_name'].'</a>'; |
|
253 | - $output .= '</div>'; |
|
254 | - $output .= '<div class="ge-row">'; |
|
255 | - $output .= '<span>Departure Airport</span>'; |
|
256 | - $output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].')</a>'; |
|
257 | - $output .= '</div>'; |
|
258 | - $output .= '<div class="ge-row">'; |
|
259 | - $output .= '<span>Arrival Airport</span>'; |
|
260 | - $output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a>'; |
|
261 | - $output .= '</div>'; |
|
233 | + $output .= '<div class="ge-balloon">'; |
|
234 | + if ($spotter_item['image_thumbnail'] != "") |
|
235 | + { |
|
236 | + $output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click on image to see Flight profile" title="Click on image to see Flight profile" class="ge-image" /></a>'; |
|
237 | + } |
|
238 | + $output .= '<div class="ge-row">'; |
|
239 | + $output .= '<span>Ident</span>'; |
|
240 | + $output .= '<a href="'.$globalURL.'/ident/'.$spotter_item['ident'].'" target="_blank">'.$spotter_item['ident'].'</a>'; |
|
241 | + $output .= '</div>'; |
|
242 | + $output .= '<div class="ge-row">'; |
|
243 | + $output .= '<span>Registration</span>'; |
|
244 | + $output .= '<a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a>'; |
|
245 | + $output .= '</div>'; |
|
246 | + $output .= '<div class="ge-row">'; |
|
247 | + $output .= '<span>Aircraft</span>'; |
|
248 | + $output .= '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" target="_blank">'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>'; |
|
249 | + $output .= '</div>'; |
|
250 | + $output .= '<div class="ge-row">'; |
|
251 | + $output .= '<span>Airline</span>'; |
|
252 | + $output .= '<a href="'.$globalURL.'/airline/'.$spotter_item['airline_icao'].'" target="_blank">'.$spotter_item['airline_name'].'</a>'; |
|
253 | + $output .= '</div>'; |
|
254 | + $output .= '<div class="ge-row">'; |
|
255 | + $output .= '<span>Departure Airport</span>'; |
|
256 | + $output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].')</a>'; |
|
257 | + $output .= '</div>'; |
|
258 | + $output .= '<div class="ge-row">'; |
|
259 | + $output .= '<span>Arrival Airport</span>'; |
|
260 | + $output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a>'; |
|
261 | + $output .= '</div>'; |
|
262 | 262 | $output .= '<div class="ge-row">'; |
263 | - $output .= '<span>Date</span>'; |
|
264 | - $output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank">'.date("D M j, Y, g:i a T", strtotime($spotter_item['date_iso_8601'])).'</a>'; |
|
265 | - $output .= '</div>'; |
|
266 | - $output .= '</div>'; |
|
267 | - $output .= ' ]]></description>'; |
|
263 | + $output .= '<span>Date</span>'; |
|
264 | + $output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank">'.date("D M j, Y, g:i a T", strtotime($spotter_item['date_iso_8601'])).'</a>'; |
|
265 | + $output .= '</div>'; |
|
266 | + $output .= '</div>'; |
|
267 | + $output .= ' ]]></description>'; |
|
268 | 268 | $output .= '<styleUrl>#aircraft_'.$spotter_item['spotter_id'].'</styleUrl>'; |
269 | 269 | $output .= '<Point>'; |
270 | 270 | $output .= '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>'; |
@@ -273,14 +273,14 @@ discard block |
||
273 | 273 | $output .= '</Placemark>'; |
274 | 274 | |
275 | 275 | $output .= '<Style id="aircraft_'.$spotter_item['spotter_id'].'">'; |
276 | - $output .= '<IconStyle>'; |
|
277 | - $output .= '<Icon>'; |
|
278 | - $output .= '<href>http://www.flightairmap.fr/images/kml_aircraft.png</href>'; |
|
279 | - $output .= '</Icon>'; |
|
280 | - $output .= '<heading>'.$spotter_item['heading'].'</heading>'; |
|
281 | - $output .= '</IconStyle>'; |
|
282 | - $output .= '</Style>'; |
|
283 | - } |
|
276 | + $output .= '<IconStyle>'; |
|
277 | + $output .= '<Icon>'; |
|
278 | + $output .= '<href>http://www.flightairmap.fr/images/kml_aircraft.png</href>'; |
|
279 | + $output .= '</Icon>'; |
|
280 | + $output .= '<heading>'.$spotter_item['heading'].'</heading>'; |
|
281 | + $output .= '</IconStyle>'; |
|
282 | + $output .= '</Style>'; |
|
283 | + } |
|
284 | 284 | } |
285 | 285 | |
286 | 286 | $output .= '</Document>'; |
@@ -3,8 +3,8 @@ discard block |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | if (!isset($_GET['airline'])) { |
6 | - header('Location: '.$globalURL.'/airline'); |
|
7 | - die(); |
|
6 | + header('Location: '.$globalURL.'/airline'); |
|
7 | + die(); |
|
8 | 8 | } |
9 | 9 | $airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
10 | 10 | $Spotter = new Spotter(); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | function drawChart() { |
70 | 70 | var data = google.visualization.arrayToDataTable([ |
71 | 71 | ["'._("Country").'", "'._("# of times").'"], '; |
72 | - $country_data = ''; |
|
72 | + $country_data = ''; |
|
73 | 73 | foreach($airport_country_array as $airport_item) |
74 | 74 | { |
75 | 75 | $country_data .= '[ "'.$airport_item['departure_airport_country'].'",'.$airport_item['airport_departure_country_count'].'],'; |