Inspection of "Load data only one time when using bbox" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 550aa3...43c414 )

by Yannick

created 2017-08-14 13:04 UTC

Status

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -39,30 +39,30 @@  discard block
 block discarded – undo
 
 
 function quaternionrotate($heading, $attitude = 0, $bank = 0) {
-    // Assuming the angles are in radians.
-    $c1 = cos($heading/2);
-    $s1 = sin($heading/2);
-    $c2 = cos($attitude/2);
-    $s2 = sin($attitude/2);
-    $c3 = cos($bank/2);
-    $s3 = sin($bank/2);
-    $c1c2 = $c1*$c2;
-    $s1s2 = $s1*$s2;
-    $w =$c1c2*$c3 - $s1s2*$s3;
-    $x =$c1c2*$s3 + $s1s2*$c3;
-    $y =$s1*$c2*$c3 + $c1*$s2*$s3;
-    $z =$c1*$s2*$c3 - $s1*$c2*$s3;
-    return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
+	// Assuming the angles are in radians.
+	$c1 = cos($heading/2);
+	$s1 = sin($heading/2);
+	$c2 = cos($attitude/2);
+	$s2 = sin($attitude/2);
+	$c3 = cos($bank/2);
+	$s3 = sin($bank/2);
+	$c1c2 = $c1*$c2;
+	$s1s2 = $s1*$s2;
+	$w =$c1c2*$c3 - $s1s2*$s3;
+	$x =$c1c2*$s3 + $s1s2*$c3;
+	$y =$s1*$c2*$c3 + $c1*$s2*$s3;
+	$z =$c1*$s2*$c3 - $s1*$c2*$s3;
+	return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
 //    return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365');
 
 }
 
 
 if (isset($_GET['download'])) {
-    if ($_GET['download'] == "true")
-    {
+	if ($_GET['download'] == "true")
+	{
 	header('Content-disposition: attachment; filename="flightairmap.json"');
-    }
+	}
 }
 header('Content-Type: text/javascript');
 
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
 	if (isset($_GET['coord']) && $_GET['coord'] != '') {
 		$coord = explode(',',$_GET['coord']);
 		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
-		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
+			&& $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
 			$coord = array();
 		}
 	}
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
 	if (isset($_GET['coord']) && $_GET['coord'] != '') {
 		$coord = explode(',',$_GET['coord']);
 		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
-		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
+			&& $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
 			$coord = array();
 		}
 	}
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
 	if (isset($_GET['coord']) && $_GET['coord'] != '') {
 		$coord = explode(',',$_GET['coord']);
 		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
-		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
+			&& $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
 			$coord = array();
 		}
 	}
@@ -265,10 +265,10 @@  discard block
 block discarded – undo
 			$image = "images/placeholder_thumb.png";
 		}
 
-                if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
-                elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
-                elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
-                if ($prev_flightaware_id != $id) {
+				if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
+				elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
+				elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
+				if ($prev_flightaware_id != $id) {
 			if ($prev_flightaware_id != '') {
 				/*
 				if ($nblatlong == 1) {
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
 						} else $aircraft_shadow = '';
-	    					$output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
+							$output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
 						if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true' && isset($_COOKIE['IconColor'])) {
 							$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
 							$output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}';
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
 							$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
 							$output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}';
 						}
-    						$output .= '},';
+							$output .= '},';
 					} elseif (isset($modelsdb[$aircraft_icao]) && $aircraft_icao != '') {
 						$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_icao].'","scale" : 1.0,"minimumPixelSize": 20';
 						$output .= ',"heightReference": "'.$heightrelative.'"';
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
 							$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
 							$output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}';
 						}
-    						$output .= '},';
+							$output .= '},';
 					} elseif ($aircraft_icao != '') {
 						$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao);
 						if (isset($aircraft_info[0]['engine_type'])) {

Please login to merge, or discard this patch.

live-geojson.php 1 patch

Indentation +65 added lines, -65 removed lines patch added patch discarded remove patch

@@ -5,23 +5,23 @@  discard block
 block discarded – undo
 $marine = false;
 $usecoord = false;
 if (isset($_GET['tracker'])) {
-    $tracker = true;
+	$tracker = true;
 }
 if (isset($_GET['marine'])) {
-    $marine = true;
+	$marine = true;
 }
 if ($tracker) {
-    require_once('require/class.Tracker.php');
-    require_once('require/class.TrackerLive.php');
-    require_once('require/class.TrackerArchive.php');
+	require_once('require/class.Tracker.php');
+	require_once('require/class.TrackerLive.php');
+	require_once('require/class.TrackerArchive.php');
 } elseif ($marine) {
-    require_once('require/class.Marine.php');
-    require_once('require/class.MarineLive.php');
-    require_once('require/class.MarineArchive.php');
+	require_once('require/class.Marine.php');
+	require_once('require/class.MarineLive.php');
+	require_once('require/class.MarineArchive.php');
 } else {
-    require_once('require/class.Spotter.php');
-    require_once('require/class.SpotterLive.php');
-    require_once('require/class.SpotterArchive.php');
+	require_once('require/class.Spotter.php');
+	require_once('require/class.SpotterLive.php');
+	require_once('require/class.SpotterArchive.php');
 }
 
 $begintime = microtime(true);
@@ -41,10 +41,10 @@  discard block
 block discarded – undo
 $Common = new Common();
 
 if (isset($_GET['download'])) {
-    if ($_GET['download'] == "true")
-    {
+	if ($_GET['download'] == "true")
+	{
 	header('Content-disposition: attachment; filename="flightairmap.json"');
-    }
+	}
 }
 header('Content-Type: text/javascript');
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
 	$usecoord = true;
 	$coord = explode(',',$_GET['coord']);
 	if (filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
-	    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
+		&& $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
 		if ($tracker) {
 			$spotter_array = $TrackerLive->getLiveTrackerDatabyCoord($coord,$filter);
 		} elseif ($marine) {
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
 	$usecoord = true;
 	$coord = explode(',',$_GET['coord']);
 	if (filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
-	    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
+		&& $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
 		if ($tracker) {
 			$spotter_array = $TrackerLive->getMinLiveTrackerDatabyCoord($coord,$filter);
 		} elseif ($marine) {
@@ -538,17 +538,17 @@  discard block
 block discarded – undo
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
 				
 				if (
-				    (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
-				    || ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
+					(isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
+					|| ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
 				//    || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))
 				//    || (isset($history) && $history != '' && $history != 'NA' && $history == $spotter_item['ident'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
-				    ) {
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
+					) {
 					if ($tracker) {
 						if ($from_archive || $globalArchive) {
 							$spotter_history_array = $TrackerArchive->getAllArchiveTrackerDataById($spotter_item['famtrackid']);
@@ -637,65 +637,65 @@  discard block
 block discarded – undo
 				}
 				
 				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
-				     && (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) && $globalMapRoute)))) {
-				    if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
-				    else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
-				    if (isset($spotter_item['departure_airport_latitude'])) {
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
+					 && (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) && $globalMapRoute)))) {
+					if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
+					else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
+					if (isset($spotter_item['departure_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
-				    } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
+					} elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
 					$dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
 					if (isset($dairport[0]['latitude'])) {
-					    $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
+						$output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
 					}
-				    }
-				    if (isset($spotter_item['arrival_airport_latitude'])) {
+					}
+					if (isset($spotter_item['arrival_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].'],';
-				    } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
+					} elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
 					$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 					if (isset($aairport[0]['latitude'])) {
-					    $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],';
+						$output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],';
 					}
-				    }
-				    $output_air  = substr($output_air, 0, -1);
-				    $output_air .= ']}},';
-				    $output .= $output_air;
-				    unset($output_air);
+					}
+					$output_air  = substr($output_air, 0, -1);
+					$output_air .= ']}},';
+					$output .= $output_air;
+					unset($output_air);
 				}
 
 				//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))))) {
 				//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
 				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
-				     && (isset($spotter_item['arrival_airport']) 
-				        && $spotter_item['arrival_airport'] != 'NA' 
-				        && ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == "true") 
-				    	    || (!isset($_COOKIE['MapRemainaingRoute']) && (!isset($globalMapRemainingRoute) 
-				    	    || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
-				    $havedata = false;
-				    if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
-				    else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
-				    $output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
+					 && (isset($spotter_item['arrival_airport']) 
+						&& $spotter_item['arrival_airport'] != 'NA' 
+						&& ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == "true") 
+							|| (!isset($_COOKIE['MapRemainaingRoute']) && (!isset($globalMapRemainingRoute) 
+							|| (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
+					$havedata = false;
+					if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
+					else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
+					$output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
 
-				    if (isset($spotter_item['arrival_airport_latitude'])) {
+					if (isset($spotter_item['arrival_airport_latitude'])) {
 					$output_dest .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']';
 					$havedata = true;
-				    } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
+					} elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
 					$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 					if (isset($aairport[0]['latitude'])) {
-					    $output_dest .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
-					    $havedata = true;
+						$output_dest .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
+						$havedata = true;
 					}
-				    }
-				    //$output_dest  = substr($output_dest, 0, -1);
-				    $output_dest .= ']}},';
-				    if ($havedata) $output .= $output_dest;
-				    unset($output_dest);
+					}
+					//$output_dest  = substr($output_dest, 0, -1);
+					$output_dest .= ']}},';
+					if ($havedata) $output .= $output_dest;
+					unset($output_dest);
 				}
 			}
 			$output  = substr($output, 0, -1);

Please login to merge, or discard this patch.

		@@ -39,30 +39,30 @@ discard block
		block discarded – undo
39	39
40	40
41	41	function quaternionrotate($heading, $attitude = 0, $bank = 0) {
42		- // Assuming the angles are in radians.
43		- $c1 = cos($heading/2);
44		- $s1 = sin($heading/2);
45		- $c2 = cos($attitude/2);
46		- $s2 = sin($attitude/2);
47		- $c3 = cos($bank/2);
48		- $s3 = sin($bank/2);
49		- $c1c2 = $c1*$c2;
50		- $s1s2 = $s1*$s2;
51		- $w =$c1c2$c3 - $s1s2$s3;
52		- $x =$c1c2$s3 + $s1s2$c3;
53		- $y =$s1$c2$c3 + $c1$s2$s3;
54		- $z =$c1$s2$c3 - $s1$c2$s3;
55		- return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
	42	+ // Assuming the angles are in radians.
	43	+ $c1 = cos($heading/2);
	44	+ $s1 = sin($heading/2);
	45	+ $c2 = cos($attitude/2);
	46	+ $s2 = sin($attitude/2);
	47	+ $c3 = cos($bank/2);
	48	+ $s3 = sin($bank/2);
	49	+ $c1c2 = $c1*$c2;
	50	+ $s1s2 = $s1*$s2;
	51	+ $w =$c1c2$c3 - $s1s2$s3;
	52	+ $x =$c1c2$s3 + $s1s2$c3;
	53	+ $y =$s1$c2$c3 + $c1$s2$s3;
	54	+ $z =$c1$s2$c3 - $s1$c2$s3;
	55	+ return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
56	56	// return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365');
57	57
58	58	}
59	59
60	60
61	61	if (isset($_GET['download'])) {
62		- if ($_GET['download'] == "true")
63		- {
	62	+ if ($_GET['download'] == "true")
	63	+ {
64	64	header('Content-disposition: attachment; filename="flightairmap.json"');
65		- }
	65	+ }
66	66	}
67	67	header('Content-Type: text/javascript');
68	68
		@@ -155,7 +155,7 @@ discard block
		block discarded – undo
155	155	if (isset($_GET['coord']) && $_GET['coord'] != '') {
156	156	$coord = explode(',',$_GET['coord']);
157	157	if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
158		- && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
	158	+ && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
159	159	$coord = array();
160	160	}
161	161	}
		@@ -165,7 +165,7 @@ discard block
		block discarded – undo
165	165	if (isset($_GET['coord']) && $_GET['coord'] != '') {
166	166	$coord = explode(',',$_GET['coord']);
167	167	if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
168		- && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
	168	+ && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
169	169	$coord = array();
170	170	}
171	171	}
		@@ -175,7 +175,7 @@ discard block
		block discarded – undo
175	175	if (isset($_GET['coord']) && $_GET['coord'] != '') {
176	176	$coord = explode(',',$_GET['coord']);
177	177	if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
178		- && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
	178	+ && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
179	179	$coord = array();
180	180	}
181	181	}
		@@ -265,10 +265,10 @@ discard block
		block discarded – undo
265	265	$image = "images/placeholder_thumb.png";
266	266	}
267	267
268		- if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
269		- elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
270		- elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
271		- if ($prev_flightaware_id != $id) {
	268	+ if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
	269	+ elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
	270	+ elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
	271	+ if ($prev_flightaware_id != $id) {
272	272	if ($prev_flightaware_id != '') {
273	273	/*
274	274	if ($nblatlong == 1) {
		@@ -348,7 +348,7 @@ discard block
		block discarded – undo
348	348	$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
349	349	$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
350	350	} else $aircraft_shadow = '';
351		- $output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
	351	+ $output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
352	352	if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true' && isset($_COOKIE['IconColor'])) {
353	353	$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
354	354	$output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}';
		@@ -379,7 +379,7 @@ discard block
		block discarded – undo
379	379	$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
380	380	$output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}';
381	381	}
382		- $output .= '},';
	382	+ $output .= '},';
383	383	} elseif (isset($modelsdb[$aircraft_icao]) && $aircraft_icao != '') {
384	384	$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_icao].'","scale" : 1.0,"minimumPixelSize": 20';
385	385	$output .= ',"heightReference": "'.$heightrelative.'"';
		@@ -387,7 +387,7 @@ discard block
		block discarded – undo
387	387	$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
388	388	$output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}';
389	389	}
390		- $output .= '},';
	390	+ $output .= '},';
391	391	} elseif ($aircraft_icao != '') {
392	392	$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao);
393	393	if (isset($aircraft_info[0]['engine_type'])) {

		@@ -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
		@@ -108,7 +108,7 @@ discard block
		block discarded – undo
108	108	$usecoord = true;
109	109	$coord = explode(',',$_GET['coord']);
110	110	if (filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
111		- && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
	111	+ && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
112	112	if ($tracker) {
113	113	$spotter_array = $TrackerLive->getLiveTrackerDatabyCoord($coord,$filter);
114	114	} elseif ($marine) {
		@@ -121,7 +121,7 @@ discard block
		block discarded – undo
121	121	$usecoord = true;
122	122	$coord = explode(',',$_GET['coord']);
123	123	if (filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
124		- && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
	124	+ && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
125	125	if ($tracker) {
126	126	$spotter_array = $TrackerLive->getMinLiveTrackerDatabyCoord($coord,$filter);
127	127	} elseif ($marine) {
		@@ -538,17 +538,17 @@ discard block
		block discarded – undo
538	538	if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
539	539
540	540	if (
541		- (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')
542		- \|\| ((isset($globalMapHistory) && $globalMapHistory) \|\| $allhistory)
	541	+ (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')
	542	+ \|\| ((isset($globalMapHistory) && $globalMapHistory) \|\| $allhistory)
543	543	// \|\| (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] \|\| $history == $spotter_item['flightaware_id']))
544	544	// \|\| (isset($history) && $history != '' && $history != 'NA' && $history == $spotter_item['ident'])
545		- \|\| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
546		- \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
547		- \|\| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
548		- \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
549		- \|\| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
550		- \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
551		- ) {
	545	+ \|\| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
	546	+ \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
	547	+ \|\| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
	548	+ \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
	549	+ \|\| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
	550	+ \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
	551	+ ) {
552	552	if ($tracker) {
553	553	if ($from_archive \|\| $globalArchive) {
554	554	$spotter_history_array = $TrackerArchive->getAllArchiveTrackerDataById($spotter_item['famtrackid']);
		@@ -637,65 +637,65 @@ discard block
		block discarded – undo
637	637	}
638	638
639	639	if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
640		- \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
641		- && (isset($spotter_item['departure_airport'])
642		- && $spotter_item['departure_airport'] != 'NA'
643		- && isset($spotter_item['arrival_airport'])
644		- && $spotter_item['arrival_airport'] != 'NA'
645		- && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true")
646		- \|\| (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
647		- if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
648		- else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
649		- if (isset($spotter_item['departure_airport_latitude'])) {
	640	+ \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
	641	+ && (isset($spotter_item['departure_airport'])
	642	+ && $spotter_item['departure_airport'] != 'NA'
	643	+ && isset($spotter_item['arrival_airport'])
	644	+ && $spotter_item['arrival_airport'] != 'NA'
	645	+ && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true")
	646	+ \|\| (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
	647	+ if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
	648	+ else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
	649	+ if (isset($spotter_item['departure_airport_latitude'])) {
650	650	$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
651		- } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
	651	+ } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
652	652	$dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
653	653	if (isset($dairport[0]['latitude'])) {
654		- $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
	654	+ $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
655	655	}
656		- }
657		- if (isset($spotter_item['arrival_airport_latitude'])) {
	656	+ }
	657	+ if (isset($spotter_item['arrival_airport_latitude'])) {
658	658	$output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].'],';
659		- } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
	659	+ } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
660	660	$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
661	661	if (isset($aairport[0]['latitude'])) {
662		- $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],';
	662	+ $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],';
663	663	}
664		- }
665		- $output_air = substr($output_air, 0, -1);
666		- $output_air .= ']}},';
667		- $output .= $output_air;
668		- unset($output_air);
	664	+ }
	665	+ $output_air = substr($output_air, 0, -1);
	666	+ $output_air .= ']}},';
	667	+ $output .= $output_air;
	668	+ unset($output_air);
669	669	}
670	670
671	671	//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))))) {
672	672	//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") \|\| (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) \|\| (isset($globalMapRoute) && $globalMapRoute))))) {
673	673	if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
674		- \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
675		- && (isset($spotter_item['arrival_airport'])
676		- && $spotter_item['arrival_airport'] != 'NA'
677		- && ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == "true")
678		- \|\| (!isset($_COOKIE['MapRemainaingRoute']) && (!isset($globalMapRemainingRoute)
679		- \|\| (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
680		- $havedata = false;
681		- if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
682		- else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
683		- $output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
	674	+ \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
	675	+ && (isset($spotter_item['arrival_airport'])
	676	+ && $spotter_item['arrival_airport'] != 'NA'
	677	+ && ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == "true")
	678	+ \|\| (!isset($_COOKIE['MapRemainaingRoute']) && (!isset($globalMapRemainingRoute)
	679	+ \|\| (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
	680	+ $havedata = false;
	681	+ if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
	682	+ else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
	683	+ $output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
684	684
685		- if (isset($spotter_item['arrival_airport_latitude'])) {
	685	+ if (isset($spotter_item['arrival_airport_latitude'])) {
686	686	$output_dest .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']';
687	687	$havedata = true;
688		- } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
	688	+ } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
689	689	$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
690	690	if (isset($aairport[0]['latitude'])) {
691		- $output_dest .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
692		- $havedata = true;
	691	+ $output_dest .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
	692	+ $havedata = true;
693	693	}
694		- }
695		- //$output_dest = substr($output_dest, 0, -1);
696		- $output_dest .= ']}},';
697		- if ($havedata) $output .= $output_dest;
698		- unset($output_dest);
	694	+ }
	695	+ //$output_dest = substr($output_dest, 0, -1);
	696	+ $output_dest .= ']}},';
	697	+ if ($havedata) $output .= $output_dest;
	698	+ unset($output_dest);
699	699	}
700	700	}
701	701	$output = substr($output, 0, -1);

Ysurac / FlightAirMap

Push — master ( 550aa3...43c414 )

Status

Category

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

Indentation +65 added lines, -65 removed lines patch added patch discarded remove patch