Inspection of "Update Cesium git" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 4ca6dc...c9fe9a )

by Yannick

created 2018-02-06 14:08 UTC

Status

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

@@ -7,16 +7,16 @@  discard block
 block discarded – undo
 require_once(dirname(__FILE__).'/class.Source.php');
 
 class TrackerImport {
-    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;
 	$Connection = new Connection($dbc);
 	$this->db = $Connection->db();
@@ -38,50 +38,50 @@  discard block
 block discarded – undo
 	    }
 	}
 	*/
-    }
+	}
 
-    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";
-    		$Tracker = new Tracker($this->db);
-        	$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
-            }
+			$Tracker = new Tracker($this->db);
+			$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
+			}
+	}
 	}
-    }
 
-    public function del() {
+	public function del() {
 	global $globalDebug;
 	// 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($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($this->all_tracked[$key]['id'])) {
+					if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
 			/*
 			$TrackerLive = new TrackerLive();
             		$TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']);
 			$TrackerLive->db = null;
 			*/
-            		//$real_arrival = $this->arrival($key);
-            		$Tracker = new Tracker($this->db);
-            		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
+					//$real_arrival = $this->arrival($key);
+					$Tracker = new Tracker($this->db);
+					if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
 				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			}
 			// Put in archive
 //			$Tracker->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, $globalCoordMinChangeTracker, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked;
 	if (!isset($globalCoordMinChangeTracker) || $globalCoordMinChangeTracker == '') $globalCoordMinChangeTracker = '0.015';
 	date_default_timezone_set('UTC');
@@ -90,47 +90,47 @@  discard block
 block discarded – undo
 	
 	// SBS format is CSV format
 	if(is_array($line) && isset($line['ident'])) {
-	    //print_r($line);
-  	    if (isset($line['ident'])) {
+		//print_r($line);
+  		if (isset($line['ident'])) {
 
 		
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
-		    $current_date = date('Y-m-d');
-		    if (isset($line['source_name'])) $source = $line['source_name'];
-		    else $source = '';
-		    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');
+			if (isset($line['source_name'])) $source = $line['source_name'];
+			else $source = '';
+			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;
 		}
 		
 		
 		$Common = new Common();
-	        if (!isset($line['id'])) $id = trim($line['ident']);
-	        else $id = trim($line['id']);
+			if (!isset($line['id'])) $id = trim($line['ident']);
+			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('addedTracker' => 0));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
-		    $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('addedTracker' => 0));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
+			$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['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]['ident']." - format : ".$line['format_source']."\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]['ident']." - 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]['ident']." - format : ".$line['format_source']."!!!\n";
 			return '';
@@ -147,38 +147,38 @@  discard block
 block discarded – undo
 		
 		//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]['addedTracker'] == 1) {
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
+			if ($this->all_tracked[$id]['addedTracker'] == 1) {
 			$timeelapsed = microtime(true);
-            		$Tracker = new Tracker($this->db);
-            		$fromsource = NULL;
-            		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
+					$Tracker = new Tracker($this->db);
+					$fromsource = NULL;
+					$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
 			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			$Tracker->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['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 > 100 && $distance < 10000) {
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
+			if ($distance > 100 && $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]['ident']." : ".$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 > 90 || ($timediff > 60 && 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 > 90 || ($timediff > 60 && 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'],0.08)) {
+				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'],0.08)) {
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_tracked[$id]['putinarchive'] = true;
@@ -192,30 +192,30 @@  discard block
 block discarded – undo
 				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']) > $globalCoordMinChangeTracker || $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']) > $globalCoordMinChangeTracker || $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;
 			if ($line['latitude'] != $this->all_tracked[$id]['latitude'] && $line['longitude'] != $this->all_tracked[$id]['longitude']) {
 				echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
@@ -223,131 +223,131 @@  discard block
 block discarded – undo
 				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['comment']) && $line['comment'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
-		    //$dataFound = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
+			//$dataFound = true;
 		}
 		if (isset($line['type']) && $line['type'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
-		    //$dataFound = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
+			//$dataFound = true;
 		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
-		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
+			//if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
 			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude']));
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$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_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]['ident'])) {
-		    $this->all_tracked[$id]['lastupdate'] = time();
-		    if ($this->all_tracked[$id]['addedTracker'] == 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]['addedTracker'] == 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 ($globalDebug) echo "Check if aircraft is already in DB...";
 				$timeelapsed = microtime(true);
 				$TrackerLive = new TrackerLive($this->db);
 				if (isset($line['id'])) {
-				    $recent_ident = $TrackerLive->checkIdRecent($line['id']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$recent_ident = $TrackerLive->checkIdRecent($line['id']);
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
-				    $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				} else $recent_ident = '';
 				$TrackerLive->db=null;
 
 				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
 				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
-			    } 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 == "")
-			    {
+				}
+				//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_tracked[$id]['ident']." 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]['ident'].'-'.date('YmdHi')));
-				    $timeelapsed = microtime(true);
-				    $Tracker = new Tracker($this->db);
-				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
-				    $Tracker->db = null;
-				    if ($globalDebug && isset($result)) echo $result."\n";
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$highlight = '';
+					if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
+					$timeelapsed = microtime(true);
+					$Tracker = new Tracker($this->db);
+					$result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
+					$Tracker->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)) {
+					// 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_tracker',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$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_tracker',$date);
-			    			        unset($this->stats[$date][$source]['msg']);
-			    			    }
-			    			}
-			    		    }
-			    		    if ($date != date('Y-m-d')) {
-			    			unset($this->stats[$date]);
-			    		    }
-				    	}
-				    	if ($globalDebug) echo 'Done'."\n";
+						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_tracker',$date);
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$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_tracker',$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;
+					}
+					$Stats->db = null;
 				    
-				    $this->del();
+					$this->del();
 				//$ignoreImport = false;
 				$this->all_tracked[$id]['addedTracker'] = 1;
 				//print_r($this->all_tracked[$id]);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
-				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
-				    $TrackerLive = new TrackerLive($this->db);
-				    $TrackerLive->deleteLiveTrackerData();
-				    $TrackerLive->db=null;
-				    if ($globalDebug) echo " Done\n";
-				    $this->last_delete = time();
+					if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
+					//TrackerLive->deleteLiveTrackerDataNotUpdated();
+					$TrackerLive = new TrackerLive($this->db);
+					$TrackerLive->deleteLiveTrackerData();
+					$TrackerLive->db=null;
+					if ($globalDebug) echo " Done\n";
+					$this->last_delete = time();
 				}
-			    } else {
+				} else {
 				$this->all_tracked[$id]['id'] = $recent_ident;
 				$this->all_tracked[$id]['addedTracker'] = 1;
 				if (isset($globalDaemon) && !$globalDaemon) {
@@ -356,16 +356,16 @@  discard block
 block discarded – undo
 					$Tracker->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'].' - Altitude : '.$this->all_tracked[$id]['altitude'].' - 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 : ";
 				$timeelapsed = microtime(true);
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
 					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 {
@@ -416,11 +416,11 @@  discard block
 block discarded – undo
 					//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 {
@@ -436,22 +436,22 @@  discard block
 block discarded – undo
 			
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
-			    if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
-			    $TrackerLive = new TrackerLive($this->db);
-			    $TrackerLive->deleteLiveTrackerDataNotUpdated();
-			    $TrackerLive->db = null;
-			    //TrackerLive->deleteLiveTrackerData();
-			    if ($globalDebug) echo " Done\n";
-			    $this->last_delete_hourly = time();
+				if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
+				$TrackerLive = new TrackerLive($this->db);
+				$TrackerLive->deleteLiveTrackerDataNotUpdated();
+				$TrackerLive->db = null;
+				//TrackerLive->deleteLiveTrackerData();
+				if ($globalDebug) echo " Done\n";
+				$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];
-	    }
+		}
+	}
 	}
-    }
 }
 ?>

Please login to merge, or discard this patch.

live-geojson.php 1 patch

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

@@ -14,23 +14,23 @@  discard block
 block discarded – undo
 $usecoord = false;
 if (isset($_GET['test'])) exit();
 if (isset($_GET['tracker'])) {
-    $tracker = true;
+	$tracker = true;
 }
 if (isset($_GET['marine'])) {
-    $marine = true;
+	$marine = true;
 }
 if ($tracker) {
-    require_once('require/class.Tracker.php');
-    require_once('require/class.TrackerLive.php');
-    require_once('require/class.TrackerArchive.php');
+	require_once('require/class.Tracker.php');
+	require_once('require/class.TrackerLive.php');
+	require_once('require/class.TrackerArchive.php');
 } elseif ($marine) {
-    require_once('require/class.Marine.php');
-    require_once('require/class.MarineLive.php');
-    require_once('require/class.MarineArchive.php');
+	require_once('require/class.Marine.php');
+	require_once('require/class.MarineLive.php');
+	require_once('require/class.MarineArchive.php');
 } else {
-    require_once('require/class.Spotter.php');
-    require_once('require/class.SpotterLive.php');
-    require_once('require/class.SpotterArchive.php');
+	require_once('require/class.Spotter.php');
+	require_once('require/class.SpotterLive.php');
+	require_once('require/class.SpotterArchive.php');
 }
 
 $begintime = microtime(true);
@@ -50,10 +50,10 @@  discard block
 block discarded – undo
 $Common = new Common();
 
 if (isset($_GET['download'])) {
-    if ($_GET['download'] == "true")
-    {
+	if ($_GET['download'] == "true")
+	{
 	header('Content-disposition: attachment; filename="flightairmap.json"');
-    }
+	}
 }
 header('Content-Type: text/javascript');
 
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
 	$usecoord = true;
 	$coord = explode(',',$_GET['coord']);
 	if (filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
-	    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
+		&& $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
 		if ($tracker) {
 			$spotter_array = $TrackerLive->getMinLiveTrackerDatabyCoord($coord,$filter);
 		} elseif ($marine) {
@@ -635,17 +635,17 @@  discard block
 block discarded – undo
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
 				
 				if (
-				    (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
-				    || ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
+					(isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
+					|| ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
 				//    || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))
 				//    || (isset($history) && $history != '' && $history != 'NA' && $history == $spotter_item['ident'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
-				    ) {
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
+					) {
 					if ($tracker) {
 						if ($from_archive || $globalArchive) {
 							$spotter_history_array = $TrackerArchive->getAllArchiveTrackerDataById($spotter_item['famtrackid']);
@@ -653,9 +653,9 @@  discard block
 block discarded – undo
 							$spotter_history_array = $TrackerLive->getAllLiveTrackerDataById($spotter_item['famtrackid']);
 						}
 						if (((isset($_COOKIE['mapmatching']) && $_COOKIE['mapmatching'] == 'true') ||
-						    (!isset($_COOKIE['mapmatching']) && $globalMapMatching === TRUE)) && 
-						    isset($_GET['zoom']) && $_GET['zoom'] > 12 && 
-						    isset($spotter_item['type']) && (
+							(!isset($_COOKIE['mapmatching']) && $globalMapMatching === TRUE)) && 
+							isset($_GET['zoom']) && $_GET['zoom'] > 12 && 
+							isset($spotter_item['type']) && (
 							$spotter_item['type'] == 'Firetruck' ||
 							$spotter_item['type'] == 'Ambulance' ||
 							$spotter_item['type'] == 'Truck (18 Wheeler)' ||
@@ -667,7 +667,7 @@  discard block
 block discarded – undo
 							$spotter_item['type'] == 'Jeep' ||
 							$spotter_item['type'] == 'Motorcycle' ||
 							$spotter_item['type'] == 'Car'
-						    )
+							)
 						) {
 							require(dirname(__FILE__).'/require/class.MapMatching.php');
 							$MapMatching = new MapMatching();
@@ -770,75 +770,75 @@  discard block
 block discarded – undo
 				}
 				
 				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
-				     && (isset($spotter_item['departure_airport']) 
-				        && $spotter_item['departure_airport'] != 'NA' 
-				        && isset($spotter_item['arrival_airport']) 
-				        && $spotter_item['arrival_airport'] != 'NA' 
-				        && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") 
-				    	    || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
-				    if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
-				    else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
-				    if (isset($spotter_item['departure_airport_latitude'])) {
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
+					 && (isset($spotter_item['departure_airport']) 
+						&& $spotter_item['departure_airport'] != 'NA' 
+						&& isset($spotter_item['arrival_airport']) 
+						&& $spotter_item['arrival_airport'] != 'NA' 
+						&& ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") 
+							|| (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
+					if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
+					else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
+					if (isset($spotter_item['departure_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
-				    } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
+					} elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
 					$dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
 					if (isset($dairport[0]['latitude'])) {
-					    $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
+						$output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
 					}
-				    }
-				    if (isset($spotter_item['arrival_airport_latitude'])) {
+					}
+					if (isset($spotter_item['arrival_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].'],';
-				    } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
+					} elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
 					$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 					if (isset($aairport[0]['latitude'])) {
-					    $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],';
+						$output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],';
 					}
-				    }
-				    $output_air  = substr($output_air, 0, -1);
-				    $output_air .= ']}},';
-				    $output .= $output_air;
-				    unset($output_air);
+					}
+					$output_air  = substr($output_air, 0, -1);
+					$output_air .= ']}},';
+					$output .= $output_air;
+					unset($output_air);
 				}
 
 				//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA' && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
 				//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
 				if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
-				     && (isset($spotter_item['arrival_airport']) 
-				        && $spotter_item['arrival_airport'] != 'NA' 
-				        && ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == "true") 
-				    	    || (!isset($_COOKIE['MapRemainingRoute']) && (!isset($globalMapRemainingRoute) 
-				    	    || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
-				    $havedata = false;
-				    if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
-				    else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
+					 && (isset($spotter_item['arrival_airport']) 
+						&& $spotter_item['arrival_airport'] != 'NA' 
+						&& ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == "true") 
+							|| (!isset($_COOKIE['MapRemainingRoute']) && (!isset($globalMapRemainingRoute) 
+							|| (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
+					$havedata = false;
+					if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
+					else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
 				    
-				    //$output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
-				    if (isset($spotter_item['arrival_airport_latitude'])) {
+					//$output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
+					if (isset($spotter_item['arrival_airport_latitude'])) {
 					//$output_dest .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']';
 					$end_lon = $spotter_item['arrival_airport_longitude'];
 					$end_lat = $spotter_item['arrival_airport_latitude'];
 					$havedata = true;
-				    } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
+					} elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
 					$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 					if (isset($aairport[0]['latitude'])) {
-					    //$output_dest .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
-					    $end_lon = $aairport[0]['longitude'];
-					    $end_lat = $aairport[0]['latitude'];
-					    $havedata = true;
+						//$output_dest .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
+						$end_lon = $aairport[0]['longitude'];
+						$end_lat = $aairport[0]['latitude'];
+						$havedata = true;
 					}
-				    }
-				    if ($havedata) {
+					}
+					if ($havedata) {
 					$line = $Common->greatCircle($spotter_item['latitude'],$spotter_item['longitude'],$end_lat,$end_lon);
 					foreach ($line[0] as $coord) {
 						$output_dest .= '['.$coord[0].','.$coord[1].'],';
 					}
 					$output_dest  = substr($output_dest, 0, -1);
-				    }
-				    $output_dest .= ']}},';
-				    if ($havedata) $output .= $output_dest;
-				    unset($output_dest);
+					}
+					$output_dest .= ']}},';
+					if ($havedata) $output .= $output_dest;
+					unset($output_dest);
 				}
 			}
 			$output  = substr($output, 0, -1);

Please login to merge, or discard this patch.

airspace-geojson.php 1 patch

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

@@ -11,13 +11,13 @@  discard block
 block discarded – undo
 $Connection = new Connection();
 
 if (!$Connection->tableExists('airspace')) {
-    die;
+	die;
 }
 
 if (isset($_GET['coord'])) 
 {
 	$coords = explode(',',$_GET['coord']);
-        if ($globalDBdriver == 'mysql') {
+		if ($globalDBdriver == 'mysql') {
 		$query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace WHERE ST_Intersects(SHAPE, ST_Envelope(linestring(point(:minlon,:minlat), point(:maxlon,:maxlat))))";
 		try {
 			$sth = $Connection->db->prepare($query);
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 		}
 	}
 } else {
-        if ($globalDBdriver == 'mysql') {
+		if ($globalDBdriver == 'mysql') {
 		$query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace";
 	} else {
 		$query = "SELECT *, ST_AsBinary(wkb_geometry,'NDR') AS wkb FROM airspace";
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
 }
 
 $geojson = array(
-    'type' => 'FeatureCollection',
-    'features' => array()
+	'type' => 'FeatureCollection',
+	'features' => array()
 );
 
 while ($row = $sth->fetch(PDO::FETCH_ASSOC))
@@ -115,9 +115,9 @@  discard block
 block discarded – undo
 		}
 		if (isset($properties['type']) && $properties['type'] != '') {
 			$feature = array(
-			    'type' => 'Feature',
-			    'geometry' => json_decode($geom->out('json')),
-			    'properties' => $properties
+				'type' => 'Feature',
+				'geometry' => json_decode($geom->out('json')),
+				'properties' => $properties
 			);
 			array_push($geojson['features'], $feature);
 		}

Please login to merge, or discard this patch.

js/map-tracker.2d.js.php 1 patch

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

@@ -575,8 +575,8 @@  discard block
 block discarded – undo
 			}
                     }
 		    <?php
-            		} else {
-            	    ?>
+					} else {
+					?>
 		    if (map.getZoom() > 7) {
                 	var style = {
                     	    "color": "#1a3151",
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
                 	layer_tracker_data.addLayer(layer);
 		    }
 <?php
-            		}
+					}
 ?>
 				}
 			    }
@@ -740,11 +740,11 @@  discard block
 block discarded – undo
 $( document ).ready(function() {
 	map.on('moveend', function() {
 <?php
-    if (isset($globalMapUseBbox) && $globalMapUseBbox && (!isset($archive) || $archive === false)) {
+	if (isset($globalMapUseBbox) && $globalMapUseBbox && (!isset($archive) || $archive === false)) {
 ?>
 		getLiveTrackerData(1);
 <?php
-    }
+	}
 ?>
 	});
 

Please login to merge, or discard this patch.

js/map-tracker.3d.js.php 1 patch

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

@@ -98,21 +98,21 @@  discard block
 block discarded – undo
 			var entityid = entity.id;
 			var lastupdateentity = entity.properties.valueOf('lastupdate')._lastupdate._value;
 			<?php 
-			    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+				if (isset($globalMapUseBbox) && $globalMapUseBbox) {
 			?>
 			if (lastupdateentity != lastupdatetracker) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 				czmldstracker.entities.removeById(entityid);
 			}
 			<?php
-			    } else {
+				} else {
 			?>
 			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 				czmldstracker.entities.removeById(entityid);
 			}
 			<?php
-			    }
+				}
 			?>
 		}
 	}
@@ -145,15 +145,15 @@  discard block
 block discarded – undo
 function updateTrackerData() {
 	lastupdatetracker = Date.now();
 <?php
-    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+	if (isset($globalMapUseBbox) && $globalMapUseBbox) {
 ?>
 	var livetrackerdata = czmldstracker.process('<?php print $globalURL; ?>/live-czml.php?tracker&coord='+bbox()+'&update=' + lastupdatetracker);
 <?php
-    } else {
+	} else {
 ?>
 	var livetrackerdata = czmldstracker.process('<?php print $globalURL; ?>/live-czml.php?tracker&update=' + lastupdatetracker);
 <?php
-    }
+	}
 ?>  
 	livetrackerdata.then(function (data) { 
 		displayTrackerData(data);
@@ -209,13 +209,13 @@  discard block
 block discarded – undo
 }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
 camera.moveEnd.addEventListener(function() {
 <?php
-    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+	if (isset($globalMapUseBbox) && $globalMapUseBbox) {
 ?>
 	if (typeof archive == 'undefined' || archive == false) {
 		updateTrackerData();
 	}
 <?php
-    }
+	}
 ?>
 });
 

Please login to merge, or discard this patch.

js/map-aircraft.3d.js.php 1 patch

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

@@ -289,8 +289,8 @@  discard block
 block discarded – undo
 			var entityid = entity.id;
 			var lastupdateentity = entity.properties.lastupdate;
 			<?php 
-			    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
-			    // Remove flights not in latest CZML
+				if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+				// Remove flights not in latest CZML
 			?>
 			if (lastupdateentity != lastupdate) {
 				console.log('Remove...');
@@ -298,14 +298,14 @@  discard block
 block discarded – undo
 				czmlds.entities.removeById(entityid);
 			}
 			<?php
-			    } else {
+				} else {
 			?>
 			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 				czmlds.entities.removeById(entityid);
 			}
 			<?php
-			    }
+				}
 			?>
 		}
 	}
@@ -762,12 +762,12 @@  discard block
 block discarded – undo
 }
 
 <?php
-    if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
+	if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
 ?>
 update_atcLayer();
 setInterval(function(){update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
 <?php
-    }
+	}
 ?>
 
 function iconColor(color) {

Please login to merge, or discard this patch.

tracker-data.php 1 patch

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

@@ -78,10 +78,10 @@  discard block
 block discarded – undo
 print '<div class="details">';
 print '<div><span>'._("Altitude").'</span>';
 if (isset($globalGroundAltitude) && $globalGroundAltitude) {
-    try {
+	try {
 	$groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
-    } catch(Exception $e) {
-    }
+	} catch(Exception $e) {
+	}
 }
 print '<span class="altitude">';
 if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
@@ -91,17 +91,17 @@  discard block
 block discarded – undo
 }
 print '</span>';
 if (isset($groundAltitude) && $groundAltitude < $spotter_item['altitude']*0.3048) {
-    print '<br>';
-    print '<span>'._("Ground Altitude").'</span>';
-    print '<i>';
-    print '<span class="groundaltitude">';
-    if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
+	print '<br>';
+	print '<span>'._("Ground Altitude").'</span>';
+	print '<i>';
+	print '<span class="groundaltitude">';
+	if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
 	print round($groundAltitude*3.28084).' feet';
-    } else {
+	} else {
 	print round($groundAltitude).' m';
-    }
-    print '</span>';
-    print '</i>';
+	}
+	print '</span>';
+	print '</i>';
 }
 print '</div>';
 print '<div><span>'._("Speed").'</span>';

Please login to merge, or discard this patch.

airport-geojson.php 1 patch

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

@@ -27,7 +27,7 @@  discard block
 block discarded – undo
 		date_default_timezone_set('UTC');
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"name": '.json_encode(str_replace('"',"'",$spotter_item['name'])).',';
 			$output .= '"city": '.json_encode(str_replace('"',"'",$spotter_item['city'])).',';
 			$output .= '"country": "'.$spotter_item['country'].'",';
@@ -50,13 +50,13 @@  discard block
 block discarded – undo
 			$output .= '"homepage": "'.$spotter_item['home_link'].'",';
 			$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
 //			$output .= '"photo": "'.$spotter_item['image_thumbnail'].'",';
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
+				$output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 		$output .= '},';
 	}
 	$output  = substr($output, 0, -1);

Please login to merge, or discard this patch.

live-czml.php 1 patch

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

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

Please login to merge, or discard this patch.

		@@ -575,8 +575,8 @@ discard block
		block discarded – undo
575	575	}
576	576	}
577	577	<?php
578		- } else {
579		- ?>
	578	+ } else {
	579	+ ?>
580	580	if (map.getZoom() > 7) {
581	581	var style = {
582	582	"color": "#1a3151",
		@@ -595,7 +595,7 @@ discard block
		block discarded – undo
595	595	layer_tracker_data.addLayer(layer);
596	596	}
597	597	<?php
598		- }
	598	+ }
599	599	?>
600	600	}
601	601	}
		@@ -740,11 +740,11 @@ discard block
		block discarded – undo
740	740	$( document ).ready(function() {
741	741	map.on('moveend', function() {
742	742	<?php
743		- if (isset($globalMapUseBbox) && $globalMapUseBbox && (!isset($archive) \|\| $archive === false)) {
	743	+ if (isset($globalMapUseBbox) && $globalMapUseBbox && (!isset($archive) \|\| $archive === false)) {
744	744	?>
745	745	getLiveTrackerData(1);
746	746	<?php
747		- }
	747	+ }
748	748	?>
749	749	});
750	750

		@@ -98,21 +98,21 @@ discard block
		block discarded – undo
98	98	var entityid = entity.id;
99	99	var lastupdateentity = entity.properties.valueOf('lastupdate')._lastupdate._value;
100	100	<?php
101		- if (isset($globalMapUseBbox) && $globalMapUseBbox) {
	101	+ if (isset($globalMapUseBbox) && $globalMapUseBbox) {
102	102	?>
103	103	if (lastupdateentity != lastupdatetracker) {
104	104	viewer.dataSources.get(dsn).entities.remove(entity);
105	105	czmldstracker.entities.removeById(entityid);
106	106	}
107	107	<?php
108		- } else {
	108	+ } else {
109	109	?>
110	110	if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
111	111	viewer.dataSources.get(dsn).entities.remove(entity);
112	112	czmldstracker.entities.removeById(entityid);
113	113	}
114	114	<?php
115		- }
	115	+ }
116	116	?>
117	117	}
118	118	}
		@@ -145,15 +145,15 @@ discard block
		block discarded – undo
145	145	function updateTrackerData() {
146	146	lastupdatetracker = Date.now();
147	147	<?php
148		- if (isset($globalMapUseBbox) && $globalMapUseBbox) {
	148	+ if (isset($globalMapUseBbox) && $globalMapUseBbox) {
149	149	?>
150	150	var livetrackerdata = czmldstracker.process('<?php print $globalURL; ?>/live-czml.php?tracker&coord='+bbox()+'&update=' + lastupdatetracker);
151	151	<?php
152		- } else {
	152	+ } else {
153	153	?>
154	154	var livetrackerdata = czmldstracker.process('<?php print $globalURL; ?>/live-czml.php?tracker&update=' + lastupdatetracker);
155	155	<?php
156		- }
	156	+ }
157	157	?>
158	158	livetrackerdata.then(function (data) {
159	159	displayTrackerData(data);
		@@ -209,13 +209,13 @@ discard block
		block discarded – undo
209	209	}, Cesium.ScreenSpaceEventType.LEFT_CLICK);
210	210	camera.moveEnd.addEventListener(function() {
211	211	<?php
212		- if (isset($globalMapUseBbox) && $globalMapUseBbox) {
	212	+ if (isset($globalMapUseBbox) && $globalMapUseBbox) {
213	213	?>
214	214	if (typeof archive == 'undefined' \|\| archive == false) {
215	215	updateTrackerData();
216	216	}
217	217	<?php
218		- }
	218	+ }
219	219	?>
220	220	});
221	221

		@@ -289,8 +289,8 @@ discard block
		block discarded – undo
289	289	var entityid = entity.id;
290	290	var lastupdateentity = entity.properties.lastupdate;
291	291	<?php
292		- if (isset($globalMapUseBbox) && $globalMapUseBbox) {
293		- // Remove flights not in latest CZML
	292	+ if (isset($globalMapUseBbox) && $globalMapUseBbox) {
	293	+ // Remove flights not in latest CZML
294	294	?>
295	295	if (lastupdateentity != lastupdate) {
296	296	console.log('Remove...');
		@@ -298,14 +298,14 @@ discard block
		block discarded – undo
298	298	czmlds.entities.removeById(entityid);
299	299	}
300	300	<?php
301		- } else {
	301	+ } else {
302	302	?>
303	303	if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
304	304	viewer.dataSources.get(dsn).entities.remove(entity);
305	305	czmlds.entities.removeById(entityid);
306	306	}
307	307	<?php
308		- }
	308	+ }
309	309	?>
310	310	}
311	311	}
		@@ -762,12 +762,12 @@ discard block
		block discarded – undo
762	762	}
763	763
764	764	<?php
765		- if ((isset($globalIVAO) && $globalIVAO) \|\| (isset($globalVATSIM) && $globalVATSIM)) {
	765	+ if ((isset($globalIVAO) && $globalIVAO) \|\| (isset($globalVATSIM) && $globalVATSIM)) {
766	766	?>
767	767	update_atcLayer();
768	768	setInterval(function(){update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh10002; else print '60000'; ?>);
769	769	<?php
770		- }
	770	+ }
771	771	?>
772	772
773	773	function iconColor(color) {

		@@ -14,23 +14,23 @@ discard block
		block discarded – undo
14	14	$usecoord = false;
15	15	if (isset($_GET['test'])) exit();
16	16	if (isset($_GET['tracker'])) {
17		- $tracker = true;
	17	+ $tracker = true;
18	18	}
19	19	if (isset($_GET['marine'])) {
20		- $marine = true;
	20	+ $marine = true;
21	21	}
22	22	if ($tracker) {
23		- require_once('require/class.Tracker.php');
24		- require_once('require/class.TrackerLive.php');
25		- require_once('require/class.TrackerArchive.php');
	23	+ require_once('require/class.Tracker.php');
	24	+ require_once('require/class.TrackerLive.php');
	25	+ require_once('require/class.TrackerArchive.php');
26	26	} elseif ($marine) {
27		- require_once('require/class.Marine.php');
28		- require_once('require/class.MarineLive.php');
29		- require_once('require/class.MarineArchive.php');
	27	+ require_once('require/class.Marine.php');
	28	+ require_once('require/class.MarineLive.php');
	29	+ require_once('require/class.MarineArchive.php');
30	30	} else {
31		- require_once('require/class.Spotter.php');
32		- require_once('require/class.SpotterLive.php');
33		- require_once('require/class.SpotterArchive.php');
	31	+ require_once('require/class.Spotter.php');
	32	+ require_once('require/class.SpotterLive.php');
	33	+ require_once('require/class.SpotterArchive.php');
34	34	}
35	35
36	36	$begintime = microtime(true);
		@@ -50,10 +50,10 @@ discard block
		block discarded – undo
50	50	$Common = new Common();
51	51
52	52	if (isset($_GET['download'])) {
53		- if ($_GET['download'] == "true")
54		- {
	53	+ if ($_GET['download'] == "true")
	54	+ {
55	55	header('Content-disposition: attachment; filename="flightairmap.json"');
56		- }
	56	+ }
57	57	}
58	58	header('Content-Type: text/javascript');
59	59
		@@ -131,7 +131,7 @@ discard block
		block discarded – undo
131	131	$usecoord = true;
132	132	$coord = explode(',',$_GET['coord']);
133	133	if (filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
134		- && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
	134	+ && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0) {
135	135	if ($tracker) {
136	136	$spotter_array = $TrackerLive->getMinLiveTrackerDatabyCoord($coord,$filter);
137	137	} elseif ($marine) {
		@@ -635,17 +635,17 @@ discard block
		block discarded – undo
635	635	if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
636	636
637	637	if (
638		- (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')
639		- \|\| ((isset($globalMapHistory) && $globalMapHistory) \|\| $allhistory)
	638	+ (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')
	639	+ \|\| ((isset($globalMapHistory) && $globalMapHistory) \|\| $allhistory)
640	640	// \|\| (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] \|\| $history == $spotter_item['flightaware_id']))
641	641	// \|\| (isset($history) && $history != '' && $history != 'NA' && $history == $spotter_item['ident'])
642		- \|\| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
643		- \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
644		- \|\| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
645		- \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
646		- \|\| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
647		- \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
648		- ) {
	642	+ \|\| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
	643	+ \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
	644	+ \|\| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
	645	+ \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
	646	+ \|\| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
	647	+ \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
	648	+ ) {
649	649	if ($tracker) {
650	650	if ($from_archive \|\| $globalArchive) {
651	651	$spotter_history_array = $TrackerArchive->getAllArchiveTrackerDataById($spotter_item['famtrackid']);
		@@ -653,9 +653,9 @@ discard block
		block discarded – undo
653	653	$spotter_history_array = $TrackerLive->getAllLiveTrackerDataById($spotter_item['famtrackid']);
654	654	}
655	655	if (((isset($_COOKIE['mapmatching']) && $_COOKIE['mapmatching'] == 'true') \|\|
656		- (!isset($_COOKIE['mapmatching']) && $globalMapMatching === TRUE)) &&
657		- isset($_GET['zoom']) && $_GET['zoom'] > 12 &&
658		- isset($spotter_item['type']) && (
	656	+ (!isset($_COOKIE['mapmatching']) && $globalMapMatching === TRUE)) &&
	657	+ isset($_GET['zoom']) && $_GET['zoom'] > 12 &&
	658	+ isset($spotter_item['type']) && (
659	659	$spotter_item['type'] == 'Firetruck' \|\|
660	660	$spotter_item['type'] == 'Ambulance' \|\|
661	661	$spotter_item['type'] == 'Truck (18 Wheeler)' \|\|
		@@ -667,7 +667,7 @@ discard block
		block discarded – undo
667	667	$spotter_item['type'] == 'Jeep' \|\|
668	668	$spotter_item['type'] == 'Motorcycle' \|\|
669	669	$spotter_item['type'] == 'Car'
670		- )
	670	+ )
671	671	) {
672	672	require(dirname(__FILE__).'/require/class.MapMatching.php');
673	673	$MapMatching = new MapMatching();
		@@ -770,75 +770,75 @@ discard block
		block discarded – undo
770	770	}
771	771
772	772	if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
773		- \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
774		- && (isset($spotter_item['departure_airport'])
775		- && $spotter_item['departure_airport'] != 'NA'
776		- && isset($spotter_item['arrival_airport'])
777		- && $spotter_item['arrival_airport'] != 'NA'
778		- && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true")
779		- \|\| (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
780		- if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
781		- else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
782		- if (isset($spotter_item['departure_airport_latitude'])) {
	773	+ \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
	774	+ && (isset($spotter_item['departure_airport'])
	775	+ && $spotter_item['departure_airport'] != 'NA'
	776	+ && isset($spotter_item['arrival_airport'])
	777	+ && $spotter_item['arrival_airport'] != 'NA'
	778	+ && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true")
	779	+ \|\| (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
	780	+ if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
	781	+ else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
	782	+ if (isset($spotter_item['departure_airport_latitude'])) {
783	783	$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
784		- } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
	784	+ } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
785	785	$dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
786	786	if (isset($dairport[0]['latitude'])) {
787		- $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
	787	+ $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
788	788	}
789		- }
790		- if (isset($spotter_item['arrival_airport_latitude'])) {
	789	+ }
	790	+ if (isset($spotter_item['arrival_airport_latitude'])) {
791	791	$output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].'],';
792		- } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
	792	+ } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
793	793	$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
794	794	if (isset($aairport[0]['latitude'])) {
795		- $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],';
	795	+ $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].'],';
796	796	}
797		- }
798		- $output_air = substr($output_air, 0, -1);
799		- $output_air .= ']}},';
800		- $output .= $output_air;
801		- unset($output_air);
	797	+ }
	798	+ $output_air = substr($output_air, 0, -1);
	799	+ $output_air .= ']}},';
	800	+ $output .= $output_air;
	801	+ unset($output_air);
802	802	}
803	803
804	804	//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA' && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") \|\| (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) \|\| (isset($globalMapRoute) && $globalMapRoute))))) {
805	805	//if (isset($history) && $history != '' && $history == $spotter_item['ident'] && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") \|\| (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) \|\| (isset($globalMapRoute) && $globalMapRoute))))) {
806	806	if (((isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
807		- \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
808		- && (isset($spotter_item['arrival_airport'])
809		- && $spotter_item['arrival_airport'] != 'NA'
810		- && ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == "true")
811		- \|\| (!isset($_COOKIE['MapRemainingRoute']) && (!isset($globalMapRemainingRoute)
812		- \|\| (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
813		- $havedata = false;
814		- if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
815		- else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
	807	+ \|\| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']))
	808	+ && (isset($spotter_item['arrival_airport'])
	809	+ && $spotter_item['arrival_airport'] != 'NA'
	810	+ && ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == "true")
	811	+ \|\| (!isset($_COOKIE['MapRemainingRoute']) && (!isset($globalMapRemainingRoute)
	812	+ \|\| (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
	813	+ $havedata = false;
	814	+ if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
	815	+ else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
816	816
817		- //$output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
818		- if (isset($spotter_item['arrival_airport_latitude'])) {
	817	+ //$output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
	818	+ if (isset($spotter_item['arrival_airport_latitude'])) {
819	819	//$output_dest .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']';
820	820	$end_lon = $spotter_item['arrival_airport_longitude'];
821	821	$end_lat = $spotter_item['arrival_airport_latitude'];
822	822	$havedata = true;
823		- } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
	823	+ } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
824	824	$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
825	825	if (isset($aairport[0]['latitude'])) {
826		- //$output_dest .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
827		- $end_lon = $aairport[0]['longitude'];
828		- $end_lat = $aairport[0]['latitude'];
829		- $havedata = true;
	826	+ //$output_dest .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
	827	+ $end_lon = $aairport[0]['longitude'];
	828	+ $end_lat = $aairport[0]['latitude'];
	829	+ $havedata = true;
830	830	}
831		- }
832		- if ($havedata) {
	831	+ }
	832	+ if ($havedata) {
833	833	$line = $Common->greatCircle($spotter_item['latitude'],$spotter_item['longitude'],$end_lat,$end_lon);
834	834	foreach ($line[0] as $coord) {
835	835	$output_dest .= '['.$coord[0].','.$coord[1].'],';
836	836	}
837	837	$output_dest = substr($output_dest, 0, -1);
838		- }
839		- $output_dest .= ']}},';
840		- if ($havedata) $output .= $output_dest;
841		- unset($output_dest);
	838	+ }
	839	+ $output_dest .= ']}},';
	840	+ if ($havedata) $output .= $output_dest;
	841	+ unset($output_dest);
842	842	}
843	843	}
844	844	$output = substr($output, 0, -1);

		@@ -11,13 +11,13 @@ discard block
		block discarded – undo
11	11	$Connection = new Connection();
12	12
13	13	if (!$Connection->tableExists('airspace')) {
14		- die;
	14	+ die;
15	15	}
16	16
17	17	if (isset($_GET['coord']))
18	18	{
19	19	$coords = explode(',',$_GET['coord']);
20		- if ($globalDBdriver == 'mysql') {
	20	+ if ($globalDBdriver == 'mysql') {
21	21	$query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace WHERE ST_Intersects(SHAPE, ST_Envelope(linestring(point(:minlon,:minlat), point(:maxlon,:maxlat))))";
22	22	try {
23	23	$sth = $Connection->db->prepare($query);
		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	}
38	38	}
39	39	} else {
40		- if ($globalDBdriver == 'mysql') {
	40	+ if ($globalDBdriver == 'mysql') {
41	41	$query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace";
42	42	} else {
43	43	$query = "SELECT *, ST_AsBinary(wkb_geometry,'NDR') AS wkb FROM airspace";
		@@ -51,8 +51,8 @@ discard block
		block discarded – undo
51	51	}
52	52
53	53	$geojson = array(
54		- 'type' => 'FeatureCollection',
55		- 'features' => array()
	54	+ 'type' => 'FeatureCollection',
	55	+ 'features' => array()
56	56	);
57	57
58	58	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
		@@ -115,9 +115,9 @@ discard block
		block discarded – undo
115	115	}
116	116	if (isset($properties['type']) && $properties['type'] != '') {
117	117	$feature = array(
118		- 'type' => 'Feature',
119		- 'geometry' => json_decode($geom->out('json')),
120		- 'properties' => $properties
	118	+ 'type' => 'Feature',
	119	+ 'geometry' => json_decode($geom->out('json')),
	120	+ 'properties' => $properties
121	121	);
122	122	array_push($geojson['features'], $feature);
123	123	}

		@@ -78,10 +78,10 @@ discard block
		block discarded – undo
78	78	print '<div class="details">';
79	79	print '<div><span>'._("Altitude").'</span>';
80	80	if (isset($globalGroundAltitude) && $globalGroundAltitude) {
81		- try {
	81	+ try {
82	82	$groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
83		- } catch(Exception $e) {
84		- }
	83	+ } catch(Exception $e) {
	84	+ }
85	85	}
86	86	print '<span class="altitude">';
87	87	if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') \|\| (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
		@@ -91,17 +91,17 @@ discard block
		block discarded – undo
91	91	}
92	92	print '</span>';
93	93	if (isset($groundAltitude) && $groundAltitude < $spotter_item['altitude']*0.3048) {
94		- print '<br>';
95		- print '<span>'._("Ground Altitude").'</span>';
96		- print '<i>';
97		- print '<span class="groundaltitude">';
98		- if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') \|\| (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
	94	+ print '<br>';
	95	+ print '<span>'._("Ground Altitude").'</span>';
	96	+ print '<i>';
	97	+ print '<span class="groundaltitude">';
	98	+ if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') \|\| (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
99	99	print round($groundAltitude*3.28084).' feet';
100		- } else {
	100	+ } else {
101	101	print round($groundAltitude).' m';
102		- }
103		- print '</span>';
104		- print '</i>';
	102	+ }
	103	+ print '</span>';
	104	+ print '</i>';
105	105	}
106	106	print '</div>';
107	107	print '<div><span>'._("Speed").'</span>';

		@@ -27,7 +27,7 @@ discard block
		block discarded – undo
27	27	date_default_timezone_set('UTC');
28	28	//waypoint plotting
29	29	$output .= '{"type": "Feature",';
30		- $output .= '"properties": {';
	30	+ $output .= '"properties": {';
31	31	$output .= '"name": '.json_encode(str_replace('"',"'",$spotter_item['name'])).',';
32	32	$output .= '"city": '.json_encode(str_replace('"',"'",$spotter_item['city'])).',';
33	33	$output .= '"country": "'.$spotter_item['country'].'",';
		@@ -50,13 +50,13 @@ discard block
		block discarded – undo
50	50	$output .= '"homepage": "'.$spotter_item['home_link'].'",';
51	51	$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
52	52	// $output .= '"photo": "'.$spotter_item['image_thumbnail'].'",';
53		- $output .= '},';
54		- $output .= '"geometry": {';
	53	+ $output .= '},';
	54	+ $output .= '"geometry": {';
55	55	$output .= '"type": "Point",';
56	56	$output .= '"coordinates": [';
57		- $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
	57	+ $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
58	58	$output .= ']';
59		- $output .= '}';
	59	+ $output .= '}';
60	60	$output .= '},';
61	61	}
62	62	$output = substr($output, 0, -1);

		@@ -50,30 +50,30 @@ discard block
		block discarded – undo
50	50
51	51
52	52	function quaternionrotate($heading, $attitude = 0, $bank = 0) {
53		- // Assuming the angles are in radians.
54		- $c1 = cos($heading/2);
55		- $s1 = sin($heading/2);
56		- $c2 = cos($attitude/2);
57		- $s2 = sin($attitude/2);
58		- $c3 = cos($bank/2);
59		- $s3 = sin($bank/2);
60		- $c1c2 = $c1*$c2;
61		- $s1s2 = $s1*$s2;
62		- $w =$c1c2$c3 - $s1s2$s3;
63		- $x =$c1c2$s3 + $s1s2$c3;
64		- $y =$s1$c2$c3 + $c1$s2$s3;
65		- $z =$c1$s2$c3 - $s1$c2$s3;
66		- return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
	53	+ // Assuming the angles are in radians.
	54	+ $c1 = cos($heading/2);
	55	+ $s1 = sin($heading/2);
	56	+ $c2 = cos($attitude/2);
	57	+ $s2 = sin($attitude/2);
	58	+ $c3 = cos($bank/2);
	59	+ $s3 = sin($bank/2);
	60	+ $c1c2 = $c1*$c2;
	61	+ $s1s2 = $s1*$s2;
	62	+ $w =$c1c2$c3 - $s1s2$s3;
	63	+ $x =$c1c2$s3 + $s1s2$c3;
	64	+ $y =$s1$c2$c3 + $c1$s2$s3;
	65	+ $z =$c1$s2$c3 - $s1$c2$s3;
	66	+ return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
67	67	// return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365');
68	68
69	69	}
70	70
71	71
72	72	if (isset($_GET['download'])) {
73		- if ($_GET['download'] == "true")
74		- {
	73	+ if ($_GET['download'] == "true")
	74	+ {
75	75	header('Content-disposition: attachment; filename="flightairmap.json"');
76		- }
	76	+ }
77	77	}
78	78	header('Content-Type: text/javascript');
79	79
		@@ -184,7 +184,7 @@ discard block
		block discarded – undo
184	184	if (isset($_GET['coord']) && $_GET['coord'] != '') {
185	185	$coord = explode(',',$_GET['coord']);
186	186	if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
187		- && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
	187	+ && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
188	188	$coord = array();
189	189	}
190	190	}
		@@ -208,7 +208,7 @@ discard block
		block discarded – undo
208	208	if (!((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') && (isset($_COOKIE['MapTrackMarine']) && $_COOKIE['MapTrackMarine'] != '')) && isset($_GET['coord']) && $_GET['coord'] != '') {
209	209	$coord = explode(',',$_GET['coord']);
210	210	if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
211		- && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
	211	+ && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
212	212	$coord = array();
213	213	}
214	214	}
		@@ -229,7 +229,7 @@ discard block
		block discarded – undo
229	229	if (!((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') && (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '')) && isset($_GET['coord']) && $_GET['coord'] != '') {
230	230	$coord = explode(',',$_GET['coord']);
231	231	if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
232		- && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
	232	+ && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
233	233	$coord = array();
234	234	}
235	235	}
		@@ -350,10 +350,10 @@ discard block
		block discarded – undo
350	350	$image = "images/placeholder_thumb.png";
351	351	}
352	352
353		- if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
354		- elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
355		- elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
356		- if ($prev_flightaware_id != $id) {
	353	+ if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
	354	+ elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
	355	+ elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
	356	+ if ($prev_flightaware_id != $id) {
357	357	if ($prev_flightaware_id != '') {
358	358	/*
359	359	if ($nblatlong == 1) {
		@@ -449,7 +449,7 @@ discard block
		block discarded – undo
449	449	$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
450	450	$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
451	451	} else $aircraft_shadow = '';
452		- $output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
	452	+ $output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
453	453	if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true' && isset($_COOKIE['IconColor'])) {
454	454	$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
455	455	$output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}';
		@@ -480,7 +480,7 @@ discard block
		block discarded – undo
480	480	$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
481	481	$output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}';
482	482	}
483		- $output .= '},';
	483	+ $output .= '},';
484	484	} elseif (isset($modelsdb[$aircraft_icao]) && $aircraft_icao != '') {
485	485	$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_icao].'","scale" : '.$scale.',"minimumPixelSize": '.$minimumpixelsize.'';
486	486	$output .= ',"heightReference": "'.$heightrelative.'"';
		@@ -488,7 +488,7 @@ discard block
		block discarded – undo
488	488	$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
489	489	$output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}';
490	490	}
491		- $output .= '},';
	491	+ $output .= '},';
492	492	} elseif ($aircraft_icao != '') {
493	493	$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao);
494	494	if (isset($aircraft_info[0]['engine_type'])) {

Ysurac / FlightAirMap

Push — master ( 4ca6dc...c9fe9a )

Status

Category

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

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

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

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

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

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

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

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

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