View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( e699fe...2e25d0 )
by Yannick
08:35
created
Status
Category
Toggle Patches
require/class.MarineImport.php 1 patch
Indentation   +163 added lines, -163 removed lines patch added patch discarded remove patch 
@@ -9,25 +9,25 @@  discard block
 
 block discarded – undo
9 9 
 require_once(dirname(__FILE__).'/class.Stats.php');
10 10 
 require_once(dirname(__FILE__).'/class.Source.php');
11 11 
 if (isset($globalServerAPRS) && $globalServerAPRS) {
12 
-    require_once(dirname(__FILE__).'/class.APRS.php');
12 
+	require_once(dirname(__FILE__).'/class.APRS.php');
13 13 
 }
14 14
15 15 
 class MarineImport {
16 
-    private $all_tracked = array();
17 
-    private $last_delete_hourly = 0;
18 
-    private $last_delete = 0;
19 
-    private $stats = array();
20 
-    private $tmd = 0;
21 
-    private $source_location = array();
22 
-    public $db = null;
23 
-    public $nb = 0;
16 
+	private $all_tracked = array();
17 
+	private $last_delete_hourly = 0;
18 
+	private $last_delete = 0;
19 
+	private $stats = array();
20 
+	private $tmd = 0;
21 
+	private $source_location = array();
22 
+	public $db = null;
23 
+	public $nb = 0;
24 24
25 
-    public function __construct($dbc = null) {
25 
+	public function __construct($dbc = null) {
26 26 
 	global $globalBeta, $globalServerAPRS, $APRSSpotter, $globalNoDB;
27 27 
 	if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
28 
-	    $Connection = new Connection($dbc);
29 
-	    $this->db = $Connection->db();
30 
-	    date_default_timezone_set('UTC');
28 
+		$Connection = new Connection($dbc);
29 
+		$this->db = $Connection->db();
30 
+		date_default_timezone_set('UTC');
31 31 
 	}
32 32 
 	// Get previous source stats
33 33 
 	/*
 
@@ -46,53 +46,53 @@  discard block
 
 block discarded – undo
46 46 
 	}
47 47 
 	*/
48 48 
 	if (isset($globalServerAPRS) && $globalServerAPRS) {
49 
-	    $APRSMarine = new APRSMarine();
50 
-	    //$APRSSpotter->connect();
49 
+		$APRSMarine = new APRSMarine();
50 
+		//$APRSSpotter->connect();
51 
+	}
51 52 
 	}
52 
-    }
53 53
54 
-    public function checkAll() {
54 
+	public function checkAll() {
55 55 
 	global $globalDebug;
56 56 
 	if ($globalDebug) echo "Update last seen tracked data...\n";
57 57 
 	foreach ($this->all_tracked as $key => $flight) {
58 
-	    if (isset($this->all_tracked[$key]['id'])) {
58 
+		if (isset($this->all_tracked[$key]['id'])) {
59 59 
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
60 
-    		$Marine = new Marine($this->db);
61 
-        	$Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
62 
-            }
60 
+			$Marine = new Marine($this->db);
61 
+			$Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
62 
+			}
63 
+	}
63 64 
 	}
64 
-    }
65 65
66 
-    public function del() {
66 
+	public function del() {
67 67 
 	global $globalDebug;
68 68 
 	// Delete old infos
69 69 
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
70 70 
 	foreach ($this->all_tracked as $key => $flight) {
71 
-    	    if (isset($flight['lastupdate'])) {
72 
-        	if ($flight['lastupdate'] < (time()-3000)) {
73 
-            	    if (isset($this->all_tracked[$key]['id'])) {
74 
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
71 
+			if (isset($flight['lastupdate'])) {
72 
+			if ($flight['lastupdate'] < (time()-3000)) {
73 
+					if (isset($this->all_tracked[$key]['id'])) {
74 
+					if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
75 75 
 			/*
76 76 
 			$MarineLive = new MarineLive();
77 77 
             		$MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']);
78 78 
 			$MarineLive->db = null;
79 79 
 			*/
80 
-            		//$real_arrival = $this->arrival($key);
81 
-            		$Marine = new Marine($this->db);
82 
-            		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
80 
+					//$real_arrival = $this->arrival($key);
81 
+					$Marine = new Marine($this->db);
82 
+					if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
83 83 
 				$result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed']);
84 84 
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
85 85 
 			}
86 86 
 			// Put in archive
87 87 
 //			$Marine->db = null;
88 
-            	    }
89 
-            	    unset($this->all_tracked[$key]);
90 
-    	        }
91 
-	    }
92 
-        }
93 
-    }
88 
+					}
89 
+					unset($this->all_tracked[$key]);
90 
+				}
91 
+		}
92 
+		}
93 
+	}
94 94
95 
-    public function add($line) {
95 
+	public function add($line) {
96 96 
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB;
97 97 
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
98 98 
 	date_default_timezone_set('UTC');
 
@@ -101,8 +101,8 @@  discard block
 
 block discarded – undo
101 101
102 102 
 	// SBS format is CSV format
103 103 
 	if(is_array($line) && isset($line['mmsi'])) {
104 
-	    //print_r($line);
105 
-  	    if (isset($line['mmsi'])) {
104 
+		//print_r($line);
105 
+  		if (isset($line['mmsi'])) {
106 106
107 107 
 		/*
108 108 
 		// Increment message number
 
@@ -119,61 +119,61 @@  discard block
 
 block discarded – undo
119 119
120 120 
 		$Common = new Common();
121 121 
 		$AIS = new AIS();
122 
-	        if (!isset($line['id'])) $id = trim($line['mmsi']);
123 
-	        else $id = trim($line['id']);
122 
+			if (!isset($line['id'])) $id = trim($line['mmsi']);
123 
+			else $id = trim($line['id']);
124 124
125 125 
 		if (!isset($this->all_tracked[$id])) {
126 
-		    $this->all_tracked[$id] = array();
127 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0));
128 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => ''));
129 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
130 
-		    if (!isset($line['id'])) {
126 
+			$this->all_tracked[$id] = array();
127 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0));
128 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => ''));
129 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
130 
+			if (!isset($line['id'])) {
131 131 
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
132 132 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
133 
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
134 
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
133 
+			 } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
134 
+			if ($globalAllTracked !== FALSE) $dataFound = true;
135 135 
 		}
136 136
137 137 
 		if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) {
138 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
139 
-		    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
138 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
139 
+			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
140 140 
 			$Marine = new Marine($this->db);
141 141 
 			$identity = $Marine->getIdentity($line['mmsi']);
142 142 
 			if (!empty($identity)) {
143 
-			    $this->all_tracked[$id]['ident'] = $identity['ship_name'];
144 
-			    $this->all_tracked[$id]['type'] = $identity['type'];
143 
+				$this->all_tracked[$id]['ident'] = $identity['ship_name'];
144 
+				$this->all_tracked[$id]['type'] = $identity['type'];
145 145 
 			}
146 146 
 			//print_r($identity);
147 147 
 			unset($Marine);
148 148 
 			//$dataFound = true;
149 
-		    }
149 
+			}
150 150 
 		}
151 151 
 		if (isset($line['type_id']) && $line['type_id'] != '') {
152 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id'])));
152 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id'])));
153 153 
 		}
154 154 
 		if (isset($line['type']) && $line['type'] != '') {
155 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
155 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
156 156 
 		}
157 157 
 		if (isset($line['imo']) && $line['imo'] != '') {
158 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo']));
158 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo']));
159 159 
 		}
160 160 
 		if (isset($line['callsign']) && $line['callsign'] != '') {
161 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign']));
161 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign']));
162 162 
 		}
163 163 
 		if (isset($line['arrival_code']) && $line['arrival_code'] != '') {
164 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code']));
164 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code']));
165 165 
 		}
166 166 
 		if (isset($line['arrival_date']) && $line['arrival_date'] != '') {
167 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
167 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
168 168 
 		}
169 169
170 170
171 171 
 		//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'])) {
172 172 
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
173 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
174 
-		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
173 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
174 
+			if ($this->all_tracked[$id]['addedMarine'] == 1) {
175 175 
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
176 
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
176 
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
177 177 
 				$timeelapsed = microtime(true);
178 178 
 				$Marine = new Marine($this->db);
179 179 
 				$fromsource = NULL;
 
@@ -181,31 +181,31 @@  discard block
 
 block discarded – undo
181 181 
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
182 182 
 				$Marine->db = null;
183 183 
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
184 
-			    }
184 
+				}
185 185 
 			}
186 
-		    }
187 
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
186 
+			}
187 
+			if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
188 188 
 		}
189 189
190 190 
 		if (isset($line['speed']) && $line['speed'] != '') {
191 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
192 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
191 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
192 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
193 193 
 		} 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'])) {
194 
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
195 
-		    if ($distance > 1000 && $distance < 10000) {
194 
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
195 
+			if ($distance > 1000 && $distance < 10000) {
196 196 
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
197 197 
 			$speed = $speed*3.6;
198 198 
 			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
199 199 
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
200 
-		    }
200 
+			}
201 201 
 		}
202 202
203 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
204 
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
205 
-	    	    else unset($timediff);
206 
-	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
203 
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
204 
+				if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
205 
+				else unset($timediff);
206 
+				if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
207 207 
 			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'])) {
208 
-			    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'])) {
208 
+				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'])) {
209 209 
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
210 210 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
211 211 
 				$this->all_tracked[$id]['putinarchive'] = true;
 
@@ -213,84 +213,84 @@  discard block
 
 block discarded – undo
213 213 
 				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
214 214 
 				$timeelapsed = microtime(true);
215 215 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
216 
-				    $Marine = new Marine($this->db);
217 
-				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
218 
-				    if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
219 
-				    $Marine->db = null;
220 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
216 
+					$Marine = new Marine($this->db);
217 
+					$all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
218 
+					if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
219 
+					$Marine->db = null;
220 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
221 221 
 				}
222 222 
 				$this->tmd = 0;
223 223 
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
224 
-			    }
224 
+				}
225 225 
 			}
226 226
227 227 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
228 228 
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
229 229 
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
230 
-				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
231 
-				    $dataFound = true;
232 
-				    $this->all_tracked[$id]['time_last_coord'] = time();
230 
+					$this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
231 
+					$dataFound = true;
232 
+					$this->all_tracked[$id]['time_last_coord'] = time();
233 233 
 				}
234 234 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
235 235 
 			}
236 236 
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
237 
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
237 
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
238 238 
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
239 239 
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
240 
-				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
241 
-				    $dataFound = true;
242 
-				    $this->all_tracked[$id]['time_last_coord'] = time();
240 
+					$this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
241 
+					$dataFound = true;
242 
+					$this->all_tracked[$id]['time_last_coord'] = time();
243 243 
 				}
244 244 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
245 245 
 			}
246 246
247 
-		    } else if ($globalDebug && $timediff > 20) {
247 
+			} else if ($globalDebug && $timediff > 20) {
248 248 
 			$this->tmd = $this->tmd + 1;
249 249 
 			echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
250 250 
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -";
251 251 
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
252 252 
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
253 
-		    }
253 
+			}
254 254 
 		}
255 255 
 		if (isset($line['last_update']) && $line['last_update'] != '') {
256 
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
257 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
256 
+			if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
257 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
258 258 
 		}
259 259 
 		if (isset($line['format_source']) && $line['format_source'] != '') {
260 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
260 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
261 261 
 		}
262 262 
 		if (isset($line['source_name']) && $line['source_name'] != '') {
263 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
263 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
264 264 
 		}
265 265 
 		if (isset($line['status']) && $line['status'] != '') {
266 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status']));
266 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status']));
267 267 
 		}
268 268
269 269 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
270 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
270 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
271 271 
 		}
272 272
273 273 
 		if (isset($line['heading']) && $line['heading'] != '') {
274 
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
275 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
276 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
277 
-		    //$dataFound = true;
274 
+			if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
275 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
276 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
277 
+			//$dataFound = true;
278 278 
   		} 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']) {
279 
-  		    $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']);
280 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
281 
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
282 
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
279 
+  			$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']);
280 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
281 
+			if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
282 
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
283 283 
   		}
284 284 
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
285 285
286 286 
 		if (isset($line['datetime'])) {
287 
-		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
287 
+			if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
288 288 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
289 
-		    } else {
289 
+			} else {
290 290 
 				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n";
291 291 
 				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n";
292 292 
 				return '';
293 
-		    }
293 
+			}
294 294 
 		} else {
295 295 
 			date_default_timezone_set('UTC');
296 296 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
 
@@ -298,50 +298,50 @@  discard block
 
 block discarded – undo
298 298
299 299
300 300 
 		if ($dataFound === true && isset($this->all_tracked[$id]['mmsi'])) {
301 
-		    $this->all_tracked[$id]['lastupdate'] = time();
302 
-		    if ($this->all_tracked[$id]['addedMarine'] == 0) {
303 
-		        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'])) {
304 
-			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
301 
+			$this->all_tracked[$id]['lastupdate'] = time();
302 
+			if ($this->all_tracked[$id]['addedMarine'] == 0) {
303 
+				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'])) {
304 
+				if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
305 305 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
306 
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
307 
-				    $timeelapsed = microtime(true);
308 
-				    $MarineLive = new MarineLive($this->db);
309 
-				    if (isset($line['id'])) {
306 
+					if ($globalDebug) echo "Check if aircraft is already in DB...";
307 
+					$timeelapsed = microtime(true);
308 
+					$MarineLive = new MarineLive($this->db);
309 
+					if (isset($line['id'])) {
310 310 
 					$recent_ident = $MarineLive->checkIdRecent($line['id']);
311 311 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
312 
-				    } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
312 
+					} elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
313 313 
 					$recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']);
314 314 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
315 
-				    } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
315 
+					} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
316 316 
 					$recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']);
317 317 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
318 
-				    } else $recent_ident = '';
319 
-				    $MarineLive->db=null;
320 
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
321 
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
318 
+					} else $recent_ident = '';
319 
+					$MarineLive->db=null;
320 
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
321 
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
322 322 
 				} else $recent_ident = '';
323 
-			    } else {
323 
+				} else {
324 324 
 				$recent_ident = '';
325 325 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
326 
-			    }
327 
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
328 
-			    if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
329 
-			    {
326 
+				}
327 
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
328 
+				if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
329 
+				{
330 330 
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
331 331 
 				//adds the spotter data for the archive
332 
-				    $highlight = '';
333 
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
334 
-				    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
332 
+					$highlight = '';
333 
+					if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
334 
+					if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
335 335 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
336 
-					    $timeelapsed = microtime(true);
337 
-					    $Marine = new Marine($this->db);
338 
-					    $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
339 
-					    $Marine->db = null;
340 
-					    if ($globalDebug && isset($result)) echo $result."\n";
341 
-					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
336 
+						$timeelapsed = microtime(true);
337 
+						$Marine = new Marine($this->db);
338 
+						$result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
339 
+						$Marine->db = null;
340 
+						if ($globalDebug && isset($result)) echo $result."\n";
341 
+						if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
342 342 
 					}
343 
-				    }
344 
-				    /*
343 
+					}
344 
+					/*
345 345 
 				    // Add source stat in DB
346 346 
 				    $Stats = new Stats($this->db);
347 347 
 				    if (!empty($this->stats)) {
 
@@ -368,55 +368,55 @@  discard block
 
 block discarded – undo
368 368 
 				    }
369 369 
 				    $Stats->db = null;
370 370 
 				    */
371 
-				    $this->del();
371 
+					$this->del();
372 372 
 				//$ignoreImport = false;
373 373 
 				$this->all_tracked[$id]['addedMarine'] = 1;
374 374 
 				//print_r($this->all_tracked[$id]);
375 375 
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
376 
-				    if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
377 
-				    //MarineLive->deleteLiveMarineDataNotUpdated();
378 
-				    if (!isset($globaNoDB) || $globalNoDB !== TRUE) {
376 
+					if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
377 
+					//MarineLive->deleteLiveMarineDataNotUpdated();
378 
+					if (!isset($globaNoDB) || $globalNoDB !== TRUE) {
379 379 
 					$MarineLive = new MarineLive($this->db);
380 380 
 					$MarineLive->deleteLiveMarineData();
381 381 
 					$MarineLive->db=null;
382 382 
 					if ($globalDebug) echo " Done\n";
383 
-				    }
384 
-				    $this->last_delete = time();
383 
+					}
384 
+					$this->last_delete = time();
385 385 
 				}
386 
-			    } elseif ($recent_ident != '') {
386 
+				} elseif ($recent_ident != '') {
387 387 
 				$this->all_tracked[$id]['id'] = $recent_ident;
388 388 
 				$this->all_tracked[$id]['addedMarine'] = 1;
389 389 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
390 
-				    if (isset($globalDaemon) && !$globalDaemon) {
390 
+					if (isset($globalDaemon) && !$globalDaemon) {
391 391 
 					$Marine = new Marine($this->db);
392 392 
 					$Marine->updateLatestMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']);
393 393 
 					$Marine->db = null;
394 
-				    }
394 
+					}
395 395 
 				}
396 396
397 
-			    }
397 
+				}
398 398 
 			}
399 
-		    }
400 
-		    //adds the spotter LIVE data
401 
-		    if ($globalDebug) {
399 
+			}
400 
+			//adds the spotter LIVE data
401 
+			if ($globalDebug) {
402 402 
 			echo 'DATA : ident : '.$this->all_tracked[$id]['ident'].' - type : '.$this->all_tracked[$id]['type'].' - Latitude : '.$this->all_tracked[$id]['latitude'].' - Longitude : '.$this->all_tracked[$id]['longitude'].' - Heading : '.$this->all_tracked[$id]['heading'].' - Speed : '.$this->all_tracked[$id]['speed']."\n";
403 
-		    }
404 
-		    $ignoreImport = false;
403 
+			}
404 
+			$ignoreImport = false;
405 405
406 
-		    if (!$ignoreImport) {
406 
+			if (!$ignoreImport) {
407 407 
 			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'])) {
408 408 
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
409 409 
 				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
410 
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
410 
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
411 411 
 					$timeelapsed = microtime(true);
412 412 
 					$MarineLive = new MarineLive($this->db);
413 413 
 					$result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
414 414 
 					$MarineLive->db = null;
415 415 
 					if ($globalDebug) echo $result."\n";
416 
-				    }
416 
+					}
417 417 
 				}
418 418 
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
419 
-				    $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
419 
+					$APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
420 420 
 				}
421 421 
 				$this->all_tracked[$id]['putinarchive'] = false;
422 422 
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 
@@ -482,24 +482,24 @@  discard block
 
 block discarded – undo
482 482
483 483
484 484 
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
485 
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
485 
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
486 486 
 				if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour...";
487 487 
 				$MarineLive = new MarineLive($this->db);
488 488 
 				$MarineLive->deleteLiveMarineDataNotUpdated();
489 489 
 				$MarineLive->db = null;
490 490 
 				//MarineLive->deleteLiveMarineData();
491 491 
 				if ($globalDebug) echo " Done\n";
492 
-			    }
493 
-			    $this->last_delete_hourly = time();
492 
+				}
493 
+				$this->last_delete_hourly = time();
494 494 
 			}
495 495
496 
-		    }
497 
-		    //$ignoreImport = false;
496 
+			}
497 
+			//$ignoreImport = false;
498 498 
 		}
499 499 
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
500 500 
 		if ($send) return $this->all_tracked[$id];
501 
-	    }
501 
+		}
502 
+	}
502 503 
 	}
503 
-    }
504 504 
 }
505 505 
 ?>
Please login to merge, or discard this patch.