projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix lack of warnins.pm in 5.005004
[spider.git]
/
perl
/
DXBearing.pm
diff --git
a/perl/DXBearing.pm
b/perl/DXBearing.pm
index a2eaeba59f9828b8babbda95fb44475d94a36f43..637a6aa889642b33d3a04c3b62656312b3f9e4c2 100644
(file)
--- a/
perl/DXBearing.pm
+++ b/
perl/DXBearing.pm
@@
-13,8
+13,8
@@
package DXBearing;
package DXBearing;
-use POSIX;
use DXUtil;
use DXUtil;
+use POSIX qw(:math_h);
use strict;
use vars qw($pi);
use strict;
use vars qw($pi);
@@
-78,13
+78,6
@@
sub dr
return ($n / 180) * $pi;
}
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
# calc bearing and distance, with arguments in DEGREES
# home lat/long -> lat/long
# returns bearing (in DEGREES) & distance in KM
@@
-96,12
+89,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 $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;
$az = $pi - $az if $co < 0;
$az = -$az if $si < 0;
$az = $az+2*$pi if $az < 0;
@@
-111,7
+104,7
@@
sub bdist
# 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) =
split /\s+/, shift
;
+ 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';