|
@@ -5,23 +5,23 @@ discard block |
|
|
block discarded – undo |
|
5
|
5
|
$marine = false; |
|
6
|
6
|
$usecoord = false; |
|
7
|
7
|
if (isset($_GET['tracker'])) { |
|
8
|
|
- $tracker = true; |
|
|
8
|
+ $tracker = true; |
|
9
|
9
|
} |
|
10
|
10
|
if (isset($_GET['marine'])) { |
|
11
|
|
- $marine = true; |
|
|
11
|
+ $marine = true; |
|
12
|
12
|
} |
|
13
|
13
|
if ($tracker) { |
|
14
|
|
- require_once('require/class.Tracker.php'); |
|
15
|
|
- require_once('require/class.TrackerLive.php'); |
|
16
|
|
- require_once('require/class.TrackerArchive.php'); |
|
|
14
|
+ require_once('require/class.Tracker.php'); |
|
|
15
|
+ require_once('require/class.TrackerLive.php'); |
|
|
16
|
+ require_once('require/class.TrackerArchive.php'); |
|
17
|
17
|
} elseif ($marine) { |
|
18
|
|
- require_once('require/class.Marine.php'); |
|
19
|
|
- require_once('require/class.MarineLive.php'); |
|
20
|
|
- require_once('require/class.MarineArchive.php'); |
|
|
18
|
+ require_once('require/class.Marine.php'); |
|
|
19
|
+ require_once('require/class.MarineLive.php'); |
|
|
20
|
+ require_once('require/class.MarineArchive.php'); |
|
21
|
21
|
} else { |
|
22
|
|
- require_once('require/class.Spotter.php'); |
|
23
|
|
- require_once('require/class.SpotterLive.php'); |
|
24
|
|
- require_once('require/class.SpotterArchive.php'); |
|
|
22
|
+ require_once('require/class.Spotter.php'); |
|
|
23
|
+ require_once('require/class.SpotterLive.php'); |
|
|
24
|
+ require_once('require/class.SpotterArchive.php'); |
|
25
|
25
|
} |
|
26
|
26
|
|
|
27
|
27
|
$begintime = microtime(true); |
|
@@ -41,10 +41,10 @@ discard block |
|
|
block discarded – undo |
|
41
|
41
|
$Common = new Common(); |
|
42
|
42
|
|
|
43
|
43
|
if (isset($_GET['download'])) { |
|
44
|
|
- if ($_GET['download'] == "true") |
|
45
|
|
- { |
|
|
44
|
+ if ($_GET['download'] == "true") |
|
|
45
|
+ { |
|
46
|
46
|
header('Content-disposition: attachment; filename="flightairmap.json"'); |
|
47
|
|
- } |
|
|
47
|
+ } |
|
48
|
48
|
} |
|
49
|
49
|
header('Content-Type: text/javascript'); |
|
50
|
50
|
|
|
@@ -497,17 +497,17 @@ discard block |
|
|
block discarded – undo |
|
497
|
497
|
if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history']; |
|
498
|
498
|
|
|
499
|
499
|
if ( |
|
500
|
|
- (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') |
|
501
|
|
- || ((isset($globalMapHistory) && $globalMapHistory) || $allhistory) |
|
|
500
|
+ (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') |
|
|
501
|
+ || ((isset($globalMapHistory) && $globalMapHistory) || $allhistory) |
|
502
|
502
|
// || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id'])) |
|
503
|
503
|
// || (isset($history) && $history != '' && $history != 'NA' && $history == $spotter_item['ident']) |
|
504
|
|
- || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id'])) |
|
505
|
|
- || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']) |
|
506
|
|
- || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id'])) |
|
507
|
|
- || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id']) |
|
508
|
|
- || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid'])) |
|
509
|
|
- || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid']) |
|
510
|
|
- ) { |
|
|
504
|
+ || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id'])) |
|
|
505
|
+ || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']) |
|
|
506
|
+ || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id'])) |
|
|
507
|
+ || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id']) |
|
|
508
|
+ || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid'])) |
|
|
509
|
+ || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid']) |
|
|
510
|
+ ) { |
|
511
|
511
|
if ($tracker) { |
|
512
|
512
|
if ($from_archive || $globalArchive) { |
|
513
|
513
|
$spotter_history_array = $TrackerArchive->getAllArchiveTrackerDataById($spotter_item['famtrackid']); |
|
@@ -596,27 +596,27 @@ discard block |
|
|
block discarded – undo |
|
596
|
596
|
} |
|
597
|
597
|
|
|
598
|
598
|
if (isset($history) && $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))))) { |
|
599
|
|
- $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": ['; |
|
600
|
|
- if (isset($spotter_item['departure_airport_latitude'])) { |
|
|
599
|
+ $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": ['; |
|
|
600
|
+ if (isset($spotter_item['departure_airport_latitude'])) { |
|
601
|
601
|
$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],'; |
|
602
|
|
- } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') { |
|
|
602
|
+ } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') { |
|
603
|
603
|
$dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']); |
|
604
|
604
|
if (isset($dairport[0]['latitude'])) { |
|
605
|
|
- $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],'; |
|
|
605
|
+ $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],'; |
|
606
|
606
|
} |
|
607
|
|
- } |
|
608
|
|
- if (isset($spotter_item['arrival_airport_latitude'])) { |
|
|
607
|
+ } |
|
|
608
|
+ if (isset($spotter_item['arrival_airport_latitude'])) { |
|
609
|
609
|
$output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].'],'; |
|
610
|
|
- } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') { |
|
|
610
|
+ } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') { |
|
611
|
611
|
$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']); |
|
612
|
612
|
if (isset($aairport[0]['latitude'])) { |
|
613
|
|
- $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],'; |
|
|
613
|
+ $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],'; |
|
614
|
614
|
} |
|
615
|
|
- } |
|
616
|
|
- $output_air = substr($output_air, 0, -1); |
|
617
|
|
- $output_air .= ']}},'; |
|
618
|
|
- $output .= $output_air; |
|
619
|
|
- unset($output_air); |
|
|
615
|
+ } |
|
|
616
|
+ $output_air = substr($output_air, 0, -1); |
|
|
617
|
+ $output_air .= ']}},'; |
|
|
618
|
+ $output .= $output_air; |
|
|
619
|
+ unset($output_air); |
|
620
|
620
|
} |
|
621
|
621
|
} |
|
622
|
622
|
$output = substr($output, 0, -1); |
Ysurac /
FlightAirMap
