projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mark calls like DR4W-HB as invalid
[spider.git]
/
perl
/
DXBearing.pm
diff --git
a/perl/DXBearing.pm
b/perl/DXBearing.pm
index 066826d6983e52cc9d3836c5d3353c8a3fda33de..db6f4686d0a75ed89c32e0c32e28509ae233bb5a 100644
(file)
--- a/
perl/DXBearing.pm
+++ b/
perl/DXBearing.pm
@@
-8,25
+8,19
@@
#
# Copyright (c) 1998 - Dirk Koopman G1TLH
#
#
# Copyright (c) 1998 - Dirk Koopman G1TLH
#
-#
$Id$
+#
#
package DXBearing;
#
package DXBearing;
-use POSIX;
use DXUtil;
use DXUtil;
+use POSIX qw(:math_h);
use strict;
use vars qw($pi);
$pi = 3.14159265358979;
use strict;
use vars qw($pi);
$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,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
# convert a qra locator into lat/long in DEGREES
sub qratoll
{
# convert a qra locator into lat/long in DEGREES
sub qratoll
{
@@
-95,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 $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);
$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);
}
$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
{
# 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';
$longd += ($longm/60);
$longd = 0-$longd if (uc $longl) eq 'W';