X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXBearing.pm;h=acf90fa3323dfee9666dbf1a47f237d67541e99c;hb=78cf2dcb9be8128af7f8dc5ae37540c9c53c6057;hp=a2eaeba59f9828b8babbda95fb44475d94a36f43;hpb=cc75f4ffe229e8ff381828f88a68c89cec818788;p=spider.git

diff --git a/perl/DXBearing.pm b/perl/DXBearing.pm
index a2eaeba5..acf90fa3 100644
--- a/perl/DXBearing.pm
+++ b/perl/DXBearing.pm
@@ -78,13 +78,6 @@ sub dr
 	return ($n / 180) * $pi;
 }
 
-# does it look like a qra locator?
-sub is_qra
-{
-	my $qra = shift;
-	return $qra =~ /^[A-Za-z][A-Za-z]\d\d[A-Za-z][A-Za-z]$/o;
-}
-
 # calc bearing and distance, with arguments in DEGREES
 # home lat/long -> lat/long
 # returns bearing (in DEGREES) & distance in KM
@@ -111,7 +104,7 @@ sub bdist
 # turn a lat long string into floating point lat and long
 sub stoll
 {
-	my ($latd, $latm, $latl, $longd, $longm, $longl) = split /\s+/, shift;
+	my ($latd, $latm, $latl, $longd, $longm, $longl) = $_[0] =~ /(\d{1,2})\s+(\d{1,2})\s*([NnSs])\s+(\d{1,2})\s+(\d{1,2})\s*([EeWw])/;
 	
 	$longd += ($longm/60);
 	$longd = 0-$longd if (uc $longl) eq 'W';