View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 0c6dd7...d86a10 )
by Yannick
114:41 queued 80:01
created
Status
Category
Toggle Patches
require/class.MarineImport.php 1 patch
Spacing   +88 added lines, -88 removed lines patch added patch discarded remove patch 
@@ -59,7 +59,7 @@  discard block
 
 block discarded – undo
59 59 
 		if (isset($this->all_tracked[$key]['id'])) {
60 60 
 		    //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
61 61 
     		    $Marine = new Marine($this->db);
62 
-    		    $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 
+    		    $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']);
63 63 
 		}
64 64 
 	    }
65 65 
 	}
 
@@ -71,7 +71,7 @@  discard block
 
 block discarded – undo
71 71 
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
72 72 
 	foreach ($this->all_tracked as $key => $flight) {
73 73 
     	    if (isset($flight['lastupdate'])) {
74 
-        	if ($flight['lastupdate'] < (time()-3000)) {
74 
+        	if ($flight['lastupdate'] < (time() - 3000)) {
75 75 
             	    if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
76 76 
             		if (isset($this->all_tracked[$key]['id'])) {
77 77 
             		    if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
 
@@ -83,7 +83,7 @@  discard block
 
 block discarded – undo
83 83 
             		    //$real_arrival = $this->arrival($key);
84 84 
             		    $Marine = new Marine($this->db);
85 85 
             		    if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
86 
-				$result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
86 
+				$result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']);
87 87 
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
88 88 
 			    }
89 89 
 			    // Put in archive
 
@@ -97,14 +97,14 @@  discard block
 
 block discarded – undo
97 97 
     }
98 98
99 99 
     public function add($line) {
100 
-	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine;
100 
+	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS, $APRSMarine;
101 101 
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
102 102 
 	date_default_timezone_set('UTC');
103 103 
 	$dataFound = false;
104 104 
 	$send = false;
105 105
106 106 
 	// SBS format is CSV format
107 
-	if(is_array($line) && isset($line['mmsi'])) {
107 
+	if (is_array($line) && isset($line['mmsi'])) {
108 108 
 	    //print_r($line);
109 109 
   	    if (isset($line['mmsi'])) {
110 110 
 
@@ -129,25 +129,25 @@  discard block
 
 block discarded – undo
129 129
130 130 
 		if (!isset($this->all_tracked[$id])) {
131 131 
 		    $this->all_tracked[$id] = array();
132 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0));
133 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => ''));
134 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
132 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('addedMarine' => 0));
133 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => '', 'latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '', 'source_name' => '', 'comment'=> '', 'type' => '', 'typeid' => '', 'noarchive' => false, 'putinarchive' => true, 'over_country' => '', 'mmsi' => '', 'status' => '', 'status_id' => '', 'imo' => '', 'callsign' => '', 'arrival_code' => '', 'arrival_date' => '', 'mmsi_type' => ''));
134 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('lastupdate' => time()));
135 135 
 		    if (!isset($line['id'])) {
136 136 
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
137 
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
138 
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
137 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $id.'-'.date('YmdHi')));
138 
+		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $line['id']));
139 139 
 		    if ($globalAllTracked !== FALSE) $dataFound = true;
140 140 
 		}
141 141
142 142 
 		if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) {
143 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
143 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('mmsi' => $line['mmsi']));
144 144 
 		    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
145 145 
 			$Marine = new Marine($this->db);
146 146 
 			$identity = $Marine->getIdentity($line['mmsi']);
147 147 
 			if (!empty($identity)) {
148 148 
 			    $this->all_tracked[$id]['ident'] = $identity['ship_name'];
149 149 
 			    $this->all_tracked[$id]['type'] = $identity['type'];
150 
-			    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $AIS->getShipTypeID($identity['type'])));
150 
+			    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('typeid' => $AIS->getShipTypeID($identity['type'])));
151 151 
 			}
152 152 
 			//print_r($identity);
153 153 
 			unset($Marine);
 
@@ -155,23 +155,23 @@  discard block
 
 block discarded – undo
155 155 
 		    }
156 156 
 		}
157 157 
 		if (isset($line['type_id'])) {
158 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id'])));
159 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $line['type_id']));
158 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $AIS->getShipType($line['type_id'])));
159 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('typeid' => $line['type_id']));
160 160 
 		}
161 161 
 		if (isset($line['type']) && $line['type'] != '' && $this->all_tracked[$id]['type'] == '') {
162 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
163 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $AIS->getShipTypeID($line['type'])));
162 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $line['type']));
163 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('typeid' => $AIS->getShipTypeID($line['type'])));
164 164 
 		}
165 165 
 		if (isset($line['status']) && $line['status'] != '') {
166 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status']));
166 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('status' => $line['status']));
167 167 
 		}
168 168 
 		if (isset($line['status_id']) && (!isset($this->all_tracked[$id]['status_id']) || $this->all_tracked[$id]['status_id'] != $line['status_id'])) {
169 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id']));
169 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('status_id' => $line['status_id']));
170 170 
 		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
171 171 
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
172 172 
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
173 173 
 				$Marine = new Marine($this->db);
174 
-				$Marine->updateStatusMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['status']);
174 
+				$Marine->updateStatusMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['status']);
175 175 
 				unset($Marine);
176 176 
 			    }
177 177 
 			}
 
@@ -180,24 +180,24 @@  discard block
 
 block discarded – undo
180 180
181 181
182 182 
 		if (isset($line['mmsi_type']) && $line['mmsi_type'] != '') {
183 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type']));
183 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('mmsi_type' => $line['mmsi_type']));
184 184 
 		}
185 185 
 		if (isset($line['imo']) && $line['imo'] != '') {
186 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo']));
186 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('imo' => $line['imo']));
187 187 
 		}
188 188 
 		if (isset($line['callsign']) && $line['callsign'] != '') {
189 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign']));
189 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('callsign' => $line['callsign']));
190 190 
 		}
191 191 
 		if (isset($line['arrival_code']) && $line['arrival_code'] != '') {
192 192 
 		    if (!isset($this->all_tracked[$id]['arrival_code'])) {
193 
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code']));
193 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('arrival_code' => $line['arrival_code']));
194 194 
 			if ($globalDebug) echo $this->all_tracked[$id]['id'].' => New arrival: '.$line['arrival_code']."\n";
195 195 
 			if ($this->all_tracked[$id]['addedMarine'] != 0) {
196 196 
 			    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
197 197 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
198 198 
 				    $Marine = new Marine($this->db);
199 199 
 				    $fromsource = NULL;
200 
-				    $Marine->updateArrivalPortNameMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['arrival_code'],$fromsource);
200 
+				    $Marine->updateArrivalPortNameMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['arrival_code'], $fromsource);
201 201 
 				    $Marine->db = null;
202 202 
 				}
203 203 
 			    }
 
@@ -213,7 +213,7 @@  discard block
 
 block discarded – undo
213 213 
 		    }
214 214 
 		}
215 215 
 		if (isset($line['arrival_date']) && $line['arrival_date'] != '') {
216 
-		    if (strtotime($line['arrival_date']) > time()) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
216 
+		    if (strtotime($line['arrival_date']) > time()) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('arrival_date' => $line['arrival_date']));
217 217 
 		}
218 218
219 219 
 		//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'])) {
 
@@ -222,44 +222,44 @@  discard block
 
 block discarded – undo
222 222 
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
223 223 
 			    $timeelapsed = microtime(true);
224 224 
 			    $Marine = new Marine($this->db);
225 
-			    $Marine->addIdentity($this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['type']);
225 
+			    $Marine->addIdentity($this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['type']);
226 226 
 			    $Marine->db = null;
227 227 
 			}
228 228 
 		    }
229 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
229 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => trim($line['ident'])));
230 230 
 		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
231 231 
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
232 232 
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
233 233 
 				$timeelapsed = microtime(true);
234 234 
 				$Marine = new Marine($this->db);
235 235 
 				$fromsource = NULL;
236 
-				$result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
236 
+				$result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $fromsource);
237 237 
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
238 238 
 				$Marine->db = null;
239 
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
239 
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
240 240 
 			    }
241 241 
 			}
242 242 
 		    }
243 
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
243 
+		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident']));
244 244 
 		}
245 245
246 
-		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-30*60 && strtotime($line['datetime']) < time()+20*60) {
246 
+		if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 30*60 && strtotime($line['datetime']) < time() + 20*60) {
247 247 
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
248 
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
248 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => $line['datetime']));
249 249 
 		    } else {
250 250 
 				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";
251 251 
 				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";
252 252 
 				return '';
253 253 
 		    }
254 
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) <= time()-30*60) {
254 
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) <= time() - 30*60) {
255 255 
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!\n";
256 256 
 			return '';
257 
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) >= time()+20*60) {
257 
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) >= time() + 20*60) {
258 258 
 			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!\n";
259 259 
 			return '';
260 260 
 		} elseif (!isset($line['datetime'])) {
261 261 
 			date_default_timezone_set('UTC');
262 
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
262 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => date('Y-m-d H:i:s')));
263 263 
 		} else {
264 264 
 			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." date: ".$line['datetime']." - format : ".$line['format_source']."!!!\n";
265 265 
 			return '';
 
@@ -267,24 +267,24 @@  discard block
 
 block discarded – undo
267 267
268 268
269 269 
 		if (isset($line['speed'])) {
270 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
271 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
270 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($line['speed'])));
271 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed_fromsrc' => true));
272 272 
 		} 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'])) {
273 
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
273 
+		    $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm');
274 274 
 		    if ($distance > 1000 && $distance < 10000) {
275 275 
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
276 276 
 			$speed = $speed*3.6;
277 
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
277 
+			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($speed)));
278 278 
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
279 279 
 		    }
280 280 
 		}
281 281
282 282 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
283 
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
283 
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time() - $this->all_tracked[$id]['time_last_coord']);
284 284 
 	    	    else unset($timediff);
285 
-	    	    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')))) {
285 
+	    	    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')))) {
286 286 
 			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'])) {
287 
-			    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'])) {
287 
+			    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'])) {
288 288 
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
289 289 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
290 290 
 				$this->all_tracked[$id]['putinarchive'] = true;
 
@@ -293,10 +293,10 @@  discard block
 
 block discarded – undo
293 293 
 				$timeelapsed = microtime(true);
294 294 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
295 295 
 				    $Marine = new Marine($this->db);
296 
-				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
296 
+				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']);
297 297 
 				    if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
298 298 
 				    $Marine->db = null;
299 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
299 
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
300 300 
 				}
301 301 
 				$this->tmd = 0;
302 302 
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
 
@@ -305,55 +305,55 @@  discard block
 
 block discarded – undo
305 305
306 306 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
307 307 
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
308 
-				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') {
308 
+				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') {
309 309 
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
310 310 
 				    $dataFound = true;
311 311 
 				    $this->all_tracked[$id]['time_last_coord'] = time();
312 312 
 				}
313 
-				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
313 
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('latitude' => $line['latitude']));
314 314 
 			}
315 315 
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
316 316 
 			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
317 317 
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
318 
-				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') {
318 
+				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') {
319 319 
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
320 320 
 				    $dataFound = true;
321 321 
 				    $this->all_tracked[$id]['time_last_coord'] = time();
322 322 
 				}
323 
-				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
323 
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('longitude' => $line['longitude']));
324 324 
 			}
325 325
326 326 
 		    } else if ($globalDebug && $timediff > 20) {
327 327 
 			$this->tmd = $this->tmd + 1;
328 328 
 			echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
329 
-			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -";
330 
-			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
329 
+			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')."m -";
330 
+			echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - ";
331 331 
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
332 332 
 		    }
333 333 
 		}
334 334 
 		if (isset($line['last_update']) && $line['last_update'] != '') {
335 335 
 		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
336 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
336 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('last_update' => $line['last_update']));
337 337 
 		}
338 338 
 		if (isset($line['format_source']) && $line['format_source'] != '') {
339 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
339 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('format_source' => $line['format_source']));
340 340 
 		}
341 341 
 		if (isset($line['source_name']) && $line['source_name'] != '') {
342 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
342 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('source_name' => $line['source_name']));
343 343 
 		}
344 344 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
345 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
345 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('noarchive' => true));
346 346 
 		}
347 347
348 348 
 		if (isset($line['heading']) && $line['heading'] != '') {
349 
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
350 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
351 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
349 
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading'] - round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
350 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($line['heading'])));
351 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading_fromsrc' => true));
352 352 
 		    //$dataFound = true;
353 353 
   		} 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']) {
354 
-  		    $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']);
355 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
356 
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
354 
+  		    $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']);
355 
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($heading)));
356 
+		    if (abs($this->all_tracked[$id]['heading'] - round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
357 357 
   		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
358 358 
   		}
359 359 
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
 
@@ -363,7 +363,7 @@  discard block
 
 block discarded – undo
363 363 
 		if ($dataFound === true && isset($this->all_tracked[$id]['mmsi'])) {
364 364 
 		    $this->all_tracked[$id]['lastupdate'] = time();
365 365 
 		    if ($this->all_tracked[$id]['addedMarine'] == 0) {
366 
-		        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'])) {
366 
+		        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'])) {
367 367 
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
368 368 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
369 369 
 				    if ($globalDebug) echo "Check if vessel is already in DB...";
 
@@ -371,37 +371,37 @@  discard block
 
 block discarded – undo
371 371 
 				    $MarineLive = new MarineLive($this->db);
372 372 
 				    if (isset($line['id'])) {
373 373 
 					$recent_ident = $MarineLive->checkIdRecent($line['id']);
374 
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
374 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
375 375 
 				    } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
376 376 
 					$recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']);
377 
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
377 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
378 378 
 				    } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
379 379 
 					$recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']);
380 
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
380 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
381 381 
 				    } else $recent_ident = '';
382 
-				    $MarineLive->db=null;
382 
+				    $MarineLive->db = null;
383 383 
 				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
384 384 
 				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
385 385 
 				} else $recent_ident = '';
386 386 
 			    } else {
387 387 
 				$recent_ident = '';
388 
-				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
388 
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('forcenew' => 0));
389 389 
 			    }
390 390 
 			    //if there was no vessel with the same callsign within the last hour and go post it into the archive
391 
-			    if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
391 
+			    if ($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
392 392 
 			    {
393 393 
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
394 394 
 				//adds the spotter data for the archive
395 395 
 				    $highlight = '';
396 
-				    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')));
396 
+				    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')));
397 397 
 				    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
398 398 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
399 399 
 					    $timeelapsed = microtime(true);
400 400 
 					    $Marine = new Marine($this->db);
401 
-					    $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
401 
+					    $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name']);
402 402 
 					    $Marine->db = null;
403 403 
 					    if ($globalDebug && isset($result)) echo $result."\n";
404 
-					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
404 
+					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
405 405 
 					}
406 406 
 				    }
407 407 
 				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
 
@@ -409,15 +409,15 @@  discard block
 
 block discarded – undo
409 409 
 					$Stats = new Stats($this->db);
410 410 
 					if (!empty($this->stats)) {
411 411 
 					    if ($globalDebug) echo 'Add source stats : ';
412 
-				    	    foreach($this->stats as $date => $data) {
413 
-						foreach($data as $source => $sourced) {
412 
+				    	    foreach ($this->stats as $date => $data) {
413 
+						foreach ($data as $source => $sourced) {
414 414 
 					    	    //print_r($sourced);
415 
-				    	    	    if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
416 
-				    	    	    if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
415 
+				    	    	    if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar_marine', $date);
416 
+				    	    	    if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist_marine', $date);
417 417 
 				    		    if (isset($sourced['msg'])) {
418 418 
 				    			if (time() - $sourced['msg']['date'] > 10) {
419 419 
 				    		    	    $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
420 
-				    		    	    echo $Stats->addStatSource($nbmsg,$source,'msg_marine',$date);
420 
+				    		    	    echo $Stats->addStatSource($nbmsg, $source, 'msg_marine', $date);
421 421 
 			    			    	    unset($this->stats[$date][$source]['msg']);
422 422 
 			    				}
423 423 
 			    			    }
 
@@ -441,7 +441,7 @@  discard block
 
 block discarded – undo
441 441 
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
442 442 
 					$MarineLive = new MarineLive($this->db);
443 443 
 					$MarineLive->deleteLiveMarineData();
444 
-					$MarineLive->db=null;
444 
+					$MarineLive->db = null;
445 445 
 					if ($globalDebug) echo " Done\n";
446 446 
 				    }
447 447 
 				    $this->last_delete = time();
 
@@ -452,7 +452,7 @@  discard block
 
 block discarded – undo
452 452 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
453 453 
 				    if (isset($globalDaemon) && !$globalDaemon) {
454 454 
 					$Marine = new Marine($this->db);
455 
-					$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']);
455 
+					$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']);
456 456 
 					$Marine->db = null;
457 457 
 				    }
458 458 
 				}
 
@@ -467,20 +467,20 @@  discard block
 
 block discarded – undo
467 467 
 		    $ignoreImport = false;
468 468
469 469 
 		    if (!$ignoreImport) {
470 
-			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'])) {
470 
+			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'])) {
471 471 
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
472 472 
 				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
473 473 
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
474 474 
 					$timeelapsed = microtime(true);
475 475 
 					$MarineLive = new MarineLive($this->db);
476 
-					$result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
476 
+					$result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']);
477 477 
 					$MarineLive->db = null;
478 478 
 					if ($globalDebug) echo $result."\n";
479 
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
479 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
480 480 
 				    }
481 481 
 				}
482 482 
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) {
483 
-				    $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]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
483 
+				    $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]['status_id'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']);
484 484 
 				}
485 485 
 				$this->all_tracked[$id]['putinarchive'] = false;
486 486 
 
@@ -499,19 +499,19 @@  discard block
 
 block discarded – undo
499 499 
 							$latitude = $globalCenterLatitude;
500 500 
 							$longitude = $globalCenterLongitude;
501 501 
 						}
502 
-						$this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude);
502 
+						$this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude);
503 503 
 					} else {
504 504 
 						$latitude = $this->source_location[$source]['latitude'];
505 505 
 						$longitude = $this->source_location[$source]['longitude'];
506 506 
 					}
507 
-					$stats_heading = $Common->getHeading($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
507 
+					$stats_heading = $Common->getHeading($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']);
508 508 
 					//$stats_heading = $stats_heading%22.5;
509 509 
 					$stats_heading = round($stats_heading/22.5);
510 
-					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
510 
+					$stats_distance = $Common->distance($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']);
511 511 
 					$current_date = date('Y-m-d');
512 512 
 					if ($stats_heading == 16) $stats_heading = 0;
513 513 
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
514 
-						for ($i=0;$i<=15;$i++) {
514 
+						for ($i = 0; $i <= 15; $i++) {
515 515 
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
516 516 
 						}
517 517 
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
 
@@ -526,9 +526,9 @@  discard block
 
 block discarded – undo
526 526 
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
527 527 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
528 528 
 						    end($this->stats[$current_date][$source]['hist']);
529 
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
529 
+						    $mini = key($this->stats[$current_date][$source]['hist']) + 10;
530 530 
 						} else $mini = 0;
531 
-						for ($i=$mini;$i<=$distance;$i+=10) {
531 
+						for ($i = $mini; $i <= $distance; $i += 10) {
532 532 
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
533 533 
 						}
534 534 
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
 
@@ -540,7 +540,7 @@  discard block
 
 block discarded – undo
540 540
541 541 
 				$this->all_tracked[$id]['lastupdate'] = time();
542 542 
 				if ($this->all_tracked[$id]['putinarchive']) $send = true;
543 
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
543 
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n";
544 544 
 			//$this->del();
545 545
546 546
Please login to merge, or discard this patch.