Add squawk code and usage display

kalkocz · Sep 9, 2014 · 1270daf · 1270daf
1 parent 35c0744
commit 1270daf
Show file tree

Hide file tree

Showing 6 changed files with 9,333 additions and 9 deletions.
diff --git a/cron-sbs.php b/cron-sbs.php
@@ -74,7 +74,7 @@
 
 		if (!isset($all_flights[$id]['hex'])) {
 		    $all_flights[$id] = array('hex' => $hex,'datetime' => $line[8].' '.$line[7],'aircraft_icao' => Spotter::getAllAircraftType($hex));
-		    $all_flights[$id] = array_merge($all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => ''));
+		    $all_flights[$id] = array_merge($all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => ''));
 		    $all_flights[$id] = array_merge($all_flights[$id],array('lastupdate' => time()));
 		    if ($debug) echo "New aircraft !!! \n";
 		}
@@ -97,14 +97,14 @@
 					if ($all_flights[$id]['departure_airport'] != Spotter::getAirportIcao($schedule['DepartureAirportIATA'])) {
 						$airport_icao = Spotter::getAirportIcao($schedule['DepartureAirportIATA']);
 						if ($airport_icao != '') $all_flights[$id]['departure_airport'] = $airport_icao;
-						if ($debug) echo "Change departure airport !!!! \n";
+						if ($debug) echo "Change departure airport !!!! for ".$line[10]."\n";
 					}
 				}
 				if ($schedule['ArrivalAirportIATA'] != '') {
 					if ($all_flights[$id]['arrival_airport'] != Spotter::getAirportIcao($schedule['ArrivalAirportIATA'])) {
 						$airport_icao = Spotter::getAirportIcao($schedule['ArrivalAirportIATA']);
 						if ($airport_icao != '') $all_flights[$id]['arrival_airport'] = $airport_icao;
-						if ($debug) echo "Change arrival airport !!!! \n";
+						if ($debug) echo "Change arrival airport !!!! for ".$line[10]."\n";
 					}
 				}
 			}
@@ -130,6 +130,10 @@
 			$all_flights[$id] = array_merge($all_flights[$id],array('speed' => $line[12]));
 			$dataFound = true;
 		}
+		if ($line[17] != '') {
+			$all_flights[$id] = array_merge($all_flights[$id],array('squawk' => $line[17]));
+			//$dataFound = true;
+		}
 
 		$waypoints = '';
 		if ($line[11] != '') {
@@ -167,7 +171,7 @@
 			//echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
 			if ($debug) echo 'hex : '.$all_flights[$id]['hex'].' - ident : '.$all_flights[$id]['ident'].' - ICAO : '.$all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$all_flights[$id]['departure_airport'].' - Arrival Airport : '.$all_flights[$id]['arrival_airport'].' - Latitude : '.$all_flights[$id]['latitude'].' - Longitude : '.$all_flights[$id]['longitude'].' - waypoints : '.$waypoints.' - Altitude : '.$all_flights[$id]['altitude'].' - Heading : '.$all_flights[$id]['heading'].' - Speed : '.$all_flights[$id]['speed'].' - Departure Airport Time : '.$all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$all_flights[$id]['arrival_airport_time']."\n";
 
-			$result = SpotterLive::addLiveSpotterData($all_flights[$id]['hex'].'-'.$all_flights[$id]['ident'], $all_flights[$id]['ident'], $all_flights[$id]['aircraft_icao'], $all_flights[$id]['departure_airport'], $all_flights[$id]['arrival_airport'], $all_flights[$id]['latitude'], $all_flights[$id]['longitude'], $waypoints, $all_flights[$id]['altitude'], $all_flights[$id]['heading'], $all_flights[$id]['speed'], $all_flights[$id]['departure_airport_time'], $all_flights[$id]['arrival_airport_time']);
+			$result = SpotterLive::addLiveSpotterData($all_flights[$id]['hex'].'-'.$all_flights[$id]['ident'], $all_flights[$id]['ident'], $all_flights[$id]['aircraft_icao'], $all_flights[$id]['departure_airport'], $all_flights[$id]['arrival_airport'], $all_flights[$id]['latitude'], $all_flights[$id]['longitude'], $waypoints, $all_flights[$id]['altitude'], $all_flights[$id]['heading'], $all_flights[$id]['speed'], $all_flights[$id]['departure_airport_time'], $all_flights[$id]['arrival_airport_time'], $all_flights[$id]['squawk']);
 			if ($debug) echo $result."\n";
 		}
     	    }

diff --git a/db/spotter_live.sql b/db/spotter_live.sql
@@ -55,6 +55,7 @@ CREATE TABLE IF NOT EXISTS `spotter_live` (
   `altitude` int(11) NOT NULL,
   `heading` int(11) NOT NULL,
   `ground_speed` int(11) NOT NULL,
+  `squawk` int(11),
   PRIMARY KEY (`spotter_live_id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=0 ;