View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 3f35c5...0c6dd7 )
by Yannick
88:47 queued 56:59
created
Status
Category
Toggle Patches
require/class.MarineImport.php 1 patch
Indentation   +217 added lines, -217 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, $APRSMarine, $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,57 +46,57 @@  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, $globalNoDB;
56 56 
 	if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
57 
-	    if ($globalDebug) echo "Update last seen tracked data...\n";
58 
-	    foreach ($this->all_tracked as $key => $flight) {
57 
+		if ($globalDebug) echo "Update last seen tracked data...\n";
58 
+		foreach ($this->all_tracked as $key => $flight) {
59 59 
 		if (isset($this->all_tracked[$key]['id'])) {
60 
-		    //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
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']);
60 
+			//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
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']);
63 
+		}
63 64 
 		}
64 
-	    }
65 65 
 	}
66 
-    }
66 
+	}
67 67
68 
-    public function del() {
68 
+	public function del() {
69 69 
 	global $globalDebug, $globalNoDB, $globalNoImport;
70 70 
 	// Delete old infos
71 71 
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
72 72 
 	foreach ($this->all_tracked as $key => $flight) {
73 
-    	    if (isset($flight['lastupdate'])) {
74 
-        	if ($flight['lastupdate'] < (time()-3000)) {
75 
-            	    if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
76 
-            		if (isset($this->all_tracked[$key]['id'])) {
77 
-            		    if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
78 
-			    /*
73 
+			if (isset($flight['lastupdate'])) {
74 
+			if ($flight['lastupdate'] < (time()-3000)) {
75 
+					if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
76 
+					if (isset($this->all_tracked[$key]['id'])) {
77 
+						if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
78 
+				/*
79 79 
 			    $MarineLive = new MarineLive();
80 80 
             		    $MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']);
81 81 
 			    $MarineLive->db = null;
82 82 
 			    */
83 
-            		    //$real_arrival = $this->arrival($key);
84 
-            		    $Marine = new Marine($this->db);
85 
-            		    if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
83 
+						//$real_arrival = $this->arrival($key);
84 
+						$Marine = new Marine($this->db);
85 
+						if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
86 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 
-			    }
89 
-			    // Put in archive
88 
+				}
89 
+				// Put in archive
90 90 
 //				$Marine->db = null;
91 91 
 			}
92 
-            	    }
93 
-            	    unset($this->all_tracked[$key]);
94 
-    	        }
95 
-	    }
96 
-        }
97 
-    }
92 
+					}
93 
+					unset($this->all_tracked[$key]);
94 
+				}
95 
+		}
96 
+		}
97 
+	}
98 98
99 
-    public function add($line) {
99 
+	public function add($line) {
100 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');
 
@@ -105,104 +105,104 @@  discard block
 
 block discarded – undo
105 105
106 106 
 	// SBS format is CSV format
107 107 
 	if(is_array($line) && isset($line['mmsi'])) {
108 
-	    //print_r($line);
109 
-  	    if (isset($line['mmsi'])) {
108 
+		//print_r($line);
109 
+  		if (isset($line['mmsi'])) {
110 110
111 111
112 112 
 		// Increment message number
113 113 
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
114 
-		    $current_date = date('Y-m-d');
115 
-		    if (isset($line['source_name'])) $source = $line['source_name'];
116 
-		    else $source = '';
117 
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
118 
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
119 
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
120 
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
121 
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
114 
+			$current_date = date('Y-m-d');
115 
+			if (isset($line['source_name'])) $source = $line['source_name'];
116 
+			else $source = '';
117 
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
118 
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
119 
+				$this->stats[$current_date][$source]['msg']['date'] = time();
120 
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
121 
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
122 122 
 		}
123 123
124 124
125 125 
 		$Common = new Common();
126 126 
 		$AIS = new AIS();
127 
-	        if (!isset($line['id'])) $id = trim($line['mmsi']);
128 
-	        else $id = trim($line['id']);
127 
+			if (!isset($line['id'])) $id = trim($line['mmsi']);
128 
+			else $id = trim($line['id']);
129 129
130 130 
 		if (!isset($this->all_tracked[$id])) {
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()));
135 
-		    if (!isset($line['id'])) {
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()));
135 
+			if (!isset($line['id'])) {
136 136 
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
137 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 
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
138 
+			 } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
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']));
144 
-		    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
143 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
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 
-			    $this->all_tracked[$id]['ident'] = $identity['ship_name'];
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'])));
148 
+				$this->all_tracked[$id]['ident'] = $identity['ship_name'];
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'])));
151 151 
 			}
152 152 
 			//print_r($identity);
153 153 
 			unset($Marine);
154 154 
 			//$dataFound = true;
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']));
170 
-		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
169 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id']));
170 
+			if ($this->all_tracked[$id]['addedMarine'] == 1) {
171 171 
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
172 
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
172 
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
173 173 
 				$Marine = new Marine($this->db);
174 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 178 
 			}
178 
-		    }
179 179 
 		}
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 
-		    if (!isset($this->all_tracked[$id]['arrival_code'])) {
192 
+			if (!isset($this->all_tracked[$id]['arrival_code'])) {
193 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 
-			    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
196 
+				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
197 197 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
198 
-				    $Marine = new Marine($this->db);
199 
-				    $fromsource = NULL;
200 
-				    $Marine->updateArrivalPortNameMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['arrival_code'],$fromsource);
201 
-				    $Marine->db = null;
198 
+					$Marine = new Marine($this->db);
199 
+					$fromsource = NULL;
200 
+					$Marine->updateArrivalPortNameMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['arrival_code'],$fromsource);
201 
+					$Marine->db = null;
202 
+				}
202 203 
 				}
203 
-			    }
204 204 
 			}
205 
-		    } elseif ($this->all_tracked[$id]['arrival_code'] != $line['arrival_code']) {
205 
+			} elseif ($this->all_tracked[$id]['arrival_code'] != $line['arrival_code']) {
206 206 
 			$this->all_tracked[$id]['arrival_code'] = $line['arrival_code'];
207 207 
 			if ($globalDebug) echo $this->all_tracked[$id]['id'].' => New arrival: '.$line['arrival_code']."\n";
208 208 
 			if (!isset($line['id'])) {
 
@@ -210,18 +210,18 @@  discard block
 
 block discarded – undo
210 210 
 				$this->all_tracked[$id]['forcenew'] = 1;
211 211 
 				$this->all_tracked[$id]['addedMarine'] = 0;
212 212 
 			}
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'])) {
220 220 
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
221 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
222 
-		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
221 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
222 
+			if ($this->all_tracked[$id]['addedMarine'] == 1) {
223 223 
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
224 
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
224 
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
225 225 
 				$timeelapsed = microtime(true);
226 226 
 				$Marine = new Marine($this->db);
227 227 
 				$fromsource = NULL;
 
@@ -230,20 +230,20 @@  discard block
 
 block discarded – undo
230 230 
 				$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']);
231 231 
 				$Marine->db = null;
232 232 
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
233 
-			    }
233 
+				}
234 
+			}
234 235 
 			}
235 
-		    }
236 
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
236 
+			if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
237 237 
 		}
238 238
239 239 
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-30*60 && strtotime($line['datetime']) < time()+20*60) {
240 
-		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
240 
+			if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
241 241 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
242 
-		    } else {
242 
+			} else {
243 243 
 				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";
244 244 
 				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";
245 245 
 				return '';
246 
-		    }
246 
+			}
247 247 
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) <= time()-30*60) {
248 248 
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!\n";
249 249 
 			return '';
 
@@ -260,24 +260,24 @@  discard block
 
 block discarded – undo
260 260
261 261
262 262 
 		if (isset($line['speed'])) {
263 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
264 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
263 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
264 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
265 265 
 		} 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'])) {
266 
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
267 
-		    if ($distance > 1000 && $distance < 10000) {
266 
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
267 
+			if ($distance > 1000 && $distance < 10000) {
268 268 
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
269 269 
 			$speed = $speed*3.6;
270 270 
 			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
271 271 
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
272 
-		    }
272 
+			}
273 273 
 		}
274 274
275 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
276 
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
277 
-	    	    else unset($timediff);
278 
-	    	    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')))) {
275 
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
276 
+				if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
277 
+				else unset($timediff);
278 
+				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')))) {
279 279 
 			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'])) {
280 
-			    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'])) {
280 
+				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'])) {
281 281 
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
282 282 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
283 283 
 				$this->all_tracked[$id]['putinarchive'] = true;
 
@@ -285,195 +285,195 @@  discard block
 
 block discarded – undo
285 285 
 				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
286 286 
 				$timeelapsed = microtime(true);
287 287 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
288 
-				    $Marine = new Marine($this->db);
289 
-				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
290 
-				    if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
291 
-				    $Marine->db = null;
292 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
288 
+					$Marine = new Marine($this->db);
289 
+					$all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
290 
+					if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
291 
+					$Marine->db = null;
292 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
293 293 
 				}
294 294 
 				$this->tmd = 0;
295 295 
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
296 
-			    }
296 
+				}
297 297 
 			}
298 298
299 299 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
300 300 
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
301 301 
 				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') {
302 
-				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
303 
-				    $dataFound = true;
304 
-				    $this->all_tracked[$id]['time_last_coord'] = time();
302 
+					$this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
303 
+					$dataFound = true;
304 
+					$this->all_tracked[$id]['time_last_coord'] = time();
305 305 
 				}
306 306 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
307 307 
 			}
308 308 
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
309 
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
309 
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
310 310 
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
311 311 
 				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') {
312 
-				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
313 
-				    $dataFound = true;
314 
-				    $this->all_tracked[$id]['time_last_coord'] = time();
312 
+					$this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
313 
+					$dataFound = true;
314 
+					$this->all_tracked[$id]['time_last_coord'] = time();
315 315 
 				}
316 316 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
317 317 
 			}
318 318
319 
-		    } else if ($globalDebug && $timediff > 20) {
319 
+			} else if ($globalDebug && $timediff > 20) {
320 320 
 			$this->tmd = $this->tmd + 1;
321 321 
 			echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
322 322 
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -";
323 323 
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
324 324 
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
325 
-		    }
325 
+			}
326 326 
 		}
327 327 
 		if (isset($line['last_update']) && $line['last_update'] != '') {
328 
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
329 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
328 
+			if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
329 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
330 330 
 		}
331 331 
 		if (isset($line['format_source']) && $line['format_source'] != '') {
332 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
332 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
333 333 
 		}
334 334 
 		if (isset($line['source_name']) && $line['source_name'] != '') {
335 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
335 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
336 336 
 		}
337 337 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
338 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
338 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
339 339 
 		}
340 340
341 341 
 		if (isset($line['heading']) && $line['heading'] != '') {
342 
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
343 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
344 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
345 
-		    //$dataFound = true;
342 
+			if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
343 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
344 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
345 
+			//$dataFound = true;
346 346 
   		} 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']) {
347 
-  		    $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']);
348 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
349 
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
350 
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
347 
+  			$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']);
348 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
349 
+			if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
350 
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
351 351 
   		}
352 352 
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
353 353
354 354
355 355
356 356 
 		if ($dataFound === true && isset($this->all_tracked[$id]['mmsi'])) {
357 
-		    $this->all_tracked[$id]['lastupdate'] = time();
358 
-		    if ($this->all_tracked[$id]['addedMarine'] == 0) {
359 
-		        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'])) {
360 
-			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
357 
+			$this->all_tracked[$id]['lastupdate'] = time();
358 
+			if ($this->all_tracked[$id]['addedMarine'] == 0) {
359 
+				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'])) {
360 
+				if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
361 361 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
362 
-				    if ($globalDebug) echo "Check if vessel is already in DB...";
363 
-				    $timeelapsed = microtime(true);
364 
-				    $MarineLive = new MarineLive($this->db);
365 
-				    if (isset($line['id'])) {
362 
+					if ($globalDebug) echo "Check if vessel is already in DB...";
363 
+					$timeelapsed = microtime(true);
364 
+					$MarineLive = new MarineLive($this->db);
365 
+					if (isset($line['id'])) {
366 366 
 					$recent_ident = $MarineLive->checkIdRecent($line['id']);
367 367 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
368 
-				    } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
368 
+					} elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
369 369 
 					$recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']);
370 370 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
371 
-				    } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
371 
+					} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
372 372 
 					$recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']);
373 373 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
374 
-				    } else $recent_ident = '';
375 
-				    $MarineLive->db=null;
376 
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
377 
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
374 
+					} else $recent_ident = '';
375 
+					$MarineLive->db=null;
376 
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
377 
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
378 378 
 				} else $recent_ident = '';
379 
-			    } else {
379 
+				} else {
380 380 
 				$recent_ident = '';
381 381 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
382 
-			    }
383 
-			    //if there was no vessel with the same callsign within the last hour and go post it into the archive
384 
-			    if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
385 
-			    {
382 
+				}
383 
+				//if there was no vessel with the same callsign within the last hour and go post it into the archive
384 
+				if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
385 
+				{
386 386 
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
387 387 
 				//adds the spotter data for the archive
388 
-				    $highlight = '';
389 
-				    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')));
390 
-				    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
388 
+					$highlight = '';
389 
+					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')));
390 
+					if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
391 391 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
392 
-					    $timeelapsed = microtime(true);
393 
-					    $Marine = new Marine($this->db);
394 
-					    $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']);
395 
-					    $Marine->db = null;
396 
-					    if ($globalDebug && isset($result)) echo $result."\n";
397 
-					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
392 
+						$timeelapsed = microtime(true);
393 
+						$Marine = new Marine($this->db);
394 
+						$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']);
395 
+						$Marine->db = null;
396 
+						if ($globalDebug && isset($result)) echo $result."\n";
397 
+						if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
398 398 
 					}
399 
-				    }
400 
-				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
399 
+					}
400 
+					if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
401 401 
 					// Add source stat in DB
402 402 
 					$Stats = new Stats($this->db);
403 403 
 					if (!empty($this->stats)) {
404 
-					    if ($globalDebug) echo 'Add source stats : ';
405 
-				    	    foreach($this->stats as $date => $data) {
404 
+						if ($globalDebug) echo 'Add source stats : ';
405 
+							foreach($this->stats as $date => $data) {
406 406 
 						foreach($data as $source => $sourced) {
407 
-					    	    //print_r($sourced);
408 
-				    	    	    if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
409 
-				    	    	    if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
410 
-				    		    if (isset($sourced['msg'])) {
411 
-				    			if (time() - $sourced['msg']['date'] > 10) {
412 
-				    		    	    $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
413 
-				    		    	    echo $Stats->addStatSource($nbmsg,$source,'msg_marine',$date);
414 
-			    			    	    unset($this->stats[$date][$source]['msg']);
415 
-			    				}
416 
-			    			    }
417 
-			    			}
418 
-			    			if ($date != date('Y-m-d')) {
419 
-			    			    unset($this->stats[$date]);
420 
-			    			}
421 
-				    	    }
422 
-				    	    if ($globalDebug) echo 'Done'."\n";
407 
+								//print_r($sourced);
408 
+									if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
409 
+									if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
410 
+								if (isset($sourced['msg'])) {
411 
+								if (time() - $sourced['msg']['date'] > 10) {
412 
+										$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
413 
+										echo $Stats->addStatSource($nbmsg,$source,'msg_marine',$date);
414 
+										unset($this->stats[$date][$source]['msg']);
415 
+								}
416 
+								}
417 
+							}
418 
+							if ($date != date('Y-m-d')) {
419 
+								unset($this->stats[$date]);
420 
+							}
421 
+							}
422 
+							if ($globalDebug) echo 'Done'."\n";
423 423 
 					}
424 424 
 					$Stats->db = null;
425 
-				    }
425 
+					}
426 426
427 
-				    $this->del();
427 
+					$this->del();
428 428 
 				//$ignoreImport = false;
429 429 
 				$this->all_tracked[$id]['addedMarine'] = 1;
430 430 
 				//print_r($this->all_tracked[$id]);
431 431 
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
432 
-				    if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
433 
-				    //MarineLive->deleteLiveMarineDataNotUpdated();
434 
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
432 
+					if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
433 
+					//MarineLive->deleteLiveMarineDataNotUpdated();
434 
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
435 435 
 					$MarineLive = new MarineLive($this->db);
436 436 
 					$MarineLive->deleteLiveMarineData();
437 437 
 					$MarineLive->db=null;
438 438 
 					if ($globalDebug) echo " Done\n";
439 
-				    }
440 
-				    $this->last_delete = time();
439 
+					}
440 
+					$this->last_delete = time();
441 441 
 				}
442 
-			    } elseif ($recent_ident != '') {
442 
+				} elseif ($recent_ident != '') {
443 443 
 				$this->all_tracked[$id]['id'] = $recent_ident;
444 444 
 				$this->all_tracked[$id]['addedMarine'] = 1;
445 445 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
446 
-				    if (isset($globalDaemon) && !$globalDaemon) {
446 
+					if (isset($globalDaemon) && !$globalDaemon) {
447 447 
 					$Marine = new Marine($this->db);
448 448 
 					$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']);
449 449 
 					$Marine->db = null;
450 
-				    }
450 
+					}
451 451 
 				}
452 452
453 
-			    }
453 
+				}
454 
+			}
454 455 
 			}
455 
-		    }
456 
-		    //adds the spotter LIVE data
457 
-		    if ($globalDebug) {
456 
+			//adds the spotter LIVE data
457 
+			if ($globalDebug) {
458 458 
 			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";
459 
-		    }
460 
-		    $ignoreImport = false;
459 
+			}
460 
+			$ignoreImport = false;
461 461
462 
-		    if (!$ignoreImport) {
462 
+			if (!$ignoreImport) {
463 463 
 			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'])) {
464 464 
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
465 465 
 				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
466 
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
466 
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
467 467 
 					$timeelapsed = microtime(true);
468 468 
 					$MarineLive = new MarineLive($this->db);
469 469 
 					$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']);
470 470 
 					$MarineLive->db = null;
471 471 
 					if ($globalDebug) echo $result."\n";
472 472 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
473 
-				    }
473 
+					}
474 474 
 				}
475 475 
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) {
476 
-				    $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']);
476 
+					$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']);
477 477 
 				}
478 478 
 				$this->all_tracked[$id]['putinarchive'] = false;
479 479 
 
@@ -505,7 +505,7 @@  discard block
 
 block discarded – undo
505 505 
 					if ($stats_heading == 16) $stats_heading = 0;
506 506 
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
507 507 
 						for ($i=0;$i<=15;$i++) {
508 
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
508 
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
509 509 
 						}
510 510 
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
511 511 
 					} else {
 
@@ -518,11 +518,11 @@  discard block
 
 block discarded – undo
518 518 
 					//var_dump($this->stats);
519 519 
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
520 520 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
521 
-						    end($this->stats[$current_date][$source]['hist']);
522 
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
521 
+							end($this->stats[$current_date][$source]['hist']);
522 
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
523 523 
 						} else $mini = 0;
524 524 
 						for ($i=$mini;$i<=$distance;$i+=10) {
525 
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
525 
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
526 526 
 						}
527 527 
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
528 528 
 					} else {
 
@@ -538,24 +538,24 @@  discard block
 
 block discarded – undo
538 538
539 539
540 540 
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
541 
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
541 
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
542 542 
 				if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour...";
543 543 
 				$MarineLive = new MarineLive($this->db);
544 544 
 				$MarineLive->deleteLiveMarineDataNotUpdated();
545 545 
 				$MarineLive->db = null;
546 546 
 				//MarineLive->deleteLiveMarineData();
547 547 
 				if ($globalDebug) echo " Done\n";
548 
-			    }
549 
-			    $this->last_delete_hourly = time();
548 
+				}
549 
+				$this->last_delete_hourly = time();
550 550 
 			}
551 551
552 
-		    }
553 
-		    //$ignoreImport = false;
552 
+			}
553 
+			//$ignoreImport = false;
554 554 
 		}
555 555 
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
556 556 
 		if ($send) return $this->all_tracked[$id];
557 
-	    }
557 
+		}
558 
+	}
558 559 
 	}
559 
-    }
560 560 
 }
561 561 
 ?>
Please login to merge, or discard this patch.