X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXBearing.pm;h=db6f4686d0a75ed89c32e0c32e28509ae233bb5a;hb=refs%2Fheads%2Fstaging;hp=acf90fa3323dfee9666dbf1a47f237d67541e99c;hpb=78cf2dcb9be8128af7f8dc5ae37540c9c53c6057;p=spider.git

diff --git a/perl/DXBearing.pm b/perl/DXBearing.pm
index acf90fa3..db6f4686 100644
--- a/perl/DXBearing.pm
+++ b/perl/DXBearing.pm
@@ -8,13 +8,13 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package DXBearing;
 
-use POSIX;
 use DXUtil;
+use POSIX qw(:math_h);
 
 use strict;
 use vars qw($pi);
@@ -89,22 +89,36 @@ 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;
 	return (rd($az), $dx);
 }
 
+# just the distance - parameters as above
+sub distance
+{
+	my $hn = dr(shift);
+	my $he = dr(shift);
+	my $n = dr(shift);
+	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 = $co ? atan(abs(sqrt(1-$co*$co)/$co)) : $pi;
+	$ca = $pi-$ca if $co < 0;
+	my $dx = 6367*$ca;
+}
+
 # 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';