projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added cgi_weather
[spider.git]
/
perl
/
DXBearing.pm
diff --git
a/perl/DXBearing.pm
b/perl/DXBearing.pm
index a2eaeba59f9828b8babbda95fb44475d94a36f43..e7736f8a138d64a367865bce605631389f96f861 100644
(file)
--- a/
perl/DXBearing.pm
+++ b/
perl/DXBearing.pm
@@
-21,6
+21,12
@@
use vars qw($pi);
$pi = 3.14159265358979;
$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
{
@@
-78,13
+84,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
@@
-111,7
+110,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';