X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXBearing.pm;h=e3aac65e9ffee4ae8b18ae308104fcc7b9601769;hb=9b47e7023d41616a9efa885ef9338277dc2ab851;hp=e2c45e30cad82cb6358b34df06e23fa2f62a0bc3;hpb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;p=spider.git

diff --git a/perl/DXBearing.pm b/perl/DXBearing.pm
index e2c45e30..e3aac65e 100644
--- a/perl/DXBearing.pm
+++ b/perl/DXBearing.pm
@@ -13,8 +13,8 @@
 
 package DXBearing;
 
-use POSIX;
 use DXUtil;
+use POSIX qw(:math_h);
 
 use strict;
 use vars qw($pi);
@@ -23,7 +23,7 @@ $pi = 3.14159265358979;
 
 use vars qw($VERSION $BRANCH);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -95,12 +95,12 @@ sub bdist
 	my $e = dr(shift);
 	return (0, 0) if $hn == $n && $he == $e;
 	my $co = cos($he-$e)*cos($hn)*cos($n)+sin($hn)*sin($n);
-	my $ca = atan(abs(sqrt(1-$co*$co)/$co));
+	my $ca = $co ? atan(abs(sqrt(1-$co*$co)/$co)) : $pi;
 	$ca = $pi-$ca if $co < 0;
 	my $dx = 6367*$ca;
 	my $si = sin($e-$he)*cos($n)*cos($hn);
 	$co = sin($n)-sin($hn)*cos($ca);
-	my $az = atan(abs($si/$co));
+	my $az = $co ? atan(abs($si/$co)) : $pi;
 	$az = $pi - $az if $co < 0;
 	$az = -$az if $si < 0;
 	$az = $az+2*$pi if $az < 0;
@@ -110,7 +110,7 @@ sub bdist
 # turn a lat long string into floating point lat and long
 sub stoll
 {
-	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])/;
+	my ($latd, $latm, $latl, $longd, $longm, $longl) = $_[0] =~ /(\d{1,2})\s+(\d{1,2})\s*([NnSs])\s+(1?\d{1,2})\s+(\d{1,2})\s*([EeWw])/;
 	
 	$longd += ($longm/60);
 	$longd = 0-$longd if (uc $longl) eq 'W';