View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 411a33...7303c2 )
by Yannick
55:38 queued 25:37
created
Status
Category
Toggle Patches
require/class.MarineImport.php 1 patch
Indentation   +258 added lines, -258 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,75 +46,75 @@  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 
-    		    if (isset($globalVM) && $globalVM) {
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 
+				if (isset($globalVM) && $globalVM) {
63 63 
 			if ($this->all_tracked[$key]['status'] == 'Racing') {
64 
-    			    $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'],$this->all_tracked[$key]['distance'],$this->all_tracked[$key]['race_rank'],$this->all_tracked[$key]['race_time'],$this->all_tracked[$key]['status'],$this->all_tracked[$key]['race_begin']);
65 
-    			} else {
66 
-    			    $finaldatetime = date('Y-m-d H:i:s',strtotime($this->all_tracked[$key]['race_begin'])+$this->all_tracked[$key]['race_time']);
67 
-    			    $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'],$finaldatetime,$this->all_tracked[$key]['distance'],$this->all_tracked[$key]['race_rank'],$this->all_tracked[$key]['race_time'],$this->all_tracked[$key]['status'],$this->all_tracked[$key]['race_begin']);
68 
-    			}
69 
-    		    } else {
64 
+					$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'],$this->all_tracked[$key]['distance'],$this->all_tracked[$key]['race_rank'],$this->all_tracked[$key]['race_time'],$this->all_tracked[$key]['status'],$this->all_tracked[$key]['race_begin']);
65 
+				} else {
66 
+					$finaldatetime = date('Y-m-d H:i:s',strtotime($this->all_tracked[$key]['race_begin'])+$this->all_tracked[$key]['race_time']);
67 
+					$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'],$finaldatetime,$this->all_tracked[$key]['distance'],$this->all_tracked[$key]['race_rank'],$this->all_tracked[$key]['race_time'],$this->all_tracked[$key]['status'],$this->all_tracked[$key]['race_begin']);
68 
+				}
69 
+				} else {
70 70 
 			$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'],$this->all_tracked[$key]['distance'],$this->all_tracked[$key]['race_rank'],$this->all_tracked[$key]['race_time'],$this->all_tracked[$key]['status'],$this->all_tracked[$key]['race_begin']);
71 
-		    }
71 
+			}
72 72 
 		}
73 
-	    }
73 
+		}
74 
+	}
74 75 
 	}
75 
-    }
76 76
77 
-    public function del() {
77 
+	public function del() {
78 78 
 	global $globalDebug, $globalNoDB, $globalNoImport;
79 79 
 	// Delete old infos
80 80 
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
81 81 
 	foreach ($this->all_tracked as $key => $flight) {
82 
-    	    if (isset($flight['lastupdate'])) {
83 
-        	if ($flight['lastupdate'] < (time()-3000)) {
84 
-            	    if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
85 
-            		if (isset($this->all_tracked[$key]['id'])) {
86 
-            		    if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
87 
-			    /*
82 
+			if (isset($flight['lastupdate'])) {
83 
+			if ($flight['lastupdate'] < (time()-3000)) {
84 
+					if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
85 
+					if (isset($this->all_tracked[$key]['id'])) {
86 
+						if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
87 
+				/*
88 88 
 			    $MarineLive = new MarineLive();
89 89 
             		    $MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']);
90 90 
 			    $MarineLive->db = null;
91 91 
 			    */
92 
-            		    //$real_arrival = $this->arrival($key);
93 
-            		    $Marine = new Marine($this->db);
94 
-            		    if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
92 
+						//$real_arrival = $this->arrival($key);
93 
+						$Marine = new Marine($this->db);
94 
+						if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
95 95 
 				if (isset($globalVM) && $globalVM) {
96 
-				    if ($this->all_tracked[$key]['status'] == 'Racing') {
96 
+					if ($this->all_tracked[$key]['status'] == 'Racing') {
97 97 
 					$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'],$this->all_tracked[$key]['distance'],$this->all_tracked[$key]['race_rank'],$this->all_tracked[$key]['race_time'],$this->all_tracked[$key]['status'],$this->all_tracked[$key]['race_begin']);
98 
-				    } else {
98 
+					} else {
99 99 
 					$finaldatetime = date('Y-m-d H:i:s',strtotime($this->all_tracked[$key]['race_begin'])+$this->all_tracked[$key]['race_time']);
100 100 
 					$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'],$finaldatetime,$this->all_tracked[$key]['distance'],$this->all_tracked[$key]['race_rank'],$this->all_tracked[$key]['race_time'],$this->all_tracked[$key]['status'],$this->all_tracked[$key]['race_begin']);
101 
-				    }
101 
+					}
102 102 
 				} else {
103 103 
 					$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'],$this->all_tracked[$key]['distance'],$this->all_tracked[$key]['race_rank'],$this->all_tracked[$key]['race_time'],$this->all_tracked[$key]['status'],$this->all_tracked[$key]['race_begin']);
104 104 
 				}
105 105 
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
106 
-			    }
107 
-			    // Put in archive
106 
+				}
107 
+				// Put in archive
108 108 
 //				$Marine->db = null;
109 109 
 			}
110 
-            	    }
111 
-            	    unset($this->all_tracked[$key]);
112 
-    	        }
113 
-	    }
114 
-        }
115 
-    }
110 
+					}
111 
+					unset($this->all_tracked[$key]);
112 
+				}
113 
+		}
114 
+		}
115 
+	}
116 116
117 
-    public function add($line) {
117 
+	public function add($line) {
118 118 
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine, $globalLiveInterval, $globalVM;
119 119 
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
120 120 
 	date_default_timezone_set('UTC');
 
@@ -123,106 +123,106 @@  discard block
 
 block discarded – undo
123 123
124 124 
 	// SBS format is CSV format
125 125 
 	if(is_array($line) && (isset($line['mmsi']) || isset($line['id']))) {
126 
-	    //print_r($line);
127 
-  	    if (isset($line['mmsi']) || isset($line['id'])) {
126 
+		//print_r($line);
127 
+  		if (isset($line['mmsi']) || isset($line['id'])) {
128 128
129 129
130 130 
 		// Increment message number
131 131 
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
132 
-		    $current_date = date('Y-m-d');
133 
-		    if (isset($line['source_name'])) $source = $line['source_name'];
134 
-		    else $source = '';
135 
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
136 
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
137 
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
138 
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
139 
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
132 
+			$current_date = date('Y-m-d');
133 
+			if (isset($line['source_name'])) $source = $line['source_name'];
134 
+			else $source = '';
135 
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
136 
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
137 
+				$this->stats[$current_date][$source]['msg']['date'] = time();
138 
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
139 
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
140 140 
 		}
141 141
142 142
143 143 
 		$Common = new Common();
144 144 
 		$AIS = new AIS();
145 
-	        if (!isset($line['id'])) $id = trim($line['mmsi']);
146 
-	        else $id = trim($line['id']);
145 
+			if (!isset($line['id'])) $id = trim($line['mmsi']);
146 
+			else $id = trim($line['id']);
147 147
148 148 
 		if (!isset($this->all_tracked[$id])) {
149 
-		    $this->all_tracked[$id] = array();
150 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0));
151 
-		    $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' => '','captain_id' => '','captain_name' => '','race_id' => '','race_name' => '','distance' => NULL,'race_rank' => NULL,'race_time' => NULL,'race_begin' => ''));
152 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
153 
-		    if (!isset($line['id'])) {
149 
+			$this->all_tracked[$id] = array();
150 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0));
151 
+			$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' => '','captain_id' => '','captain_name' => '','race_id' => '','race_name' => '','distance' => NULL,'race_rank' => NULL,'race_time' => NULL,'race_begin' => ''));
152 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
153 
+			if (!isset($line['id'])) {
154 154 
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
155 155 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
156 
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
157 
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
156 
+			 } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
157 
+			if ($globalAllTracked !== FALSE) $dataFound = true;
158 158 
 		}
159 159
160 160 
 		if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) {
161 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
162 
-		    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
161 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
162 
+			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
163 163 
 			$Marine = new Marine($this->db);
164 164 
 			$identity = $Marine->getIdentity($line['mmsi']);
165 165 
 			if (!empty($identity)) {
166 
-			    $this->all_tracked[$id]['ident'] = $identity['ship_name'];
167 
-			    $this->all_tracked[$id]['type'] = $identity['type'];
168 
-			    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $AIS->getShipTypeID($identity['type'])));
166 
+				$this->all_tracked[$id]['ident'] = $identity['ship_name'];
167 
+				$this->all_tracked[$id]['type'] = $identity['type'];
168 
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $AIS->getShipTypeID($identity['type'])));
169 169 
 			}
170 170 
 			//print_r($identity);
171 171 
 			unset($Marine);
172 172 
 			//$dataFound = true;
173 
-		    }
173 
+			}
174 174 
 		}
175 175 
 		if (isset($line['type_id'])) {
176 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id'])));
177 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $line['type_id']));
176 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id'])));
177 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $line['type_id']));
178 178 
 		}
179 179 
 		if (isset($line['type']) && $line['type'] != '' && $this->all_tracked[$id]['type'] == '') {
180 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
181 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $AIS->getShipTypeID($line['type'])));
180 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
181 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $AIS->getShipTypeID($line['type'])));
182 182 
 		} elseif (isset($line['type']) && $line['type'] != '' && $this->all_tracked[$id]['type'] != '') {
183 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
183 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
184 184 
 		}
185 185 
 		if (isset($line['status']) && $line['status'] != '') {
186 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status']));
186 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status']));
187 187 
 		}
188 188 
 		if (isset($line['status_id']) && (!isset($this->all_tracked[$id]['status_id']) || $this->all_tracked[$id]['status_id'] != $line['status_id'])) {
189 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id']));
190 
-		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
189 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id']));
190 
+			if ($this->all_tracked[$id]['addedMarine'] == 1) {
191 191 
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
192 
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
192 
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
193 193 
 				$Marine = new Marine($this->db);
194 194 
 				$Marine->updateStatusMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['status']);
195 195 
 				unset($Marine);
196 
-			    }
196 
+				}
197 
+			}
197 198 
 			}
198 
-		    }
199 199 
 		}
200 200
201 201
202 202 
 		if (isset($line['mmsi_type']) && $line['mmsi_type'] != '') {
203 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type']));
203 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type']));
204 204 
 		}
205 205 
 		if (isset($line['imo']) && $line['imo'] != '') {
206 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo']));
206 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo']));
207 207 
 		}
208 208 
 		if (isset($line['callsign']) && $line['callsign'] != '') {
209 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign']));
209 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign']));
210 210 
 		}
211 211 
 		if (isset($line['arrival_code']) && $line['arrival_code'] != '') {
212 
-		    if (!isset($this->all_tracked[$id]['arrival_code'])) {
212 
+			if (!isset($this->all_tracked[$id]['arrival_code'])) {
213 213 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code']));
214 214 
 			if ($globalDebug) echo $this->all_tracked[$id]['id'].' => New arrival: '.$line['arrival_code']."\n";
215 215 
 			if ($this->all_tracked[$id]['addedMarine'] != 0) {
216 
-			    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
216 
+				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
217 217 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
218 
-				    $Marine = new Marine($this->db);
219 
-				    $fromsource = NULL;
220 
-				    $Marine->updateArrivalPortNameMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['arrival_code'],$fromsource);
221 
-				    $Marine->db = null;
218 
+					$Marine = new Marine($this->db);
219 
+					$fromsource = NULL;
220 
+					$Marine->updateArrivalPortNameMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['arrival_code'],$fromsource);
221 
+					$Marine->db = null;
222 
+				}
222 223 
 				}
223 
-			    }
224 224 
 			}
225 
-		    } elseif ($this->all_tracked[$id]['arrival_code'] != $line['arrival_code']) {
225 
+			} elseif ($this->all_tracked[$id]['arrival_code'] != $line['arrival_code']) {
226 226 
 			$this->all_tracked[$id]['arrival_code'] = $line['arrival_code'];
227 227 
 			if ($globalDebug) echo $this->all_tracked[$id]['id'].' => New arrival: '.$line['arrival_code']."\n";
228 228 
 			if (!isset($line['id'])) {
 
@@ -230,50 +230,50 @@  discard block
 
 block discarded – undo
230 230 
 				$this->all_tracked[$id]['forcenew'] = 1;
231 231 
 				$this->all_tracked[$id]['addedMarine'] = 0;
232 232 
 			}
233 
-		    }
233 
+			}
234 234 
 		}
235 235 
 		if (isset($line['arrival_date']) && $line['arrival_date'] != '') {
236 
-		    if (strtotime($line['arrival_date']) > time()) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
236 
+			if (strtotime($line['arrival_date']) > time()) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
237 237 
 		}
238 238 
 		if (isset($line['captain_id']) && $line['captain_id'] != '') {
239 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('captain_id' => $line['captain_id']));
239 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('captain_id' => $line['captain_id']));
240 240 
 		}
241 241 
 		if (isset($line['captain_name']) && $line['captain_name'] != '') {
242 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('captain_name' => $line['captain_name']));
242 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('captain_name' => $line['captain_name']));
243 243 
 		}
244 244 
 		if (isset($line['race_id']) && $line['race_id'] != '') {
245 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('race_id' => $line['race_id']));
245 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('race_id' => $line['race_id']));
246 246 
 		}
247 247 
 		if (isset($line['race_name']) && $line['race_name'] != '') {
248 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('race_name' => $line['race_name']));
248 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('race_name' => $line['race_name']));
249 249 
 		}
250 250 
 		if (isset($line['race_rank']) && $line['race_rank'] != '') {
251 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('race_rank' => $line['race_rank']));
251 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('race_rank' => $line['race_rank']));
252 252 
 		}
253 253 
 		if (isset($line['race_time']) && $line['race_time'] != '') {
254 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('race_time' => $line['race_time']));
254 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('race_time' => $line['race_time']));
255 255 
 		}
256 256 
 		if (isset($line['race_begin']) && $line['race_begin'] != '') {
257 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('race_begin' => $line['race_begin']));
257 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('race_begin' => $line['race_begin']));
258 258 
 		}
259 259 
 		if (isset($line['distance']) && $line['distance'] != '') {
260 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('distance' => $line['distance']));
260 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('distance' => $line['distance']));
261 261 
 		}
262 262
263 263 
 		//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'])) {
264 264 
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
265 
-		    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
265 
+			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
266 266 
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
267 
-			    $timeelapsed = microtime(true);
268 
-			    $Marine = new Marine($this->db);
269 
-			    $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']);
270 
-			    $Marine->db = null;
267 
+				$timeelapsed = microtime(true);
268 
+				$Marine = new Marine($this->db);
269 
+				$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']);
270 
+				$Marine->db = null;
271 
+			}
271 272 
 			}
272 
-		    }
273 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
274 
-		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
273 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
274 
+			if ($this->all_tracked[$id]['addedMarine'] == 1) {
275 275 
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
276 
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
276 
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
277 277 
 				$timeelapsed = microtime(true);
278 278 
 				$Marine = new Marine($this->db);
279 279 
 				$fromsource = NULL;
 
@@ -281,20 +281,20 @@  discard block
 
 block discarded – undo
281 281 
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
282 282 
 				$Marine->db = null;
283 283 
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
284 
-			    }
284 
+				}
285 
+			}
285 286 
 			}
286 
-		    }
287 
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
287 
+			if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
288 288 
 		}
289 289
290 290 
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-30*60 && strtotime($line['datetime']) < time()+20*60) {
291 
-		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
291 
+			if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
292 292 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
293 
-		    } else {
293 
+			} else {
294 294 
 				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";
295 295 
 				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";
296 296 
 				return '';
297 
-		    }
297 
+			}
298 298 
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) <= time()-30*60) {
299 299 
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!\n";
300 300 
 			return '';
 
@@ -311,33 +311,33 @@  discard block
 
 block discarded – undo
311 311
312 312
313 313 
 		if (isset($line['speed'])) {
314 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'],2)));
315 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
314 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'],2)));
315 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
316 316 
 		} 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'])) {
317 
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
318 
-		    if ($distance > 1000 && $distance < 10000) {
317 
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
318 
+			if ($distance > 1000 && $distance < 10000) {
319 319 
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
320 320 
 			$speed = $speed*3.6;
321 321 
 			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed,2)));
322 322 
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
323 
-		    }
323 
+			}
324 324 
 		}
325 325
326 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
327 
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
328 
-	    	    else unset($timediff);
329 
-	    	    if ($this->tmd > 5 ||
330 
-	    		!isset($timediff) ||
331 
-	    		$timediff > $globalLiveInterval ||
332 
-	    		(
333 
-	    		    $timediff > 30 &&
334 
-	    		    isset($this->all_tracked[$id]['latitude']) &&
335 
-	    		    isset($this->all_tracked[$id]['longitude']) &&
336 
-	    		    $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'))
337 
-	    		)
338 
-	    		) {
326 
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
327 
+				if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
328 
+				else unset($timediff);
329 
+				if ($this->tmd > 5 ||
330 
+				!isset($timediff) ||
331 
+				$timediff > $globalLiveInterval ||
332 
+				(
333 
+					$timediff > 30 &&
334 
+					isset($this->all_tracked[$id]['latitude']) &&
335 
+					isset($this->all_tracked[$id]['longitude']) &&
336 
+					$Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'))
337 
+				)
338 
+				) {
339 339 
 			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'])) {
340 
-			    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'])) {
340 
+				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'])) {
341 341 
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
342 342 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
343 343 
 				$this->all_tracked[$id]['putinarchive'] = true;
 
@@ -345,213 +345,213 @@  discard block
 
 block discarded – undo
345 345 
 				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
346 346 
 				$timeelapsed = microtime(true);
347 347 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
348 
-				    $Marine = new Marine($this->db);
349 
-				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
350 
-				    if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
351 
-				    $Marine->db = null;
352 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
348 
+					$Marine = new Marine($this->db);
349 
+					$all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
350 
+					if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
351 
+					$Marine->db = null;
352 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
353 353 
 				}
354 354 
 				$this->tmd = 0;
355 355 
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
356 
-			    }
356 
+				}
357 357 
 			}
358 358
359 359 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
360 360 
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
361 361 
 				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') {
362 
-				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
363 
-				    $dataFound = true;
364 
-				    $this->all_tracked[$id]['time_last_coord'] = time();
362 
+					$this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
363 
+					$dataFound = true;
364 
+					$this->all_tracked[$id]['time_last_coord'] = time();
365 365 
 				}
366 366 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
367 367 
 			}
368 368 
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
369 
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
369 
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
370 370 
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
371 371 
 				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') {
372 
-				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
373 
-				    $dataFound = true;
374 
-				    $this->all_tracked[$id]['time_last_coord'] = time();
372 
+					$this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
373 
+					$dataFound = true;
374 
+					$this->all_tracked[$id]['time_last_coord'] = time();
375 375 
 				}
376 376 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
377 377 
 			}
378 378
379 
-		    } else if ($globalDebug && $timediff > 20) {
379 
+			} else if ($globalDebug && $timediff > 20) {
380 380 
 			$this->tmd = $this->tmd + 1;
381 381 
 			echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
382 382 
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -";
383 383 
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
384 384 
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
385 
-		    }
385 
+			}
386 386 
 		}
387 387 
 		if (isset($line['last_update']) && $line['last_update'] != '') {
388 
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
389 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
388 
+			if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
389 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
390 390 
 		}
391 391 
 		if (isset($line['format_source']) && $line['format_source'] != '') {
392 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
392 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
393 393 
 		}
394 394 
 		if (isset($line['source_name']) && $line['source_name'] != '') {
395 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
395 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
396 396 
 		}
397 397 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
398 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
398 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
399 399 
 		}
400 400
401 401 
 		if (isset($line['heading']) && $line['heading'] != '') {
402 
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
403 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
404 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
405 
-		    //$dataFound = true;
402 
+			if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
403 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
404 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
405 
+			//$dataFound = true;
406 406 
   		} 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']) {
407 
-  		    $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']);
408 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
409 
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
410 
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
407 
+  			$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']);
408 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
409 
+			if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
410 
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
411 411 
   		}
412 412 
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
413 413
414 414
415 415
416 416 
 		if ($dataFound === true && (isset($this->all_tracked[$id]['mmsi']) || isset($this->all_tracked[$id]['id']))) {
417 
-		    $this->all_tracked[$id]['lastupdate'] = time();
418 
-		    if ($this->all_tracked[$id]['addedMarine'] == 0 || (isset($globalVM) && $globalVM)) {
419 
-		        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'])) {
420 
-			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
417 
+			$this->all_tracked[$id]['lastupdate'] = time();
418 
+			if ($this->all_tracked[$id]['addedMarine'] == 0 || (isset($globalVM) && $globalVM)) {
419 
+				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'])) {
420 
+				if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
421 421 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
422 
-				    if ($globalDebug) echo "Check if vessel is already in DB...";
423 
-				    $timeelapsed = microtime(true);
424 
-				    $MarineLive = new MarineLive($this->db);
425 
-				    if (isset($line['id']) && isset($globalVM) && $globalVM) {
422 
+					if ($globalDebug) echo "Check if vessel is already in DB...";
423 
+					$timeelapsed = microtime(true);
424 
+					$MarineLive = new MarineLive($this->db);
425 
+					if (isset($line['id']) && isset($globalVM) && $globalVM) {
426 426 
 					$Marine = new Marine($this->db);
427 427 
 					$recent_ident = $Marine->checkId($line['id']);
428 428 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkId : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
429 429 
 					$Marine->db=null;
430 
-				    } elseif (isset($line['id'])) {
430 
+					} elseif (isset($line['id'])) {
431 431 
 					$recent_ident = $MarineLive->checkIdRecent($line['id']);
432 432 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
433 
-				    } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
433 
+					} elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
434 434 
 					$recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']);
435 435 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
436 
-				    } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
436 
+					} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
437 437 
 					$recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']);
438 438 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
439 
-				    } else $recent_ident = '';
440 
-				    $MarineLive->db=null;
441 
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
442 
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
439 
+					} else $recent_ident = '';
440 
+					$MarineLive->db=null;
441 
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
442 
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
443 443 
 				} else $recent_ident = '';
444 
-			    } else {
444 
+				} else {
445 445 
 				$recent_ident = '';
446 446 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
447 
-			    }
448 
-			    //if there was no vessel with the same callsign within the last hour and go post it into the archive
449 
-			    if($recent_ident == "" && (($this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') || (isset($globalVM) && $globalVM)))
450 
-			    {
447 
+				}
448 
+				//if there was no vessel with the same callsign within the last hour and go post it into the archive
449 
+				if($recent_ident == "" && (($this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') || (isset($globalVM) && $globalVM)))
450 
+				{
451 451 
 				if ($globalDebug) {
452 452 
 					if ($this->all_tracked[$id]['mmsi'] == '') echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
453 453 
 					else echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
454 454 
 				}
455 455 
 				//adds the spotter data for the archive
456 
-				    $highlight = '';
457 
-				    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')));
458 
-				    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
456 
+					$highlight = '';
457 
+					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')));
458 
+					if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
459 459 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
460 
-					    $timeelapsed = microtime(true);
461 
-					    $Marine = new Marine($this->db);
462 
-					    if (isset($globalVM) && $globalVM && $this->all_tracked[$id]['race_begin'] != '') {
460 
+						$timeelapsed = microtime(true);
461 
+						$Marine = new Marine($this->db);
462 
+						if (isset($globalVM) && $globalVM && $this->all_tracked[$id]['race_begin'] != '') {
463 463 
 						$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]['race_begin'], $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'],$this->all_tracked[$id]['captain_id'],$this->all_tracked[$id]['captain_name'],$this->all_tracked[$id]['race_id'],$this->all_tracked[$id]['race_name'],$this->all_tracked[$id]['distance'],$this->all_tracked[$id]['race_rank'],$this->all_tracked[$id]['race_time']);
464 
-					    } else {
464 
+						} else {
465 465 
 						$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'],$this->all_tracked[$id]['captain_id'],$this->all_tracked[$id]['captain_name'],$this->all_tracked[$id]['race_id'],$this->all_tracked[$id]['race_name'],$this->all_tracked[$id]['distance'],$this->all_tracked[$id]['race_rank'],$this->all_tracked[$id]['race_time']);
466 
-					    }
467 
-					    $Marine->db = null;
468 
-					    if ($globalDebug && isset($result)) echo $result."\n";
469 
-					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
466 
+						}
467 
+						$Marine->db = null;
468 
+						if ($globalDebug && isset($result)) echo $result."\n";
469 
+						if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
470 
+					}
470 471 
 					}
471 
-				    }
472 
-				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
472 
+					if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
473 473 
 					// Add source stat in DB
474 474 
 					$Stats = new Stats($this->db);
475 475 
 					if (!empty($this->stats)) {
476 
-					    if ($globalDebug) echo 'Add source stats : ';
477 
-				    	    foreach($this->stats as $date => $data) {
476 
+						if ($globalDebug) echo 'Add source stats : ';
477 
+							foreach($this->stats as $date => $data) {
478 478 
 						foreach($data as $source => $sourced) {
479 
-					    	    //print_r($sourced);
480 
-				    	    	    if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
481 
-				    	    	    if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
482 
-				    		    if (isset($sourced['msg'])) {
483 
-				    			if (time() - $sourced['msg']['date'] > 10) {
484 
-				    		    	    $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
485 
-				    		    	    echo $Stats->addStatSource($nbmsg,$source,'msg_marine',$date);
486 
-			    			    	    unset($this->stats[$date][$source]['msg']);
487 
-			    				}
488 
-			    			    }
489 
-			    			}
490 
-			    			if ($date != date('Y-m-d')) {
491 
-			    			    unset($this->stats[$date]);
492 
-			    			}
493 
-				    	    }
494 
-				    	    if ($globalDebug) echo 'Done'."\n";
479 
+								//print_r($sourced);
480 
+									if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
481 
+									if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
482 
+								if (isset($sourced['msg'])) {
483 
+								if (time() - $sourced['msg']['date'] > 10) {
484 
+										$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
485 
+										echo $Stats->addStatSource($nbmsg,$source,'msg_marine',$date);
486 
+										unset($this->stats[$date][$source]['msg']);
487 
+								}
488 
+								}
489 
+							}
490 
+							if ($date != date('Y-m-d')) {
491 
+								unset($this->stats[$date]);
492 
+							}
493 
+							}
494 
+							if ($globalDebug) echo 'Done'."\n";
495 495 
 					}
496 496 
 					$Stats->db = null;
497 
-				    }
497 
+					}
498 498
499 
-				    $this->del();
499 
+					$this->del();
500 500 
 				//$ignoreImport = false;
501 501 
 				$this->all_tracked[$id]['addedMarine'] = 1;
502 502 
 				//print_r($this->all_tracked[$id]);
503 503 
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
504 
-				    if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
505 
-				    //MarineLive->deleteLiveMarineDataNotUpdated();
506 
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
504 
+					if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
505 
+					//MarineLive->deleteLiveMarineDataNotUpdated();
506 
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
507 507 
 					$MarineLive = new MarineLive($this->db);
508 508 
 					$MarineLive->deleteLiveMarineData();
509 509 
 					$MarineLive->db=null;
510 510 
 					if ($globalDebug) echo " Done\n";
511 
-				    }
512 
-				    $this->last_delete = time();
511 
+					}
512 
+					$this->last_delete = time();
513 513 
 				}
514 
-			    } elseif ($recent_ident != '') {
514 
+				} elseif ($recent_ident != '') {
515 515 
 				$this->all_tracked[$id]['id'] = $recent_ident;
516 516 
 				$this->all_tracked[$id]['addedMarine'] = 1;
517 517 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
518 
-				    if ((isset($globalDaemon) && !$globalDaemon) || (isset($globalVM) && $globalVM)) {
518 
+					if ((isset($globalDaemon) && !$globalDaemon) || (isset($globalVM) && $globalVM)) {
519 519 
 					$Marine = new Marine($this->db);
520 520 
 					if (isset($globalVM) && $globalVM) {
521 
-					    if ($this->all_tracked[$id]['status'] == 'Racing') {
521 
+						if ($this->all_tracked[$id]['status'] == 'Racing') {
522 522 
 						$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'],$this->all_tracked[$id]['distance'],$this->all_tracked[$id]['race_rank'],$this->all_tracked[$id]['race_time'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['race_begin']);
523 
-					    } else {
523 
+						} else {
524 524 
 						$finaldatetime = date('Y-m-d H:i:s',strtotime($this->all_tracked[$id]['race_begin'])+$this->all_tracked[$id]['race_time']);
525 525 
 						$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'],$finaldatetime,$this->all_tracked[$id]['distance'],$this->all_tracked[$id]['race_rank'],$this->all_tracked[$id]['race_time'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['race_begin']);
526 
-					    }
526 
+						}
527 527 
 					} else {
528 
-					    $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'],$this->all_tracked[$id]['distance'],$this->all_tracked[$id]['race_rank'],$this->all_tracked[$id]['race_time'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['race_begin']);
528 
+						$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'],$this->all_tracked[$id]['distance'],$this->all_tracked[$id]['race_rank'],$this->all_tracked[$id]['race_time'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['race_begin']);
529 529 
 					}
530 530 
 					$Marine->db = null;
531 
-				    }
531 
+					}
532 532 
 				}
533 533
534 
-			    }
534 
+				}
535 
+			}
535 536 
 			}
536 
-		    }
537 
-		    //adds the spotter LIVE data
538 
-		    if ($globalDebug) {
537 
+			//adds the spotter LIVE data
538 
+			if ($globalDebug) {
539 539 
 			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";
540 
-		    }
541 
-		    $ignoreImport = false;
542 
-		    if ((isset($globalVM) && $globalVM) && $this->all_tracked[$id]['status'] != 'Racing') $ignoreImport = true;
543 
-		    if (!$ignoreImport) {
540 
+			}
541 
+			$ignoreImport = false;
542 
+			if ((isset($globalVM) && $globalVM) && $this->all_tracked[$id]['status'] != 'Racing') $ignoreImport = true;
543 
+			if (!$ignoreImport) {
544 544 
 			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'])) {
545 545 
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
546 546 
 				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
547 
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
547 
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
548 548 
 					$timeelapsed = microtime(true);
549 549 
 					$MarineLive = new MarineLive($this->db);
550 550 
 					$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'],$this->all_tracked[$id]['captain_id'],$this->all_tracked[$id]['captain_name'],$this->all_tracked[$id]['race_id'],$this->all_tracked[$id]['race_name'],$this->all_tracked[$id]['distance'],$this->all_tracked[$id]['race_rank'],$this->all_tracked[$id]['race_time']);
551 551 
 					$MarineLive->db = null;
552 552 
 					if ($globalDebug) echo $result."\n";
553 553 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
554 
-				    }
554 
+					}
555 555 
 				}
556 556 
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) {
557 557 
 					$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']);
 
@@ -586,7 +586,7 @@  discard block
 
 block discarded – undo
586 586 
 					if ($stats_heading == 16) $stats_heading = 0;
587 587 
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
588 588 
 						for ($i=0;$i<=15;$i++) {
589 
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
589 
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
590 590 
 						}
591 591 
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
592 592 
 					} else {
 
@@ -599,11 +599,11 @@  discard block
 
 block discarded – undo
599 599 
 					//var_dump($this->stats);
600 600 
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
601 601 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
602 
-						    end($this->stats[$current_date][$source]['hist']);
603 
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
602 
+							end($this->stats[$current_date][$source]['hist']);
603 
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
604 604 
 						} else $mini = 0;
605 605 
 						for ($i=$mini;$i<=$distance;$i+=10) {
606 
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
606 
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
607 607 
 						}
608 608 
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
609 609 
 					} else {
 
@@ -619,24 +619,24 @@  discard block
 
 block discarded – undo
619 619
620 620
621 621 
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
622 
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
622 
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
623 623 
 				if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour...";
624 624 
 				$MarineLive = new MarineLive($this->db);
625 625 
 				$MarineLive->deleteLiveMarineDataNotUpdated();
626 626 
 				$MarineLive->db = null;
627 627 
 				//MarineLive->deleteLiveMarineData();
628 628 
 				if ($globalDebug) echo " Done\n";
629 
-			    }
630 
-			    $this->last_delete_hourly = time();
629 
+				}
630 
+				$this->last_delete_hourly = time();
631 631 
 			}
632 632
633 
-		    }
634 
-		    //$ignoreImport = false;
633 
+			}
634 
+			//$ignoreImport = false;
635 635 
 		}
636 636 
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
637 637 
 		if ($send) return $this->all_tracked[$id];
638 
-	    }
638 
+		}
639 
+	}
639 640 
 	}
640 
-    }
641 641 
 }
642 642 
 ?>
Please login to merge, or discard this patch.