Ysurac / FlightAirMap

notam-data.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 <button type="button" class="close">&times;</button>
 <?php
 
-$notamref = filter_input(INPUT_GET,'notam',FILTER_SANITIZE_STRING);
+$notamref = filter_input(INPUT_GET, 'notam', FILTER_SANITIZE_STRING);
 $notamref = urldecode($notamref);
 $NOTAM = new NOTAM();
 $notam = $NOTAM->getNOTAMbyRef($notamref);

require/class.NOTAM.php

Indentation +942 added lines, -942 removed lines

@@ -7,964 +7,964 @@
 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',
-	                    'ADIZ' => 'Air defense identification zone',
-	                    'ADJ' => 'Adjacent',
-	                    'ADR' => 'Advisory Route',
-	                    'ADS' => 'Automatic Dependent Surveillance',
-	                    'ADVS' => 'Advisory Service',
-	                    'ADZ' => 'Advised',
-	                    'AFIL' => 'Flight Plan Filed In The Air',
-	                    'AFIS' => 'Airport flight information service',
-	                    'AFM' => 'Affirm',
-	                    'AFT' => 'After',
-	                    'AGA' => 'Aerodromes, Air Routes and Ground Aids',
-	                    'AGN' => 'Again',
-	                    'AIS' => 'Aeronautical information service',
-	                    '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',
-	                    'ATIS' => 'Automatic terminal information service',
-	                    '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',
-	                    'CTA' => 'Control area',
-	                    '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',
-	                    'DME' => 'Distance measuring equipment',
-	                    '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',
-	                    'FIR' => 'Flight information region',
-	                    'FIS' => 'Flight information service',
-	                    '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',
-	                    'FRMG' => 'Missile, gun or rocket firing',
-	                    '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',
-	                    'GCA' => 'Ground Controlled Approach System',
-	                    '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',
-	                    'OCL' => 'Obstacle Clearance Limit',
-	                    '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',
-	                    'SELCAL' => 'Selective calling system',
-	                    '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',
-	                    'UDA' => 'Upper advisory area',
-	                    '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',
+						'ADIZ' => 'Air defense identification zone',
+						'ADJ' => 'Adjacent',
+						'ADR' => 'Advisory Route',
+						'ADS' => 'Automatic Dependent Surveillance',
+						'ADVS' => 'Advisory Service',
+						'ADZ' => 'Advised',
+						'AFIL' => 'Flight Plan Filed In The Air',
+						'AFIS' => 'Airport flight information service',
+						'AFM' => 'Affirm',
+						'AFT' => 'After',
+						'AGA' => 'Aerodromes, Air Routes and Ground Aids',
+						'AGN' => 'Again',
+						'AIS' => 'Aeronautical information service',
+						'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',
+						'ATIS' => 'Automatic terminal information service',
+						'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',
+						'CTA' => 'Control area',
+						'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',
+						'DME' => 'Distance measuring equipment',
+						'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',
+						'FIR' => 'Flight information region',
+						'FIS' => 'Flight information service',
+						'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',
+						'FRMG' => 'Missile, gun or rocket firing',
+						'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',
+						'GCA' => 'Ground Controlled Approach System',
+						'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',
+						'OCL' => 'Obstacle Clearance Limit',
+						'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',
+						'SELCAL' => 'Selective calling system',
+						'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',
+						'UDA' => 'Upper advisory area',
+						'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');
 	public $code_airspace = array(
-			    'AA' => 'Minimum altitude',
-			    'AC' => 'Class B, C, D, or E Surface Area',
-			    'AD' => 'Air defense identification zone',
-			    'AE' => 'Control area',
-			    'AF' => 'Flight information region',
-			    'AH' => 'Upper control area',
-			    'AL' => 'Minimum usable flight level',
-			    'AN' => 'Area navigation route',
-			    'AO' => 'Oceanic control area',
-			    'AP' => 'Reporting point',
-			    'AR' => 'ATS route',
-			    'AT' => 'Class B Airspace',
-			    'AU' => 'Upper flight information region',
-			    'AV' => 'Upper advisory area',
-			    'AX' => 'Intersection',
-			    'AZ' => 'Aerodrome traffic zone');
+				'AA' => 'Minimum altitude',
+				'AC' => 'Class B, C, D, or E Surface Area',
+				'AD' => 'Air defense identification zone',
+				'AE' => 'Control area',
+				'AF' => 'Flight information region',
+				'AH' => 'Upper control area',
+				'AL' => 'Minimum usable flight level',
+				'AN' => 'Area navigation route',
+				'AO' => 'Oceanic control area',
+				'AP' => 'Reporting point',
+				'AR' => 'ATS route',
+				'AT' => 'Class B Airspace',
+				'AU' => 'Upper flight information region',
+				'AV' => 'Upper advisory area',
+				'AX' => 'Intersection',
+				'AZ' => 'Aerodrome traffic zone');
 	public $code_comradar = array(
-			    'CA' => 'Air/ground',
-			    'CE' => 'En route surveillance radar',
-			    'CG' => 'Ground controlled approach system',
-			    'CL' => 'Selective calling system',
-			    'CM' => 'Surface movement radar',
-			    'CP' => 'Precision approach radar',
-			    'CR' => 'Surveillance radar element of precision approach radar system',
-			    'CS' => 'Secondary surveillance radar',
-			    'CT' => 'Terminal area surveillance radar');
+				'CA' => 'Air/ground',
+				'CE' => 'En route surveillance radar',
+				'CG' => 'Ground controlled approach system',
+				'CL' => 'Selective calling system',
+				'CM' => 'Surface movement radar',
+				'CP' => 'Precision approach radar',
+				'CR' => 'Surveillance radar element of precision approach radar system',
+				'CS' => 'Secondary surveillance radar',
+				'CT' => 'Terminal area surveillance radar');
 	public $code_facilities = array(
-			    'FA' => 'airport',
-			    'FB' => 'Braking action measurement equipment',
-			    'FC' => 'Ceiling measurement equipment',
-			    'FD' => 'Docking system',
-			    'FF' => 'Fire fighting and rescue',
-			    'FG' => 'Ground movement control',
-			    'FH' => 'Helicopter alighting area/platform',
-			    'FL' => 'Landing direction indicator',
-			    'FM' => 'Meteorological service',
-			    'FO' => 'Fog dispersal system',
-			    'FP' => 'Heliport',
-			    'FS' => 'Snow removal equipment',
-			    'FT' => 'Transmissometer',
-			    'FU' => 'Fuel availability',
-			    'FW' => 'Wind direction indicator',
-			    'FZ' => 'Customs');
+				'FA' => 'airport',
+				'FB' => 'Braking action measurement equipment',
+				'FC' => 'Ceiling measurement equipment',
+				'FD' => 'Docking system',
+				'FF' => 'Fire fighting and rescue',
+				'FG' => 'Ground movement control',
+				'FH' => 'Helicopter alighting area/platform',
+				'FL' => 'Landing direction indicator',
+				'FM' => 'Meteorological service',
+				'FO' => 'Fog dispersal system',
+				'FP' => 'Heliport',
+				'FS' => 'Snow removal equipment',
+				'FT' => 'Transmissometer',
+				'FU' => 'Fuel availability',
+				'FW' => 'Wind direction indicator',
+				'FZ' => 'Customs');
 	public $code_instrumentlanding = array(
-			    'ID' => 'DME associated with ILS',
-			    'IG' => 'Glide path',
-			    'II' => 'Inner marker',
-			    'IL' => 'Localizer',
-			    'IM' => 'Middle marker',
-			    'IO' => 'Outer marker',
-			    'IS' => 'ILS Category I',
-			    'IT' => 'ILS Category II',
-			    'IU' => 'ILS Category III',
-			    'IW' => 'Microwave landing system',
-			    'IX' => 'Locator, outer',
-			    'IY' => 'Locator, middle');
+				'ID' => 'DME associated with ILS',
+				'IG' => 'Glide path',
+				'II' => 'Inner marker',
+				'IL' => 'Localizer',
+				'IM' => 'Middle marker',
+				'IO' => 'Outer marker',
+				'IS' => 'ILS Category I',
+				'IT' => 'ILS Category II',
+				'IU' => 'ILS Category III',
+				'IW' => 'Microwave landing system',
+				'IX' => 'Locator, outer',
+				'IY' => 'Locator, middle');
 	public $code_lightingfacilities = array(
-			    'LA' => 'Approach lighting system',
-			    'LB' => 'Airport beacon',
-			    'LC' => 'Runway center line lights',
-			    'LD' => 'Landing direction indicator lights',
-			    'LE' => 'Runway edge lights',
-			    'LF' => 'Sequenced flashing lights',
-			    'LH' => 'High intensity runway lights',
-			    'LI' => 'Runway end identifier lights',
-			    'LK' => 'Category II components of approach lighting system',
-			    'LL' => 'Low intensity runway lights',
-			    'LM' => 'Medium intensity runway lights',
-			    'LP' => 'Precision approach path indicator',
-			    'LR' => 'All landing area lighting facilities',
-			    'LS' => 'Stopway lights',
-			    'LT' => 'Threshold lights',
-			    'LV' => 'Visual approach slope indicator system',
-			    'LW' => 'Heliport lighting',
-			    'LX' => 'Taxiway center line lights',
-			    'LY' => 'Taxiway edge lights',
-			    'LZ' => 'Runway touchdown zone lights');
+				'LA' => 'Approach lighting system',
+				'LB' => 'Airport beacon',
+				'LC' => 'Runway center line lights',
+				'LD' => 'Landing direction indicator lights',
+				'LE' => 'Runway edge lights',
+				'LF' => 'Sequenced flashing lights',
+				'LH' => 'High intensity runway lights',
+				'LI' => 'Runway end identifier lights',
+				'LK' => 'Category II components of approach lighting system',
+				'LL' => 'Low intensity runway lights',
+				'LM' => 'Medium intensity runway lights',
+				'LP' => 'Precision approach path indicator',
+				'LR' => 'All landing area lighting facilities',
+				'LS' => 'Stopway lights',
+				'LT' => 'Threshold lights',
+				'LV' => 'Visual approach slope indicator system',
+				'LW' => 'Heliport lighting',
+				'LX' => 'Taxiway center line lights',
+				'LY' => 'Taxiway edge lights',
+				'LZ' => 'Runway touchdown zone lights');
 	public $code_movementareas = array(
-			    'MA' => 'Movement area',
-			    'MB' => 'Bearing strength',
-			    'MC' => 'Clearway',
-			    'MD' => 'Declared distances',
-			    'MG' => 'Taxiing guidance system',
-			    'MH' => 'Runway arresting gear',
-			    'MK' => 'Parking area',
-			    'MM' => 'Daylight markings',
-			    'MN' => 'Apron',
-			    'MP' => 'Aircraft stands',
-			    'MR' => 'Runway',
-			    'MS' => 'Stopway',
-			    'MT' => 'Threshold',
-			    'MU' => 'Runway turning bay',
-			    'MW' => 'Strip',
-			    'MX' => 'Taxiway');
+				'MA' => 'Movement area',
+				'MB' => 'Bearing strength',
+				'MC' => 'Clearway',
+				'MD' => 'Declared distances',
+				'MG' => 'Taxiing guidance system',
+				'MH' => 'Runway arresting gear',
+				'MK' => 'Parking area',
+				'MM' => 'Daylight markings',
+				'MN' => 'Apron',
+				'MP' => 'Aircraft stands',
+				'MR' => 'Runway',
+				'MS' => 'Stopway',
+				'MT' => 'Threshold',
+				'MU' => 'Runway turning bay',
+				'MW' => 'Strip',
+				'MX' => 'Taxiway');
 	public $code_terminalfacilities = array(
-			    'NA' => 'All radio navigation facilities',
-			    'NB' => 'Non directional beacon',
-			    'NC' => 'DECCA',
-			    'ND' => 'Distance measuring equipment',
-			    'NF' => 'Fan marker',
-			    'NL' => 'Locator',
-			    'NM' => 'VOR/DME',
-			    'NN' => 'TACAN',
-			    'NO' => 'OMEGA',
-			    'NT' => 'VORTAC',
-			    'NV' => 'VOR',
-			    'NX' => 'Direction finding station');
+				'NA' => 'All radio navigation facilities',
+				'NB' => 'Non directional beacon',
+				'NC' => 'DECCA',
+				'ND' => 'Distance measuring equipment',
+				'NF' => 'Fan marker',
+				'NL' => 'Locator',
+				'NM' => 'VOR/DME',
+				'NN' => 'TACAN',
+				'NO' => 'OMEGA',
+				'NT' => 'VORTAC',
+				'NV' => 'VOR',
+				'NX' => 'Direction finding station');
 	public $code_information = array(
-			    'OA' => 'Aeronautical information service',
-			    'OB' => 'Obstacle',
-			    'OE' => 'Aircraft entry requirements',
-			    'OL' => 'Obstacle lights on',
-			    'OR' => 'Rescue coordination centre');
+				'OA' => 'Aeronautical information service',
+				'OB' => 'Obstacle',
+				'OE' => 'Aircraft entry requirements',
+				'OL' => 'Obstacle lights on',
+				'OR' => 'Rescue coordination centre');
 	public $code_airtraffic = array(
-			    'PA' => 'Standard instrument arrival',
-			    'PD' => 'Standard instrument departure',
-			    'PF' => 'Flow control procedure',
-			    'PH' => 'Holding procedure',
-			    'PI' => 'Instrument approach procedure',
-			    'PL' => 'Obstacle clearance limit',
-			    'PM' => 'Aerodrome operating minima',
-			    'PO' => 'Obstacle clearance altitude',
-			    'PP' => 'Obstacle clearance height',
-			    'PR' => 'Radio failure procedure',
-			    'PT' => 'Transition altitude',
-			    'PU' => 'Missed approach procedure',
-			    'PX' => 'Minimum holding altitude',
-			    'PZ' => 'ADIZ procedure');
+				'PA' => 'Standard instrument arrival',
+				'PD' => 'Standard instrument departure',
+				'PF' => 'Flow control procedure',
+				'PH' => 'Holding procedure',
+				'PI' => 'Instrument approach procedure',
+				'PL' => 'Obstacle clearance limit',
+				'PM' => 'Aerodrome operating minima',
+				'PO' => 'Obstacle clearance altitude',
+				'PP' => 'Obstacle clearance height',
+				'PR' => 'Radio failure procedure',
+				'PT' => 'Transition altitude',
+				'PU' => 'Missed approach procedure',
+				'PX' => 'Minimum holding altitude',
+				'PZ' => 'ADIZ procedure');
 	public $code_navigationw = array(
-			    'RA' => 'Airspace reservation',
-			    'RD' => 'Danger area',
-			    'RO' => 'Overflying of',
-			    'RP' => 'Prohibited area',
-			    'RR' => 'Restricted area',
-			    'RT' => 'Temporary restricted area');
+				'RA' => 'Airspace reservation',
+				'RD' => 'Danger area',
+				'RO' => 'Overflying of',
+				'RP' => 'Prohibited area',
+				'RR' => 'Restricted area',
+				'RT' => 'Temporary restricted area');
 	public $code_volmet = array(
-			    'SA' => 'Automatic terminal information service',
-			    'SB' => 'ATS reporting office',
-			    'SC' => 'Area control center',
-			    'SE' => 'Flight information service',
-			    'SF' => 'Airport flight information service',
-			    'SL' => 'Flow control centre',
-			    'SO' => 'Oceanic area control centre',
-			    'SP' => 'Approach control service',
-			    'SS' => 'Flight service station',
-			    'ST' => 'Airport control tower',
-			    'SU' => 'Upper area control centre',
-			    'SV' => 'VOLMET broadcast',
-			    'SY' => 'Upper advisory service');
+				'SA' => 'Automatic terminal information service',
+				'SB' => 'ATS reporting office',
+				'SC' => 'Area control center',
+				'SE' => 'Flight information service',
+				'SF' => 'Airport flight information service',
+				'SL' => 'Flow control centre',
+				'SO' => 'Oceanic area control centre',
+				'SP' => 'Approach control service',
+				'SS' => 'Flight service station',
+				'ST' => 'Airport control tower',
+				'SU' => 'Upper area control centre',
+				'SV' => 'VOLMET broadcast',
+				'SY' => 'Upper advisory service');
 	public $code_warnings = array(
-			    'WA' => 'Air display',
-			    'WB' => 'Aerobatics',
-			    'WC' => 'Captive balloon or kite',
-			    'WD' => 'Demolition of explosives',
-			    'WE' => 'Exercises',
-			    'WF' => 'Air refueling',
-			    'WG' => 'Glider flying',
-			    'WJ' => 'Banner/target towing',
-			    'WL' => 'Ascent of free balloon',
-			    'WM' => 'Missile, gun or rocket firing',
-			    'WP' => 'Parachute jumping exercise',
-			    'WS' => 'Burning or blowing gas',
-			    'WT' => 'Mass movement of aircraft',
-			    'WV' => 'Formation flight',
-			    'WZ' => 'model flying');
+				'WA' => 'Air display',
+				'WB' => 'Aerobatics',
+				'WC' => 'Captive balloon or kite',
+				'WD' => 'Demolition of explosives',
+				'WE' => 'Exercises',
+				'WF' => 'Air refueling',
+				'WG' => 'Glider flying',
+				'WJ' => 'Banner/target towing',
+				'WL' => 'Ascent of free balloon',
+				'WM' => 'Missile, gun or rocket firing',
+				'WP' => 'Parachute jumping exercise',
+				'WS' => 'Burning or blowing gas',
+				'WT' => 'Mass movement of aircraft',
+				'WV' => 'Formation flight',
+				'WZ' => 'model flying');
 	public $code_sp_availabity = array(
-			    'AC' => 'Withdrawn for maintenance',
-			    'AD' => 'Available for daylight operation',
-			    'AF' => 'Flight checked and found reliable',
-			    'AG' => 'Operating but ground checked only, awaiting flight check',
-			    'AH' => 'Hours of service are now',
-			    'AK' => 'Resumed normal operations',
-			    'AM' => 'Military operations only',
-			    'AN' => 'Available for night operation',
-			    'AO' => 'Operational',
-			    'AP' => 'Available, prior permission required',
-			    'AR' => 'Available on request',
-			    'AS' => 'Unserviceable',
-			    'AU' => 'Not available',
-			    'AW' => 'Completely withdrawn',
-			    'AX' => 'Previously promulgated shutdown has been cancelled');
+				'AC' => 'Withdrawn for maintenance',
+				'AD' => 'Available for daylight operation',
+				'AF' => 'Flight checked and found reliable',
+				'AG' => 'Operating but ground checked only, awaiting flight check',
+				'AH' => 'Hours of service are now',
+				'AK' => 'Resumed normal operations',
+				'AM' => 'Military operations only',
+				'AN' => 'Available for night operation',
+				'AO' => 'Operational',
+				'AP' => 'Available, prior permission required',
+				'AR' => 'Available on request',
+				'AS' => 'Unserviceable',
+				'AU' => 'Not available',
+				'AW' => 'Completely withdrawn',
+				'AX' => 'Previously promulgated shutdown has been cancelled');
 	public $code_sp_changes = array(
-			    'CA' => 'Activated',
-			    'CC' => 'Completed',
-			    'CD' => 'Deactivated',
-			    'CE' => 'Erected',
-			    'CF' => 'Operating frequency(ies) changed to',
-			    'CG' => 'Downgraded to',
-			    'CH' => 'Changed',
-			    'CI' => 'dentification or radio call sign changed to',
-			    'CL' => 'Realigned',
-			    'CM' => 'Displaced',
-			    'CO' => 'Operating',
-			    'CP' => 'Operating on reduced power',
-			    'CR' => 'Temporarily replaced by',
-			    'CS' => 'Installed',
-			    'CT' => 'On test, do not use');
+				'CA' => 'Activated',
+				'CC' => 'Completed',
+				'CD' => 'Deactivated',
+				'CE' => 'Erected',
+				'CF' => 'Operating frequency(ies) changed to',
+				'CG' => 'Downgraded to',
+				'CH' => 'Changed',
+				'CI' => 'dentification or radio call sign changed to',
+				'CL' => 'Realigned',
+				'CM' => 'Displaced',
+				'CO' => 'Operating',
+				'CP' => 'Operating on reduced power',
+				'CR' => 'Temporarily replaced by',
+				'CS' => 'Installed',
+				'CT' => 'On test, do not use');
 	public $code_sp_hazardous = array(
-			    'HA' => 'Braking action is',
-			    'HB' => 'Braking coefficient is',
-			    'HC' => 'Covered by compacted snow to depth of x Ft',
-			    'HD' => 'Covered by dry snow to a depth of x Ft',
-			    'HE' => 'Covered by water to a depth of x Ft',
-			    'HF' => 'Totally free of snow and ice',
-			    'HG' => 'Grass cutting in progress',
-			    'HH' => 'Hazard due to',
-			    'HI' => 'Covered by ice',
-			    'HJ' => 'Launch planned',
-			    'HK' => 'Migration in progress',
-			    'HL' => 'Snow clearance completed',
-			    'HM' => 'Marked by',
-			    'HN' => 'Covered by wet snow or slush to a depth of x Ft',
-			    'HO' => 'Obscured by snow',
-			    'HP' => 'Snow clearance in progress',
-			    'HQ' => 'Operation cancelled',
-			    'HR' => 'Standing water',
-			    'HS' => 'Sanding in progress',
-			    'HT' => 'Approach according to signal area only',
-			    'HU' => 'Launch in progress',
-			    'HV' => 'Work completed',
-			    'HW' => 'Work in progress',
-			    'HX' => 'Concentration of birds',
-			    'HY' => 'Snow banks exist',
-			    'HZ' => 'Covered by frozen ruts and ridges');
+				'HA' => 'Braking action is',
+				'HB' => 'Braking coefficient is',
+				'HC' => 'Covered by compacted snow to depth of x Ft',
+				'HD' => 'Covered by dry snow to a depth of x Ft',
+				'HE' => 'Covered by water to a depth of x Ft',
+				'HF' => 'Totally free of snow and ice',
+				'HG' => 'Grass cutting in progress',
+				'HH' => 'Hazard due to',
+				'HI' => 'Covered by ice',
+				'HJ' => 'Launch planned',
+				'HK' => 'Migration in progress',
+				'HL' => 'Snow clearance completed',
+				'HM' => 'Marked by',
+				'HN' => 'Covered by wet snow or slush to a depth of x Ft',
+				'HO' => 'Obscured by snow',
+				'HP' => 'Snow clearance in progress',
+				'HQ' => 'Operation cancelled',
+				'HR' => 'Standing water',
+				'HS' => 'Sanding in progress',
+				'HT' => 'Approach according to signal area only',
+				'HU' => 'Launch in progress',
+				'HV' => 'Work completed',
+				'HW' => 'Work in progress',
+				'HX' => 'Concentration of birds',
+				'HY' => 'Snow banks exist',
+				'HZ' => 'Covered by frozen ruts and ridges');
 	public $code_sp_limitations = array(
-			    'LA' => 'Operating on Auxiliary Power Supply',
-			    'LB' => 'Reserved for aircraft based therein',
-			    'LC' => 'Closed',
-			    'LD' => 'Unsafe',
-			    'LE' => 'Operated without auxiliary power supply',
-			    'LF' => 'Interference from',
-			    'LG' => 'Operating without identification',
-			    'LH' => 'Unserviceable for aircraft heavier than',
-			    'LI' => 'Close to IFR operations',
-			    'LK' => 'Operating as a fixed light',
-			    'LL' => 'Usable for lenght of... and width of...',
-			    'LN' => 'Close to all night operations',
-			    'LP' => 'Prohibited to',
-			    'LR' => 'Aircraft restricted to runways and taxiways',
-			    'LS' => 'Subject to interruption',
-			    'LT' => 'Limited to',
-			    'LV' => 'Close to VFR operations',
-			    'LW' => 'Will take place',
-			    'LX' => 'Operating but caution advised to'); 
+				'LA' => 'Operating on Auxiliary Power Supply',
+				'LB' => 'Reserved for aircraft based therein',
+				'LC' => 'Closed',
+				'LD' => 'Unsafe',
+				'LE' => 'Operated without auxiliary power supply',
+				'LF' => 'Interference from',
+				'LG' => 'Operating without identification',
+				'LH' => 'Unserviceable for aircraft heavier than',
+				'LI' => 'Close to IFR operations',
+				'LK' => 'Operating as a fixed light',
+				'LL' => 'Usable for lenght of... and width of...',
+				'LN' => 'Close to all night operations',
+				'LP' => 'Prohibited to',
+				'LR' => 'Aircraft restricted to runways and taxiways',
+				'LS' => 'Subject to interruption',
+				'LT' => 'Limited to',
+				'LV' => 'Close to VFR operations',
+				'LW' => 'Will take place',
+				'LX' => 'Operating but caution advised to'); 
 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);

Doc Comments +14 added lines

@@ -1098,6 +1098,10 @@ 
 		else return array();
 	}
 
+	/**
+	 * @param string $type
+	 * @param string $rules
+	 */
 	public function addNOTAM($ref,$title,$type,$fir,$code,$rules,$scope,$lower_limit,$upper_limit,$center_latitude,$center_longitude,$radius,$date_begin,$date_end,$permanent,$text,$full_notam) {
 		$query = "INSERT INTO notam (ref,title,notam_type,fir,code,rules,scope,lower_limit,upper_limit,center_latitude,center_longitude,radius,date_begin,date_end,permanent,notam_text,full_notam) VALUES (:ref,:title,:type,:fir,:code,:rules,:scope,:lower_limit,:upper_limit,:center_latitude,:center_longitude,:radius,:date_begin,:date_end,:permanent,:text,:full_notam)";
 		$query_values = array(':ref' => $ref,':title' => $title,':type' => $type,':fir' => $fir,':code' => $code,':rules' => $rules,':scope' => $scope,':lower_limit' => $lower_limit,':upper_limit' => $upper_limit,':center_latitude' => $center_latitude,':center_longitude' => $center_longitude,':radius' => $radius,':date_begin' => $date_begin,':date_end' => $date_end,':permanent' => $permanent,':text' => $text,':full_notam' => $full_notam);
@@ -1179,6 +1183,10 @@ 
 			}
 		}
 	}
+
+	/**
+	 * @param string $filename
+	 */
 	public function updateNOTAMfromTextFile($filename) {
 		$alldata = $this->parseNOTAMtextFile($filename);
 		if (count($alldata) > 0) {
@@ -1223,6 +1231,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $icao
+	 */
 	public function downloadNOTAM($icao) {
 		date_default_timezone_set("UTC");
 		$Common = new Common();
@@ -1359,6 +1370,9 @@ 
 		return $result;
 	}
 	
+	/**
+	 * @param string $code
+	 */
 	public function parse_code($code) {
 		$code = str_split($code);
 		$code_fp = $code[1].$code[2];

Spacing +53 added lines, -53 removed lines

@@ -982,19 +982,19 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 	public function getAllNOTAMtext() {
-		$query  = 'SELECT full_notam FROM notam';
+		$query = 'SELECT full_notam FROM notam';
 		$query_values = array();
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1003,13 +1003,13 @@ 
 	public function createNOTAMtextFile($filename) {
 		$allnotam_result = $this->getAllNOTAMtext();
 		$notamtext = '';
-		foreach($allnotam_result as $notam) {
+		foreach ($allnotam_result as $notam) {
 			$notamtext .= '%%'."\n";
 			$notamtext .= $notam['full_notam'];
 			$notamtext .= "\n".'%%'."\n";
 		}
 		//$allnotam = implode('\n%%%%\n',$allnotam_result);
-		file_put_contents($filename,$notamtext);
+		file_put_contents($filename, $notamtext);
 	}
 	public function parseNOTAMtextFile($filename) {
 		$data = file_get_contents($filename);
@@ -1030,7 +1030,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1039,10 +1039,10 @@ 
 	public function getAllNOTAMbyCoord($coord) {
 		global $globalDBdriver;
 		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);
+			$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 * FROM notam WHERE center_latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND center_longitude BETWEEN '.$minlong.' AND '.$maxlong.' AND radius > 0 AND date_end > UTC_TIMESTAMP() AND date_begin < UTC_TIMESTAMP()';
@@ -1054,19 +1054,19 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function getAllNOTAMbyCoordScope($coord,$scope) {
+	public function getAllNOTAMbyCoordScope($coord, $scope) {
 		global $globalDBdriver;
 		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);
+			$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 * FROM notam WHERE center_latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND center_longitude BETWEEN '.$minlong.' AND '.$maxlong.' AND radius > 0 AND date_end > UTC_TIMESTAMP() AND date_begin < UTC_TIMESTAMP() AND scope = :scope';
@@ -1078,7 +1078,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1090,7 +1090,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1098,13 +1098,13 @@ 
 		else return array();
 	}
 
-	public function addNOTAM($ref,$title,$type,$fir,$code,$rules,$scope,$lower_limit,$upper_limit,$center_latitude,$center_longitude,$radius,$date_begin,$date_end,$permanent,$text,$full_notam) {
+	public function addNOTAM($ref, $title, $type, $fir, $code, $rules, $scope, $lower_limit, $upper_limit, $center_latitude, $center_longitude, $radius, $date_begin, $date_end, $permanent, $text, $full_notam) {
 		$query = "INSERT INTO notam (ref,title,notam_type,fir,code,rules,scope,lower_limit,upper_limit,center_latitude,center_longitude,radius,date_begin,date_end,permanent,notam_text,full_notam) VALUES (:ref,:title,:type,:fir,:code,:rules,:scope,:lower_limit,:upper_limit,:center_latitude,:center_longitude,:radius,:date_begin,:date_end,:permanent,:text,:full_notam)";
-		$query_values = array(':ref' => $ref,':title' => $title,':type' => $type,':fir' => $fir,':code' => $code,':rules' => $rules,':scope' => $scope,':lower_limit' => $lower_limit,':upper_limit' => $upper_limit,':center_latitude' => $center_latitude,':center_longitude' => $center_longitude,':radius' => $radius,':date_begin' => $date_begin,':date_end' => $date_end,':permanent' => $permanent,':text' => $text,':full_notam' => $full_notam);
+		$query_values = array(':ref' => $ref, ':title' => $title, ':type' => $type, ':fir' => $fir, ':code' => $code, ':rules' => $rules, ':scope' => $scope, ':lower_limit' => $lower_limit, ':upper_limit' => $upper_limit, ':center_latitude' => $center_latitude, ':center_longitude' => $center_longitude, ':radius' => $radius, ':date_begin' => $date_begin, ':date_end' => $date_end, ':permanent' => $permanent, ':text' => $text, ':full_notam' => $full_notam);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1115,7 +1115,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1130,7 +1130,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1140,7 +1140,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1149,7 +1149,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1158,7 +1158,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1166,14 +1166,14 @@ 
 	public function updateNOTAM() {
 		global $globalNOTAMAirports;
 		if (isset($globalNOTAMAirports) && is_array($globalNOTAMAirports) && count($globalNOTAMAirports) > 0) {
-			foreach (array_chunk($globalNOTAMAirports,10) as $airport) {
-				$airport_icao = implode(',',$airport);
+			foreach (array_chunk($globalNOTAMAirports, 10) as $airport) {
+				$airport_icao = implode(',', $airport);
 				$alldata = $this->downloadNOTAM($airport_icao);
 				if (count($alldata) > 0) {
 					foreach ($alldata as $initial_data) {
 						$data = $this->parse($initial_data);
 						$notamref = $this->getNOTAMbyRef($data['ref']);
-						if (count($notamref) == 0) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+						if (count($notamref) == 0) $this->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
 					}
 				}
 			}
@@ -1186,7 +1186,7 @@ 
 			foreach ($alldata as $initial_data) {
 				$data = $this->parse($initial_data);
 				$notamref = $this->getNOTAMbyRef($data['ref']);
-				if (!isset($notamref['notam_id'])) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+				if (!isset($notamref['notam_id'])) $this->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
 			}
 		}
 	}
@@ -1195,12 +1195,12 @@ 
 		global $globalTransaction;
 		$Spotter = new Spotter();
 		$allairports = $Spotter->getAllAirportInfo();
-		foreach (array_chunk($allairports,20) as $airport) {
+		foreach (array_chunk($allairports, 20) as $airport) {
 			$airports_icao = array();
-			foreach($airport as $icao) {
+			foreach ($airport as $icao) {
 				if (isset($icao['icao'])) $airports_icao[] = $icao['icao'];
 			}
-			$airport_icao = implode(',',$airports_icao);
+			$airport_icao = implode(',', $airports_icao);
 			$alldata = $this->downloadNOTAM($airport_icao);
 			if ($globalTransaction) $this->db->beginTransaction();
 			if (count($alldata) > 0) {
@@ -1213,7 +1213,7 @@ 
 						if (count($notamref) == 0) {
 							if (isset($data['ref_replaced'])) $this->deleteNOTAMbyRef($data['ref_replaced']);
 							if (isset($data['ref_cancelled'])) $this->deleteNOTAMbyRef($data['ref_cancelled']);
-							elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) echo $this->addNOTAM($data['ref'],'','',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+							elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) echo $this->addNOTAM($data['ref'], '', '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
 						}
 					}
 				}
@@ -1227,7 +1227,7 @@ 
 		date_default_timezone_set("UTC");
 		$Common = new Common();
 		//$url = str_replace('{icao}',$icao,'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=DOMESTIC&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
-		$url = str_replace('{icao}',$icao,'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=ICAO&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
+		$url = str_replace('{icao}', $icao, 'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=ICAO&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
 		$data = $Common->getData($url);
 		preg_match_all("/<pre>(.+?)<\/pre>/is", $data, $matches);
 		//print_r($matches);
@@ -1239,14 +1239,14 @@ 
 		$Common = new Common();
 		$result = array();
 		$result['full_notam'] = $data;
-		$data = str_ireplace(array("\r","\n",'\r','\n'),' ',$data);
-		$data = preg_split('#(?=([A-Z]\)\s))#',$data);
+		$data = str_ireplace(array("\r", "\n", '\r', '\n'), ' ', $data);
+		$data = preg_split('#(?=([A-Z]\)\s))#', $data);
 		//print_r($data);
 		foreach ($data as $line) {
 			$line = trim($line);
-			if (preg_match('#Q\) (.*)#',$line,$matches)) {
-				$line = str_replace(' ','',$line);
-				if (preg_match('#Q\)([A-Z]{4})\/([A-Z]{5})\/(IV|I|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N|S)([0-9]{5})(E|W)([0-9]{3})#',$line,$matches)) {
+			if (preg_match('#Q\) (.*)#', $line, $matches)) {
+				$line = str_replace(' ', '', $line);
+				if (preg_match('#Q\)([A-Z]{4})\/([A-Z]{5})\/(IV|I|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N|S)([0-9]{5})(E|W)([0-9]{3})#', $line, $matches)) {
 				//if (preg_match('#Q\)([A-Z]{4})\/([A-Z]{5})\/(IV|I|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N|S)([0-9]{5})(E|W)([0-9]{3})#',$line,$matches)) {
 					//print_r($matches);
 					$result['fir'] = $matches[1];
@@ -1292,30 +1292,30 @@ 
 					elseif ($matches[5] == 'AW') $result['scope'] = 'Airport/Navigation warning';
 					$result['lower_limit'] = $matches[6];
 					$result['upper_limit'] = $matches[7];
-					$latitude = $Common->convertDec($matches[8],'latitude');
+					$latitude = $Common->convertDec($matches[8], 'latitude');
 					if ($matches[9] == 'S') $latitude = -$latitude;
-					$longitude = $Common->convertDec($matches[10],'longitude');
+					$longitude = $Common->convertDec($matches[10], 'longitude');
 					if ($matches[11] == 'W') $longitude = -$longitude;
 					$result['latitude'] = $latitude;
 					$result['longitude'] = $longitude;
 					$result['radius'] = intval($matches[12]);
 				} else echo 'ERROR : '.$line."\n";
 			}
-			elseif (preg_match('#A\) (.*)#',$line,$matches)) {
+			elseif (preg_match('#A\) (.*)#', $line, $matches)) {
 				$result['icao'] = $matches[1];
 			}
-			elseif (preg_match('#B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches)) {
+			elseif (preg_match('#B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#', $line, $matches)) {
 				if ($matches[1] > 50) $year = '19'.$matches[1];
 				else $year = '20'.$matches[1];
 				$result['date_begin'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5];
 			}
-			elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches)) {
+			elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#', $line, $matches)) {
 				if ($matches[1] > 50) $year = '19'.$matches[1];
 				else $year = '20'.$matches[1];
 				$result['date_end'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5];
 				$result['permanent'] = 0;
 			}
-			elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#',$line,$matches)) {
+			elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#', $line, $matches)) {
 				if ($matches[1] > 50) $year = '19'.$matches[1];
 				else $year = '20'.$matches[1];
 				$result['date_end'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5];
@@ -1324,26 +1324,26 @@ 
 				if ($matches[6] == 'PERM') $result['permanent'] = 1;
 				else $result['permanent'] = 0;
 			}
-			elseif (preg_match('#C\) (EST|PERM)$#',$line,$matches)) {
+			elseif (preg_match('#C\) (EST|PERM)$#', $line, $matches)) {
 				$result['date_end'] = '2030/12/20 12:00';
 				if ($matches[1] == 'EST') $result['estimated'] = 1;
 				else $result['estimated'] = 0;
 				if ($matches[1] == 'PERM') $result['permanent'] = 1;
 				else $result['permanent'] = 0;
 			}
-			elseif (preg_match('#E\) (.*)#',$line,$matches)) {
+			elseif (preg_match('#E\) (.*)#', $line, $matches)) {
 				$rtext = array();
-				$text = explode(' ',$matches[1]);
+				$text = explode(' ', $matches[1]);
 				foreach ($text as $word) {
 					if (isset($this->abbr[$word])) $rtext[] = strtoupper($this->abbr[$word]);
-					elseif (ctype_digit(strval(substr($word,3))) && isset($this->abbr[substr($word,0,3)])) $rtext[] = strtoupper($this->abbr[substr($word,0,3)]).' '.substr($word,3);
+					elseif (ctype_digit(strval(substr($word, 3))) && isset($this->abbr[substr($word, 0, 3)])) $rtext[] = strtoupper($this->abbr[substr($word, 0, 3)]).' '.substr($word, 3);
 					else $rtext[] = $word;
 				}
-				$result['text'] = implode(' ',$rtext);
+				$result['text'] = implode(' ', $rtext);
 			//} elseif (preg_match('#F\) (.*)#',$line,$matches)) {
 			//} elseif (preg_match('#G\) (.*)#',$line,$matches)) {
-			} elseif (preg_match('#(NOTAMN|NOTAMR|NOTAMC)#',$line,$matches)) {
-				$text = explode(' ',$line);
+			} elseif (preg_match('#(NOTAMN|NOTAMR|NOTAMC)#', $line, $matches)) {
+				$text = explode(' ', $line);
 				$result['ref'] = $text[0];
 				if ($matches[1] == 'NOTAMN') $result['type'] = 'new';
 				if ($matches[1] == 'NOTAMC') {

Braces +208 added lines, -88 removed lines

@@ -1015,8 +1015,11 @@ 
 		$data = file_get_contents($filename);
 		preg_match_all("/%%(.+?)%%/is", $data, $matches);
 		//print_r($matches);
-		if (isset($matches[1])) return $matches[1];
-		else return array();
+		if (isset($matches[1])) {
+			return $matches[1];
+		} else {
+			return array();
+		}
 	}
 	public function getAllNOTAMbyScope($scope) {
 		global $globalDBdriver;
@@ -1043,7 +1046,9 @@ 
 			$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();
+		} else {
+			return array();
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT * FROM notam WHERE center_latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND center_longitude BETWEEN '.$minlong.' AND '.$maxlong.' AND radius > 0 AND date_end > UTC_TIMESTAMP() AND date_begin < UTC_TIMESTAMP()';
 		} else {
@@ -1067,7 +1072,9 @@ 
 			$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();
+		} else {
+			return array();
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT * FROM notam WHERE center_latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND center_longitude BETWEEN '.$minlong.' AND '.$maxlong.' AND radius > 0 AND date_end > UTC_TIMESTAMP() AND date_begin < UTC_TIMESTAMP() AND scope = :scope';
 		} else {
@@ -1094,8 +1101,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($all[0])) return $all[0];
-		else return array();
+		if (isset($all[0])) {
+			return $all[0];
+		} else {
+			return array();
+		}
 	}
 
 	public function addNOTAM($ref,$title,$type,$fir,$code,$rules,$scope,$lower_limit,$upper_limit,$center_latitude,$center_longitude,$radius,$date_begin,$date_end,$permanent,$text,$full_notam) {
@@ -1173,7 +1183,9 @@ 
 					foreach ($alldata as $initial_data) {
 						$data = $this->parse($initial_data);
 						$notamref = $this->getNOTAMbyRef($data['ref']);
-						if (count($notamref) == 0) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+						if (count($notamref) == 0) {
+							$this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+						}
 					}
 				}
 			}
@@ -1186,7 +1198,9 @@ 
 			foreach ($alldata as $initial_data) {
 				$data = $this->parse($initial_data);
 				$notamref = $this->getNOTAMbyRef($data['ref']);
-				if (!isset($notamref['notam_id'])) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+				if (!isset($notamref['notam_id'])) {
+					$this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+				}
 			}
 		}
 	}
@@ -1198,11 +1212,15 @@ 
 		foreach (array_chunk($allairports,20) as $airport) {
 			$airports_icao = array();
 			foreach($airport as $icao) {
-				if (isset($icao['icao'])) $airports_icao[] = $icao['icao'];
+				if (isset($icao['icao'])) {
+					$airports_icao[] = $icao['icao'];
+				}
 			}
 			$airport_icao = implode(',',$airports_icao);
 			$alldata = $this->downloadNOTAM($airport_icao);
-			if ($globalTransaction) $this->db->beginTransaction();
+			if ($globalTransaction) {
+				$this->db->beginTransaction();
+			}
 			if (count($alldata) > 0) {
 				foreach ($alldata as $initial_data) {
 					//print_r($initial_data);
@@ -1211,14 +1229,23 @@ 
 					if (isset($data['ref'])) {
 						$notamref = $this->getNOTAMbyRef($data['ref']);
 						if (count($notamref) == 0) {
-							if (isset($data['ref_replaced'])) $this->deleteNOTAMbyRef($data['ref_replaced']);
-							if (isset($data['ref_cancelled'])) $this->deleteNOTAMbyRef($data['ref_cancelled']);
-							elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) echo $this->addNOTAM($data['ref'],'','',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+							if (isset($data['ref_replaced'])) {
+								$this->deleteNOTAMbyRef($data['ref_replaced']);
+							}
+							if (isset($data['ref_cancelled'])) {
+								$this->deleteNOTAMbyRef($data['ref_cancelled']);
+							} elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) {
+								echo $this->addNOTAM($data['ref'],'','',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+							}
 						}
 					}
 				}
-			} else echo 'Error on download. Nothing matches for '.$airport_icao."\n";
-			if ($globalTransaction) $this->db->commit();
+			} else {
+				echo 'Error on download. Nothing matches for '.$airport_icao."\n";
+			}
+			if ($globalTransaction) {
+				$this->db->commit();
+			}
 			sleep(5);
 		}
 	}
@@ -1231,8 +1258,11 @@ 
 		$data = $Common->getData($url);
 		preg_match_all("/<pre>(.+?)<\/pre>/is", $data, $matches);
 		//print_r($matches);
-		if (isset($matches[1])) return $matches[1];
-		else return array();
+		if (isset($matches[1])) {
+			return $matches[1];
+		} else {
+			return array();
+		}
 	}
 
 	public function parse($data) {
@@ -1255,89 +1285,145 @@ 
 					$rules = str_split($matches[3]);
 					foreach ($rules as $rule) {
 						if ($rule == 'I') {
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/IFR';
-							else $result['rules'] = 'IFR';
+							if (isset($result['rules'])) {
+								$result['rules'] = $result['rules'].'/IFR';
+							} else {
+								$result['rules'] = 'IFR';
+							}
 						} elseif ($rule == 'V') {
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/VFR';
-							else $result['rules'] = 'VFR';
+							if (isset($result['rules'])) {
+								$result['rules'] = $result['rules'].'/VFR';
+							} else {
+								$result['rules'] = 'VFR';
+							}
 						} elseif ($rule == 'K') {
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/Checklist';
-							else $result['rules'] = 'Checklist';
+							if (isset($result['rules'])) {
+								$result['rules'] = $result['rules'].'/Checklist';
+							} else {
+								$result['rules'] = 'Checklist';
+							}
 						}
 					}
 					$attentions = str_split($matches[4]);
 					foreach ($attentions as $attention) {
 						if ($attention == 'N') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Immediate attention';
-							else $result['rules'] = 'Immediate attention';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Immediate attention';
+							} else {
+								$result['rules'] = 'Immediate attention';
+							}
 						} elseif ($attention == 'B') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Operational significance';
-							else $result['rules'] = 'Operational significance';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Operational significance';
+							} else {
+								$result['rules'] = 'Operational significance';
+							}
 						} elseif ($attention == 'O') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Flight operations';
-							else $result['rules'] = 'Flight operations';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Flight operations';
+							} else {
+								$result['rules'] = 'Flight operations';
+							}
 						} elseif ($attention == 'M') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Misc';
-							else $result['rules'] = 'Misc';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Misc';
+							} else {
+								$result['rules'] = 'Misc';
+							}
 						} elseif ($attention == 'K') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Checklist';
-							else $result['rules'] = 'Checklist';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Checklist';
+							} else {
+								$result['rules'] = 'Checklist';
+							}
 						}
 					}
-					if ($matches[5] == 'A') $result['scope'] = 'Airport warning';
-					elseif ($matches[5] == 'E') $result['scope'] = 'Enroute warning';
-					elseif ($matches[5] == 'W') $result['scope'] = 'Navigation warning';
-					elseif ($matches[5] == 'K') $result['scope'] = 'Checklist';
-					elseif ($matches[5] == 'AE') $result['scope'] = 'Airport/Enroute warning';
-					elseif ($matches[5] == 'AW') $result['scope'] = 'Airport/Navigation warning';
+					if ($matches[5] == 'A') {
+						$result['scope'] = 'Airport warning';
+					} elseif ($matches[5] == 'E') {
+						$result['scope'] = 'Enroute warning';
+					} elseif ($matches[5] == 'W') {
+						$result['scope'] = 'Navigation warning';
+					} elseif ($matches[5] == 'K') {
+						$result['scope'] = 'Checklist';
+					} elseif ($matches[5] == 'AE') {
+						$result['scope'] = 'Airport/Enroute warning';
+					} elseif ($matches[5] == 'AW') {
+						$result['scope'] = 'Airport/Navigation warning';
+					}
 					$result['lower_limit'] = $matches[6];
 					$result['upper_limit'] = $matches[7];
 					$latitude = $Common->convertDec($matches[8],'latitude');
-					if ($matches[9] == 'S') $latitude = -$latitude;
+					if ($matches[9] == 'S') {
+						$latitude = -$latitude;
+					}
 					$longitude = $Common->convertDec($matches[10],'longitude');
-					if ($matches[11] == 'W') $longitude = -$longitude;
+					if ($matches[11] == 'W') {
+						$longitude = -$longitude;
+					}
 					$result['latitude'] = $latitude;
 					$result['longitude'] = $longitude;
 					$result['radius'] = intval($matches[12]);
-				} else echo 'ERROR : '.$line."\n";
-			}
-			elseif (preg_match('#A\) (.*)#',$line,$matches)) {
+				} else {
+					echo 'ERROR : '.$line."\n";
+				}
+			} elseif (preg_match('#A\) (.*)#',$line,$matches)) {
 				$result['icao'] = $matches[1];
-			}
-			elseif (preg_match('#B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches)) {
-				if ($matches[1] > 50) $year = '19'.$matches[1];
-				else $year = '20'.$matches[1];
+			} elseif (preg_match('#B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches)) {
+				if ($matches[1] > 50) {
+					$year = '19'.$matches[1];
+				} else {
+					$year = '20'.$matches[1];
+				}
 				$result['date_begin'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5];
-			}
-			elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches)) {
-				if ($matches[1] > 50) $year = '19'.$matches[1];
-				else $year = '20'.$matches[1];
+			} elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches)) {
+				if ($matches[1] > 50) {
+					$year = '19'.$matches[1];
+				} else {
+					$year = '20'.$matches[1];
+				}
 				$result['date_end'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5];
 				$result['permanent'] = 0;
-			}
-			elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#',$line,$matches)) {
-				if ($matches[1] > 50) $year = '19'.$matches[1];
-				else $year = '20'.$matches[1];
+			} elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#',$line,$matches)) {
+				if ($matches[1] > 50) {
+					$year = '19'.$matches[1];
+				} else {
+					$year = '20'.$matches[1];
+				}
 				$result['date_end'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5];
-				if ($matches[6] == 'EST') $result['estimated'] = 1;
-				else $result['estimated'] = 0;
-				if ($matches[6] == 'PERM') $result['permanent'] = 1;
-				else $result['permanent'] = 0;
-			}
-			elseif (preg_match('#C\) (EST|PERM)$#',$line,$matches)) {
+				if ($matches[6] == 'EST') {
+					$result['estimated'] = 1;
+				} else {
+					$result['estimated'] = 0;
+				}
+				if ($matches[6] == 'PERM') {
+					$result['permanent'] = 1;
+				} else {
+					$result['permanent'] = 0;
+				}
+			} elseif (preg_match('#C\) (EST|PERM)$#',$line,$matches)) {
 				$result['date_end'] = '2030/12/20 12:00';
-				if ($matches[1] == 'EST') $result['estimated'] = 1;
-				else $result['estimated'] = 0;
-				if ($matches[1] == 'PERM') $result['permanent'] = 1;
-				else $result['permanent'] = 0;
-			}
-			elseif (preg_match('#E\) (.*)#',$line,$matches)) {
+				if ($matches[1] == 'EST') {
+					$result['estimated'] = 1;
+				} else {
+					$result['estimated'] = 0;
+				}
+				if ($matches[1] == 'PERM') {
+					$result['permanent'] = 1;
+				} else {
+					$result['permanent'] = 0;
+				}
+			} elseif (preg_match('#E\) (.*)#',$line,$matches)) {
 				$rtext = array();
 				$text = explode(' ',$matches[1]);
 				foreach ($text as $word) {
-					if (isset($this->abbr[$word])) $rtext[] = strtoupper($this->abbr[$word]);
-					elseif (ctype_digit(strval(substr($word,3))) && isset($this->abbr[substr($word,0,3)])) $rtext[] = strtoupper($this->abbr[substr($word,0,3)]).' '.substr($word,3);
-					else $rtext[] = $word;
+					if (isset($this->abbr[$word])) {
+						$rtext[] = strtoupper($this->abbr[$word]);
+					} elseif (ctype_digit(strval(substr($word,3))) && isset($this->abbr[substr($word,0,3)])) {
+						$rtext[] = strtoupper($this->abbr[substr($word,0,3)]).' '.substr($word,3);
+					} else {
+						$rtext[] = $word;
+					}
 				}
 				$result['text'] = implode(' ',$rtext);
 			//} elseif (preg_match('#F\) (.*)#',$line,$matches)) {
@@ -1345,7 +1431,9 @@ 
 			} elseif (preg_match('#(NOTAMN|NOTAMR|NOTAMC)#',$line,$matches)) {
 				$text = explode(' ',$line);
 				$result['ref'] = $text[0];
-				if ($matches[1] == 'NOTAMN') $result['type'] = 'new';
+				if ($matches[1] == 'NOTAMN') {
+					$result['type'] = 'new';
+				}
 				if ($matches[1] == 'NOTAMC') {
 					$result['type'] = 'cancel';
 					$result['ref_cancelled'] = $text[2];
@@ -1367,69 +1455,101 @@ 
 		switch ($code[1]) {
 			case 'A':
 				$result = 'Airspace organization ';
-				if (isset($this->code_airspace[$code_fp])) $result .= $this->code_airspace[$code_fp];
+				if (isset($this->code_airspace[$code_fp])) {
+					$result .= $this->code_airspace[$code_fp];
+				}
 				break;
 			case 'C':
 				$result = 'Communications and radar facilities ';
-				if (isset($this->code_comradar[$code_fp])) $result .= $this->code_comradar[$code_fp];
+				if (isset($this->code_comradar[$code_fp])) {
+					$result .= $this->code_comradar[$code_fp];
+				}
 				break;
 			case 'F':
 				$result = 'Facilities and services ';
-				if (isset($this->code_facilities[$code_fp])) $result .= $this->code_facilities[$code_fp];
+				if (isset($this->code_facilities[$code_fp])) {
+					$result .= $this->code_facilities[$code_fp];
+				}
 				break;
 			case 'I':
 				$result = 'Instrument and Microwave Landing System ';
-				if (isset($this->code_instrumentlanding[$code_fp])) $result .= $this->code_instrumentlanding[$code_fp];
+				if (isset($this->code_instrumentlanding[$code_fp])) {
+					$result .= $this->code_instrumentlanding[$code_fp];
+				}
 				break;
 			case 'L':
 				$result = 'Lighting facilities ';
-				if (isset($this->code_lightingfacilities[$code_fp])) $result .= $this->code_lightingfacilities[$code_fp];
+				if (isset($this->code_lightingfacilities[$code_fp])) {
+					$result .= $this->code_lightingfacilities[$code_fp];
+				}
 				break;
 			case 'M':
 				$result = 'Movement and landing areas ';
-				if (isset($this->code_movementareas[$code_fp])) $result .= $this->code_movementareas[$code_fp];
+				if (isset($this->code_movementareas[$code_fp])) {
+					$result .= $this->code_movementareas[$code_fp];
+				}
 				break;
 			case 'N':
 				$result = 'Terminal and En Route Navigation Facilities ';
-				if (isset($this->code_terminalfacilities[$code_fp])) $result .= $this->code_terminalfacilities[$code_fp];
+				if (isset($this->code_terminalfacilities[$code_fp])) {
+					$result .= $this->code_terminalfacilities[$code_fp];
+				}
 				break;
 			case 'O':
 				$result = 'Other information ';
-				if (isset($this->code_information[$code_fp])) $result .= $this->code_information[$code_fp];
+				if (isset($this->code_information[$code_fp])) {
+					$result .= $this->code_information[$code_fp];
+				}
 				break;
 			case 'P':
 				$result = 'Air Traffic procedures ';
-				if (isset($this->code_airtraffic[$code_fp])) $result .= $this->code_airtraffic[$code_fp];
+				if (isset($this->code_airtraffic[$code_fp])) {
+					$result .= $this->code_airtraffic[$code_fp];
+				}
 				break;
 			case 'R':
 				$result = 'Navigation Warnings: Airspace Restrictions ';
-				if (isset($this->code_navigationw[$code_fp])) $result .= $this->code_navigationw[$code_fp];
+				if (isset($this->code_navigationw[$code_fp])) {
+					$result .= $this->code_navigationw[$code_fp];
+				}
 				break;
 			case 'S':
 				$result = 'Air Traffic and VOLMET Services ';
-				if (isset($this->code_volmet[$code_fp])) $result .= $this->code_volmet[$code_fp];
+				if (isset($this->code_volmet[$code_fp])) {
+					$result .= $this->code_volmet[$code_fp];
+				}
 				break;
 			case 'W':
 				$result = 'Navigation Warnings: Warnings ';
-				if (isset($this->code_warnings[$code_fp])) $result .= $this->code_warnings[$code_fp];
+				if (isset($this->code_warnings[$code_fp])) {
+					$result .= $this->code_warnings[$code_fp];
+				}
 				break;
 		}
 		switch ($code[3]) {
 			case 'A':
 				// Availability
-				if (isset($this->code_sp_availabity[$code_sp])) $result .= ' '.$this->code_sp_availabity[$code_sp];
+				if (isset($this->code_sp_availabity[$code_sp])) {
+					$result .= ' '.$this->code_sp_availabity[$code_sp];
+				}
 				break;
 			case 'C':
 				// Changes
-				if (isset($this->code_sp_changes[$code_sp])) $result .= ' '.$this->code_sp_changes[$code_sp];
+				if (isset($this->code_sp_changes[$code_sp])) {
+					$result .= ' '.$this->code_sp_changes[$code_sp];
+				}
 				break;
 			case 'H':
 				// Hazardous conditions
-				if (isset($this->code_sp_hazardous[$code_sp])) $result .= ' '.$this->code_sp_hazardous[$code_sp];
+				if (isset($this->code_sp_hazardous[$code_sp])) {
+					$result .= ' '.$this->code_sp_hazardous[$code_sp];
+				}
 				break;
 			case 'L':
 				// Limitations
-				if (isset($this->code_sp_limitations[$code_sp])) $result .= ' '.$this->code_sp_limitations[$code_sp];
+				if (isset($this->code_sp_limitations[$code_sp])) {
+					$result .= ' '.$this->code_sp_limitations[$code_sp];
+				}
 				break;
 			case 'X':
 				// Other Information

waypoints-geojson.php

Indentation +16 added lines, -16 removed lines

@@ -26,7 +26,7 @@ 
 		date_default_timezone_set('UTC');
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"segment_name": "'.$spotter_item['segment_name'].'",';
 			$output .= '"base": "'.$spotter_item['base'].'",';
 			$output .= '"top": "'.$spotter_item['top'].'",';
@@ -49,15 +49,15 @@ 
 				$output .= '"stroke": "#f0f0f0",';
 				$output .= '"stroke-width": 2';
 //			}
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "LineString",';
 			$output .= '"coordinates": [';
-			    //$output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].'], ['.$spotter_item['longitude_end_seg2'].', '.$spotter_item['latitude_end_seg2'].']';
-			    $output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].','.round($spotter_item['base']*100*0.3048).'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].','.round($spotter_item['base']*100*0.3048).']';
+				//$output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].'], ['.$spotter_item['longitude_end_seg2'].', '.$spotter_item['latitude_end_seg2'].']';
+				$output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].','.round($spotter_item['base']*100*0.3048).'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].','.round($spotter_item['base']*100*0.3048).']';
 			//    $output .= '['.$spotter_item['latitude_begin'].', '.$spotter_item['longitude_begin'].'], ['.$spotter_item['latitude_end'].', '.$spotter_item['longitude_end'].']';
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 /*		    $output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
@@ -68,7 +68,7 @@ 
 		$output .= '},';
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"ident": "'.$spotter_item['name_begin'].'",';
 			$output .= '"high": "'.$spotter_item['high'].'",';
 			$output .= '"alt": "'.$spotter_item['base'].'",';
@@ -98,17 +98,17 @@ 
 				$output .= '"marker-size": "small",';
 				$output .= '"marker-color": "#0000ff"';
 			}
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048);;
+				$output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048);;
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 
 		$output .= '},';
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"ident": "'.$spotter_item['name_end'].'",';
 			$output .= '"high": "'.$spotter_item['high'].'",';
 			$output .= '"alt": "'.$spotter_item['top'].'",';
@@ -145,13 +145,13 @@ 
 				$output .= '"marker-size": "small",';
 				$output .= '"marker-color": "#0000ff"';
 			}
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].', '.round($spotter_item['base']*100*0.3048);
+				$output .= $spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].', '.round($spotter_item['base']*100*0.3048);
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 
 		$output .= '},';
 	}

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
 
 if (isset($_GET['coord'])) 
 {
-	$coords = explode(',',$_GET['coord']);
+	$coords = explode(',', $_GET['coord']);
 	$spotter_array = $Spotter->getAllWaypointsInfobyCoord($coords);
 } else {
 	die;
@@ -21,7 +21,7 @@ 
 if (!empty($spotter_array))
 {	  
 //	print_r($spotter_array);
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		//waypoint plotting
@@ -102,7 +102,7 @@ 
 		    $output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048);;
+			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048); ;
 			$output .= ']';
 		    $output .= '}';
 

airspace-data.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 <button type="button" class="close">&times;</button>
 <?php
 
-$airspaceid = filter_input(INPUT_GET,'airspace',FILTER_SANITIZE_NUMBER_INT);
+$airspaceid = filter_input(INPUT_GET, 'airspace', FILTER_SANITIZE_NUMBER_INT);
 //$notamref = urldecode($notamref);
 if ($globalDBdriver == 'mysql') {
 	$query = "SELECT * FROM airspace WHERE ogr_fid = :id";
@@ -18,10 +18,10 @@ 
 try {
 	$sth = $Connection->db->prepare($query);
 	$sth->execute(array(':id' => $airspaceid));
-} catch(PDOException $e) {
+} catch (PDOException $e) {
 	echo "error";
 }
-$result=$sth->fetchAll(PDO::FETCH_ASSOC);
+$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 $airspace = $result[0];
 date_default_timezone_set('UTC');
 print '<div class="top">';

Braces +9 added lines, -3 removed lines

@@ -25,7 +25,9 @@ 
 $airspace = $result[0];
 date_default_timezone_set('UTC');
 print '<div class="top">';
-if (isset($airspace['name'])) $airspace['title'] = $airspace['name']; 
+if (isset($airspace['name'])) {
+	$airspace['title'] = $airspace['name'];
+}
 print '<div class="right"><div class="callsign-details"><div class="callsign">'.$airspace['title'].'</a></div>';
 print '</div>';
 print '<div class="details">';
@@ -44,13 +46,17 @@ 
 	print '</div>';
 }
 
-if (isset($airspace['ceiling'])) $airspace['tops'] = $airspace['ceiling'];
+if (isset($airspace['ceiling'])) {
+	$airspace['tops'] = $airspace['ceiling'];
+}
 print '<div>';
 print '<span>'._("Tops").'</span>';
 print $airspace['tops'];
 print '</div>';
 
-if (isset($airspace['floor'])) $airspace['base'] = $airspace['floor'];
+if (isset($airspace['floor'])) {
+	$airspace['base'] = $airspace['floor'];
+}
 print '<div>';
 print '<span>'._("Base").'</span>';
 print $airspace['base'];

scripts/update_db.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 	exec("ps ux", $output, $result);
 	$j = 0;
-	foreach ($output as $line) if(strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++;
+	foreach ($output as $line) if (strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++;
 	if ($j > 1) {
 		echo "Script is already runnning...";
 		die();

Braces +19 added lines, -7 removed lines

@@ -9,7 +9,9 @@ 
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 	exec("ps ux", $output, $result);
 	$j = 0;
-	foreach ($output as $line) if(strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++;
+	foreach ($output as $line) {
+		if(strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++;
+	}
 	if ($j > 1) {
 		echo "Script is already runnning...";
 		die();
@@ -29,14 +31,18 @@ 
 			$update_db->update_notam();
 		}
 		$update_db->insert_last_notam_update();
-	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) echo "NOTAM are only updated once a day.\n";
+	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) {
+		echo "NOTAM are only updated once a day.\n";
+	}
 	if ($update_db->check_last_update() && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
 		$update_db->update_all();
 	//	require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 	//	$Spotter = new Spotter();
 	//	$Spotter->updateFieldsFromOtherTables();
 		$update_db->insert_last_update();
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) {
+		echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
+	}
 	if (isset($globalWaypoints) && $globalWaypoints && $update_db->check_last_airspace_update()) {
 		echo "Check if new airspace version exist...";
 		echo $update_db->update_airspace_fam();
@@ -52,8 +58,10 @@ 
 	if ($METAR->check_last_update()) {
 		$METAR->addMETARCycle();
 		$METAR->insert_last_update();
-	} else echo "METAR are only updated every 30 minutes.\n";
-}
+	} else {
+		echo "METAR are only updated every 30 minutes.\n";
+	}
+	}
 
 
 if ($update_db->check_last_owner_update() && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
@@ -62,14 +70,18 @@ 
 	$update_db->update_owner_fam();
 	$update_db->delete_duplicateowner();
 	$update_db->insert_last_owner_update();
-} elseif (isset($globalDebug) && $globalDebug && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Owner are only updated every 15 days.\n";
+} elseif (isset($globalDebug) && $globalDebug && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
+	echo "Owner are only updated every 15 days.\n";
+}
 
 if (isset($globalSchedules) && $globalSchedules && $update_db->check_last_schedules_update() && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
 	echo "Updating schedules...";
 	//$update_db->update_oneworld();
 	$update_db->update_skyteam();
 	$update_db->insert_last_schedules_update();
-} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Schedules are only updated every 15 days.\n";
+} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
+	echo "Schedules are only updated every 15 days.\n";
+}
 
 if (isset($globalArchiveMonths) && $globalArchiveMonths > 0) {
 	echo "Updating statistics and archive old data...";

install/VAM/VAM-json.php

Spacing +17 added lines, -17 removed lines

@@ -11,27 +11,27 @@
 	die();
 }
 $query = 'select * from vam_live_flights rc, gvausers gu where gu.gvauser_id = rc.gvauser_id';  
-$json_data=array();  
+$json_data = array();  
 $result = $db->query($query);
 while ($rec = $result->fetch_assoc())
 {  
-	$json_array['gvauser_id']=$rec['gvauser_id']; // users "pilot unique ID" "40"
-	$json_array['flight_id']=$rec['flight_id']; // flight_id
-	$json_array['pilot_id']=$rec['callsign']; // users pilot_id "VAM500"
-	$json_array['callsign']=substr($rec['flight_id'],-7);  // substr icao Flight "AFR524"
-	$json_array['pilot_name']=$rec['name'] .' '.$rec['surname'] ;  // Users "name + surname"
-	$json_array['plane_type']=$rec['plane_type'];  // type Plane "B739"
-	$json_array['departure']=$rec['departure'];  // departure ICAO
-	$json_array['arrival']=$rec['arrival'];     // arrival Ident
-	$json_array['latitude']=$rec['latitude'];  // return 55.7328860921521
-	$json_array['longitude']=$rec['longitude'];  // return 8.87433614409404
-	$json_array['altitude']=$rec['altitude'];  // return "147"
-	$json_array['heading']=$rec['heading'];  // return "307"
-	$json_array['ias']=$rec['ias'];  // return speed "IAS"
-	$json_array['gs']=$rec['gs'];  // return speed "GS"
+	$json_array['gvauser_id'] = $rec['gvauser_id']; // users "pilot unique ID" "40"
+	$json_array['flight_id'] = $rec['flight_id']; // flight_id
+	$json_array['pilot_id'] = $rec['callsign']; // users pilot_id "VAM500"
+	$json_array['callsign'] = substr($rec['flight_id'], -7); // substr icao Flight "AFR524"
+	$json_array['pilot_name'] = $rec['name'].' '.$rec['surname']; // Users "name + surname"
+	$json_array['plane_type'] = $rec['plane_type']; // type Plane "B739"
+	$json_array['departure'] = $rec['departure']; // departure ICAO
+	$json_array['arrival'] = $rec['arrival']; // arrival Ident
+	$json_array['latitude'] = $rec['latitude']; // return 55.7328860921521
+	$json_array['longitude'] = $rec['longitude']; // return 8.87433614409404
+	$json_array['altitude'] = $rec['altitude']; // return "147"
+	$json_array['heading'] = $rec['heading']; // return "307"
+	$json_array['ias'] = $rec['ias']; // return speed "IAS"
+	$json_array['gs'] = $rec['gs']; // return speed "GS"
 	// $json_array['routes']=$rec['routes'];  // (unusable)
-	$json_array['flight_status']=$rec['flight_status'];  // "return Status"
-	$json_array['last_update']=$rec['last_update'];  // return "DateTime"
+	$json_array['flight_status'] = $rec['flight_status']; // "return Status"
+	$json_array['last_update'] = $rec['last_update']; // return "DateTime"
 	$json_data[] = $json_array;
  }  
 echo json_encode($json_data);

statistics-pilot.php

Indentation +7 added lines, -7 removed lines

@@ -7,13 +7,13 @@ 
 
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
-    unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
-    $airline_icao = '';
+	unset($_COOKIE['stats_airline_icao']);
+	setcookie('stats_airline_icao', '', time()-3600);
+	$airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
-    $airline_icao = $_COOKIE['stats_airline_icao'];
+	$airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
 setcookie('stats_airline_icao',$airline_icao);
 
@@ -34,14 +34,14 @@ 
           function drawChart() {
             var data = google.visualization.arrayToDataTable([
             	["'._("Pilot").'", "'._("# of times").'"], ';
-            	$pilot_data = '';
+				$pilot_data = '';
 		foreach($pilot_array as $pilot_item)
 		{
 			$pilot_data .= '[ "'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
 		}
 		$pilot_data = substr($pilot_data, 0, -1);
 		print $pilot_data;
-            print ']);
+			print ']);
     
             var options = {
             	chartArea: {"width": "80%", "height": "60%"},

Spacing +6 added lines, -6 removed lines

@@ -6,17 +6,17 @@ 
 $title = _("Statistics").' - '._("Most common Pilots");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
+    setcookie('stats_airline_icao', '', time() - 3600);
     $airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-setcookie('stats_airline_icao',$airline_icao);
+setcookie('stats_airline_icao', $airline_icao);
 
 require_once('header.php');
 include('statistics-sub-menu.php');
@@ -27,7 +27,7 @@ 
 	</div>
 	<p>'._("Below are the <strong>Top 10</strong> most common pilot.").'</p>';
 	  
-	$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name);
+	$pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name);
 	print '<div id="chart" class="chart" width="100%"></div>
       	<script> 
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -36,7 +36,7 @@ 
             var data = google.visualization.arrayToDataTable([
             	["'._("Pilot").'", "'._("# of times").'"], ';
             	$pilot_data = '';
-		foreach($pilot_array as $pilot_item)
+		foreach ($pilot_array as $pilot_item)
 		{
 			$pilot_data .= '[ "'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
 		}
@@ -69,7 +69,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($pilot_array as $pilot_item)
+	foreach ($pilot_array as $pilot_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Braces +7 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Callsign");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
@@ -14,8 +16,10 @@ 
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 setcookie('stats_airline_icao',$airline_icao);
 
 require_once('header.php');

statistics-owner.php

Indentation +7 added lines, -7 removed lines

@@ -7,13 +7,13 @@ 
 
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
-    unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
-    $airline_icao = '';
+	unset($_COOKIE['stats_airline_icao']);
+	setcookie('stats_airline_icao', '', time()-3600);
+	$airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
-    $airline_icao = $_COOKIE['stats_airline_icao'];
+	$airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
 setcookie('stats_airline_icao',$airline_icao);
 
@@ -33,14 +33,14 @@ 
           function drawChart() {
             var data = google.visualization.arrayToDataTable([
             	["'._("Owner").'", "'._("# of times").'"], ';
-            	$owner_data = '';
+				$owner_data = '';
 		foreach($owner_array as $owner_item)
 		{
 			$owner_data .= '[ "'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
 		}
 		$owner_data = substr($owner_data, 0, -1);
 		print $owner_data;
-            print ']);
+			print ']);
     
             var options = {
             	chartArea: {"width": "80%", "height": "60%"},

Spacing +6 added lines, -6 removed lines

@@ -6,17 +6,17 @@ 
 $title = _("Statistics").' - '._("Most common owners");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
+    setcookie('stats_airline_icao', '', time() - 3600);
     $airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-setcookie('stats_airline_icao',$airline_icao);
+setcookie('stats_airline_icao', $airline_icao);
 
 require_once('header.php');
 include('statistics-sub-menu.php');
@@ -26,7 +26,7 @@ 
 	</div>
 	<p>'._("Below are the <strong>Top 10</strong> most common owner.").'</p>';
  
-	$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name);
+	$owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name);
 	print '<div id="chart" class="chart" width="100%"></div>
       	<script> 
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -35,7 +35,7 @@ 
             var data = google.visualization.arrayToDataTable([
             	["'._("Owner").'", "'._("# of times").'"], ';
             	$owner_data = '';
-		foreach($owner_array as $owner_item)
+		foreach ($owner_array as $owner_item)
 		{
 			$owner_data .= '[ "'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
 		}
@@ -68,7 +68,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($owner_array as $owner_item)
+	foreach ($owner_array as $owner_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Braces +7 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Callsign");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
@@ -14,8 +16,10 @@ 
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 setcookie('stats_airline_icao',$airline_icao);
 
 require_once('header.php');

statistics-registration.php

Indentation +6 added lines, -6 removed lines

@@ -7,13 +7,13 @@ 
 
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
-    unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
-    $airline_icao = '';
+	unset($_COOKIE['stats_airline_icao']);
+	setcookie('stats_airline_icao', '', time()-3600);
+	$airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
-    $airline_icao = $_COOKIE['stats_airline_icao'];
+	$airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
 setcookie('stats_airline_icao',$airline_icao);
 
@@ -34,7 +34,7 @@ 
           function drawChart() {
             var data = google.visualization.arrayToDataTable([
             	["'._("Aircraft Manufacturer").'", "'._("# of times").'"], ';
-            	$registration_data = '';
+				$registration_data = '';
 foreach($registration_array as $registration_item)
 {
 	$registration_data .= '[ "'.$registration_item['registration'].' - '.$registration_item['aircraft_name'].' ('.$registration_item['aircraft_icao'].')",'.$registration_item['aircraft_registration_count'].'],';

Spacing +6 added lines, -6 removed lines

@@ -6,17 +6,17 @@ 
 $title = _("Statistics").' - '._("Most common Aircraft Registrations");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
+    setcookie('stats_airline_icao', '', time() - 3600);
     $airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-setcookie('stats_airline_icao',$airline_icao);
+setcookie('stats_airline_icao', $airline_icao);
 
 require_once('header.php');
 include('statistics-sub-menu.php'); 
@@ -27,7 +27,7 @@ 
 	</div>
     	<p>'._("Below are the <strong>Top 10</strong> most common aircraft registrations.").'</p>';
   
-$registration_array = $Stats->countAllAircraftRegistrations(true,$airline_icao,$filter_name);
+$registration_array = $Stats->countAllAircraftRegistrations(true, $airline_icao, $filter_name);
 print '<div id="chart" class="chart" width="100%"></div>
       	    <script> 
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -36,7 +36,7 @@ 
             var data = google.visualization.arrayToDataTable([
             	["'._("Aircraft Manufacturer").'", "'._("# of times").'"], ';
             	$registration_data = '';
-foreach($registration_array as $registration_item)
+foreach ($registration_array as $registration_item)
 {
 	$registration_data .= '[ "'.$registration_item['registration'].' - '.$registration_item['aircraft_name'].' ('.$registration_item['aircraft_icao'].')",'.$registration_item['aircraft_registration_count'].'],';
 }
@@ -71,7 +71,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($registration_array as $registration_item)
+	foreach ($registration_array as $registration_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Braces +7 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Callsign");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
@@ -14,8 +16,10 @@ 
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 setcookie('stats_airline_icao',$airline_icao);
 
 require_once('header.php');