Bug #27513 for Geo-WeatherNWS: Geo-WeatherNWS returns wrong (?) station code

Hi Marc, I did some more hacking around, and changed / fixed some regex, and added now 7 new vars, and finally prepared for a new release which I want to propose: - Fixed servername, fixed code var setting - added full date to obs var for http request - added vars windspeedkmh, windgustkmh, year, month, hour, minute, time_sep Here are the old samples which show now that the 'code' and 'station' vars are equal: http://svwe10.itex.at/perldemo/getweather.pl?station=yssy&debug=1 http://svwe10.itex.at/perldemo/getweather.pl?station=lowg&debug=1 that are samples for ICAO codes containing numbers: http://svwe10.itex.at/perldemo/getweather.pl?station=k3a1&debug=1 http://svwe10.itex.at/perldemo/getweather.pl?station=k9f2&debug=1 Here's my latest patch which includes also the patch to correct the new servername (#27515): --- WeatherNWS.pm.orig Mon Feb 10 03:57:32 2003 +++ WeatherNWS.pm Wed Jun 13 17:19:14 2007 @@ -6,6 +6,9 @@ # # Last Modified: 18 December 2001 - Prepared for CPAN - Marc Slagle # 24 February 2002 - Adding server/error code - Marc +# 13 June 2007 - Fixed servername, fixed code var setting +# - added vars year, month, hour, minute, +# time_sep, windspeedkmh, windgustkmh # #------------------------------------------------------------------------------ @@ -24,7 +27,7 @@ # Version #------------------------------------------------------------------------------ -our $VERSION = '1.03'; +our $VERSION = '1.04'; #------------------------------------------------------------------------------ # Lets create a new self @@ -36,7 +39,7 @@ my $Class=ref($Proto) || $Proto; my $Self={}; - $Self->{servername}="weather.noaa.gov"; + $Self->{servername}="tgftp.nws.noaa.gov"; $Self->{username}="anonymous"; $Self->{password}='weather@cpan.org'; $Self->{directory}="/data/observations/metar/stations"; @@ -123,7 +126,7 @@ { use LWP::UserAgent; my $Ua=LWP::UserAgent->new(); - $Ua->agent("Geo::WeatherNWS 1.03"); + $Ua->agent("Geo::WeatherNWS $VERSION"); my $Req=HTTP::Request->new(GET => "$Self->{http}"); $Req->content_type('application/x-www-form-urlencoded'); @@ -134,9 +137,13 @@ my @Lines=split(/\n/,$Res->content); foreach my $Line (@Lines) { - if ($Line =~ /^([A-Z][A-Z][A-Z][A-Z])/) + if ($Line =~ /^([0-9]{4}\/[0-9]{2}\/[0-9]{2}) [0-9]{2}:[0-9]{2}/) { - $Self->{obs}=$Line; + $Self->{obs}="$1 "; + } + if ($Line =~ /^[A-Z][A-Z0-9]{3} /) + { + $Self->{obs}.=$Line; last; } } @@ -265,20 +272,34 @@ foreach $Line (@Splitter) { - if (($Line =~ /^([A-Z][A-Z][A-Z][A-Z])/) && ($Line ne "AUTO")) + if (($Line =~ /^[A-Z][A-Z0-9]{3}$/) && ($Line ne "AUTO")) { - $Self->{code}="$Line"; + if (!$Self->{code}) { + $Self->{code}="$Line"; + } } #------------------------------------------------------------------------------ # Report Time #------------------------------------------------------------------------------ - elsif ($Line =~ /([0-9]Z)$/) + elsif ($Line =~ /([0-9]{2})([0-9]{2})([0-9]{2})Z$/) + { + $Self->{day}="$1"; + $Self->{hour}="$2"; + $Self->{minute}="$3"; + $Self->{time}="$2$3"; + $Self->{time_sep}="$2:$3"; + } + +#------------------------------------------------------------------------------ +# Report Date +#------------------------------------------------------------------------------ + + elsif ($Line =~ /^([0-9]{4})\/([0-9]{2})\/([0-9]{2})$/) { - my $Timez=substr($Line,2,4); - $Self->{time}="$Timez"; - $Self->{day}=substr($Line,0,2); + $Self->{year}="$1"; + $Self->{month}="$2"; } #------------------------------------------------------------------------------ @@ -362,13 +383,17 @@ } my $MPH=int($Windspeedkts/0.868391); + my $KMH=int($Windspeedkts*1.851984); my $GMPH=int($Windgustkts/0.868391); + my $GKMH=int($Windgustkts*1.851984); $Self->{windspeedkts}=$Windspeedkts; $Self->{windgustkts}=$Windgustkts; $Self->{windspeedkts}=$Self->{windspeedkts}-0; $Self->{windspeedmph}=$MPH; + $Self->{windspeedkmh}=$KMH; $Self->{windgustmph}=$GMPH; + $Self->{windgustkmh}=$GKMH; $Self->{winddirtext}=$Winddirtxt; $Self->{winddir}=$Winddir; $Self->{winddir}=$Self->{winddir}-0; @@ -902,6 +927,15 @@ =head1 DESCRIPTION + New for version 1.04: the regex was changed to enable also ICAO codes which + contain numbers. In addition the $Report{code} var now always gets set with + the first ICAO code returned; previous versions picked up codes at the end + of the ob line, and even 5-character codes which was wrong. + Added seven new vars: windspeedkmh, windgustkmh, year, month, hour, minute, + and time_sep which returns the time separated with a colon. + Also the returned obs from ftp and http request are now equal - with previous + version the full date was missing with http. + New for version 1.03: the getreporthttp call now calls the script on the weather.noaa.gov site for those who cant FTP through firewalls. @@ -940,7 +974,7 @@ you end up having to re-code your parsing program. With the weather module, all you need is a four-letter station code to get the most recent weather observations. If you do not know what the station code is for your area, - check the site at http://205.156.54.206/oso/siteloc.shtml to start your + check the site at https://pilotweb.nas.faa.gov/qryhtml/icao/ to start your search. Since this module uses the NWS METAR Observations, you can get weather @@ -1006,10 +1040,12 @@ These are the returned values specific to wind: + $Report->{windspeedkmh} # Wind Speed (in kmh) $Report->{windspeedmph} # Wind Speed (in mph) $Report->{windspeedkts} # Wind Speed (in kts) $Report->{winddir} # Wind Direction (in degrees) $Report->{winddirtext} # Wind Direction (text version) + $Report->{windgustkmh} # Wind Gusts (kmh) $Report->{windgustmph} # Wind Gusts (mph) $Report->{windgustkts} # Wind Gusts (kts) attached a tar.gz archive which contains everything... thanks, Guenter.