--- /home/matt/flooterbuck/flooterbuck/modules/aviation.pm	2012-11-21 19:45:22.000000000 +0000
+++ aviation.pm	2013-01-16 14:18:10.000000000 +0000
@@ -33,13 +33,16 @@
 #              to support more airports
 #            - Initial heading is now calculated internally with standard
 #              algorithm from http://williams.best.vwh.net/avform.htm.
+# 2012/12/19 matt@knm.org.uk
+#            - Added support for Geo::TAF module to parse METAR and TAF
+#              results into English
 #
 # $Id: aviation.pm,v 1.5 2005/08/31 13:39:08 rich_lafferty Exp $
 #------------------------------------------------------------------------
 
 package aviation;
 
-my ( $no_aviation, $no_entities, $no_posix );
+my ( $no_aviation, $no_entities, $no_posix, $no_parsing );
 my $pi = 3.1415926535;
 
 BEGIN {
@@ -51,6 +54,8 @@
     if ($@) { $no_posix++ }
     eval "use HTML::TokeParser";
     if ($@) { $no_aviation++ }
+    eval "use Geo::TAF";
+    if ($@) { $no_parsing++ }
 }
 
 # Set the following to 1 if you want the forecast separators in
@@ -75,7 +80,9 @@
            defined( ::getparam('aviation') )
         or defined( ::getparam('metar') )
         and $message =~ /^(metar             |
+                           conditions        |
                            taf               |
+                           forecast          |
                            great[-\s]?circle | 
                            zulutime          |
                            tsd               |
@@ -105,6 +112,8 @@
     return 'NOREPLY' if $pid;  # parent does nothing
     if    ( $line =~ /^metar\s+/i ) { $callback->( metar($line) ) }
     elsif ( $line =~ /^taf\s+/i )   { $callback->( taf($line) ) }
+    elsif ( $line =~ /^conditions\s+/i )   { $callback->( metar($line,1) ) }
+    elsif ( $line =~ /^forecast\s+/i )   { $callback->( taf($line,1) ) }
     elsif ( $line =~ /^great[-\s]?circle\s+/i ) {
         $callback->( greatcircle($line) );
     } elsif ( $line =~ /^tsd\s+/i ) {
@@ -131,7 +140,7 @@
 # aviation - list available aviation functions
 #
 sub aviation {
-    return "My aviation-related functions are metar, taf, great-circle, tsd, zulutime, rh, and airport. For help with any, ask me about '<function name> help'.";
+    return "My aviation-related functions are metar, conditions, taf, forecast, great-circle, tsd, zulutime, rh, and airport. For help with any, ask me about '<function name> help'.";
 }
 
 #
@@ -139,13 +148,18 @@
 #
 sub metar {
     my $line = shift;
-    if ( $line =~ /^metar\s+(for\s+)?(.*)/i ) {
+    my $parse = shift;
+    print $line;
+    print "\n";
+    if ( $line =~ /metar\s+(for\s+)?(.*)/i or $line =~ /conditions\s+(for\s+)?(.*)/i) {
 
      # ICAO airport codes *can* contain numbers, despite earlier claims.
      # Americans tend to use old FAA three-letter codes; luckily we can
      # *usually* guess what they mean by prepending a 'K'. The author,
      # being Canadian, is similarly lazy.
         my $site_id = uc($2);
+	print $site_id;
+	print "\n";
         $site_id =~ s/[.?!]$//;
         $site_id =~ s/\s+$//g;
         return "'$site_id' doesn't look like a valid ICAO airport identifier."
@@ -155,7 +169,7 @@
         $site_id = "K" . $site_id if length($site_id) == 3;
 
         # HELP isn't an airport, so we use it for a reference work.
-        return "For observations, ask me 'metar <code>'. For information on decoding Aerodrome Weather Observations (METAR), see http://www.avweb.com/weather/metartaf.html"
+        return "For observations, ask me 'metar <code>'. For information on decoding Aerodrome Weather Observations (METAR), see http://www.avweb.com/weather/metartaf.html - or use 'conditions <code>'"
           if $site_id eq 'HELP';
 
         my $metar_url =
@@ -186,7 +200,13 @@
         return "I can't find any observations for $site_id."
           if length($metar) < 10;
 
-        return $metar;
+	if($no_parsing or not $parse){
+          return $metar;
+	} else {
+          my $t = new Geo::TAF;
+	  $t->metar($metar);
+          return $t->as_string;
+	}
     } else {
 
         # malformed
@@ -199,7 +219,8 @@
 #
 sub taf {
     my $line = shift;
-    if ( $line =~ /^taf\s+(for\s+)?(.*)/i ) {
+    my $parse = shift;
+    if ( $line =~ /^taf+\s+(for\s+)?(.*)/i or $line =~ /^forecast+\s+(for\s+)?(.*)/i ) {
 
      # ICAO airport codes *can* contain numbers, despite earlier claims.
      # Americans tend to use old FAA three-letter codes; luckily we can
@@ -215,7 +236,7 @@
         $site_id = "K" . $site_id if length($site_id) == 3;
 
         # HELP isn't an airport, so we use it for a reference work.
-        return "For a forecast, ask me 'taf <ICAO code>'. For information on decoding Terminal Area Forecasts, see http://www.avweb.com/toc/metartaf.html"
+        return "For a forecast, ask me 'taf <ICAO code>'. For information on decoding Terminal Area Forecasts, see http://www.avweb.com/toc/metartaf.html or use 'forecast <ICAO code>'"
           if $site_id eq 'HELP';
 
         my $taf_url =
@@ -254,7 +275,13 @@
         return "I can't find any forecast for $site_id."
           if length($taf) < 10;
 
-        return $taf;
+	if($no_parsing or not $parse){
+          return $taf;
+	} else {
+          my $t = new Geo::TAF;
+	  $t->taf($taf);
+          return $t->as_string;
+	}
     } else {
 
         # malformed