Ysurac / FlightAirMap

require/class.APRS.php

Indentation +142 added lines, -142 removed lines

@@ -2,10 +2,10 @@ 
 require_once(dirname(__FILE__).'/settings.php');
 require_once(dirname(__FILE__).'/class.Common.php');
 class aprs {
-    private $socket;
-    private $connected = false;
+	private $socket;
+	private $connected = false;
 
-    protected $symbols = array('!' => 'Police',
+	protected $symbols = array('!' => 'Police',
 	'#' => 'DIGI',
 	'$' => 'Phone',
 	'%' => 'DX Cluster',
@@ -89,13 +89,13 @@ 
 	'y' => 'Yagi At QTH');
 	
 
-    private function urshift($n, $s) {
+	private function urshift($n, $s) {
 	return ($n >= 0) ? ($n >> $s) :
-	    (($n & 0x7fffffff) >> $s) | 
+		(($n & 0x7fffffff) >> $s) | 
 		(0x40000000 >> ($s - 1));
-    }
+	}
 
-    public function parse($input) {
+	public function parse($input) {
 	global $globalDebug;
 	$debug = false;
 	$result = array();
@@ -107,8 +107,8 @@ 
 	
 	/* Check that end was found and body has at least one byte. */
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
-	    if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
-	    return false;
+		if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
+		return false;
 	}
 	
 	if ($debug) echo 'input : '.$input."\n";
@@ -122,31 +122,31 @@ 
 	/* Parse source, target and path. */
 	//FLRDF0A52>APRS,qAS,LSTB
 	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
-	    $ident = $matches[1];
-	    $all_elements = $matches[2];
-	    if ($ident == 'AIRCRAFT') {
+		$ident = $matches[1];
+		$all_elements = $matches[2];
+		if ($ident == 'AIRCRAFT') {
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'modes';
-	    } elseif ($ident == 'MARINE') {
+		} elseif ($ident == 'MARINE') {
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'ais';
-	    } else {
+		} else {
 		if ($debug) echo 'ident : '.$ident."\n";
 		$result['ident'] = $ident;
-	    }
+		}
 	} else return false;
 	$elements = explode(',',$all_elements);
 	$source = end($elements);
 	$result['source'] = $source;
 	foreach ($elements as $element) {
-	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
-	        //echo "ok";
-	        //if ($element == 'TCPIP*') return false;
-	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
+		if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
+			//echo "ok";
+			//if ($element == 'TCPIP*') return false;
+		} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
 		if ($debug) echo 'element : '.$element."\n";
 		return false;
-	    }
-	    /*
+		}
+		/*
 	    } elseif (preg_match('/^([0-9A-F]{32})$/',$element)) {
 		//echo "ok";
 	    } else {
@@ -173,49 +173,49 @@ 
 	$body_parse = substr($body,1);
 	//echo 'Body : '.$body."\n";
 	if (preg_match('/^;(.){9}\*/',$body,$matches)) {
-	    $body_parse = substr($body_parse,10);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,10);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match('/^`(.*)\//',$body,$matches)) {
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,strlen($matches[1])-1);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match("/^'(.*)\//",$body,$matches)) {
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,strlen($matches[1])-1);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
-	    $find = true;
-	    //print_r($matches);
-	    $timestamp = $matches[0];
-	    if ($matches[4] == 'h') {
+		$find = true;
+		//print_r($matches);
+		$timestamp = $matches[0];
+		if ($matches[4] == 'h') {
 		$timestamp = strtotime(date('Ymd').' '.$matches[1].':'.$matches[2].':'.$matches[3]);
 		//echo 'timestamp : '.$timestamp.' - now : '.time()."\n";
 		/*
 		if (time() + 3900 < $timestamp) $timestamp -= 86400;
 		elseif (time() - 82500 > $timestamp) $timestamp += 86400;
 		*/
-	    } elseif ($matches[4] == 'z' || $matches[4] == '/') {
+		} elseif ($matches[4] == 'z' || $matches[4] == '/') {
 		// This work or not ?
 		$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
-	    }
-	    $body_parse = substr($body_parse,7);
-	    $result['timestamp'] = $timestamp;
-	    //echo date('Ymd H:i:s',$timestamp);
+		}
+		$body_parse = substr($body_parse,7);
+		$result['timestamp'] = $timestamp;
+		//echo date('Ymd H:i:s',$timestamp);
 	}
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) {
-	    $find = true;
-	    $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
-	    $body_parse = substr($body_parse,8);
-	    $result['timestamp'] = $timestamp;
-	    //echo date('Ymd H:i:s',$timestamp);
+		$find = true;
+		$timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
+		$body_parse = substr($body_parse,8);
+		$result['timestamp'] = $timestamp;
+		//echo date('Ymd H:i:s',$timestamp);
 	}
 	//if (strlen($body_parse) > 19) {
-	    if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
-	    $find = true;
+		if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
+		$find = true;
 		// 4658.70N/00707.78Ez
 		//print_r(str_split($body_parse));
 		
@@ -232,7 +232,7 @@ 
 		$lon = intval($lon_deg);
 		if ($lat > 89 || $lon > 179) return false;
 	    
-	    /*
+		/*
 	    $tmp_5b = str_replace('.','',$lat_min);
 	    if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) {
 	        print_r($matches);
@@ -246,9 +246,9 @@ 
 		$result['longitude'] = $longitude;
 		$body_parse = substr($body_parse,18);
 		$body_parse_len = strlen($body_parse);
-	    }
-	    $body_parse_len = strlen($body_parse);
-	    if ($body_parse_len > 0) {
+		}
+		$body_parse_len = strlen($body_parse);
+		if ($body_parse_len > 0) {
 		/*
 		if (!isset($result['timestamp']) && !isset($result['latitude'])) {
 			$body_split = str_split($body);
@@ -278,92 +278,92 @@ 
 			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
 			if ($symbol_code != '_') {
 			}
-		    //$body_parse = substr($body_parse,1);
-		    //$body_parse = trim($body_parse);
-		    //$body_parse_len = strlen($body_parse);
-		    if ($body_parse_len >= 7) {
+			//$body_parse = substr($body_parse,1);
+			//$body_parse = trim($body_parse);
+			//$body_parse_len = strlen($body_parse);
+			if ($body_parse_len >= 7) {
 			
-		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
-		    	    $course = substr($body_parse,0,3);
-		    	    $tmp_s = intval($course);
-		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
-		    	    $speed = substr($body_parse,4,3);
-		    	    if ($speed != '...') {
-		    		//$result['speed'] = round($speed*1.852);
-		    		$result['speed'] = intval($speed);
-		    	    }
-		    	    $body_parse = substr($body_parse,7);
-		        }
-		        // Check PHGR, PHG, RNG
-		    } 
-		    /*
+				if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
+					$course = substr($body_parse,0,3);
+					$tmp_s = intval($course);
+					if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
+					$speed = substr($body_parse,4,3);
+					if ($speed != '...') {
+					//$result['speed'] = round($speed*1.852);
+					$result['speed'] = intval($speed);
+					}
+					$body_parse = substr($body_parse,7);
+				}
+				// Check PHGR, PHG, RNG
+			} 
+			/*
 		    else if ($body_parse_len > 0) {
 			$rest = $body_parse;
 		    }
 		    */
-		    if (strlen($body_parse) > 0) {
-		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
-		            $altitude = intval($matches[1]);
-		            //$result['altitude'] = round($altitude*0.3048);
-		            $result['altitude'] = $altitude;
-		            //$body_parse = trim(substr($body_parse,strlen($matches[0])));
-		            $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
-		        }
-		    }
+			if (strlen($body_parse) > 0) {
+				if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
+					$altitude = intval($matches[1]);
+					//$result['altitude'] = round($altitude*0.3048);
+					$result['altitude'] = $altitude;
+					//$body_parse = trim(substr($body_parse,strlen($matches[0])));
+					$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
+				}
+			}
 		    
-		    // Telemetry
-		    /*
+			// Telemetry
+			/*
 		    if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) {
 		        // Nothing yet...
 		    }
 		    */
-		    // DAO
+			// DAO
 		    
-		    if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
+			if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
 			    
-			    $dao = $matches[1];
-			    if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
+				$dao = $matches[1];
+				if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
 				$dao_split = str_split($dao);
-			        $lat_off = (($dao_split[1])-48.0)*0.001/60.0;
-			        $lon_off = (($dao_split[2])-48.0)*0.001/60.0;
+					$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
+					$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
 			    
 				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
 				else $result['latitude'] += $lat_off;
 				if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
 				else $result['longitude'] += $lon_off;
-			    }
+				}
 			    
-		            $body_parse = substr($body_parse,6);
-		    }
+					$body_parse = substr($body_parse,6);
+			}
 		    
-		    if (preg_match('/CS=([0-9A-Z]*)/',$body_parse,$matches)) {
+			if (preg_match('/CS=([0-9A-Z]*)/',$body_parse,$matches)) {
 			$result['ident'] = $matches[1];
-		    }
-		    if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
+			}
+			if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
 			$result['squawk'] = $matches[1];
-		    }
-		    if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
+			}
+			if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
 			$result['aircraft_icao'] = $matches[1];
-		    }
-		    if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
 			$result['typeid'] = $matches[1];
-		    }
-		    if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
 			$result['statusid'] = $matches[1];
-		    }
-		    if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
+			}
+			if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
 			$result['imo'] = $matches[1];
-		    }
-		    if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
 			$result['arrival_date'] = $matches[1];
-		    }
-		    if (preg_match('/AC=([0-9A-Z]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/AC=([0-9A-Z]*)/',$body_parse,$matches)) {
 			$result['arrival_code'] = $matches[1];
-		    }
-		    // OGN comment
+			}
+			// OGN comment
 		   // echo "Before OGN : ".$body_parse."\n";
-		    //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
-		    if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
+			//if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
+			if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
 			$id = $matches[1];
 			//$mode = substr($id,0,2);
 			$address = substr($id,2);
@@ -393,53 +393,53 @@ 
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
 			$result['stealth'] = $stealth;
 			$result['address'] = $address;
-		    }
+			}
 		    
-		    //Comment
-		    $result['comment'] = trim($body_parse);
+			//Comment
+			$result['comment'] = trim($body_parse);
 		} else {
-		    // parse weather
-		    //$body_parse = substr($body_parse,1);
-		    //$body_parse_len = strlen($body_parse);
+			// parse weather
+			//$body_parse = substr($body_parse,1);
+			//$body_parse_len = strlen($body_parse);
 
-		    if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
-			    $result['wind_dir'] = intval($matches[1]);
-			    $result['wind_speed'] = round(intval($matches[2])*1.60934,1);
-			    $result['wind_gust'] = round(intval($matches[3])*1.60934,1);
-			    $result['temp'] = round(5/9*((intval($matches[4]))-32),1);
-		    	    $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+			if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+				$result['wind_dir'] = intval($matches[1]);
+				$result['wind_speed'] = round(intval($matches[2])*1.60934,1);
+				$result['wind_gust'] = round(intval($matches[3])*1.60934,1);
+				$result['temp'] = round(5/9*((intval($matches[4]))-32),1);
+					$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = intval($matches[1]);
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
 			$result['temp'] = round(5/9*(($matches[4])-32),1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = intval($matches[1]);
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = intval($matches[1]);
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    }
-		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			}
+			if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
 			$result['temp'] = round(5/9*(($matches[1])-32),1);
-		    }
+			}
 		}
 		} else $result['comment'] = trim($body_parse);
 
-	    }
+		}
 	//}
 	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
 	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
 	if ($debug) print_r($result);
 	return $result;
-    }
+	}
     
-    public function connect() {
+	public function connect() {
 	global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
 	$aprs_connect = 0;
 	$aprs_keep = 120;
@@ -462,32 +462,32 @@ 
 		$send = socket_send( $this->socket  , $aprs_login , strlen($aprs_login) , 0 );
 		while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) {
 			if (strpos($msgin, "$aprs_ssid verified") !== FALSE) {
-			    echo 'APRS user verified !'."\n";
-			    $this->connected = true;
-			    return true;
-			    break;
+				echo 'APRS user verified !'."\n";
+				$this->connected = true;
+				return true;
+				break;
 			}
 			if (time()-$authstart > 5) {
-			    echo 'APRS timeout'."\n";
-			    break;
+				echo 'APRS timeout'."\n";
+				break;
 			}
 		}
 		socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE);
 	}
-    }
+	}
 
-    public function disconnect() {
+	public function disconnect() {
 	socket_close($this->socket);
-    }
+	}
     
-    public function send($data) {
+	public function send($data) {
 	if ($this->connected === false) $this->connect();
 	$send = socket_send( $this->socket  , $data , strlen($data),0);
 	if ($send === FALSE) {
 		socket_close($this->socket);
 		$this->connect();
 	}
-    }
+	}
 }
 
 class APRSSpotter extends APRS {

require/class.MarineImport.php

Indentation +169 added lines, -169 removed lines

@@ -9,25 +9,25 @@ 
 require_once(dirname(__FILE__).'/class.Stats.php');
 require_once(dirname(__FILE__).'/class.Source.php');
 if (isset($globalServerAPRS) && $globalServerAPRS) {
-    require_once(dirname(__FILE__).'/class.APRS.php');
+	require_once(dirname(__FILE__).'/class.APRS.php');
 }
 
 class MarineImport {
-    private $all_tracked = array();
-    private $last_delete_hourly = 0;
-    private $last_delete = 0;
-    private $stats = array();
-    private $tmd = 0;
-    private $source_location = array();
-    public $db = null;
-    public $nb = 0;
+	private $all_tracked = array();
+	private $last_delete_hourly = 0;
+	private $last_delete = 0;
+	private $stats = array();
+	private $tmd = 0;
+	private $source_location = array();
+	public $db = null;
+	public $nb = 0;
 
-    public function __construct($dbc = null) {
+	public function __construct($dbc = null) {
 	global $globalBeta, $globalServerAPRS, $APRSMarine, $globalNoDB;
 	if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-	    $Connection = new Connection($dbc);
-	    $this->db = $Connection->db();
-	    date_default_timezone_set('UTC');
+		$Connection = new Connection($dbc);
+		$this->db = $Connection->db();
+		date_default_timezone_set('UTC');
 	}
 	// Get previous source stats
 	/*
@@ -46,55 +46,55 @@ 
 	}
 	*/
 	if (isset($globalServerAPRS) && $globalServerAPRS) {
-	    $APRSMarine = new APRSMarine();
-	    //$APRSSpotter->connect();
+		$APRSMarine = new APRSMarine();
+		//$APRSSpotter->connect();
+	}
 	}
-    }
 
-    public function checkAll() {
+	public function checkAll() {
 	global $globalDebug;
 	if ($globalDebug) echo "Update last seen tracked data...\n";
 	foreach ($this->all_tracked as $key => $flight) {
-	    if (isset($this->all_tracked[$key]['id'])) {
+		if (isset($this->all_tracked[$key]['id'])) {
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
-    		$Marine = new Marine($this->db);
-        	$Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
-            }
+			$Marine = new Marine($this->db);
+			$Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
+			}
+	}
 	}
-    }
 
-    public function del() {
+	public function del() {
 	global $globalDebug, $globalNoDB, $globalNoImport;
 	// Delete old infos
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
 	foreach ($this->all_tracked as $key => $flight) {
-    	    if (isset($flight['lastupdate'])) {
-        	if ($flight['lastupdate'] < (time()-3000)) {
-            	    if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
-            		if (isset($this->all_tracked[$key]['id'])) {
-            		    if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
-			    /*
+			if (isset($flight['lastupdate'])) {
+			if ($flight['lastupdate'] < (time()-3000)) {
+					if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
+					if (isset($this->all_tracked[$key]['id'])) {
+						if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+				/*
 			    $MarineLive = new MarineLive();
             		    $MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']);
 			    $MarineLive->db = null;
 			    */
-            		    //$real_arrival = $this->arrival($key);
-            		    $Marine = new Marine($this->db);
-            		    if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
+						//$real_arrival = $this->arrival($key);
+						$Marine = new Marine($this->db);
+						if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
 				$result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
-			    }
-			    // Put in archive
+				}
+				// Put in archive
 //				$Marine->db = null;
 			}
-            	    }
-            	    unset($this->all_tracked[$key]);
-    	        }
-	    }
-        }
-    }
+					}
+					unset($this->all_tracked[$key]);
+				}
+		}
+		}
+	}
 
-    public function add($line) {
+	public function add($line) {
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine;
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
 	date_default_timezone_set('UTC');
@@ -103,8 +103,8 @@ 
 	
 	// SBS format is CSV format
 	if(is_array($line) && isset($line['mmsi'])) {
-	    //print_r($line);
-  	    if (isset($line['mmsi'])) {
+		//print_r($line);
+  		if (isset($line['mmsi'])) {
 
 		/*
 		// Increment message number
@@ -121,64 +121,64 @@ 
 		
 		$Common = new Common();
 		$AIS = new AIS();
-	        if (!isset($line['id'])) $id = trim($line['mmsi']);
-	        else $id = trim($line['id']);
+			if (!isset($line['id'])) $id = trim($line['mmsi']);
+			else $id = trim($line['id']);
 		
 		if (!isset($this->all_tracked[$id])) {
-		    $this->all_tracked[$id] = array();
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => ''));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
-		    if (!isset($line['id'])) {
+			$this->all_tracked[$id] = array();
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => ''));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
+			if (!isset($line['id'])) {
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
+			 } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
+			if ($globalAllTracked !== FALSE) $dataFound = true;
 		}
 		
 		if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
-		    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
+			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 			$Marine = new Marine($this->db);
 			$identity = $Marine->getIdentity($line['mmsi']);
 			if (!empty($identity)) {
-			    $this->all_tracked[$id]['ident'] = $identity['ship_name'];
-			    $this->all_tracked[$id]['type'] = $identity['type'];
+				$this->all_tracked[$id]['ident'] = $identity['ship_name'];
+				$this->all_tracked[$id]['type'] = $identity['type'];
 			}
 			//print_r($identity);
 			unset($Marine);
 			//$dataFound = true;
-		    }
+			}
 		}
 		if (isset($line['type_id']) && $line['type_id'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id'])));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id'])));
 		}
 		if (isset($line['type']) && $line['type'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
 		}
 		if (isset($line['mmsi_type']) && $line['mmsi_type'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type']));
 		}
 		if (isset($line['imo']) && $line['imo'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo']));
 		}
 		if (isset($line['callsign']) && $line['callsign'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign']));
 		}
 		if (isset($line['arrival_code']) && $line['arrival_code'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code']));
 		}
 		if (isset($line['arrival_date']) && $line['arrival_date'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
 		}
 
 
 		//if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) {
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
-		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
+			if ($this->all_tracked[$id]['addedMarine'] == 1) {
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				$timeelapsed = microtime(true);
 				$Marine = new Marine($this->db);
 				$fromsource = NULL;
@@ -186,20 +186,20 @@ 
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 				$Marine->db = null;
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-			    }
+				}
 			}
-		    }
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
+			}
+			if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
 		}
 
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
-		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
+			if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
-		    } else {
+			} else {
 				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n";
 				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n";
 				return '';
-		    }
+			}
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
 			return '';
@@ -216,24 +216,24 @@ 
 
 
 		if (isset($line['speed']) && $line['speed'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
 		} else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
-		    if ($distance > 1000 && $distance < 10000) {
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
+			if ($distance > 1000 && $distance < 10000) {
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
 			$speed = $speed*3.6;
 			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
-		    }
+			}
 		}
 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
-	    	    else unset($timediff);
-	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
+				if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
+				else unset($timediff);
+				if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
-			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
+				if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_tracked[$id]['putinarchive'] = true;
@@ -241,126 +241,126 @@ 
 				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    $Marine = new Marine($this->db);
-				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
-				    if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
-				    $Marine->db = null;
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$Marine = new Marine($this->db);
+					$all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
+					if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
+					$Marine->db = null;
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				}
 				$this->tmd = 0;
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
-			    }
+				}
 			}
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
-				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
-				    $dataFound = true;
-				    $this->all_tracked[$id]['time_last_coord'] = time();
+					$this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
+					$dataFound = true;
+					$this->all_tracked[$id]['time_last_coord'] = time();
 				}
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
-				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
-				    $dataFound = true;
-				    $this->all_tracked[$id]['time_last_coord'] = time();
+					$this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
+					$dataFound = true;
+					$this->all_tracked[$id]['time_last_coord'] = time();
 				}
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
 			}
 
-		    } else if ($globalDebug && $timediff > 20) {
+			} else if ($globalDebug && $timediff > 20) {
 			$this->tmd = $this->tmd + 1;
 			echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -";
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
-		    }
+			}
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
+			if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
 		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
 		}
 		if (isset($line['status']) && $line['status'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status']));
 		}
 		if (isset($line['status_id']) && $line['status_id'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id']));
 		}
 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
-		    //$dataFound = true;
+			if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
+			//$dataFound = true;
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
-  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+  			$heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
+			if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
   		}
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
 
 
 
 		if ($dataFound === true && isset($this->all_tracked[$id]['mmsi'])) {
-		    $this->all_tracked[$id]['lastupdate'] = time();
-		    if ($this->all_tracked[$id]['addedMarine'] == 0) {
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
+			$this->all_tracked[$id]['lastupdate'] = time();
+			if ($this->all_tracked[$id]['addedMarine'] == 0) {
+				if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+				if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
-				    $timeelapsed = microtime(true);
-				    $MarineLive = new MarineLive($this->db);
-				    if (isset($line['id'])) {
+					if ($globalDebug) echo "Check if aircraft is already in DB...";
+					$timeelapsed = microtime(true);
+					$MarineLive = new MarineLive($this->db);
+					if (isset($line['id'])) {
 					$recent_ident = $MarineLive->checkIdRecent($line['id']);
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
+					} elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
 					$recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']);
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
+					} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
 					$recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']);
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } else $recent_ident = '';
-				    $MarineLive->db=null;
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
+					} else $recent_ident = '';
+					$MarineLive->db=null;
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
 				} else $recent_ident = '';
-			    } else {
+				} else {
 				$recent_ident = '';
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
-			    }
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
-			    if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
-			    {
+				}
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
+				if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
+				{
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
 				//adds the spotter data for the archive
-				    $highlight = '';
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
-				    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
+					$highlight = '';
+					if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
+					if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-					    $timeelapsed = microtime(true);
-					    $Marine = new Marine($this->db);
-					    $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
-					    $Marine->db = null;
-					    if ($globalDebug && isset($result)) echo $result."\n";
-					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+						$timeelapsed = microtime(true);
+						$Marine = new Marine($this->db);
+						$result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
+						$Marine->db = null;
+						if ($globalDebug && isset($result)) echo $result."\n";
+						if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 					}
-				    }
-				    /*
+					}
+					/*
 				    // Add source stat in DB
 				    $Stats = new Stats($this->db);
 				    if (!empty($this->stats)) {
@@ -387,56 +387,56 @@ 
 				    }
 				    $Stats->db = null;
 				    */
-				    $this->del();
+					$this->del();
 				//$ignoreImport = false;
 				$this->all_tracked[$id]['addedMarine'] = 1;
 				//print_r($this->all_tracked[$id]);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
-				    //MarineLive->deleteLiveMarineDataNotUpdated();
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+					if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
+					//MarineLive->deleteLiveMarineDataNotUpdated();
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$MarineLive = new MarineLive($this->db);
 					$MarineLive->deleteLiveMarineData();
 					$MarineLive->db=null;
 					if ($globalDebug) echo " Done\n";
-				    }
-				    $this->last_delete = time();
+					}
+					$this->last_delete = time();
 				}
-			    } elseif ($recent_ident != '') {
+				} elseif ($recent_ident != '') {
 				$this->all_tracked[$id]['id'] = $recent_ident;
 				$this->all_tracked[$id]['addedMarine'] = 1;
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    if (isset($globalDaemon) && !$globalDaemon) {
+					if (isset($globalDaemon) && !$globalDaemon) {
 					$Marine = new Marine($this->db);
 					$Marine->updateLatestMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']);
 					$Marine->db = null;
-				    }
+					}
 				}
 				
-			    }
+				}
 			}
-		    }
-		    //adds the spotter LIVE data
-		    if ($globalDebug) {
+			}
+			//adds the spotter LIVE data
+			if ($globalDebug) {
 			echo 'DATA : ident : '.$this->all_tracked[$id]['ident'].' - type : '.$this->all_tracked[$id]['type'].' - Latitude : '.$this->all_tracked[$id]['latitude'].' - Longitude : '.$this->all_tracked[$id]['longitude'].' - Heading : '.$this->all_tracked[$id]['heading'].' - Speed : '.$this->all_tracked[$id]['speed']."\n";
-		    }
-		    $ignoreImport = false;
+			}
+			$ignoreImport = false;
 
-		    if (!$ignoreImport) {
+			if (!$ignoreImport) {
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
 				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$timeelapsed = microtime(true);
 					$MarineLive = new MarineLive($this->db);
 					$result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
 					$MarineLive->db = null;
 					if ($globalDebug) echo $result."\n";
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    }
+					}
 				}
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) {
-				    $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
+					$APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
 				}
 				$this->all_tracked[$id]['putinarchive'] = false;
 
@@ -501,24 +501,24 @@ 
 			
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour...";
 				$MarineLive = new MarineLive($this->db);
 				$MarineLive->deleteLiveMarineDataNotUpdated();
 				$MarineLive->db = null;
 				//MarineLive->deleteLiveMarineData();
 				if ($globalDebug) echo " Done\n";
-			    }
-			    $this->last_delete_hourly = time();
+				}
+				$this->last_delete_hourly = time();
 			}
 			
-		    }
-		    //$ignoreImport = false;
+			}
+			//$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
 		if ($send) return $this->all_tracked[$id];
-	    }
+		}
+	}
 	}
-    }
 }
 ?>

require/class.Marine.php

Indentation +196 added lines, -196 removed lines

@@ -11,10 +11,10 @@ 
 	}
 
 	/**
-	* Get SQL query part for filter used
-	* @param Array $filter the filter
-	* @return Array the SQL part
-	*/
+	 * Get SQL query part for filter used
+	 * @param Array $filter the filter
+	 * @return Array the SQL part
+	 */
 	
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
@@ -78,14 +78,14 @@ 
 	}
 
 	/**
-	* Executes the SQL statements to get the spotter information
-	*
-	* @param String $query the SQL query
-	* @param Array $params parameter of the query
-	* @param String $limitQuery the limit query
-	* @return Array the spotter information
-	*
-	*/
+	 * Executes the SQL statements to get the spotter information
+	 *
+	 * @param String $query the SQL query
+	 * @param Array $params parameter of the query
+	 * @param String $limitQuery the limit query
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
 	{
 		date_default_timezone_set('UTC');
@@ -213,11 +213,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the latest data entry
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestMarineData($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -275,11 +275,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMarineDataByIdent($ident = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -390,12 +390,12 @@ 
 
 
 	/**
-	* Gets all source name
-	*
-	* @param String type format of source
-	* @return Array list of source name
-	*
-	*/
+	 * Gets all source name
+	 *
+	 * @param String type format of source
+	 * @return Array list of source name
+	 *
+	 */
 	public function getAllSourceName($type = '',$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -425,11 +425,11 @@ 
 
 
 	/**
-	* Gets a list of all idents/callsigns
-	*
-	* @return Array list of ident/callsign names
-	*
-	*/
+	 * Gets a list of all idents/callsigns
+	 *
+	 * @return Array list of ident/callsign names
+	 *
+	 */
 	public function getAllIdents($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -453,11 +453,11 @@ 
 	}
 
 	/**
-	* Gets all info from a mmsi
-	*
-	* @return Array list of mmsi info
-	*
-	*/
+	 * Gets all info from a mmsi
+	 *
+	 * @return Array list of mmsi info
+	 *
+	 */
 	public function getIdentity($mmsi)
 	{
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
@@ -514,18 +514,18 @@ 
 	
 	
 	/**
-	* Update ident tracker data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $ident the marine ident
-	* @return String success or false
-	*
-	*/	
+	 * Update ident tracker data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $ident the marine ident
+	 * @return String success or false
+	 *
+	 */	
 	public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL)
 	{
 
 		$query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id';
-                $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident);
+				$query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -538,17 +538,17 @@ 
 
 	}
 	/**
-	* Update latest marine data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $ident the marine ident
-	* @return String success or false
-	*
-	*/	
+	 * Update latest marine data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $ident the marine ident
+	 * @return String success or false
+	 *
+	 */	
 	public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '')
 	{
 		$query = 'UPDATE marine_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE fammarine_id = :fammarine_id';
-                $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
+				$query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -562,30 +562,30 @@ 
 	}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $ident the marine ident
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @param String $latitude latitude of flight
-	* @param String $longitude latitude of flight
-	* @param String $waypoints waypoints of flight
-	* @param String $heading heading of flight
-	* @param String $groundspeed speed of flight
-	* @param String $date date of flight
-	* @param String $departure_airport_time departure time of flight
-	* @param String $arrival_airport_time arrival time of flight
-	* @param String $squawk squawk code of flight
-	* @param String $route_stop route stop of flight
-	* @param String $highlight highlight or not
-	* @param String $ModeS ModesS code of flight
-	* @param String $registration registration code of flight
-	* @param String $pilot_id pilot id of flight (for virtual airlines)
-	* @param String $pilot_name pilot name of flight (for virtual airlines)
-	* @param String $verticalrate vertival rate of flight
-	* @return String success or false
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $ident the marine ident
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @param String $latitude latitude of flight
+	 * @param String $longitude latitude of flight
+	 * @param String $waypoints waypoints of flight
+	 * @param String $heading heading of flight
+	 * @param String $groundspeed speed of flight
+	 * @param String $date date of flight
+	 * @param String $departure_airport_time departure time of flight
+	 * @param String $arrival_airport_time arrival time of flight
+	 * @param String $squawk squawk code of flight
+	 * @param String $route_stop route stop of flight
+	 * @param String $highlight highlight or not
+	 * @param String $ModeS ModesS code of flight
+	 * @param String $registration registration code of flight
+	 * @param String $pilot_id pilot id of flight (for virtual airlines)
+	 * @param String $pilot_name pilot name of flight (for virtual airlines)
+	 * @param String $verticalrate vertival rate of flight
+	 * @return String success or false
+	 */
 	public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$typeid = '',$imo = '',$callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$format_source = '', $source_name = '')
 	{
 		global $globalURL, $globalMarineImageFetch;
@@ -682,13 +682,13 @@ 
 			unset($Image);
 		}
 		
-                if ($latitude == '' && $longitude == '') {
-            		$latitude = 0;
-            		$longitude = 0;
-            	}
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
-                if ($arrival_date == '') $arrival_date = NULL;
+				if ($latitude == '' && $longitude == '') {
+					$latitude = 0;
+					$longitude = 0;
+				}
+				if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
+				if ($arrival_date == '') $arrival_date = NULL;
 		$query  = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date) 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)";
 
@@ -699,7 +699,7 @@ 
 			$sth->execute($query_values);
 			$this->db = null;
 		} catch (PDOException $e) {
-		    return "error : ".$e->getMessage();
+			return "error : ".$e->getMessage();
 		}
 		
 		return "success";
@@ -708,11 +708,11 @@ 
 	
   
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -728,11 +728,11 @@ 
 								AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND marine_output.date < now() AT TIME ZONE 'UTC'";
 			$query_data = array(':ident' => $ident);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
+			$ident_result='';
 		while($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
@@ -743,11 +743,11 @@ 
 	
 	
 	/**
-	* Gets the aircraft data from the last 20 seconds
-	*
-	* @return Array the spotter data
-	*
-	*/
+	 * Gets the aircraft data from the last 20 seconds
+	 *
+	 * @return Array the spotter data
+	 *
+	 */
 	public function getRealTimeData($q = '')
 	{
 		global $globalDBdriver;
@@ -785,11 +785,11 @@ 
 	
 
 	/**
-	* Gets all number of flight over countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 /*
 	public function countAllTrackedOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
@@ -840,11 +840,11 @@ 
 	
 	
 	/**
-	* Gets all callsigns that have flown over
-	*
-	* @return Array the callsign list
-	*
-	*/
+	 * Gets all callsigns that have flown over
+	 *
+	 * @return Array the callsign list
+	 *
+	 */
 	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -911,11 +911,11 @@ 
 
 
 	/**
-	* Counts all dates
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDates($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -961,11 +961,11 @@ 
 	
 	
 	/**
-	* Counts all dates during the last 7 days
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last 7 days
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLast7Days($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -987,7 +987,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1007,11 +1007,11 @@ 
 	}
 
 	/**
-	* Counts all dates during the last month
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last month
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLastMonth($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1033,7 +1033,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1055,11 +1055,11 @@ 
 
 
 	/**
-	* Counts all month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonths($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1104,11 +1104,11 @@ 
 	
 
 	/**
-	* Counts all dates during the last year
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last year
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllMonthsLastYear($filters)
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1130,7 +1130,7 @@ 
 			$query .= " GROUP BY year_name, month_name
 								ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1153,11 +1153,11 @@ 
 	
 	
 	/**
-	* Counts all hours
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHours($orderby,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1220,11 +1220,11 @@ 
 	
 	
 	/**
-	* Counts all hours by date
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by date
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1268,11 +1268,11 @@ 
 	
 	
 	/**
-	* Counts all hours by a ident/callsign
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by a ident/callsign
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1317,11 +1317,11 @@ 
 	
 	
 	/**
-	* Counts all flights that have flown over
-	*
-	* @return Integer the number of flights
-	*
-	*/
+	 * Counts all flights that have flown over
+	 *
+	 * @return Integer the number of flights
+	 *
+	 */
 	public function countOverallTracked($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -1356,11 +1356,11 @@ 
 	
   
 	/**
-	* Counts all hours of today
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours of today
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1400,12 +1400,12 @@ 
 	}
     
     
-     /**
-	* Gets the Barrie Spotter ID based on the FlightAware ID
-	*
-	* @return Integer the Barrie Spotter ID
+	 /**
+	  * Gets the Barrie Spotter ID based on the FlightAware ID
+	  *
+	  * @return Integer the Barrie Spotter ID
 q	*
-	*/
+	  */
 	public function getMarineIDBasedOnFamMarineID($fammarine_id)
 	{
 		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
@@ -1426,13 +1426,13 @@ 
   
  
 	/**
-	* Parses a date string
-	*
-	* @param String $dateString the date string
-	* @param String $timezone the timezone of a user
-	* @return Array the time information
-	*
-	*/
+	 * Parses a date string
+	 *
+	 * @param String $dateString the date string
+	 * @param String $timezone the timezone of a user
+	 * @return Array the time information
+	 *
+	 */
 	public function parseDateString($dateString, $timezone = '')
 	{
 		$time_array = array();
@@ -1465,12 +1465,12 @@ 
 	}
 	
 	/**
-	* Parses the direction degrees to working
-	*
-	* @param Float $direction the direction in degrees
-	* @return Array the direction information
-	*
-	*/
+	 * Parses the direction degrees to working
+	 *
+	 * @param Float $direction the direction in degrees
+	 * @return Array the direction information
+	 *
+	 */
 	public function parseDirection($direction = 0)
 	{
 		if ($direction == '') $direction = 0;
@@ -1549,12 +1549,12 @@ 
 	
 	
 	/**
-	* Gets Country from latitude/longitude
-	*
-	* @param Float $latitude latitute of the flight
-	* @param Float $longitude longitute of the flight
-	* @return String the countrie
-	*/
+	 * Gets Country from latitude/longitude
+	 *
+	 * @param Float $latitude latitute of the flight
+	 * @param Float $longitude longitute of the flight
+	 * @return String the countrie
+	 */
 	public function getCountryFromLatitudeLongitude($latitude,$longitude)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -1591,11 +1591,11 @@ 
 	}
 
 	/**
-	* Gets Country from iso2
-	*
-	* @param String $iso2 ISO2 country code
-	* @return String the countrie
-	*/
+	 * Gets Country from iso2
+	 *
+	 * @param String $iso2 ISO2 country code
+	 * @return String the countrie
+	 */
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -1624,12 +1624,12 @@ 
 
 	
 	/**
-	* Gets the short url from bit.ly
-	*
-	* @param String $url the full url
-	* @return String the bit.ly url
-	*
-	*/
+	 * Gets the short url from bit.ly
+	 *
+	 * @param String $url the full url
+	 * @return String the bit.ly url
+	 *
+	 */
 	public function getBitlyURL($url)
 	{
 		global $globalBitlyAccessToken;

require/class.SpotterImport.php

Indentation +402 added lines, -402 removed lines

@@ -8,20 +8,20 @@ 
 require_once(dirname(__FILE__).'/class.Stats.php');
 require_once(dirname(__FILE__).'/class.Source.php');
 if (isset($globalServerAPRS) && $globalServerAPRS) {
-    require_once(dirname(__FILE__).'/class.APRS.php');
+	require_once(dirname(__FILE__).'/class.APRS.php');
 }
 
 class SpotterImport {
-    private $all_flights = array();
-    private $last_delete_hourly = 0;
-    private $last_delete = 0;
-    private $stats = array();
-    private $tmd = 0;
-    private $source_location = array();
-    public $db = null;
-    public $nb = 0;
-
-    public function __construct($dbc = null) {
+	private $all_flights = array();
+	private $last_delete_hourly = 0;
+	private $last_delete = 0;
+	private $stats = array();
+	private $tmd = 0;
+	private $source_location = array();
+	public $db = null;
+	public $nb = 0;
+
+	public function __construct($dbc = null) {
 	global $globalBeta, $globalServerAPRS, $APRSSpotter, $globalNoDB;
 	if (!(isset($globalNoDB) && $globalNoDB)) {
 		$Connection = new Connection($dbc);
@@ -33,14 +33,14 @@ 
 		$currentdate = date('Y-m-d');
 		$sourcestat = $Stats->getStatsSource($currentdate);
 		if (!empty($sourcestat)) {
-		    foreach($sourcestat as $srcst) {
-		    	$type = $srcst['stats_type'];
+			foreach($sourcestat as $srcst) {
+				$type = $srcst['stats_type'];
 			if ($type == 'polar' || $type == 'hist') {
-			    $source = $srcst['source_name'];
-			    $data = $srcst['source_data'];
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
-	    		}
-		    }
+				$source = $srcst['source_name'];
+				$data = $srcst['source_data'];
+				$this->stats[$currentdate][$source][$type] = json_decode($data,true);
+				}
+			}
 		}
 	}
 	if (isset($globalServerAPRS) && $globalServerAPRS) {
@@ -48,9 +48,9 @@ 
 		//$APRSSpotter->connect();
 	}
 
-    }
+	}
 
-    public function get_Schedule($id,$ident) {
+	public function get_Schedule($id,$ident) {
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
 	// Get schedule here, so it's done only one time
 	
@@ -70,42 +70,42 @@ 
 	$operator = $Spotter->getOperator($ident);
 	$scheduleexist = false;
 	if ($Schedule->checkSchedule($operator) == 0) {
-	    $operator = $Translation->checkTranslation($ident);
-	    if ($Schedule->checkSchedule($operator) == 0) {
+		$operator = $Translation->checkTranslation($ident);
+		if ($Schedule->checkSchedule($operator) == 0) {
 		$schedule = $Schedule->fetchSchedule($operator);
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
-		    // Should also check if route schedule = route from DB
-		    if ($schedule['DepartureAirportIATA'] != '') {
+			if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
+			// Should also check if route schedule = route from DB
+			if ($schedule['DepartureAirportIATA'] != '') {
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
-			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
-			    if (trim($airport_icao) != '') {
+				$airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
+				if (trim($airport_icao) != '') {
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
 				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
-			    }
+				}
+			}
 			}
-		    }
-		    if ($schedule['ArrivalAirportIATA'] != '') {
+			if ($schedule['ArrivalAirportIATA'] != '') {
 			if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) {
-			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
-			    if (trim($airport_icao) != '') {
+				$airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
+				if (trim($airport_icao) != '') {
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
 				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
-			    }
+				}
 			}
-		    }
-		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
+			}
+			$Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
 		}
-	    } else $scheduleexist = true;
+		} else $scheduleexist = true;
 	} else $scheduleexist = true;
 	// close connection, at least one way will work ?
-       if ($scheduleexist) {
+	   if ($scheduleexist) {
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
-    		$sch = $Schedule->getSchedule($operator);
+			$sch = $Schedule->getSchedule($operator);
 		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time']));
-       }
+	   }
 	$Spotter->db = null;
 	$Schedule->db = null;
 	$Translation->db = null;
@@ -120,96 +120,96 @@ 
 	}
 	  */
 	}
-    }
+	}
 
-    public function checkAll() {
+	public function checkAll() {
 	global $globalDebug, $globalNoImport;
 	if ($globalDebug) echo "Update last seen flights data...\n";
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
-	    foreach ($this->all_flights as $key => $flight) {
+		foreach ($this->all_flights as $key => $flight) {
 		if (isset($this->all_flights[$key]['id'])) {
-		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
-    		    $Spotter = new Spotter($this->db);
-        	    $real_arrival = $this->arrival($key);
-        	    if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
-        	}
-	    }
+			//echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
+				$Spotter = new Spotter($this->db);
+				$real_arrival = $this->arrival($key);
+				if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
+			}
+		}
+	}
 	}
-    }
 
-    public function arrival($key) {
+	public function arrival($key) {
 	global $globalClosestMinDist, $globalDebug;
 	if ($globalDebug) echo 'Update arrival...'."\n";
 	$Spotter = new Spotter($this->db);
-        $airport_icao = '';
-        $airport_time = '';
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
+		$airport_icao = '';
+		$airport_time = '';
+		if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
-    	    if (isset($closestAirports[0])) {
-        	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
-        	    $airport_icao = $closestAirports[0]['icao'];
-        	    $airport_time = $this->all_flights[$key]['datetime'];
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
-        	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
-        	    foreach ($closestAirports as $airport) {
-        		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
-        		    $airport_icao = $airport['icao'];
-        		    $airport_time = $this->all_flights[$key]['datetime'];
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
-        		    break;
-        		}
-        	    }
-        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
-        		$airport_icao = $closestAirports[0]['icao'];
-        		$airport_time = $this->all_flights[$key]['datetime'];
-        	} else {
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
-        	}
-    	    } else {
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
-    	    }
-
-        } else {
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
-        }
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
-    }
-
-
-
-    public function del() {
+		$closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
+			if (isset($closestAirports[0])) {
+			if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
+				$airport_icao = $closestAirports[0]['icao'];
+				$airport_time = $this->all_flights[$key]['datetime'];
+				if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+			} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
+				foreach ($closestAirports as $airport) {
+				if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
+					$airport_icao = $airport['icao'];
+					$airport_time = $this->all_flights[$key]['datetime'];
+					if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+					break;
+				}
+				}
+			} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
+				$airport_icao = $closestAirports[0]['icao'];
+				$airport_time = $this->all_flights[$key]['datetime'];
+			} else {
+				if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
+			}
+			} else {
+				if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
+			}
+
+		} else {
+			if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
+		}
+		return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
+	}
+
+
+
+	public function del() {
 	global $globalDebug, $globalNoImport, $globalNoDB;
 	// Delete old infos
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
 	foreach ($this->all_flights as $key => $flight) {
-    	    if (isset($flight['lastupdate'])) {
-        	if ($flight['lastupdate'] < (time()-3000)) {
-            	    if (isset($this->all_flights[$key]['id'])) {
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
+			if (isset($flight['lastupdate'])) {
+			if ($flight['lastupdate'] < (time()-3000)) {
+					if (isset($this->all_flights[$key]['id'])) {
+					if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
 			/*
 			$SpotterLive = new SpotterLive();
             		$SpotterLive->deleteLiveSpotterDataById($this->all_flights[$key]['id']);
 			$SpotterLive->db = null;
 			*/
 			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
-            		    $real_arrival = $this->arrival($key);
-            		    $Spotter = new Spotter($this->db);
-            	    	    if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
+						$real_arrival = $this->arrival($key);
+						$Spotter = new Spotter($this->db);
+							if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
 				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
-			    }
+				}
 			// Put in archive
 //				$Spotter->db = null;
 			}
-            	    }
-            	    unset($this->all_flights[$key]);
-    	        }
-	    }
-        }
-    }
+					}
+					unset($this->all_flights[$key]);
+				}
+		}
+		}
+	}
 
-    public function add($line) {
+	public function add($line) {
 	global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA;
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
@@ -234,18 +234,18 @@ 
 	
 	// SBS format is CSV format
 	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
-	    //print_r($line);
-  	    if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
+		//print_r($line);
+  		if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
 
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
-		    $current_date = date('Y-m-d');
-		    $source = $line['source_name'];
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+			$current_date = date('Y-m-d');
+			$source = $line['source_name'];
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
+				$this->stats[$current_date][$source]['msg']['date'] = time();
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
 		}
 		
 		/*
@@ -261,49 +261,49 @@ 
 		//$this->db = $dbc;
 
 		//$hex = trim($line['hex']);
-	        if (!isset($line['id'])) $id = trim($line['hex']);
-	        else $id = trim($line['id']);
+			if (!isset($line['id'])) $id = trim($line['hex']);
+			else $id = trim($line['id']);
 		
 		if (!isset($this->all_flights[$id])) {
-		    $this->all_flights[$id] = array();
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
-		    if (!isset($line['id'])) {
+			$this->all_flights[$id] = array();
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
+			if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
+			if (!isset($line['id'])) {
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
 //			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
 //			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
 			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
-		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
+				//else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+			 } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+			if ($globalAllFlights !== FALSE) $dataFound = true;
 		}
 		if (isset($line['source_type']) && $line['source_type'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
 		}
 		
 		//print_r($this->all_flights);
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
-		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
+			//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
-		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
-		    if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') {
+			//} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
+			if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') {
 			$timeelapsed = microtime(true);
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-			    $Spotter = new Spotter($this->db);
-			    if (isset($this->all_flights[$id]['source_type'])) {
+				$Spotter = new Spotter($this->db);
+				if (isset($this->all_flights[$id]['source_type'])) {
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
-			    } else {
+				} else {
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
-			    }
-			    $Spotter->db = null;
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+				}
+				$Spotter->db = null;
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
 			}
-		    }
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
+			}
+			if ($globalAllFlights !== FALSE) $dataFound = true;
+			if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
 		}
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
 			$icao = $line['aircraft_icao'];
@@ -333,9 +333,9 @@ 
 		}
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
-		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
+			if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
-		    } else {
+			} else {
 				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
 				elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
 				/*
@@ -344,7 +344,7 @@ 
 				print_r($line);
 				*/
 				return '';
-		    }
+			}
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
 			return '';
@@ -360,36 +360,36 @@ 
 		}
 
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
 		}
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
 		}
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
 		}
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
 		}
  
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
-		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
+			if ($this->all_flights[$id]['addedSpotter'] == 1) {
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-			    $timeelapsed = microtime(true);
-            		    $Spotter = new Spotter($this->db);
-            		    $fromsource = NULL;
-            		    if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
-            		    elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
-			    elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
-			    elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
-			    elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
-            		    $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
-			    if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
-			    $Spotter->db = null;
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-			}
-		    }
+				$timeelapsed = microtime(true);
+						$Spotter = new Spotter($this->db);
+						$fromsource = NULL;
+						if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
+						elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
+				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
+				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
+				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
+						$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
+				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				$Spotter->db = null;
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			}
+			}
 
 /*
 		    if (!isset($line['id'])) {
@@ -399,104 +399,104 @@ 
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
   */
-		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+			if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 
-		    //$putinarchive = true;
-		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
+			//$putinarchive = true;
+			if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
-		    }
-		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
+			}
+			if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
-		    }
-		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
-		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
+			}
+			if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
+			} elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
 			$timeelapsed = microtime(true);
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				$Spotter = new Spotter($this->db);
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-                        }
-		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
+						}
+			} elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
 			$timeelapsed = microtime(true);
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-			    $Spotter = new Spotter($this->db);
-			    $route = $Spotter->getRouteInfo(trim($line['ident']));
-			    if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
+				$Spotter = new Spotter($this->db);
+				$route = $Spotter->getRouteInfo(trim($line['ident']));
+				if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
 				$Translation = new Translation($this->db);
 				$ident = $Translation->checkTranslation(trim($line['ident']));
 				$route = $Spotter->getRouteInfo($ident);
 				$Translation->db = null;
-			    }
-			    $Spotter->db = null;
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-                    	}
+				}
+				$Spotter->db = null;
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+						}
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
-			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
-			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
+				//if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
+				if ($route['fromairport_icao'] != $route['toairport_icao']) {
 				//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop']));
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
-		    	    }
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
+					}
 			}
 			if (!isset($globalFork)) $globalFork = TRUE;
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
 				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
 			}
-		    }
+			}
 		}
 
 		if (isset($line['speed']) && $line['speed'] != '') {
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
-		    //$dataFound = true;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
+			//$dataFound = true;
 		} else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
-		    if ($distance > 1000 && $distance < 10000) {
-		    // use datetime
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
+			if ($distance > 1000 && $distance < 10000) {
+			// use datetime
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
 			$speed = $speed*3.6;
 			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
-		    }
+			}
 		}
 
 
 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
-	    	    else unset($timediff);
-	    	    if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
+				if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
+				else unset($timediff);
+				if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
 			if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) {
-			    if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
+				if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_flights[$id]['putinarchive'] = true;
 				$this->tmd = 0;
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
-				    $timeelapsed = microtime(true);
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+					if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+					$timeelapsed = microtime(true);
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$Spotter = new Spotter($this->db);
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
 					$Spotter->db = null;
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
-				    }
+					}
+				}
 				}
-			    }
 			}
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
-			    //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
+				//if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
 				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
-				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
-				    $dataFound = true;
-				    $this->all_flights[$id]['time_last_coord'] = time();
+					$this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
+					$dataFound = true;
+					$this->all_flights[$id]['time_last_coord'] = time();
 				}
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
@@ -507,20 +507,20 @@ 
 				    //$putinarchive = true;
 				}
 				*/
-			    /*
+				/*
 			    } elseif (isset($this->all_flights[$id]['latitude'])) {
 				if ($globalDebug) echo '!!! Strange latitude value - diff : '.abs($this->all_flights[$id]['latitude']-$line['latitude']).'- previous lat : '.$this->all_flights[$id]['latitude'].'- new lat : '.$line['latitude']."\n";
 			    }
 			    */
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
-			    //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+				//if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
 				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
-				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
-				    $dataFound = true;
-				    $this->all_flights[$id]['time_last_coord'] = time();
+					$this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
+					$dataFound = true;
+					$this->all_flights[$id]['time_last_coord'] = time();
 				}
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
@@ -538,95 +538,95 @@ 
 			    */
 			}
 
-		    } else if ($globalDebug && $timediff > 30) {
+			} else if ($globalDebug && $timediff > 30) {
 			$this->tmd = $this->tmd + 1;
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
-		    }
+			}
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
+			if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
 		}
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
-		    //$dataFound = true;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
+			//$dataFound = true;
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
 		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
 		}
 		if (isset($line['emergency']) && $line['emergency'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
-		    //$dataFound = true;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
+			//$dataFound = true;
 		}
 		if (isset($line['ground']) && $line['ground'] != '') {
-		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
+			if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
 			// Here we force archive of flight because after ground it's a new one (or should be)
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
 			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
 			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
-		    }
-		    if ($line['ground'] != 1) $line['ground'] = 0;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
-		    //$dataFound = true;
+			}
+			if ($line['ground'] != 1) $line['ground'] = 0;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
+			//$dataFound = true;
 		}
 		if (isset($line['squawk']) && $line['squawk'] != '') {
-		    if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
-			    $highlight = '';
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
-			    if ($highlight != '') {
+			if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
+				if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+				$highlight = '';
+				if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
+				if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
+				if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
+				if ($highlight != '') {
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    $Spotter = new Spotter($this->db);
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
-				    $Spotter->db = null;
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$Spotter = new Spotter($this->db);
+					$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
+					$Spotter->db = null;
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				}
 				//$putinarchive = true;
 				//$highlight = '';
-			    }
+				}
 			    
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
-		    //$dataFound = true;
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+			//$dataFound = true;
 		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
-		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
+			//if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
 			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true;
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
   		}
 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
-		    //$dataFound = true;
+			if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
+			//$dataFound = true;
   		} elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) {
-  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
+  			$heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
+			if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
-  		    // If not enough messages and ACARS set heading to 0
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
+  			// If not enough messages and ACARS set heading to 0
+  			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
   		}
 		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
 		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
@@ -637,125 +637,125 @@ 
 		//if ($dataFound == true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['ident'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
 		if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
-		    $this->all_flights[$id]['lastupdate'] = time();
-		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-			    //print_r($this->all_flights);
-			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
-			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
-			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
+			$this->all_flights[$id]['lastupdate'] = time();
+			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
+				if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+				//print_r($this->all_flights);
+				//echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
+				//$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
+				if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
-				    $timeelapsed = microtime(true);
-				    $SpotterLive = new SpotterLive($this->db);
-				    if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
+					if ($globalDebug) echo "Check if aircraft is already in DB...";
+					$timeelapsed = microtime(true);
+					$SpotterLive = new SpotterLive($this->db);
+					if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } elseif (isset($line['id'])) {
+					} elseif (isset($line['id'])) {
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
+					} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } else $recent_ident = '';
-				    $SpotterLive->db=null;
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
+					} else $recent_ident = '';
+					$SpotterLive->db=null;
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
 				} else $recent_ident = '';
-			    } else {
+				} else {
 				$recent_ident = '';
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
-			    }
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
-			    if($recent_ident == "")
-			    {
+				}
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
+				if($recent_ident == "")
+				{
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
 				//adds the spotter data for the archive
 				$ignoreImport = false;
 				foreach($globalAirportIgnore as $airportIgnore) {
-				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
+					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 					$ignoreImport = true;
-				    }
+					}
 				}
 				if (count($globalAirportAccept) > 0) {
-				    $ignoreImport = true;
-				    foreach($globalAirportIgnore as $airportIgnore) {
+					$ignoreImport = true;
+					foreach($globalAirportIgnore as $airportIgnore) {
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
-					    $ignoreImport = false;
+						$ignoreImport = false;
+					}
 					}
-				    }
 				}
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
+					foreach($globalAirlineIgnore as $airlineIgnore) {
 					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
-					    $ignoreImport = true;
+						$ignoreImport = true;
+					}
 					}
-				    }
 				}
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
-				    $ignoreImport = true;
-				    foreach($globalAirlineAccept as $airlineAccept) {
+					$ignoreImport = true;
+					foreach($globalAirlineAccept as $airlineAccept) {
 					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
-					    $ignoreImport = false;
+						$ignoreImport = false;
+					}
 					}
-				    }
 				}
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
-				    $ignoreImport = true;
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
+					$ignoreImport = true;
+					foreach($globalPilotIdAccept as $pilotIdAccept) {
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
-					    $ignoreImport = false;
+						$ignoreImport = false;
+					}
 					}
-				    }
 				}
 				
 				if (!$ignoreImport) {
-				    $highlight = '';
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
-				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
-				    $timeelapsed = microtime(true);
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
+					$highlight = '';
+					if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
+					if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
+					if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
+					if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+					$timeelapsed = microtime(true);
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-					    $Spotter = new Spotter($this->db);
-					    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']);
-					    $Spotter->db = null;
-					    if ($globalDebug && isset($result)) echo $result."\n";
+						$Spotter = new Spotter($this->db);
+						$result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']);
+						$Spotter->db = null;
+						if ($globalDebug && isset($result)) echo $result."\n";
+					}
 					}
-				    }
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 
-				    // Add source stat in DB
-				    $Stats = new Stats($this->db);
-				    if (!empty($this->stats)) {
+					// Add source stat in DB
+					$Stats = new Stats($this->db);
+					if (!empty($this->stats)) {
 					if ($globalDebug) echo 'Add source stats : ';
-				        foreach($this->stats as $date => $data) {
-					    foreach($data as $source => $sourced) {
-					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
-				    		if (isset($sourced['msg'])) {
-				    		    if (time() - $sourced['msg']['date'] > 10) {
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
-			    			        unset($this->stats[$date][$source]['msg']);
-			    			    }
-			    			}
-			    		    }
-			    		    if ($date != date('Y-m-d')) {
-			    			unset($this->stats[$date]);
-			    		    }
-				    	}
-				    	if ($globalDebug) echo 'Done'."\n";
-
-				    }
-				    $Stats->db = null;
-				    }
-				    $this->del();
+						foreach($this->stats as $date => $data) {
+						foreach($data as $source => $sourced) {
+							//print_r($sourced);
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
+							if (isset($sourced['msg'])) {
+								if (time() - $sourced['msg']['date'] > 10) {
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
+									echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
+									unset($this->stats[$date][$source]['msg']);
+								}
+							}
+							}
+							if ($date != date('Y-m-d')) {
+							unset($this->stats[$date]);
+							}
+						}
+						if ($globalDebug) echo 'Done'."\n";
+
+					}
+					$Stats->db = null;
+					}
+					$this->del();
 				} elseif ($globalDebug) echo 'Ignore data'."\n";
 				//$ignoreImport = false;
 				$this->all_flights[$id]['addedSpotter'] = 1;
@@ -773,41 +773,41 @@ 
 			*/
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
-				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
+					if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
+					//SpotterLive->deleteLiveSpotterDataNotUpdated();
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-					    $SpotterLive = new SpotterLive($this->db);
-					    $SpotterLive->deleteLiveSpotterData();
-					    $SpotterLive->db=null;
+						$SpotterLive = new SpotterLive($this->db);
+						$SpotterLive->deleteLiveSpotterData();
+						$SpotterLive->db=null;
+					}
 					}
-				    }
-				    if ($globalDebug) echo " Done\n";
-				    $this->last_delete = time();
+					if ($globalDebug) echo " Done\n";
+					$this->last_delete = time();
 				}
-			    } else {
+				} else {
 				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa'  || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs')) {
-				    $this->all_flights[$id]['id'] = $recent_ident;
-				    $this->all_flights[$id]['addedSpotter'] = 1;
+					$this->all_flights[$id]['id'] = $recent_ident;
+					$this->all_flights[$id]['addedSpotter'] = 1;
 				}
 				if (isset($globalDaemon) && !$globalDaemon) {
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-					    $Spotter = new Spotter($this->db);
-					    $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
-					    $Spotter->db = null;
+						$Spotter = new Spotter($this->db);
+						$Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
+						$Spotter->db = null;
+					}
 					}
-				    }
 				}
 				
-			    }
+				}
+			}
 			}
-		    }
-		    //adds the spotter LIVE data
-		    //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
-		    //echo "\nAdd in Live !! \n";
-		    //echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
-		    if ($globalDebug) {
+			//adds the spotter LIVE data
+			//SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
+			//echo "\nAdd in Live !! \n";
+			//echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
+			if ($globalDebug) {
 			if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
 				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n";
 				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n";
@@ -815,60 +815,60 @@ 
 				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n";
 				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n";
 			}
-		    }
-		    $ignoreImport = false;
-		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
-		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
+			}
+			$ignoreImport = false;
+			if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
+			if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
 
-		    foreach($globalAirportIgnore as $airportIgnore) {
-		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
-			    $ignoreImport = true;
+			foreach($globalAirportIgnore as $airportIgnore) {
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
+				$ignoreImport = true;
 			}
-		    }
-		    if (count($globalAirportAccept) > 0) {
-		        $ignoreImport = true;
-		        foreach($globalAirportIgnore as $airportIgnore) {
-			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
+			}
+			if (count($globalAirportAccept) > 0) {
+				$ignoreImport = true;
+				foreach($globalAirportIgnore as $airportIgnore) {
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 				$ignoreImport = false;
-			    }
+				}
+			}
 			}
-		    }
-		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
+			if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
 			foreach($globalAirlineIgnore as $airlineIgnore) {
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
+				if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
 				$ignoreImport = true;
-			    }
+				}
 			}
-		    }
-		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
+			}
+			if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
 			$ignoreImport = true;
 			foreach($globalAirlineAccept as $airlineAccept) {
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
+				if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
 				$ignoreImport = false;
-			    }
+				}
+			}
 			}
-		    }
-		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
+			if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
 			$ignoreImport = true;
 			foreach($globalPilotIdAccept as $pilotIdAccept) {
-			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
-			        $ignoreImport = false;
-			    }
+				if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
+					$ignoreImport = false;
+				}
+			}
 			}
-		    }
 
-		    if (!$ignoreImport) {
+			if (!$ignoreImport) {
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 				if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
 					$SpotterLive = new SpotterLive($this->db);
 					$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
 					$SpotterLive->db = null;
 					if ($globalDebug) echo $result."\n";
-				    }
+					}
 				}
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
 					$APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
@@ -880,7 +880,7 @@ 
 				//if ($line['format_source'] != 'aprs') {
 				//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) {
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
+					if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
 					$source = $this->all_flights[$id]['source_name'];
 					if ($source == '') $source = $this->all_flights[$id]['format_source'];
 					if (!isset($this->source_location[$source])) {
@@ -906,7 +906,7 @@ 
 					if ($stats_heading == 16) $stats_heading = 0;
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
 					} else {
@@ -919,17 +919,17 @@ 
 					//var_dump($this->stats);
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
-						    end($this->stats[$current_date][$source]['hist']);
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
+							end($this->stats[$current_date][$source]['hist']);
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
 						} else $mini = 0;
 						for ($i=$mini;$i<=$distance;$i+=10) {
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
 					} else {
 						$this->stats[$current_date][$source]['hist'][$distance] += 1;
 					}
-				    }
+					}
 				}
 
 				$this->all_flights[$id]['lastupdate'] = time();
@@ -939,7 +939,7 @@ 
 			//$this->del();
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
-			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
+				if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
 				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
 				$SpotterLive = new SpotterLive($this->db);
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
@@ -947,19 +947,19 @@ 
 				//SpotterLive->deleteLiveSpotterData();
 				if ($globalDebug) echo " Done\n";
 				$this->last_delete_hourly = time();
-			    } else {
+				} else {
 				$this->del();
 				$this->last_delete_hourly = time();
-			    }
+				}
 			}
 			
-		    }
-		    //$ignoreImport = false;
+			}
+			//$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
 		if ($send) return $this->all_flights[$id];
-	    }
+		}
+	}
 	}
-    }
 }
 ?>