Ysurac / FlightAirMap

airport-statistics-arrival-airport-country.php

Indentation +3 added lines, -3 removed lines

@@ -3,8 +3,8 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['airport'])) {
-        header('Location: '.$globalURL.'/airport');
-        die();
+		header('Location: '.$globalURL.'/airport');
+		die();
 }
 $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
@@ -64,7 +64,7 @@ 
           function drawChart() {
             var data = google.visualization.arrayToDataTable([
             	["'._("Country").'", "'._("# of times").'"], ';
-            	$country_data = '';
+				$country_data = '';
 	foreach($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['arrival_airport_country'].'",'.$airport_item['airport_arrival_country_count'].'],';

header.php

Indentation +45 added lines, -45 removed lines

@@ -75,46 +75,46 @@ 
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
 <?php
-    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
+	if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
 ?>
 <script src="http://maps.google.com/maps/api/js?v=3&key=<?php print $globalGoogleAPIKey; ?>"></script>
 <script src="<?php print $globalURL; ?>/js/leaflet-Google.js"></script>
 <?php
-    }
+	}
 ?>
 <?php
-    if (isset($globalBingMapKey) && $globalBingMapKey != '') {
+	if (isset($globalBingMapKey) && $globalBingMapKey != '') {
 ?>
 <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=Promise"></script>
 <script src="<?php print $globalURL; ?>/js/leaflet-Bing.js"></script>
 <?php
-    }
+	}
 ?>
 <?php
-    if (isset($globalMapQuestKey) && $globalMapQuestKey != '' && ($MapType == 'MapQuest-OSM' || $MapType == 'MapQuest-Roadmap' || $MapType == 'MapQuest-Aerial')) {
+	if (isset($globalMapQuestKey) && $globalMapQuestKey != '' && ($MapType == 'MapQuest-OSM' || $MapType == 'MapQuest-Roadmap' || $MapType == 'MapQuest-Aerial')) {
 ?>
 <!--<script src="https://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=<?php print $globalMapQuestKey; ?>"></script>-->
 <script src="https://open.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=<?php print $globalMapQuestKey; ?>"></script>
 <?php
-    }
+	}
 ?>
 <?php
-    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
+	if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
 ?>
 <script src="<?php print $globalURL; ?>/js/leaflet-Here.js"></script>
 <?php
-    }
+	}
 ?>
 <?php
-    if ($MapType == 'Yandex') {
+	if ($MapType == 'Yandex') {
 ?>
 <script src="http://api-maps.yandex.ru/2.0/?load=package.map&lang=en_US" type="text/javascript"></script>
 <script src="<?php print $globalURL; ?>/js/leaflet-Yandex.js"></script>
 <?php
-    }
+	}
 ?>
 <?php 
-    if (isset($_POST['archive'])) {
+	if (isset($_POST['archive'])) {
 ?>
 <?php
 	if (isset($globalBeta) && $globalBeta) {
@@ -130,7 +130,7 @@ 
 	}
 ?>
 <?php    
-    } else {
+	} else {
 ?>
 <?php
 	if (isset($globalBeta) && $globalBeta) {
@@ -145,7 +145,7 @@ 
 	}
 ?>
 <?php
-    }
+	}
 }
 ?>
 <?php
@@ -229,23 +229,23 @@ 
             <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li>
             <?php
-        	if ($globalACARS) {
-        	    if (isset($globalDemo) && $globalDemo) {
-    	    ?>
+			if ($globalACARS) {
+				if (isset($globalDemo) && $globalDemo) {
+			?>
             <li><hr /></li>
             <li><i>_('ACARS data not available publicly'); ?></i></li>
             <li><a href="">_('Latest ACARS messages'); ?></a></li>
             <li><a href="">_('Archive ACARS messages'); ?></a></li>
             <?php
-        	} else {
-    	    ?>
+			} else {
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li>
             <?php
-        	}
-        	}
-    	    ?>
+			}
+			}
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li>
@@ -287,14 +287,14 @@ 
   	    <form>
   		<select class="selectpicker" data-width="120px" onchange="language(this);">
   		    <?php
-  		        $Language = new Language();
-  		        $alllang = $Language->getLanguages();
-  		        foreach ($alllang as $key => $lang) {
-  		            print '<option value="'.$key.'"';
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
-  		            print '>'.$lang[0].'</option>';
-  		        }
-  		    ?>
+  				$Language = new Language();
+  				$alllang = $Language->getLanguages();
+  				foreach ($alllang as $key => $lang) {
+  					print '<option value="'.$key.'"';
+  					if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
+  					print '>'.$lang[0].'</option>';
+  				}
+  			?>
   		</select>
   	    </form>
   	</div>
@@ -330,7 +330,7 @@ 
 }
 if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
 {
-    ?>
+	?>
     <div class="top-header clear" role="main">
         <div id="map"></div>
 	<link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" />
@@ -341,15 +341,15 @@ 
         var zoom = 13;
 //create the map
 <?php
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
+	if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
 <?php
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
+	} elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
     var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
@@ -357,22 +357,22 @@ 
     var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
     var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
 <?php
-    } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
+	} elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    }
+	}
 ?>
   //initialize the layer group for the aircrft markers
   var layer_data = L.layerGroup();
 
   //a few title layers
 <?php
-    if ($globalMapProvider == 'Mapbox') {
+	if ($globalMapProvider == 'Mapbox') {
 ?>
   L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
     maxZoom: 18,
@@ -383,7 +383,7 @@ 
     token : '<?php print $globalMapboxToken; ?>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'OpenStreetMap') {
+	} elseif ($globalMapProvider == 'OpenStreetMap') {
 ?>
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -391,7 +391,7 @@ 
       '<a href="http://www.openstreetmap.org/copyright">Open Database Licence</a>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-OSM') {
+	} elseif ($globalMapProvider == 'MapQuest-OSM') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -400,7 +400,7 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-Aerial') {
+	} elseif ($globalMapProvider == 'MapQuest-Aerial') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -409,27 +409,27 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>, Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency"'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'Google-Roadmap') {
+	} elseif ($globalMapProvider == 'Google-Roadmap') {
 ?>
     var googleLayer = new L.Google('ROADMAP');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Satellite') {
+	} elseif ($globalMapProvider == 'Google-Satellite') {
 ?>
     var googleLayer = new L.Google('SATELLITE');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Hybrid') {
+	} elseif ($globalMapProvider == 'Google-Hybrid') {
 ?>
     var googleLayer = new L.Google('HYBRID');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Terrain') {
+	} elseif ($globalMapProvider == 'Google-Terrain') {
 ?>
     var googleLayer = new L.Google('Terrain');
     map.addLayer(googleLayer);
 <?php
-    }
+	}
 ?>
         </script>
     </div>

search-wkt.php

Indentation +40 added lines, -40 removed lines

@@ -4,55 +4,55 @@
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
-        //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $end_date = $_GET['end_date'].":00";
-                $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
-                $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
-                $sql_date = $end_date;
-        } else $sql_date = '';
+		//for the date manipulation into the query
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$end_date = $_GET['end_date'].":00";
+				$sql_date = $start_date.",".$end_date;
+		} else if($_GET['start_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$sql_date = $start_date;
+		} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+				$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
+				$sql_date = $end_date;
+		} else $sql_date = '';
 } else $sql_date = '';
 
 if (isset($_GET['highest_altitude'])) {
-        //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $start_altitude = $_GET['lowest_altitude'];
-                $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-                $start_altitude = $_GET['lowest_altitude'].",60000";
-                $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
+		//for altitude manipulation
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$start_altitude = $_GET['lowest_altitude'];
+				$sql_altitude = $start_altitude.",".$end_altitude;
+		} else if($_GET['highest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$sql_altitude = $end_altitude;
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+				$start_altitude = $_GET['lowest_altitude'].",60000";
+				$sql_altitude = $start_altitude;
+		} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
 {
-        if (!isset($_GET['number_results']))
-        {
-                $limit_start = 0;
-                $limit_end = 25;
-                $absolute_difference = 25;
-        } else {
-                if ($_GET['number_results'] > 1000){
-                        $_GET['number_results'] = 1000;
-                }
-                $limit_start = 0;
-                $limit_end = $_GET['number_results'];
-                $absolute_difference = $_GET['number_results'];
-        }
+		if (!isset($_GET['number_results']))
+		{
+				$limit_start = 0;
+				$limit_end = 25;
+				$absolute_difference = 25;
+		} else {
+				if ($_GET['number_results'] > 1000){
+						$_GET['number_results'] = 1000;
+				}
+				$limit_start = 0;
+				$limit_end = $_GET['number_results'];
+				$absolute_difference = $_GET['number_results'];
+		}
 }  else {
-        $limit_explode = explode(",", $_GET['limit']);
-        $limit_start = $limit_explode[0];
-        $limit_end = $limit_explode[1];
+		$limit_explode = explode(",", $_GET['limit']);
+		$limit_start = $limit_explode[0];
+		$limit_end = $limit_explode[1];
 }
 
 $absolute_difference = abs($limit_start - $limit_end);

airport-statistics-route.php

Indentation +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['airport'])) {
-        header('Location: '.$globalURL.'/airport');
-        die();
+		header('Location: '.$globalURL.'/airport');
+		die();
 }
 $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();

manufacturer-statistics-departure-airport.php

Indentation +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['aircraft_manufacturer'])) {
-        header('Location: '.$globalURL.'/manufacturer');
-        die();
+		header('Location: '.$globalURL.'/manufacturer');
+		die();
 }
 $Spotter = new Spotter();
 $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));

require/class.NOTAM.php

Indentation +700 added lines, -700 removed lines

@@ -6,706 +6,706 @@
 class NOTAM {
 	public $db;
 	private $abbr = array(
-	                    'A/A' => 'Air-to-air',
-	                    'A/G' => 'Air-to-ground',
-	                    'AAL' => 'Above Aerodrome Level',
-	                    'ABM' => 'Abeam',
-	                    'ABN' => 'Aerodrome Beacon',
-	                    'ABT' => 'About',
-	                    'ABV' => 'Above',
-	                    'ACC' => 'Area Control',
-	                    'ACFT' => 'Aircraft',
-	                    'ACK' => 'Acknowledge',
-	                    'ACL' => 'Altimeter Check Location',
-	                    'ACN' => 'Aircraft Classification Number',
-	                    'ACPT' => 'Accepted',
-	                    'ACT' => 'Active',
-	                    'AD' => 'Aerodrome',
-	                    'ADA' => 'Advisory Area',
-	                    'ADC' => 'Aerodrome Chart',
-	                    'ADDN' => 'Additional',
-	                    'ADJ' => 'Adjacent',
-	                    'ADR' => 'Advisory Route',
-	                    'ADS' => 'Automatic Dependent Surveillance',
-	                    'ADVS' => 'Advisory Service',
-	                    'ADZ' => 'Advised',
-	                    'AFIL' => 'Flight Plan Filed In The Air',
-	                    'AFM' => 'Affirm',
-	                    'AFT' => 'After',
-	                    'AGA' => 'Aerodromes, Air Routes and Ground Aids',
-	                    'AGN' => 'Again',
-	                    'ALERFA' => 'Alert Phase',
-	                    'ALRS' => 'Alerting Service',
-	                    'ALS' => 'Approach Lighting System',
-	                    'ALT' => 'Altitude',
-	                    'ALTN' => 'Alternate',
-	                    'AMA' => 'Area Minimum Altitude',
-	                    'ANC' => 'Aeronautical Chart',
-	                    'ANCS' => 'Aeronautical Navigation Chart',
-	                    'ANS' => 'Answer',
-	                    'AOC' => 'Aerodrome Obstacle Chart',
-	                    'AP' => 'Airport',
-	                    'APCH' => 'Approach',
-	                    'APDC' => 'Aircraft Parking/docking Chart',
-	                    'APN' => 'Apron',
-	                    'APNS' => 'Aprons',
-	                    'APP' => 'Approach Control',
-	                    'APR' => 'April',
-	                    'APRX' => 'Approximately',
-	                    'APSG' => 'After Passing',
-	                    'APV' => 'Approved',
-	                    'ARC' => 'Area Chart',
-	                    'ARNG' => 'Arrange',
-	                    'ARO' => 'Air Traffic Services Reporting Office',
-	                    'ARP' => 'Aerodrome Reference Point',
-	                    'ARR' => 'Arriving',
-	                    'ARST' => 'Arresting',
-	                    'ASC' => 'Ascend To',
-	                    'ASDA' => 'Accelerate-Stop Distance Available',
-	                    'ASPEEDG' => 'Airspeed Gain',
-	                    'ASPEEDL' => 'Airspeed Loss',
-	                    'ASPH' => 'Asphalt',
-	                    'ATA' => 'Actual Time of Arrival',
-	                    'ATD' => 'Actual Time of Departure',
-	                    'ATFM' => 'Air Traffic Flow Management',
-	                    'ATM' => 'Air Traffic Management',
-	                    'ATP' => 'At',
-	                    'ATTN' => 'Attention',
-	                    'ATZ' => 'Aerodrome Traffic Zone',
-	                    'AUG' => 'August',
-	                    'AUTH' => 'Authorization',
-	                    'AUW' => 'All Up Weight',
-	                    'AUX' => 'Auxiliary',
-	                    'AVBL' => 'Available',
-	                    'AVG' => 'Average',
-	                    'AVGAS' => 'Aviation Gasoline',
-	                    'AWTA' => 'Advise At What Time Able',
-	                    'AWY' => 'Airway',
-	                    'AWYS' => 'Airways',
-	                    'AZM' => 'Azimuth',
-	                    'BA' => 'Braking Action',
-	                    'BCN' => 'Beacon',
-	                    'BCST' => 'Broadcast',
-	                    'BDRY' => 'Boundary',
-	                    'BFR' => 'Before',
-	                    'BLDG' => 'Building',
-	                    'BLO' => 'Below Clouds',
-	                    'BLW' => 'Below',
-	                    'BRF' => 'Short',
-	                    'BRG' => 'Bearing',
-	                    'BRKG' => 'Breaking',
-	                    'BTL' => 'Between Layers',
-	                    'BTN' => 'Between',
-	                    'CD' => 'Candela',
-	                    'CDN' => 'Coordination',
-	                    'CF' => 'Change Frequency To',
-	                    'CFM' => 'Confirm',
-	                    'CGL' => 'Circling Guidance Light(s)',
-	                    'CH' => 'Channel',
-	                    'CHG' => 'Changed',
-	                    'CIT' => 'Near or Over Large Towns',
-	                    'CIV' => 'Civil',
-	                    'CK' => 'Check',
-	                    'CL' => 'Centre Line',
-	                    'CLBR' => 'Calibration',
-	                    'CLD' => 'Cloud',
-	                    'CLG' => 'Calling',
-	                    'CLIMB-OUT' => 'Climb-out Area',
-	                    'CLR' => 'Clearance',
-	                    'CLRD' => 'Cleared',
-	                    'CLSD' => 'Closed',
-	                    'CMB' => 'Climb',
-	                    'CMPL' => 'Complete',
-	                    'CNL' => 'Cancel',
-	                    'CNS' => 'Communications, Navigation And Surveillance',
-	                    'COM' => 'Communications',
-	                    'CONC' => 'Concrete',
-	                    'COND' => 'Condition',
-	                    'CONS' => 'Continuous',
-	                    'CONST' => 'Construction',
-	                    'CONT' => 'Continued',
-	                    'COOR' => 'Coordination',
-	                    'COORD' => 'Coordinates',
-	                    'COP' => 'Change-over Point',
-	                    'COR' => 'Correction',
-	                    'COT' => 'At The Coast',
-	                    'COV' => 'Covered',
-	                    'CPDLC' => 'Controller-pilot Data Link Communications',
-	                    'CPL' => 'Current Flight Plan',
-	                    'CRC' => 'Cyclic Redundancy Check',
-	                    'CRZ' => 'Cruise',
-	                    'CTAM' => 'Climb To And Maintain',
-	                    'CTC' => 'Contact',
-	                    'CTL' => 'Control',
-	                    'CTN' => 'Caution',
-	                    'CTR' => 'Control Zone',
-	                    'CVR' => 'Cockpit Voice Recorder',
-	                    'CW' => 'Continuous Wave',
-	                    'CWY' => 'Clearway',
-	                    'DA' => 'Decision Altitude',
-	                    'DCKG' => 'Docking',
-	                    'DCP' => 'Datum Crossing Point',
-	                    'DCPC' => 'Direct Controller-pilot Communications',
-	                    'DCT' => 'Direct',
-	                    'DEC' => 'December',
-	                    'DEG' => 'Degrees',
-	                    'DEP' => 'Departing',
-	                    'DES' => 'Descend',
-	                    'DEST' => 'Destination',
-	                    'DETRESFA' => 'Distress Phase',
-	                    'DEV' => 'Deviating',
-	                    'DFDR' => 'Digital Flight Data Recorder',
-	                    'DFTI' => 'Distance From Touchdown Indicator',
-	                    'DH' => 'Decision Height',
-	                    'DIP' => 'Diffuse',
-	                    'DIST' => 'Distance',
-	                    'DIV' => 'Divert',
-	                    'DLA' => 'Delay',
-	                    'DLY' => 'Daily',
-	                    'DNG' => 'Dangerous',
-	                    'DOM' => 'Domestic',
-	                    'DPT' => 'Depth',
-	                    'DR' => 'Dead Reckoning',
-	                    'DRG' => 'During',
-	                    'DTAM' => 'Descend To And Maintain',
-	                    'DTG' => 'Date-time Group',
-	                    'DTHR' => 'Displaced Runway Threshold',
-	                    'DTRT' => 'Deteriorating',
-	                    'DTW' => 'Dual Tandem Wheels',
-	                    'DUPE' => 'This Is A Duplicate Message',
-	                    'DUR' => 'Duration',
-	                    'DVOR' => 'Doppler VOR',
-	                    'DW' => 'Dual Wheels',
-	                    'EAT' => 'Expected Approach Time',
-	                    'EB' => 'Eastbound',
-	                    'EDA' => 'Elevation Differential Area',
-	                    'EET' => 'Estimated Elapsed Time',
-	                    'EFC' => 'Expect Further Clearance',
-	                    'ELBA' => 'Emergency Location Beacon',
-	                    'ELEV' => 'Elevation',
-	                    'ELR' => 'Extra Long Range',
-	                    'EM' => 'Emission',
-	                    'EMERG' => 'Emergency',
-	                    'END' => 'Stop-end',
-	                    'ENE' => 'East-north-east',
-	                    'ENG' => 'Engine',
-	                    'ENR' => 'En-route',
-	                    'ENRC' => 'En-route Chart',
-	                    'EOBT' => 'Estimated Off-block Time',
-	                    'EQPT' => 'Equipment',
-	                    'ER' => 'Here',
-	                    'ESE' => 'East-south-east',
-	                    'EST' => 'Estimate',
-	                    'ETA' => 'Estimated Time Of Arrival',
-	                    'ETD' => 'Estimated Time Of Departure',
-	                    'ETO' => 'Estimated Time Over Significant Point',
-	                    'EV' => 'Every',
-	                    'EXC' => 'Except',
-	                    'EXER' => 'Exercise',
-	                    'EXP' => 'Expect',
-	                    'EXTD' => 'Extend',
-	                    'FAC' => 'Facilities',
-	                    'FAF' => 'Final Approach Fix',
-	                    'FAL' => 'Facilitation of International Airtransport',
-	                    'FAP' => 'Final Approach Point',
-	                    'FATO' => 'Final Approach And Take-off Area',
-	                    'FAX' => 'Fax',
-	                    'FBL' => 'Light',
-	                    'FCST' => 'Forecast',
-	                    'FCT' => 'Friction Coefficient',
-	                    'FDPS' => 'Flight Data Processing System',
-	                    'FEB' => 'February',
-	                    'FLD' => 'Field',
-	                    'FLG' => 'Flashing',
-	                    'FLR' => 'Flares',
-	                    'FLT' => 'Flight',
-	                    'FLTS' => 'Flights',
-	                    'FLTCK' => 'Flight Check',
-	                    'FLUC' => 'Fluctuating',
-	                    'FLW' => 'Follow(s)',
-	                    'FLY' => 'Fly',
-	                    'FM' => 'From',
-	                    'FMS' => 'Flight Management System',
-	                    'FMU' => 'Flow Management Unit',
-	                    'FNA' => 'Final Approach',
-	                    'FPAP' => 'Flight Path Alignment Point',
-	                    'FPL' => 'Flight Plan',
-	                    'FPLS' => 'Flight Plans',
-	                    'FPM' => 'Feet Per Minute',
-	                    'FPR' => 'Flight Plan Route',
-	                    'FR' => 'Fuel Remaining',
-	                    'FREQ' => 'Frequency',
-	                    'FRI' => 'Friday',
-	                    'FRNG' => 'Firing',
-	                    'FRONT' => 'Front',
-	                    'FRQ' => 'Frequent',
-	                    'FSL' => 'Full Stop Landing',
-	                    'FSS' => 'Flight Service Station',
-	                    'FST' => 'First',
-	                    'FTP' => 'Fictitious Threshold Point',
-	                    'G/A' => 'Ground-to-air',
-	                    'G/A/G' => 'Ground-to-air and Air-to-ground',
-	                    'GARP' => 'GBAS Azimuth Reference Point',
-	                    'GBAS' => 'Ground-based Augmentation System',
-	                    'GCAJ' => 'Ground Controlled Approach',
-	                    'GEN' => 'General',
-	                    'GEO' => 'Geographic or True',
-	                    'GES' => 'Ground Earth Station',
-	                    'GLD' => 'Glider',
-	                    'GMC' => 'Ground Movement Chart',
-	                    'GND' => 'Ground',
-	                    'GNDCK' => 'Ground Check',
-	                    'GP' => 'Glide Path',
-	                    'GRASS' => 'Grass landing area',
-	                    'GRVL' => 'Gravel',
-	                    'GUND' => 'Geoid Undulation',
-	                    'H24' => '24 Hours',
-	                    'HAPI' => 'Helicopter Approach Path Indicator',
-	                    'HBN' => 'Hazard Beacon',
-	                    'HDG' => 'Heading',
-	                    'HEL' => 'Helicopter',
-	                    'HGT' => 'Height',
-	                    'HJ' => 'Sunrise to Sunset',
-	                    'HLDG' => 'Holding',
-	                    'HN' => 'Sunset to Sunrise',
-	                    'HO' => 'Service Available To Meet Operational Requirements',
-	                    'HOL' => 'Holiday',
-	                    'HOSP' => 'Hospital Aircraft',
-	                    'HOT' => 'Height',
-	                    'HPA' => 'Hectopascal',
-	                    'HR' => 'Hours',
-	                    'HRS' => 'Hours',
-	                    'HS' => 'Service Available During Hours Of Scheduled Operations',
-	                    'HURCN' => 'Hurricane',
-	                    'HVY' => 'Heavy',
-	                    'HX' => 'No Specific Working Hours',
-	                    'HYR' => 'Higher',
-	                    'IAC' => 'Instrument Approach Chart',
-	                    'IAF' => 'Initial Approach Fix',
-	                    'IAO' => 'In And Out Of Clouds',
-	                    'IAP' => 'Instrument Approach Procedure',
-	                    'IAR' => 'Intersection Of Air Routes',
-	                    'IBN' => 'Identification Beacon',
-	                    'ID' => 'Identifier',
-	                    'IDENT' => 'Identification',
-	                    'IFF' => 'Identification Friend/Foe',
-	                    'IGA' => 'International General Aviation',
-	                    'IM' => 'Inner Marker',
-	                    'IMPR' => 'Improving',
-	                    'IMT' => 'Immediately',
-	                    'INA' => 'Initial Approach',
-	                    'INBD' => 'Inbound',
-	                    'INCERFA' => 'Uncertainty Phase',
-	                    'INFO' => 'Information',
-	                    'INOP' => 'Inoperative',
-	                    'INP' => 'If Not Possible',
-	                    'INPR' => 'In Progress',
-	                    'INSTL' => 'Installation',
-	                    'INSTR' => 'Instrument',
-	                    'INT' => 'Intersection',
-	                    'INTS' => 'Intersections',
-	                    'INTL' => 'International',
-	                    'INTRG' => 'Interrogator',
-	                    'INTRP' => 'Interruption',
-	                    'INTSF' => 'Intensifying',
-	                    'INTST' => 'Intensity',
-	                    'ISA' => 'International Standard Atmosphere',
-	                    'JAN' => 'January',
-	                    'JTST' => 'Jet stream',
-	                    'JUL' => 'July',
-	                    'JUN' => 'June',
-	                    'KMH' => 'Kilometres Per Hour',
-	                    'KPA' => 'Kilopascal',
-	                    'KT' => 'Knots',
-	                    'KW' => 'Kilowatts',
-	                    'LAN' => 'Inland',
-	                    'LAT' => 'Latitude',
-	                    'LDA' => 'Landing Distance Available',
-	                    'LDAH' => 'Landing Distance Available, Helicopter',
-	                    'LDG' => 'Landing',
-	                    'LDI' => 'Landing Direction Indicator',
-	                    'LEN' => 'Length',
-	                    'LGT' => 'Lighting',
-	                    'LGTD' => 'Lighted',
-	                    'LIH' => 'Light Intensity High',
-	                    'LIL' => 'Light Intensity Low',
-	                    'LIM' => 'Light Intensity Medium',
-	                    'LLZ' => 'Localizer',
-	                    'LM' => 'Locator, Middle',
-	                    'LMT' => 'Local Mean Time',
-	                    'LNG' => 'Long',
-	                    'LO' => 'Locator, Outer',
-	                    'LOG' => 'Located',
-	                    'LONG' => 'Longitude',
-	                    'LRG' => 'Long Range',
-	                    'LTD' => 'Limited',
-	                    'LTP' => 'Landing Threshold Point',
-	                    'LVE' => 'Leaving',
-	                    'LVL' => 'Level',
-	                    'LYR' => 'Layer',
-	                    'MAA' => 'Maximum Authorized Altitude',
-	                    'MAG' => 'Magnetic',
-	                    'MAINT' => 'Maintenance',
-	                    'MAP' => 'Aeronautical Maps and Charts',
-	                    'MAPT' => 'Missed Approach Point',
-	                    'MAR' => 'March',
-	                    'MAX' => 'Maximum',
-	                    'MAY' => 'May',
-	                    'MBST' => 'Microburst',
-	                    'MCA' => 'Minimum Crossing Altitude',
-	                    'MCW' => 'Modulated Continuous Wave',
-	                    'MDA' => 'Minimum Descent Altitude',
-	                    'MDH' => 'Minimum Descent Height',
-	                    'MEA' => 'Minimum En-route Altitude',
-	                    'MEHT' => 'Minimum Eye Height Over Threshold',
-	                    'MET' => 'Meteorological',
-	                    'MID' => 'Mid-point',
-	                    'MIL' => 'Military',
-	                    'MIN' => 'Minutes',
-	                    'MKR' => 'Marker Radio Beacon',
-	                    'MLS' => 'Microwave Landing System',
-	                    'MM' => 'Middle Marker',
-	                    'MNM' => 'Minimum',
-	                    'MNPS' => 'Minimum Navigation Performance Specifications',
-	                    'MNT' => 'Monitor',
-	                    'MNTN' => 'Maintain',
-	                    'MOA' => 'Military Operating Area',
-	                    'MOC' => 'Minimum Obstacle Clearance',
-	                    'MOD' => 'Moderate',
-	                    'MON' => 'Monday',
-	                    'MOPS' => 'Minimum Operational Performance Standards',
-	                    'MOV' => 'Movement',
-	                    'MRA' => 'Minimum Reception Altitude',
-	                    'MRG' => 'Medium Range',
-	                    'MRP' => 'ATS/MET Reporting Point',
-	                    'MS' => 'Minus',
-	                    'MSA' => 'Minimum Sector Altitude',
-	                    'MSAW' => 'Minimum Safe Altitude Warning',
-	                    'MSG' => 'Message',
-	                    'MSSR' => 'Monopulse Secondary Surveillance Radar',
-	                    'MT' => 'Mountain',
-	                    'MTU' => 'Metric Units',
-	                    'MTW' => 'Mountain Waves',
-	                    'NASC' => 'National AIS System Centre',
-	                    'NAT' => 'North Atlantic',
-	                    'NAV' => 'Navigation',
-	                    'NB' => 'Northbound',
-	                    'NBFR' => 'Not Before',
-	                    'NE' => 'North-east',
-	                    'NEB' => 'North-eastbound',
-	                    'NEG' => 'Negative',
-	                    'NGT' => 'Night',
-	                    'NIL' => 'None',
-	                    'NML' => 'Normal',
-	                    'NNE' => 'North-north-east',
-	                    'NNW' => 'North-north-west',
-	                    'NOF' => 'International NOTAM Office',
-	                    'NOV' => 'November',
-	                    'NOZ' => 'Normal Operating Zone',
-	                    'NR' => 'Number',
-	                    'NRH' => 'No Reply Heard',
-	                    'NTL' => 'National',
-	                    'NTZ' => 'No Transgression Zone',
-	                    'NW' => 'North-west',
-	                    'NWB' => 'North-westbound',
-	                    'NXT' => 'Next',
-	                    'O/R' => 'On Request',
-	                    'OAC' => 'Oceanic Area Control Centre',
-	                    'OAS' => 'Obstacle Assessment Surface',
-	                    'OBS' => 'Observe',
-	                    'OBST' => 'Obstacle',
-	                    'OBSTS' => 'Obstacles',
-	                    'OCA' => 'Oceanic Control Area',
-	                    'OCH' => 'Obstacle Clearance Height',
-	                    'OCS' => 'Obstacle Clearance Surface',
-	                    'OCT' => 'October',
-	                    'OFZ' => 'Obstacle Free Zone',
-	                    'OGN' => 'Originate',
-	                    'OHD' => 'Overhead',
-	                    'OM' => 'Outer Marker',
-	                    'OPC' => 'Control Indicated Is Operational Control',
-	                    'OPMET' => 'Operational Meteorological',
-	                    'OPN' => 'Open',
-	                    'OPR' => 'Operate',
-	                    'OPS' => 'Operations',
-	                    'ORD' => 'Order',
-	                    'OSV' => 'Ocean Station Vessel',
-	                    'OTLK' => 'Outlook',
-	                    'OTP' => 'On Top',
-	                    'OTS' => 'Organized Track System',
-	                    'OUBD' => 'Outbound',
-	                    'PA' => 'Precision Approach',
-	                    'PALS' => 'Precision Approach Lighting System',
-	                    'PANS' => 'Procedures for Air Navigation Services',
-	                    'PAR' => 'Precision Approach Radar',
-	                    'PARL' => 'Parallel',
-	                    'PATC' => 'Precision Approach Terrain Chart',
-	                    'PAX' => 'Passenger(s)',
-	                    'PCD' => 'Proceed',
-	                    'PCL' => 'Pilot-controlled Lighting',
-	                    'PCN' => 'Pavement Classification Number',
-	                    'PDC' => 'Pre-departure Clearance',
-	                    'PDG' => 'Procedure Design Gradient',
-	                    'PER' => 'Performance',
-	                    'PERM' => 'Permanent',
-	                    'PIB' => 'Pre-flight Information Bulletin',
-	                    'PJE' => 'Parachute Jumping Exercise',
-	                    'PLA' => 'Practice Low Approach',
-	                    'PLN' => 'Flight Plan',
-	                    'PLVL' => 'Present Level',
-	                    'PN' => 'Prior Notice Required',
-	                    'PNR' => 'Point Of No Return',
-	                    'POB' => 'Persons On Board',
-	                    'POSS' => 'Possible',
-	                    'PPI' => 'Plan Position Indicator',
-	                    'PPR' => 'Prior Permission Required',
-	                    'PPSN' => 'Present Position',
-	                    'PRI' => 'Primary',
-	                    'PRKG' => 'Parking',
-	                    'PROB' => 'Probability',
-	                    'PROC' => 'Procedure',
-	                    'PROV' => 'Provisional',
-	                    'PS' => 'Plus',
-	                    'PSG' => 'Passing',
-	                    'PSN' => 'Position',
-	                    'PSNS' => 'Positions',
-	                    'PSR' => 'Primary Surveillance Radar',
-	                    'PSYS' => 'Pressure System(s)',
-	                    'PTN' => 'Procedure Turn',
-	                    'PTS' => 'Polar Track Structure',
-	                    'PWR' => 'Power',
-	                    'QUAD' => 'Quadrant',
-	                    'RAC' => 'Rules of The Air and Air Traffic Services',
-	                    'RAG' => 'Runway Arresting Gear',
-	                    'RAI' => 'Runway Alignment Indicator',
-	                    'RASC' => 'Regional AIS System Centre',
-	                    'RASS' => 'Remote Altimeter Setting Source',
-	                    'RB' => 'Rescue Boat',
-	                    'RCA' => 'Reach Cruising Altitude',
-	                    'RCC' => 'Rescue Coordination Centre',
-	                    'RCF' => 'Radiocommunication Failure',
-	                    'RCH' => 'Reaching',
-	                    'RCL' => 'Runway Centre Line',
-	                    'RCLL' => 'Runway Centre Line Light(s)',
-	                    'RCLR' => 'Recleared',
-	                    'RDH' => 'Reference Datum Height',
-	                    'RDL' => 'Radial',
-	                    'RDO' => 'Radio',
-	                    'RE' => 'Recent',
-	                    'REC' => 'Receiver',
-	                    'REDL' => 'Runway Edge Light(s)',
-	                    'REF' => 'Refer To',
-	                    'REG' => 'Registration',
-	                    'RENL' => 'Runway End Light(s)',
-	                    'REP' => 'Report',
-	                    'REQ' => 'Requested',
-	                    'RERTE' => 'Re-route',
-	                    'RESA' => 'Runway End Safety Area',
-	                    'RG' => 'Range (lights)',
-	                    'RHC' => 'Right-hand Circuit',
-	                    'RIF' => 'Reclearance In Flight',
-	                    'RITE' => 'Right',
-	                    'RL' => 'Report Leaving',
-	                    'RLA' => 'Relay To',
-	                    'RLCE' => 'Request Level Change En Route',
-	                    'RLLS' => 'Runway Lead-in Lighting System',
-	                    'RLNA' => 'Request Level Not Available',
-	                    'RMAC' => 'Radar Minimum Altitude Chart',
-	                    'RMK' => 'Remark',
-	                    'RNG' => 'Radio Range',
-	                    'RNP' => 'Required Navigation Performance',
-	                    'ROC' => 'Rate Of Climb',
-	                    'ROD' => 'Rate Of Descent',
-	                    'ROFOR' => 'Route Forecast',
-	                    'RON' => 'Receiving Only',
-	                    'RPI' => 'Radar Position Indicator',
-	                    'RPL' => 'Repetitive Flight Plan',
-	                    'RPLC' => 'Replaced',
-	                    'RPS' => 'Radar Position Symbol',
-	                    'RQMNTS' => 'Requirements',
-	                    'RQP' => 'Request Flight Plan',
-	                    'RQS' => 'Request Supplementary Flight Plan',
-	                    'RR' => 'Report Reaching',
-	                    'RSC' => 'Rescue Sub-centre',
-	                    'RSCD' => 'Runway Surface Condition',
-	                    'RSP' => 'Responder Beacon',
-	                    'RSR' => 'En-route Surveillance Radar',
-	                    'RTE' => 'Route',
-	                    'RTES' => 'Routes',
-	                    'RTF' => 'Radiotelephone',
-	                    'RTG' => 'Radiotelegraph',
-	                    'RTHL' => 'Runway Threshold Light(s)',
-	                    'RTN' => 'Return',
-	                    'RTODAH' => 'Rejected Take-off Distance Available, Helicopter',
-	                    'RTS' => 'Return To Service',
-	                    'RTT' => 'Radioteletypewriter',
-	                    'RTZL' => 'Runway Touchdown Zone Light(s)',
-	                    'RUT' => 'Standard Regional Route Transmitting Frequencies',
-	                    'RV' => 'Rescue Vessel',
-	                    'RVSM' => 'Reduced Vertical Separation Minimum',
-	                    'RWY' => 'Runway',
-	                    'RWYS' => 'Runways',
-	                    'SALS' => 'Simple Approach Lighting System',
-	                    'SAN' => 'Sanitary',
-	                    'SAP' => 'As Soon As Possible',
-	                    'SAR' => 'Search and Rescue',
-	                    'SARPS' => 'Standards and Recommended Practices',
-	                    'SAT' => 'Saturday',
-	                    'SATCOM' => 'Satellite Communication',
-	                    'SB' => 'Southbound',
-	                    'SBAS' => 'Satellite-based Augmentation System',
-	                    'SDBY' => 'Stand by',
-	                    'SE' => 'South-east',
-	                    'SEA' => 'Sea',
-	                    'SEB' => 'South-eastbound',
-	                    'SEC' => 'Seconds',
-	                    'SECN' => 'Section',
-	                    'SECT' => 'Sector',
-	                    'SEP' => 'September',
-	                    'SER' => 'Service',
-	                    'SEV' => 'Severe',
-	                    'SFC' => 'Surface',
-	                    'SGL' => 'Signal',
-	                    'SID' => 'Standard Instrument Departure',
-	                    'SIF' => 'Selective Identification Feature',
-	                    'SIG' => 'Significant',
-	                    'SIMUL' => 'Simultaneous',
-	                    'SKED' => 'Schedule',
-	                    'SLP' => 'Speed Limiting Point',
-	                    'SLW' => 'Slow',
-	                    'SMC' => 'Surface Movement Control',
-	                    'SMR' => 'Surface Movement Radar',
-	                    'SPL' => 'Supplementary Flight Plan',
-	                    'SPOC' => 'SAR Point Of Contact',
-	                    'SPOT' => 'Spot Wind',
-	                    'SR' => 'Sunrise',
-	                    'SRA' => 'Surveillance Radar Approach',
-	                    'SRE' => 'Surveillance Radar Element Of Precision Approach Radar System',
-	                    'SRG' => 'Short Range',
-	                    'SRR' => 'Search and Rescue Region',
-	                    'SRY' => 'Secondary',
-	                    'SS' => 'Sunset',
-	                    'SSE' => 'South-south-east',
-	                    'SSR' => 'Secondary Surveillance Radar',
-	                    'SST' => 'Supersonic Transport',
-	                    'SSW' => 'South-south-west',
-	                    'STA' => 'Straight-in Approach',
-	                    'STAR' => 'Standard Instrument Arrival',
-	                    'STD' => 'Standard',
-	                    'STN' => 'Station',
-	                    'STNR' => 'Stationary',
-	                    'STOL' => 'Short Take-off and Landing',
-	                    'STS' => 'Status',
-	                    'STWL' => 'Stopway Light(s)',
-	                    'SUBJ' => 'Subject To',
-	                    'SUN' => 'Sunday',
-	                    'SUP' => 'Supplement',
-	                    'SUPPS' => 'Regional Supplementary Procedures Service Message',
-	                    'SVCBL' => 'Serviceable',
-	                    'SW' => 'South-west',
-	                    'SWB' => 'South-westbound',
-	                    'SWY' => 'Stopway',
-	                    'TA' => 'Transition Altitude',
-	                    'TAA' => 'Terminal Arrival Altitude',
-	                    'TAF' => 'Aerodrome Forecast',
-	                    'TAIL' => 'Tail Wind',
-	                    'TAR' => 'Terminal Area Surveillance Radar',
-	                    'TAX' => 'Taxi',
-	                    'TCAC' => 'Tropical Cyclone Advisory Centre',
-	                    'TDO' => 'Tornado',
-	                    'TDZ' => 'Touchdown Zone',
-	                    'TECR' => 'Technical Reason',
-	                    'TEMPO' => 'Temporarily',
-	                    'TFC' => 'Traffic',
-	                    'TGL' => 'Touch-and-go',
-	                    'TGS' => 'Taxiing Guidance System',
-	                    'THR' => 'Threshold',
-	                    'THRU' => 'Through',
-	                    'THU' => 'Thursday',
-	                    'TIBA' => 'Traffic Information Broadcast By Aircraft',
-	                    'TIL' => 'Until',
-	                    'TIP' => 'Until Past',
-	                    'TKOF' => 'Take-off',
-	                    'TL' => 'Till',
-	                    'TLOF' => 'Touchdown And Lift-off Area',
-	                    'TMA' => 'Terminal Control Area',
-	                    'TNA' => 'Turn Altitude',
-	                    'TNH' => 'Turn Height',
-	                    'TOC' => 'Top of Climb',
-	                    'TODA' => 'Take-off Distance Available',
-	                    'TODAH' => 'Take-off Distance Available, Helicopter',
-	                    'TORA' => 'Take-off Run Available',
-	                    'TP' => 'Turning Point',
-	                    'TR' => 'Track',
-	                    'TRA' => 'Temporary Reserved Airspace',
-	                    'TRANS' => 'Transmitter',
-	                    'TRL' => 'Transition Level',
-	                    'TUE' => 'Tuesday',
-	                    'TURB' => 'Turbulence',
-	                    'TVOR' => 'Terminal VOR',
-	                    'TWR' => 'Tower',
-	                    'TWY' => 'Taxiway',
-	                    'TWYL' => 'Taxiway-link',
-	                    'TXT' => 'Text',
-	                    'TYP' => 'Type of Aircraft',
-	                    'U/S' => 'Unserviceable',
-	                    'UAB' => 'Until Advised By',
-	                    'UAC' => 'Upper Area Control Centre',
-	                    'UAR' => 'Upper Air Route',
-	                    'UFN' => 'Until Further Notice',
-	                    'UHDT' => 'Unable Higher Due Traffic',
-	                    'UIC' => 'Upper Information Centre',
-	                    'UIR' => 'Upper Flight Information Region',
-	                    'ULR' => 'Ultra Long Range',
-	                    'UNA' => 'Unable',
-	                    'UNAP' => 'Unable To Approve',
-	                    'UNL' => 'Unlimited',
-	                    'UNREL' => 'Unreliable',
-	                    'UTA' => 'Upper Control Area',
-	                    'VAAC' => 'Volcanic Ash Advisory Centre',
-	                    'VAC' => 'Visual Approach Chart',
-	                    'VAL' => 'In Valleys',
-	                    'VAN' => 'Runway Control Van',
-	                    'VAR' => 'Visual-aural Radio Range',
-	                    'VC' => 'Vicinity',
-	                    'VCY' => 'Vicinity',
-	                    'VER' => 'Vertical',
-	                    'VIS' => 'Visibility',
-	                    'VLR' => 'Very Long Range',
-	                    'VPA' => 'Vertical Path Angle',
-	                    'VRB' => 'Variable',
-	                    'VSA' => 'By Visual Reference To The Ground',
-	                    'VSP' => 'Vertical Speed',
-	                    'VTOL' => 'Vertical Take-off And Landing',
-	                    'WAC' => 'World Aeronautical Chart',
-	                    'WAFC' => 'World Area Forecast Centre',
-	                    'WB' => 'Westbound',
-	                    'WBAR' => 'Wing Bar Lights',
-	                    'WDI' => 'Wind Direction Indicator',
-	                    'WDSPR' => 'Widespread',
-	                    'WED' => 'Wednesday',
-	                    'WEF' => 'Effective From',
-	                    'WI' => 'Within',
-	                    'WID' => 'Width',
-	                    'WIE' => 'Effective Immediately',
-	                    'WILCO' => 'Will Comply',
-	                    'WIND' => 'Wind',
-	                    'WINTEM' => 'Forecast Upper Wind And Temperature For Aviation',
-	                    'WIP' => 'Work In Progress',
-	                    'WKN' => 'Weaken',
-	                    'WNW' => 'West-north-west',
-	                    'WO' => 'Without',
-	                    'WPT' => 'Way-point',
-	                    'WRNG' => 'Warning',
-	                    'WSW' => 'West-south-west',
-	                    'WT' => 'Weight',
-	                    'WWW' => 'Worldwide Web',
-	                    'WX' => 'Weather',
-	                    'XBAR' => 'Crossbar',
-	                    'XNG' => 'Crossing',
-	                    'XS' => 'Atmospherics',
-	                    'YCZ' => 'Yellow Caution Zone',
-	                    'YR' => 'Your');
+						'A/A' => 'Air-to-air',
+						'A/G' => 'Air-to-ground',
+						'AAL' => 'Above Aerodrome Level',
+						'ABM' => 'Abeam',
+						'ABN' => 'Aerodrome Beacon',
+						'ABT' => 'About',
+						'ABV' => 'Above',
+						'ACC' => 'Area Control',
+						'ACFT' => 'Aircraft',
+						'ACK' => 'Acknowledge',
+						'ACL' => 'Altimeter Check Location',
+						'ACN' => 'Aircraft Classification Number',
+						'ACPT' => 'Accepted',
+						'ACT' => 'Active',
+						'AD' => 'Aerodrome',
+						'ADA' => 'Advisory Area',
+						'ADC' => 'Aerodrome Chart',
+						'ADDN' => 'Additional',
+						'ADJ' => 'Adjacent',
+						'ADR' => 'Advisory Route',
+						'ADS' => 'Automatic Dependent Surveillance',
+						'ADVS' => 'Advisory Service',
+						'ADZ' => 'Advised',
+						'AFIL' => 'Flight Plan Filed In The Air',
+						'AFM' => 'Affirm',
+						'AFT' => 'After',
+						'AGA' => 'Aerodromes, Air Routes and Ground Aids',
+						'AGN' => 'Again',
+						'ALERFA' => 'Alert Phase',
+						'ALRS' => 'Alerting Service',
+						'ALS' => 'Approach Lighting System',
+						'ALT' => 'Altitude',
+						'ALTN' => 'Alternate',
+						'AMA' => 'Area Minimum Altitude',
+						'ANC' => 'Aeronautical Chart',
+						'ANCS' => 'Aeronautical Navigation Chart',
+						'ANS' => 'Answer',
+						'AOC' => 'Aerodrome Obstacle Chart',
+						'AP' => 'Airport',
+						'APCH' => 'Approach',
+						'APDC' => 'Aircraft Parking/docking Chart',
+						'APN' => 'Apron',
+						'APNS' => 'Aprons',
+						'APP' => 'Approach Control',
+						'APR' => 'April',
+						'APRX' => 'Approximately',
+						'APSG' => 'After Passing',
+						'APV' => 'Approved',
+						'ARC' => 'Area Chart',
+						'ARNG' => 'Arrange',
+						'ARO' => 'Air Traffic Services Reporting Office',
+						'ARP' => 'Aerodrome Reference Point',
+						'ARR' => 'Arriving',
+						'ARST' => 'Arresting',
+						'ASC' => 'Ascend To',
+						'ASDA' => 'Accelerate-Stop Distance Available',
+						'ASPEEDG' => 'Airspeed Gain',
+						'ASPEEDL' => 'Airspeed Loss',
+						'ASPH' => 'Asphalt',
+						'ATA' => 'Actual Time of Arrival',
+						'ATD' => 'Actual Time of Departure',
+						'ATFM' => 'Air Traffic Flow Management',
+						'ATM' => 'Air Traffic Management',
+						'ATP' => 'At',
+						'ATTN' => 'Attention',
+						'ATZ' => 'Aerodrome Traffic Zone',
+						'AUG' => 'August',
+						'AUTH' => 'Authorization',
+						'AUW' => 'All Up Weight',
+						'AUX' => 'Auxiliary',
+						'AVBL' => 'Available',
+						'AVG' => 'Average',
+						'AVGAS' => 'Aviation Gasoline',
+						'AWTA' => 'Advise At What Time Able',
+						'AWY' => 'Airway',
+						'AWYS' => 'Airways',
+						'AZM' => 'Azimuth',
+						'BA' => 'Braking Action',
+						'BCN' => 'Beacon',
+						'BCST' => 'Broadcast',
+						'BDRY' => 'Boundary',
+						'BFR' => 'Before',
+						'BLDG' => 'Building',
+						'BLO' => 'Below Clouds',
+						'BLW' => 'Below',
+						'BRF' => 'Short',
+						'BRG' => 'Bearing',
+						'BRKG' => 'Breaking',
+						'BTL' => 'Between Layers',
+						'BTN' => 'Between',
+						'CD' => 'Candela',
+						'CDN' => 'Coordination',
+						'CF' => 'Change Frequency To',
+						'CFM' => 'Confirm',
+						'CGL' => 'Circling Guidance Light(s)',
+						'CH' => 'Channel',
+						'CHG' => 'Changed',
+						'CIT' => 'Near or Over Large Towns',
+						'CIV' => 'Civil',
+						'CK' => 'Check',
+						'CL' => 'Centre Line',
+						'CLBR' => 'Calibration',
+						'CLD' => 'Cloud',
+						'CLG' => 'Calling',
+						'CLIMB-OUT' => 'Climb-out Area',
+						'CLR' => 'Clearance',
+						'CLRD' => 'Cleared',
+						'CLSD' => 'Closed',
+						'CMB' => 'Climb',
+						'CMPL' => 'Complete',
+						'CNL' => 'Cancel',
+						'CNS' => 'Communications, Navigation And Surveillance',
+						'COM' => 'Communications',
+						'CONC' => 'Concrete',
+						'COND' => 'Condition',
+						'CONS' => 'Continuous',
+						'CONST' => 'Construction',
+						'CONT' => 'Continued',
+						'COOR' => 'Coordination',
+						'COORD' => 'Coordinates',
+						'COP' => 'Change-over Point',
+						'COR' => 'Correction',
+						'COT' => 'At The Coast',
+						'COV' => 'Covered',
+						'CPDLC' => 'Controller-pilot Data Link Communications',
+						'CPL' => 'Current Flight Plan',
+						'CRC' => 'Cyclic Redundancy Check',
+						'CRZ' => 'Cruise',
+						'CTAM' => 'Climb To And Maintain',
+						'CTC' => 'Contact',
+						'CTL' => 'Control',
+						'CTN' => 'Caution',
+						'CTR' => 'Control Zone',
+						'CVR' => 'Cockpit Voice Recorder',
+						'CW' => 'Continuous Wave',
+						'CWY' => 'Clearway',
+						'DA' => 'Decision Altitude',
+						'DCKG' => 'Docking',
+						'DCP' => 'Datum Crossing Point',
+						'DCPC' => 'Direct Controller-pilot Communications',
+						'DCT' => 'Direct',
+						'DEC' => 'December',
+						'DEG' => 'Degrees',
+						'DEP' => 'Departing',
+						'DES' => 'Descend',
+						'DEST' => 'Destination',
+						'DETRESFA' => 'Distress Phase',
+						'DEV' => 'Deviating',
+						'DFDR' => 'Digital Flight Data Recorder',
+						'DFTI' => 'Distance From Touchdown Indicator',
+						'DH' => 'Decision Height',
+						'DIP' => 'Diffuse',
+						'DIST' => 'Distance',
+						'DIV' => 'Divert',
+						'DLA' => 'Delay',
+						'DLY' => 'Daily',
+						'DNG' => 'Dangerous',
+						'DOM' => 'Domestic',
+						'DPT' => 'Depth',
+						'DR' => 'Dead Reckoning',
+						'DRG' => 'During',
+						'DTAM' => 'Descend To And Maintain',
+						'DTG' => 'Date-time Group',
+						'DTHR' => 'Displaced Runway Threshold',
+						'DTRT' => 'Deteriorating',
+						'DTW' => 'Dual Tandem Wheels',
+						'DUPE' => 'This Is A Duplicate Message',
+						'DUR' => 'Duration',
+						'DVOR' => 'Doppler VOR',
+						'DW' => 'Dual Wheels',
+						'EAT' => 'Expected Approach Time',
+						'EB' => 'Eastbound',
+						'EDA' => 'Elevation Differential Area',
+						'EET' => 'Estimated Elapsed Time',
+						'EFC' => 'Expect Further Clearance',
+						'ELBA' => 'Emergency Location Beacon',
+						'ELEV' => 'Elevation',
+						'ELR' => 'Extra Long Range',
+						'EM' => 'Emission',
+						'EMERG' => 'Emergency',
+						'END' => 'Stop-end',
+						'ENE' => 'East-north-east',
+						'ENG' => 'Engine',
+						'ENR' => 'En-route',
+						'ENRC' => 'En-route Chart',
+						'EOBT' => 'Estimated Off-block Time',
+						'EQPT' => 'Equipment',
+						'ER' => 'Here',
+						'ESE' => 'East-south-east',
+						'EST' => 'Estimate',
+						'ETA' => 'Estimated Time Of Arrival',
+						'ETD' => 'Estimated Time Of Departure',
+						'ETO' => 'Estimated Time Over Significant Point',
+						'EV' => 'Every',
+						'EXC' => 'Except',
+						'EXER' => 'Exercise',
+						'EXP' => 'Expect',
+						'EXTD' => 'Extend',
+						'FAC' => 'Facilities',
+						'FAF' => 'Final Approach Fix',
+						'FAL' => 'Facilitation of International Airtransport',
+						'FAP' => 'Final Approach Point',
+						'FATO' => 'Final Approach And Take-off Area',
+						'FAX' => 'Fax',
+						'FBL' => 'Light',
+						'FCST' => 'Forecast',
+						'FCT' => 'Friction Coefficient',
+						'FDPS' => 'Flight Data Processing System',
+						'FEB' => 'February',
+						'FLD' => 'Field',
+						'FLG' => 'Flashing',
+						'FLR' => 'Flares',
+						'FLT' => 'Flight',
+						'FLTS' => 'Flights',
+						'FLTCK' => 'Flight Check',
+						'FLUC' => 'Fluctuating',
+						'FLW' => 'Follow(s)',
+						'FLY' => 'Fly',
+						'FM' => 'From',
+						'FMS' => 'Flight Management System',
+						'FMU' => 'Flow Management Unit',
+						'FNA' => 'Final Approach',
+						'FPAP' => 'Flight Path Alignment Point',
+						'FPL' => 'Flight Plan',
+						'FPLS' => 'Flight Plans',
+						'FPM' => 'Feet Per Minute',
+						'FPR' => 'Flight Plan Route',
+						'FR' => 'Fuel Remaining',
+						'FREQ' => 'Frequency',
+						'FRI' => 'Friday',
+						'FRNG' => 'Firing',
+						'FRONT' => 'Front',
+						'FRQ' => 'Frequent',
+						'FSL' => 'Full Stop Landing',
+						'FSS' => 'Flight Service Station',
+						'FST' => 'First',
+						'FTP' => 'Fictitious Threshold Point',
+						'G/A' => 'Ground-to-air',
+						'G/A/G' => 'Ground-to-air and Air-to-ground',
+						'GARP' => 'GBAS Azimuth Reference Point',
+						'GBAS' => 'Ground-based Augmentation System',
+						'GCAJ' => 'Ground Controlled Approach',
+						'GEN' => 'General',
+						'GEO' => 'Geographic or True',
+						'GES' => 'Ground Earth Station',
+						'GLD' => 'Glider',
+						'GMC' => 'Ground Movement Chart',
+						'GND' => 'Ground',
+						'GNDCK' => 'Ground Check',
+						'GP' => 'Glide Path',
+						'GRASS' => 'Grass landing area',
+						'GRVL' => 'Gravel',
+						'GUND' => 'Geoid Undulation',
+						'H24' => '24 Hours',
+						'HAPI' => 'Helicopter Approach Path Indicator',
+						'HBN' => 'Hazard Beacon',
+						'HDG' => 'Heading',
+						'HEL' => 'Helicopter',
+						'HGT' => 'Height',
+						'HJ' => 'Sunrise to Sunset',
+						'HLDG' => 'Holding',
+						'HN' => 'Sunset to Sunrise',
+						'HO' => 'Service Available To Meet Operational Requirements',
+						'HOL' => 'Holiday',
+						'HOSP' => 'Hospital Aircraft',
+						'HOT' => 'Height',
+						'HPA' => 'Hectopascal',
+						'HR' => 'Hours',
+						'HRS' => 'Hours',
+						'HS' => 'Service Available During Hours Of Scheduled Operations',
+						'HURCN' => 'Hurricane',
+						'HVY' => 'Heavy',
+						'HX' => 'No Specific Working Hours',
+						'HYR' => 'Higher',
+						'IAC' => 'Instrument Approach Chart',
+						'IAF' => 'Initial Approach Fix',
+						'IAO' => 'In And Out Of Clouds',
+						'IAP' => 'Instrument Approach Procedure',
+						'IAR' => 'Intersection Of Air Routes',
+						'IBN' => 'Identification Beacon',
+						'ID' => 'Identifier',
+						'IDENT' => 'Identification',
+						'IFF' => 'Identification Friend/Foe',
+						'IGA' => 'International General Aviation',
+						'IM' => 'Inner Marker',
+						'IMPR' => 'Improving',
+						'IMT' => 'Immediately',
+						'INA' => 'Initial Approach',
+						'INBD' => 'Inbound',
+						'INCERFA' => 'Uncertainty Phase',
+						'INFO' => 'Information',
+						'INOP' => 'Inoperative',
+						'INP' => 'If Not Possible',
+						'INPR' => 'In Progress',
+						'INSTL' => 'Installation',
+						'INSTR' => 'Instrument',
+						'INT' => 'Intersection',
+						'INTS' => 'Intersections',
+						'INTL' => 'International',
+						'INTRG' => 'Interrogator',
+						'INTRP' => 'Interruption',
+						'INTSF' => 'Intensifying',
+						'INTST' => 'Intensity',
+						'ISA' => 'International Standard Atmosphere',
+						'JAN' => 'January',
+						'JTST' => 'Jet stream',
+						'JUL' => 'July',
+						'JUN' => 'June',
+						'KMH' => 'Kilometres Per Hour',
+						'KPA' => 'Kilopascal',
+						'KT' => 'Knots',
+						'KW' => 'Kilowatts',
+						'LAN' => 'Inland',
+						'LAT' => 'Latitude',
+						'LDA' => 'Landing Distance Available',
+						'LDAH' => 'Landing Distance Available, Helicopter',
+						'LDG' => 'Landing',
+						'LDI' => 'Landing Direction Indicator',
+						'LEN' => 'Length',
+						'LGT' => 'Lighting',
+						'LGTD' => 'Lighted',
+						'LIH' => 'Light Intensity High',
+						'LIL' => 'Light Intensity Low',
+						'LIM' => 'Light Intensity Medium',
+						'LLZ' => 'Localizer',
+						'LM' => 'Locator, Middle',
+						'LMT' => 'Local Mean Time',
+						'LNG' => 'Long',
+						'LO' => 'Locator, Outer',
+						'LOG' => 'Located',
+						'LONG' => 'Longitude',
+						'LRG' => 'Long Range',
+						'LTD' => 'Limited',
+						'LTP' => 'Landing Threshold Point',
+						'LVE' => 'Leaving',
+						'LVL' => 'Level',
+						'LYR' => 'Layer',
+						'MAA' => 'Maximum Authorized Altitude',
+						'MAG' => 'Magnetic',
+						'MAINT' => 'Maintenance',
+						'MAP' => 'Aeronautical Maps and Charts',
+						'MAPT' => 'Missed Approach Point',
+						'MAR' => 'March',
+						'MAX' => 'Maximum',
+						'MAY' => 'May',
+						'MBST' => 'Microburst',
+						'MCA' => 'Minimum Crossing Altitude',
+						'MCW' => 'Modulated Continuous Wave',
+						'MDA' => 'Minimum Descent Altitude',
+						'MDH' => 'Minimum Descent Height',
+						'MEA' => 'Minimum En-route Altitude',
+						'MEHT' => 'Minimum Eye Height Over Threshold',
+						'MET' => 'Meteorological',
+						'MID' => 'Mid-point',
+						'MIL' => 'Military',
+						'MIN' => 'Minutes',
+						'MKR' => 'Marker Radio Beacon',
+						'MLS' => 'Microwave Landing System',
+						'MM' => 'Middle Marker',
+						'MNM' => 'Minimum',
+						'MNPS' => 'Minimum Navigation Performance Specifications',
+						'MNT' => 'Monitor',
+						'MNTN' => 'Maintain',
+						'MOA' => 'Military Operating Area',
+						'MOC' => 'Minimum Obstacle Clearance',
+						'MOD' => 'Moderate',
+						'MON' => 'Monday',
+						'MOPS' => 'Minimum Operational Performance Standards',
+						'MOV' => 'Movement',
+						'MRA' => 'Minimum Reception Altitude',
+						'MRG' => 'Medium Range',
+						'MRP' => 'ATS/MET Reporting Point',
+						'MS' => 'Minus',
+						'MSA' => 'Minimum Sector Altitude',
+						'MSAW' => 'Minimum Safe Altitude Warning',
+						'MSG' => 'Message',
+						'MSSR' => 'Monopulse Secondary Surveillance Radar',
+						'MT' => 'Mountain',
+						'MTU' => 'Metric Units',
+						'MTW' => 'Mountain Waves',
+						'NASC' => 'National AIS System Centre',
+						'NAT' => 'North Atlantic',
+						'NAV' => 'Navigation',
+						'NB' => 'Northbound',
+						'NBFR' => 'Not Before',
+						'NE' => 'North-east',
+						'NEB' => 'North-eastbound',
+						'NEG' => 'Negative',
+						'NGT' => 'Night',
+						'NIL' => 'None',
+						'NML' => 'Normal',
+						'NNE' => 'North-north-east',
+						'NNW' => 'North-north-west',
+						'NOF' => 'International NOTAM Office',
+						'NOV' => 'November',
+						'NOZ' => 'Normal Operating Zone',
+						'NR' => 'Number',
+						'NRH' => 'No Reply Heard',
+						'NTL' => 'National',
+						'NTZ' => 'No Transgression Zone',
+						'NW' => 'North-west',
+						'NWB' => 'North-westbound',
+						'NXT' => 'Next',
+						'O/R' => 'On Request',
+						'OAC' => 'Oceanic Area Control Centre',
+						'OAS' => 'Obstacle Assessment Surface',
+						'OBS' => 'Observe',
+						'OBST' => 'Obstacle',
+						'OBSTS' => 'Obstacles',
+						'OCA' => 'Oceanic Control Area',
+						'OCH' => 'Obstacle Clearance Height',
+						'OCS' => 'Obstacle Clearance Surface',
+						'OCT' => 'October',
+						'OFZ' => 'Obstacle Free Zone',
+						'OGN' => 'Originate',
+						'OHD' => 'Overhead',
+						'OM' => 'Outer Marker',
+						'OPC' => 'Control Indicated Is Operational Control',
+						'OPMET' => 'Operational Meteorological',
+						'OPN' => 'Open',
+						'OPR' => 'Operate',
+						'OPS' => 'Operations',
+						'ORD' => 'Order',
+						'OSV' => 'Ocean Station Vessel',
+						'OTLK' => 'Outlook',
+						'OTP' => 'On Top',
+						'OTS' => 'Organized Track System',
+						'OUBD' => 'Outbound',
+						'PA' => 'Precision Approach',
+						'PALS' => 'Precision Approach Lighting System',
+						'PANS' => 'Procedures for Air Navigation Services',
+						'PAR' => 'Precision Approach Radar',
+						'PARL' => 'Parallel',
+						'PATC' => 'Precision Approach Terrain Chart',
+						'PAX' => 'Passenger(s)',
+						'PCD' => 'Proceed',
+						'PCL' => 'Pilot-controlled Lighting',
+						'PCN' => 'Pavement Classification Number',
+						'PDC' => 'Pre-departure Clearance',
+						'PDG' => 'Procedure Design Gradient',
+						'PER' => 'Performance',
+						'PERM' => 'Permanent',
+						'PIB' => 'Pre-flight Information Bulletin',
+						'PJE' => 'Parachute Jumping Exercise',
+						'PLA' => 'Practice Low Approach',
+						'PLN' => 'Flight Plan',
+						'PLVL' => 'Present Level',
+						'PN' => 'Prior Notice Required',
+						'PNR' => 'Point Of No Return',
+						'POB' => 'Persons On Board',
+						'POSS' => 'Possible',
+						'PPI' => 'Plan Position Indicator',
+						'PPR' => 'Prior Permission Required',
+						'PPSN' => 'Present Position',
+						'PRI' => 'Primary',
+						'PRKG' => 'Parking',
+						'PROB' => 'Probability',
+						'PROC' => 'Procedure',
+						'PROV' => 'Provisional',
+						'PS' => 'Plus',
+						'PSG' => 'Passing',
+						'PSN' => 'Position',
+						'PSNS' => 'Positions',
+						'PSR' => 'Primary Surveillance Radar',
+						'PSYS' => 'Pressure System(s)',
+						'PTN' => 'Procedure Turn',
+						'PTS' => 'Polar Track Structure',
+						'PWR' => 'Power',
+						'QUAD' => 'Quadrant',
+						'RAC' => 'Rules of The Air and Air Traffic Services',
+						'RAG' => 'Runway Arresting Gear',
+						'RAI' => 'Runway Alignment Indicator',
+						'RASC' => 'Regional AIS System Centre',
+						'RASS' => 'Remote Altimeter Setting Source',
+						'RB' => 'Rescue Boat',
+						'RCA' => 'Reach Cruising Altitude',
+						'RCC' => 'Rescue Coordination Centre',
+						'RCF' => 'Radiocommunication Failure',
+						'RCH' => 'Reaching',
+						'RCL' => 'Runway Centre Line',
+						'RCLL' => 'Runway Centre Line Light(s)',
+						'RCLR' => 'Recleared',
+						'RDH' => 'Reference Datum Height',
+						'RDL' => 'Radial',
+						'RDO' => 'Radio',
+						'RE' => 'Recent',
+						'REC' => 'Receiver',
+						'REDL' => 'Runway Edge Light(s)',
+						'REF' => 'Refer To',
+						'REG' => 'Registration',
+						'RENL' => 'Runway End Light(s)',
+						'REP' => 'Report',
+						'REQ' => 'Requested',
+						'RERTE' => 'Re-route',
+						'RESA' => 'Runway End Safety Area',
+						'RG' => 'Range (lights)',
+						'RHC' => 'Right-hand Circuit',
+						'RIF' => 'Reclearance In Flight',
+						'RITE' => 'Right',
+						'RL' => 'Report Leaving',
+						'RLA' => 'Relay To',
+						'RLCE' => 'Request Level Change En Route',
+						'RLLS' => 'Runway Lead-in Lighting System',
+						'RLNA' => 'Request Level Not Available',
+						'RMAC' => 'Radar Minimum Altitude Chart',
+						'RMK' => 'Remark',
+						'RNG' => 'Radio Range',
+						'RNP' => 'Required Navigation Performance',
+						'ROC' => 'Rate Of Climb',
+						'ROD' => 'Rate Of Descent',
+						'ROFOR' => 'Route Forecast',
+						'RON' => 'Receiving Only',
+						'RPI' => 'Radar Position Indicator',
+						'RPL' => 'Repetitive Flight Plan',
+						'RPLC' => 'Replaced',
+						'RPS' => 'Radar Position Symbol',
+						'RQMNTS' => 'Requirements',
+						'RQP' => 'Request Flight Plan',
+						'RQS' => 'Request Supplementary Flight Plan',
+						'RR' => 'Report Reaching',
+						'RSC' => 'Rescue Sub-centre',
+						'RSCD' => 'Runway Surface Condition',
+						'RSP' => 'Responder Beacon',
+						'RSR' => 'En-route Surveillance Radar',
+						'RTE' => 'Route',
+						'RTES' => 'Routes',
+						'RTF' => 'Radiotelephone',
+						'RTG' => 'Radiotelegraph',
+						'RTHL' => 'Runway Threshold Light(s)',
+						'RTN' => 'Return',
+						'RTODAH' => 'Rejected Take-off Distance Available, Helicopter',
+						'RTS' => 'Return To Service',
+						'RTT' => 'Radioteletypewriter',
+						'RTZL' => 'Runway Touchdown Zone Light(s)',
+						'RUT' => 'Standard Regional Route Transmitting Frequencies',
+						'RV' => 'Rescue Vessel',
+						'RVSM' => 'Reduced Vertical Separation Minimum',
+						'RWY' => 'Runway',
+						'RWYS' => 'Runways',
+						'SALS' => 'Simple Approach Lighting System',
+						'SAN' => 'Sanitary',
+						'SAP' => 'As Soon As Possible',
+						'SAR' => 'Search and Rescue',
+						'SARPS' => 'Standards and Recommended Practices',
+						'SAT' => 'Saturday',
+						'SATCOM' => 'Satellite Communication',
+						'SB' => 'Southbound',
+						'SBAS' => 'Satellite-based Augmentation System',
+						'SDBY' => 'Stand by',
+						'SE' => 'South-east',
+						'SEA' => 'Sea',
+						'SEB' => 'South-eastbound',
+						'SEC' => 'Seconds',
+						'SECN' => 'Section',
+						'SECT' => 'Sector',
+						'SEP' => 'September',
+						'SER' => 'Service',
+						'SEV' => 'Severe',
+						'SFC' => 'Surface',
+						'SGL' => 'Signal',
+						'SID' => 'Standard Instrument Departure',
+						'SIF' => 'Selective Identification Feature',
+						'SIG' => 'Significant',
+						'SIMUL' => 'Simultaneous',
+						'SKED' => 'Schedule',
+						'SLP' => 'Speed Limiting Point',
+						'SLW' => 'Slow',
+						'SMC' => 'Surface Movement Control',
+						'SMR' => 'Surface Movement Radar',
+						'SPL' => 'Supplementary Flight Plan',
+						'SPOC' => 'SAR Point Of Contact',
+						'SPOT' => 'Spot Wind',
+						'SR' => 'Sunrise',
+						'SRA' => 'Surveillance Radar Approach',
+						'SRE' => 'Surveillance Radar Element Of Precision Approach Radar System',
+						'SRG' => 'Short Range',
+						'SRR' => 'Search and Rescue Region',
+						'SRY' => 'Secondary',
+						'SS' => 'Sunset',
+						'SSE' => 'South-south-east',
+						'SSR' => 'Secondary Surveillance Radar',
+						'SST' => 'Supersonic Transport',
+						'SSW' => 'South-south-west',
+						'STA' => 'Straight-in Approach',
+						'STAR' => 'Standard Instrument Arrival',
+						'STD' => 'Standard',
+						'STN' => 'Station',
+						'STNR' => 'Stationary',
+						'STOL' => 'Short Take-off and Landing',
+						'STS' => 'Status',
+						'STWL' => 'Stopway Light(s)',
+						'SUBJ' => 'Subject To',
+						'SUN' => 'Sunday',
+						'SUP' => 'Supplement',
+						'SUPPS' => 'Regional Supplementary Procedures Service Message',
+						'SVCBL' => 'Serviceable',
+						'SW' => 'South-west',
+						'SWB' => 'South-westbound',
+						'SWY' => 'Stopway',
+						'TA' => 'Transition Altitude',
+						'TAA' => 'Terminal Arrival Altitude',
+						'TAF' => 'Aerodrome Forecast',
+						'TAIL' => 'Tail Wind',
+						'TAR' => 'Terminal Area Surveillance Radar',
+						'TAX' => 'Taxi',
+						'TCAC' => 'Tropical Cyclone Advisory Centre',
+						'TDO' => 'Tornado',
+						'TDZ' => 'Touchdown Zone',
+						'TECR' => 'Technical Reason',
+						'TEMPO' => 'Temporarily',
+						'TFC' => 'Traffic',
+						'TGL' => 'Touch-and-go',
+						'TGS' => 'Taxiing Guidance System',
+						'THR' => 'Threshold',
+						'THRU' => 'Through',
+						'THU' => 'Thursday',
+						'TIBA' => 'Traffic Information Broadcast By Aircraft',
+						'TIL' => 'Until',
+						'TIP' => 'Until Past',
+						'TKOF' => 'Take-off',
+						'TL' => 'Till',
+						'TLOF' => 'Touchdown And Lift-off Area',
+						'TMA' => 'Terminal Control Area',
+						'TNA' => 'Turn Altitude',
+						'TNH' => 'Turn Height',
+						'TOC' => 'Top of Climb',
+						'TODA' => 'Take-off Distance Available',
+						'TODAH' => 'Take-off Distance Available, Helicopter',
+						'TORA' => 'Take-off Run Available',
+						'TP' => 'Turning Point',
+						'TR' => 'Track',
+						'TRA' => 'Temporary Reserved Airspace',
+						'TRANS' => 'Transmitter',
+						'TRL' => 'Transition Level',
+						'TUE' => 'Tuesday',
+						'TURB' => 'Turbulence',
+						'TVOR' => 'Terminal VOR',
+						'TWR' => 'Tower',
+						'TWY' => 'Taxiway',
+						'TWYL' => 'Taxiway-link',
+						'TXT' => 'Text',
+						'TYP' => 'Type of Aircraft',
+						'U/S' => 'Unserviceable',
+						'UAB' => 'Until Advised By',
+						'UAC' => 'Upper Area Control Centre',
+						'UAR' => 'Upper Air Route',
+						'UFN' => 'Until Further Notice',
+						'UHDT' => 'Unable Higher Due Traffic',
+						'UIC' => 'Upper Information Centre',
+						'UIR' => 'Upper Flight Information Region',
+						'ULR' => 'Ultra Long Range',
+						'UNA' => 'Unable',
+						'UNAP' => 'Unable To Approve',
+						'UNL' => 'Unlimited',
+						'UNREL' => 'Unreliable',
+						'UTA' => 'Upper Control Area',
+						'VAAC' => 'Volcanic Ash Advisory Centre',
+						'VAC' => 'Visual Approach Chart',
+						'VAL' => 'In Valleys',
+						'VAN' => 'Runway Control Van',
+						'VAR' => 'Visual-aural Radio Range',
+						'VC' => 'Vicinity',
+						'VCY' => 'Vicinity',
+						'VER' => 'Vertical',
+						'VIS' => 'Visibility',
+						'VLR' => 'Very Long Range',
+						'VPA' => 'Vertical Path Angle',
+						'VRB' => 'Variable',
+						'VSA' => 'By Visual Reference To The Ground',
+						'VSP' => 'Vertical Speed',
+						'VTOL' => 'Vertical Take-off And Landing',
+						'WAC' => 'World Aeronautical Chart',
+						'WAFC' => 'World Area Forecast Centre',
+						'WB' => 'Westbound',
+						'WBAR' => 'Wing Bar Lights',
+						'WDI' => 'Wind Direction Indicator',
+						'WDSPR' => 'Widespread',
+						'WED' => 'Wednesday',
+						'WEF' => 'Effective From',
+						'WI' => 'Within',
+						'WID' => 'Width',
+						'WIE' => 'Effective Immediately',
+						'WILCO' => 'Will Comply',
+						'WIND' => 'Wind',
+						'WINTEM' => 'Forecast Upper Wind And Temperature For Aviation',
+						'WIP' => 'Work In Progress',
+						'WKN' => 'Weaken',
+						'WNW' => 'West-north-west',
+						'WO' => 'Without',
+						'WPT' => 'Way-point',
+						'WRNG' => 'Warning',
+						'WSW' => 'West-south-west',
+						'WT' => 'Weight',
+						'WWW' => 'Worldwide Web',
+						'WX' => 'Weather',
+						'XBAR' => 'Crossbar',
+						'XNG' => 'Crossing',
+						'XS' => 'Atmospherics',
+						'YCZ' => 'Yellow Caution Zone',
+						'YR' => 'Your');
 
 
 	function __construct($dbc = null) {

require/class.Translation.php

Indentation +78 added lines, -78 removed lines

@@ -7,90 +7,90 @@ 
 
 
 class Translation {
-    public $db;
-    function __construct($dbc = null) {
-	    $Connection = new Connection($dbc);
-	    $this->db = $Connection->db;
-    }
+	public $db;
+	function __construct($dbc = null) {
+		$Connection = new Connection($dbc);
+		$this->db = $Connection->db;
+	}
 
-    /**
-    * Change IATA to ICAO value for ident
-    * 
-    * @param String $ident ident
-    * @return String the icao
-    */
-    public function ident2icao($ident) {
+	/**
+	 * Change IATA to ICAO value for ident
+	 * 
+	 * @param String $ident ident
+	 * @return String the icao
+	 */
+	public function ident2icao($ident) {
 	$Spotter = new Spotter();
 	if (!is_numeric(substr($ident, 0, 3)))
-        {
-	    if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
-        	$airline_icao = substr($ident, 0, 2);
-            } elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
-        	//$airline_icao = substr($ident, 0, 3);
-        	return $ident;
-            } else return $ident;
-        } else return $ident;
-        if ($airline_icao == 'AF') {
-            if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-            else $icao = 'AFR'.ltrim(substr($ident,2),'0');
-        } else {
-            $identicao = $Spotter->getAllAirlineInfo($airline_icao);
-            if (isset($identicao[0])) {
-                $icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
-            } else $icao = $ident;
-        }
-        return $icao;
-    }
+		{
+		if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
+			$airline_icao = substr($ident, 0, 2);
+			} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
+			//$airline_icao = substr($ident, 0, 3);
+			return $ident;
+			} else return $ident;
+		} else return $ident;
+		if ($airline_icao == 'AF') {
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
+			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+		} else {
+			$identicao = $Spotter->getAllAirlineInfo($airline_icao);
+			if (isset($identicao[0])) {
+				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
+			} else $icao = $ident;
+		}
+		return $icao;
+	}
 
 
-       public function getOperator($ident) {
-                $query = "SELECT * FROM translation WHERE Operator = :ident LIMIT 1";
-                $query_values = array(':ident' => $ident);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if (count($row) > 0) {
-                        return $row['operator_correct'];
-                } else return $ident;
-        }
+	   public function getOperator($ident) {
+				$query = "SELECT * FROM translation WHERE Operator = :ident LIMIT 1";
+				$query_values = array(':ident' => $ident);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if (count($row) > 0) {
+						return $row['operator_correct'];
+				} else return $ident;
+		}
 
-       public function addOperator($ident,$correct_ident,$source) {
-                $query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)";
-                $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function addOperator($ident,$correct_ident,$source) {
+				$query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)";
+				$query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
-       public function updateOperator($ident,$correct_ident,$source) {
-                $query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident";
-                $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function updateOperator($ident,$correct_ident,$source) {
+				$query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident";
+				$query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
         
-        public function checkTranslation($ident,$web = false) {
-    	    global $globalTranslationSources, $globalTranslationFetch;
-    	    //if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder');
-    	    $globalTranslationSources = array();
-    	    if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE;
-    	    //echo "Check Translation for ".$ident."...";
-    	    $correct = $this->getOperator($ident);
-    	    if ($correct != '' && $correct != $ident) {
-    		//echo "Found in DB !\n";
-    		 return $correct;
-    	    } /*
+		public function checkTranslation($ident,$web = false) {
+			global $globalTranslationSources, $globalTranslationFetch;
+			//if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder');
+			$globalTranslationSources = array();
+			if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE;
+			//echo "Check Translation for ".$ident."...";
+			$correct = $this->getOperator($ident);
+			if ($correct != '' && $correct != $ident) {
+			//echo "Found in DB !\n";
+			 return $correct;
+			} /*
     	    elseif ($web && $globalTranslationFetch) {
     		if (! is_numeric(substr($ident,-4))) {
     		    if (count($globalTranslationSources) > 0) {
@@ -107,8 +107,8 @@ 
     		}
     	    }
     	    */
-    	    return $this->ident2icao($ident);
-        }
+			return $this->ident2icao($ident);
+		}
 
 /*  
     function fromPlanefinder($icao) {

require/class.SpotterLive.php

Indentation +207 added lines, -207 removed lines

@@ -11,11 +11,11 @@ 
 	}
 	    
 	/**
-	* Gets all the spotter information based on the latest data entry
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveSpotterData($limit = '', $sort = '', $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -58,7 +58,7 @@ 
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
 			$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query.$orderby_query;
-                } else if ($globalDBdriver == 'pgsql') {
+				} else if ($globalDBdriver == 'pgsql') {
 			$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query.$orderby_query;
 		}
 		$spotter_array = $Spotter->getDataFromDB($query.$limit_query);
@@ -67,11 +67,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveSpotterData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -104,9 +104,9 @@ 
 //			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date ORDER BY spotter_live.date GROUP BY spotter_live.flightaware_id'.$filter_query;
 
 			//$query = 'SELECT a.aircraft_shadow, spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk  FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao';
-                } else if ($globalDBdriver == 'pgsql') {
-            		//$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() AT TIME ZONE 'UTC' - '30 SECONDS'->INTERVAL <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
-            		//$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() AT TIME ZONE 'UTC' - '".$globalLiveInterval." SECONDS'->INTERVAL <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate$orderby_query";
+				} else if ($globalDBdriver == 'pgsql') {
+					//$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() AT TIME ZONE 'UTC' - '30 SECONDS'->INTERVAL <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
+					//$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() AT TIME ZONE 'UTC' - '".$globalLiveInterval." SECONDS'->INTERVAL <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate$orderby_query";
 			//$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, a.aircraft_shadow FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_live.aircraft_icao = a.icao';
 			$query  = "SELECT a.aircraft_shadow, spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date 
 			FROM spotter_live
@@ -115,7 +115,7 @@ 
 //		$spotter_array = Spotter->getDataFromDB($query.$limit_query);
 		//echo $query;
 
-    		try {
+			try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
 		} catch(PDOException $e) {
@@ -127,11 +127,11 @@ 
 	}
 
 	/**
-	* Gets number of latest data entry
-	*
-	* @return String number of entry
-	*
-	*/
+	 * Gets number of latest data entry
+	 *
+	 * @return String number of entry
+	 *
+	 */
 	public function getLiveSpotterCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -151,13 +151,13 @@ 
 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 		if ($globalDBdriver == 'mysql') {
-            		//$query  = 'SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query;
+					//$query  = 'SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query;
 			$query = 'SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'.$filter_query;
-            	} elseif ($globalDBdriver == 'pgsql') {
-	                //$query  = "SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() AT TIME ZONE 'UTC' - '".$globalLiveInterval." SECONDS'->INTERVAL <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query;
+				} elseif ($globalDBdriver == 'pgsql') {
+					//$query  = "SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() AT TIME ZONE 'UTC' - '".$globalLiveInterval." SECONDS'->INTERVAL <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query;
 			$query = "SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_live WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date".$filter_query;
-                }
-    		try {
+				}
+			try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
 		} catch(PDOException $e) {
@@ -168,11 +168,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveSpotterDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -193,140 +193,140 @@ 
 		}
 
 		if (is_array($coord)) {
-                        $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-                        $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-                        $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-                        $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-                } else return array();
-                if ($globalDBdriver == 'mysql') {
-        		//$query  = "SELECT spotter_output.* FROM spotter_output WHERE spotter_output.flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL ".$globalLiveInterval." SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.")";
-        		$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query;
-        	} else if ($globalDBdriver == 'pgsql') {
-            		$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() at time zone 'UTC'  - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." GROUP BY spotter_live.flightaware_id".$filter_query;
-                }
-                $spotter_array = $Spotter->getDataFromDB($query);
-                return $spotter_array;
-        }
+						$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+						$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+						$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+						$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+				} else return array();
+				if ($globalDBdriver == 'mysql') {
+				//$query  = "SELECT spotter_output.* FROM spotter_output WHERE spotter_output.flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL ".$globalLiveInterval." SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.")";
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query;
+			} else if ($globalDBdriver == 'pgsql') {
+					$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() at time zone 'UTC'  - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." GROUP BY spotter_live.flightaware_id".$filter_query;
+				}
+				$spotter_array = $Spotter->getDataFromDB($query);
+				return $spotter_array;
+		}
 
 	/**
-        * Gets all the spotter information based on a user's latitude and longitude
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLatestSpotterForLayar($lat, $lng, $radius, $interval)
-        {
-    		$Spotter = new Spotter($this->db);
-                date_default_timezone_set('UTC');
-
-        if ($lat != '')
-                {
-                        if (!is_numeric($lat))
-                        {
-                                return false;
-                        }
-                }
+	 * Gets all the spotter information based on a user's latitude and longitude
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+		public function getLatestSpotterForLayar($lat, $lng, $radius, $interval)
+		{
+			$Spotter = new Spotter($this->db);
+				date_default_timezone_set('UTC');
+
+		if ($lat != '')
+				{
+						if (!is_numeric($lat))
+						{
+								return false;
+						}
+				}
         
-        if ($lng != '')
-                {
-                        if (!is_numeric($lng))
-                        {
-                                return false;
-                        }
-                }
-
-                if ($radius != '')
-                {
-                        if (!is_numeric($radius))
-                        {
-                                return false;
-                        }
-                }
+		if ($lng != '')
+				{
+						if (!is_numeric($lng))
+						{
+								return false;
+						}
+				}
+
+				if ($radius != '')
+				{
+						if (!is_numeric($radius))
+						{
+								return false;
+						}
+				}
         
-        if ($interval != '')
-                {
-                        if (!is_string($interval))
-                        {
-                                $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
-                return false;
-                        } else {
-                if ($interval == '1m')
-                {
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
-                } else if ($interval == '15m'){
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
-                } 
-            }
-                } else {
-         $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
-        }
-
-                $query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
+		if ($interval != '')
+				{
+						if (!is_string($interval))
+						{
+								$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
+				return false;
+						} else {
+				if ($interval == '1m')
+				{
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
+				} else if ($interval == '15m'){
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
+				} 
+			}
+				} else {
+		 $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
+		}
+
+				$query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
                    WHERE spotter_live.latitude <> '' 
                                    AND spotter_live.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
                                    ORDER BY distance";
 
-                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius),$limit_query);
+				$spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius),$limit_query);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
     
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveSpotterDataByIdent($ident)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident));
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveSpotterDataById($id)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id));
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets altitude information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAltitudeLiveSpotterDataByIdent($ident)
 	{
 
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
+				$query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
 
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -338,12 +338,12 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveSpotterDataById($id)
 	{
 		date_default_timezone_set('UTC');
@@ -351,7 +351,7 @@ 
 		$query  = self::$global_query.' WHERE spotter_live.flightaware_id = :id ORDER BY date';
 //		$spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
 
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
@@ -363,18 +363,18 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular ident
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular ident
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveSpotterDataByIdent($ident)
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = self::$global_query.' WHERE spotter_live.ident = :ident';
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -387,24 +387,24 @@ 
 
 
 	/**
-	* Deletes all info in the table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterData()
 	{
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= spotter_live.date";
 			$query  = 'DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= spotter_live.date';
-            		//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
+					//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
 
 		} elseif ($globalDBdriver == 'pgsql') {
 			$query  = "DELETE FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date";
 		}
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
@@ -416,18 +416,18 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataNotUpdated()
 	{
 		global $globalDBdriver, $globalDebug;
 		if ($globalDBdriver == 'mysql') {
 			//$query = 'SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < spotter_live.date) LIMIT 800 OFFSET 0';
-    			$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
-    			try {
+				$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -435,8 +435,8 @@ 
 				return "error";
 			}
 			$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
-                        $i = 0;
-                        $j =0;
+						$i = 0;
+						$j =0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			foreach($all as $row)
 			{
@@ -444,20 +444,20 @@ 
 				$j++;
 				if ($j == 30) {
 					if ($globalDebug) echo ".";
-				    	try {
+						try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 						$sth->execute();
 					} catch(PDOException $e) {
 						return "error";
 					}
-                                	$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
-                                	$j = 0;
+									$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
+									$j = 0;
 				}
 				$query_delete .= "'".$row['flightaware_id']."',";
 			}
 			if ($i > 0) {
-    				try {
+					try {
 					
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 					$sth->execute();
@@ -468,9 +468,9 @@ 
 			return "success";
 		} elseif ($globalDBdriver == 'pgsql') {
 			//$query = "SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < spotter_live.date) LIMIT 800 OFFSET 0";
-    			//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
-    			$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
-    			try {
+				//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
+				$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -514,17 +514,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an ident
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an ident
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM spotter_live WHERE ident = :ident';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -536,17 +536,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an id
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an id
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
@@ -559,11 +559,11 @@ 
 
 
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -589,14 +589,14 @@ 
 			$ident_result = $row['ident'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdentRecent($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -622,14 +622,14 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by ModeS
-	*
-	* @return String the ModeS
-	*
-	*/
+	 * Check recent aircraft by ModeS
+	 *
+	 * @return String the ModeS
+	 *
+	 */
 	public function checkModeSRecent($modes)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -656,19 +656,19 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $aircraft_icao the aircraft type
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @return String success or false
-	*
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $aircraft_icao the aircraft type
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @return String success or false
+	 *
+	 */
 	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '')
 	{
 		global $globalURL, $globalArchive, $globalDebug;
@@ -894,10 +894,10 @@ 
 			$arrival_airport_country = '';
 		}
             	
-            	if ($squawk == '' || $Common->isInteger($squawk) == false ) $squawk = NULL;
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) == false ) $verticalrate = NULL;
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) == false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) == false ) $heading = 0;
+				if ($squawk == '' || $Common->isInteger($squawk) == false ) $squawk = NULL;
+				if ($verticalrate == '' || $Common->isInteger($verticalrate) == false ) $verticalrate = NULL;
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) == false ) $groundspeed = 0;
+				if ($heading == '' || $Common->isInteger($heading) == false ) $heading = 0;
             	
 		$query  = 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country) 
 		VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name, :departure_airport_city, :departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date,:departure_airport_time,:arrival_airport_time,:squawk,:route_stop,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country)';
@@ -908,13 +908,13 @@ 
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-                } catch(PDOException $e) {
-                	return "error : ".$e->getMessage();
-                }
+				} catch(PDOException $e) {
+					return "error : ".$e->getMessage();
+				}
 		if (isset($globalArchive) && $globalArchive && $putinarchive && !$noarchive) {
-		    if ($globalDebug) echo '(Add to SBS archive : ';
-		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
-		    if ($globalDebug) echo $result.')';
+			if ($globalDebug) echo '(Add to SBS archive : ';
+			$result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
+			if ($globalDebug) echo $result.')';
 		}
 		return "success";
 

require/class.Connection.php

Indentation +22 added lines, -22 removed lines

@@ -7,14 +7,14 @@ 
 	public $latest_schema = 23;
 	
 	public function __construct($dbc = null,$dbname = null) {
-	    global $globalDBdriver;
-	    if ($dbc === null) {
+		global $globalDBdriver;
+		if ($dbc === null) {
 		if ($this->db === null && $dbname === null) {
-		    $this->createDBConnection();
+			$this->createDBConnection();
 		} else {
-		    $this->createDBConnection($dbname);
+			$this->createDBConnection($dbname);
 		}
-	    } elseif ($dbname === null || $dbname === 'default') {
+		} elseif ($dbname === null || $dbname === 'default') {
 		$this->db = $dbc;
 		if ($this->connectionExists() === false) {
 			/*
@@ -24,19 +24,19 @@ 
 			*/
 			$this->createDBConnection();
 		}
-	    } else {
+		} else {
 		//$this->connectionExists();
 		$this->dbs[$dbname] = $dbc;
-	    }
+		}
 	}
 
 
 	/**
-	* Creates the database connection
-	*
-	* @return Boolean of the database connection
-	*
-	*/
+	 * Creates the database connection
+	 *
+	 * @return Boolean of the database connection
+	 *
+	 */
 
 	public function createDBConnection($DBname = null)
 	{
@@ -118,7 +118,7 @@ 
 			return false;
 		}
 		if($results->rowCount()>0) {
-		    return true; 
+			return true; 
 		}
 		else return false;
 	}
@@ -135,14 +135,14 @@ 
 				$sum = $sum->fetchColumn(0);
 			} else $sum = 0;
 			if (intval($sum) !== 2) {
-			     return false;
+				 return false;
 			}
 			
 		} catch(PDOException $e) {
 			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
-            			throw $e;
-	                }
-	                //echo 'error ! '.$e->getMessage();
+						throw $e;
+					}
+					//echo 'error ! '.$e->getMessage();
 			return false;
 		}
 		return true; 
@@ -166,7 +166,7 @@ 
 			return false;
 		}
 		if($results->rowCount()>0) {
-		    return true; 
+			return true; 
 		}
 		else return false;
 	}
@@ -220,8 +220,8 @@ 
 		$version = 0;
 		if ($this->tableExists('aircraft')) {
 			if (!$this->tableExists('config')) {
-	    			$version = '1';
-	    			return $version;
+					$version = '1';
+					return $version;
 			} else {
 				$Connection = new Connection();
 				$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
@@ -242,8 +242,8 @@ 
 	* @return Boolean if latest version or not
 	*/
 	public function latest() {
-	    if ($this->check_schema_version() == $this->latest_schema) return true;
-	    else return false;
+		if ($this->check_schema_version() == $this->latest_schema) return true;
+		else return false;
 	}
 
 }