Ysurac / FlightAirMap

require/class.MarineLive.php

Indentation +201 added lines, -201 removed lines

@@ -20,10 +20,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;
 		$filters = array();
@@ -103,11 +103,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 getLiveMarineData($limit = '', $sort = '', $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -150,11 +150,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveMarineData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -184,11 +184,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data since xx seconds
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data since xx seconds
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLastLiveMarineData($coord = array(),$filter = array(), $limit = false, $id = '')
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalMap3DMarinesLimit, $globalArchive;
@@ -268,11 +268,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data since xx seconds
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data since xx seconds
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLastLiveMarineDataByID($id = '',$filter = array(), $limit = false)
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalMap3DMarinesLimit, $globalArchive;
@@ -332,11 +332,11 @@ 
 	}
 
 	/**
-	* Gets number of latest data entry
-	*
-	* @return String number of entry
-	*
-	*/
+	 * Gets number of latest data entry
+	 *
+	 * @return String number of entry
+	 *
+	 */
 	public function getLiveMarineCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -361,11 +361,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveMarineDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -389,11 +389,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveMarineDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
@@ -462,11 +462,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on a user's latitude and longitude
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on a user's latitude and longitude
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestMarineForLayar($lat, $lng, $radius, $interval)
 	{
 		$Marine = new Marine($this->db);
@@ -479,75 +479,75 @@ 
 		if ($lng != '')
 		{
 			if (!is_numeric($lng))
-                        {
-                                return false;
-                        }
-                }
-
-                if ($radius != '')
-                {
-                        if (!is_numeric($radius))
-                        {
-                                return false;
-                        }
-                }
+						{
+								return false;
+						}
+				}
+
+				if ($radius != '')
+				{
+						if (!is_numeric($radius))
+						{
+								return false;
+						}
+				}
 		$additional_query = '';
 		if ($interval != '')
-                {
-                        if (!is_string($interval))
-                        {
-                                //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
-			        return false;
-                        } else {
-                if ($interval == '1m')
-                {
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
-                } else if ($interval == '15m'){
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date ';
-                } 
-            }
-                } else {
-         $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';   
-        }
-
-                $query  = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live 
+				{
+						if (!is_string($interval))
+						{
+								//$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
+					return false;
+						} else {
+				if ($interval == '1m')
+				{
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
+				} else if ($interval == '15m'){
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date ';
+				} 
+			}
+				} else {
+		 $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';   
+		}
+
+				$query  = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live 
                    WHERE marine_live.latitude <> '' 
                                    AND marine_live.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
                                    ORDER BY distance";
 
-                $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
+				$spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
     
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveMarineDataByIdent($ident)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
 
 		$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveMarineDataByIdent($ident,$date)
 	{
 		$Marine = new Marine($this->db);
@@ -560,11 +560,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on a particular MMSI
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on a particular MMSI
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getDateLiveMarineDataByMMSI($mmsi,$date)
 	{
 		$Marine = new Marine($this->db);
@@ -576,51 +576,51 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveMarineDataById($id)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
 
 		$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveMarineDataById($id,$date)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
-                $date = date('c',$date);
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$date = date('c',$date);
 		$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
 
 		return $spotter_array;
 	}
 
 
-        /**
-	* Gets all the spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveMarineDataById($id,$liveinterval = false)
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -648,18 +648,18 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular ident
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular ident
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveMarineDataByIdent($ident)
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = self::$global_query.' WHERE marine_live.ident = :ident';
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -673,23 +673,23 @@ 
 
 
 	/**
-	* Deletes all info in the table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineData()
 	{
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "DELETE FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= marine_live.date";
 			$query  = 'DELETE FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= marine_live.date';
-            		//$query  = "DELETE FROM marine_live WHERE marine_live.id IN (SELECT marine_live.id FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= marine_live.date)";
+					//$query  = "DELETE FROM marine_live WHERE marine_live.id IN (SELECT marine_live.id FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= marine_live.date)";
 		} else {
 			$query  = "DELETE FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= marine_live.date";
 		}
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
@@ -701,18 +701,18 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineDataNotUpdated()
 	{
 		global $globalDBdriver, $globalDebug;
 		if ($globalDBdriver == 'mysql') {
 			//$query = 'SELECT fammarine_id FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= marine_live.date AND marine_live.fammarine_id NOT IN (SELECT fammarine_id FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < marine_live.date) LIMIT 800 OFFSET 0';
-    			$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
-    			try {
+				$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -720,8 +720,8 @@ 
 				return "error";
 			}
 			$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
-                        $i = 0;
-                        $j =0;
+						$i = 0;
+						$j =0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			foreach($all as $row)
 			{
@@ -729,20 +729,20 @@ 
 				$j++;
 				if ($j == 30) {
 					if ($globalDebug) echo ".";
-				    	try {
+						try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 						$sth->execute();
 					} catch(PDOException $e) {
 						return "error";
 					}
-                                	$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
-                                	$j = 0;
+									$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
+									$j = 0;
 				}
 				$query_delete .= "'".$row['fammarine_id']."',";
 			}
 			if ($i > 0) {
-    				try {
+					try {
 					
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 					$sth->execute();
@@ -753,9 +753,9 @@ 
 			return "success";
 		} elseif ($globalDBdriver == 'pgsql') {
 			//$query = "SELECT fammarine_id FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= marine_live.date AND marine_live.fammarine_id NOT IN (SELECT fammarine_id FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < marine_live.date) LIMIT 800 OFFSET 0";
-    			//$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
-    			$query = "DELETE FROM marine_live WHERE fammarine_id IN (SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
-    			try {
+				//$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
+				$query = "DELETE FROM marine_live WHERE fammarine_id IN (SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -799,17 +799,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an ident
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an ident
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM marine_live WHERE ident = :ident';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -821,17 +821,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an id
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an id
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM marine_live WHERE fammarine_id = :id';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
@@ -844,11 +844,11 @@ 
 
 
 	/**
-	* Gets the marine races
-	*
-	* @return Array all races
-	*
-	*/
+	 * Gets the marine races
+	 *
+	 * @return Array all races
+	 *
+	 */
 	public function getAllRaces()
 	{
 		$query  = 'SELECT DISTINCT marine_live.race_id, marine_live.race_name FROM marine_live ORDER BY marine_live.race_name';
@@ -858,11 +858,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;
@@ -888,14 +888,14 @@ 
 			$ident_result = $row['ident'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdentRecent($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -921,14 +921,14 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by id
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft by id
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdRecent($id)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -954,14 +954,14 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by mmsi
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft by mmsi
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkMMSIRecent($mmsi)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -987,19 +987,19 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $fammarine_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $aircraft_icao the aircraft type
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @return String success or false
-	*
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $fammarine_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $aircraft_icao the aircraft type
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @return String success or false
+	 *
+	 */
 	public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '',$captain_id = '',$captain_name = '',$race_id = '', $race_name = '', $distance = '', $race_rank = '', $race_time = '')
 	{
 		global $globalURL, $globalArchive, $globalDebug;
@@ -1081,10 +1081,10 @@ 
 		if ($statusid == '') $statusid = NULL;
 		if ($distance == '') $distance = NULL;
 
-            	//if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
-            	if ($arrival_date == '') $arrival_date = NULL;
-            	$query = '';
+				//if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
+				if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+				if ($arrival_date == '') $arrival_date = NULL;
+				$query = '';
 		if ($globalArchive) {
 			if ($globalDebug) echo '-- Delete previous data -- ';
 			$query .= 'DELETE FROM marine_live WHERE fammarine_id = :fammarine_id;';