fixed sh/qra so that it shows the correct lat/long

[spider.git] / cmd / show / qra.pl

diff --git a/cmd/show/qra.pl b/cmd/show/qra.pl
index fe3f08abc59d555918a2dcf826816bb17aa9ac95..6269a0d57093336783d9ce9004bf12b84e2f4aab 100644 (file)
--- a/cmd/show/qra.pl
+++ b/cmd/show/qra.pl
@@ -8,9 +8,11 @@
 
 my ($self, $line) = @_;
 my @list = split /\s+/, $line;               # generate a list of callsigns
+return (1, $self->msg('qrashe1')) unless @list > 0;
 
-my $l;
 my @out;
+my $fll;
+my $tll;
 my $lat = $self->user->lat;
 my $long = $self->user->long;
 if (!$long && !$lat) {
@@ -19,33 +21,41 @@ if (!$long && !$lat) {
        $long = $main::mylongitude;
 }
 
-return (1, $self->msg('qrashe1')) unless @list > 0;
-return (1, $self->msg('qrae2')) unless (DXBearing::is_qra($list[0]) || $list[0] =~ /^[A-Za-z][A-Za-z]\d\d$/);
+my $fqra = DXBearing::is_qra($list[0]);
+my $sqra = $list[0] =~ /^[A-Za-z][A-Za-z]\d\d$/;
+my $ll = $line =~ /^\d+\s+\d+\s*[NSns]\s+\d+\s+\d+\s*[EWew]/;
+return (1, $self->msg('qrae2', $list[0])) unless $fqra || $sqra || $ll;
 
-#print "$lat $long\n";
+# convert a lat/long into a qra locator
+if ($ll) {
+       my ($llat, $llong) = DXBearing::stoll($line);
+       return (1, "QRA $line = " . DXBearing::lltoqra($llat, $llong)); 
+}
 
-my $l = uc $list[0];
-my $f;
+unshift @list, $self->user->qra if @list == 1 && $self->user->qra;
+unshift @list, DXBearing::lltoqra($lat, $long) unless @list > 1;
 
-if (@list > 1) {
-       $f = $l;
-       $f .= 'MM' if $f =~ /^[A-Z][A-Z]\d\d$/;
-       ($lat, $long) = DXBearing::qratoll($f);
-    #print "$lat $long\n";
-       
-       return (1, $self->msg('qrae2')) unless (DXBearing::is_qra($list[1]) || $list[1] =~ /^[A-Za-z][A-Za-z]\d\d$/);
-       $l = uc $list[1];
-}
+my $f = uc $list[0];
+$f .= 'MM' if $f =~ /^[A-Z][A-Z]\d\d$/;
+($lat, $long) = DXBearing::qratoll($f);
+return (1, $self->msg('qrae2', $list[1])) unless (DXBearing::is_qra($list[1]) || $list[1] =~ /^[A-Za-z][A-Za-z]\d\d$/);
 
-$l .= 'MM' if $l =~ /^[A-Z][A-Z]\d\d$/;
-               
+my $l = uc $list[1];
+
+$fll = DXBearing::lltos($lat, $long);
 my ($qlat, $qlong) = DXBearing::qratoll($l);
-#print "$qlat $qlong\n";
+$tll = DXBearing::lltos($qlat, $qlong);
+
+$tll =~ s/\s+([NSEW])/$1/g;
+$fll =~ s/\s+([NSEW])/$1/g;
+
 my ($b, $dx) = DXBearing::bdist($lat, $long, $qlat, $qlong);
 my ($r, $rdx) = DXBearing::bdist($qlat, $qlong, $lat, $long);
-my $to = " -> $list[1]" if $f;
-my $from = $list[0];
+my $to = '';
+
+$to = "->\U$list[1]($tll)" if $f;
+my $from = "\U$list[0]($fll)" ;
 
-push @out, sprintf "$list[0]$to Bearing: %.0f Deg. Recip: %.0f Deg. %.0fMi. %.0fKm.", $b, $r, $dx * 0.62133785, $dx;
+push @out, sprintf "$from$to To: %.0f Fr: %.0f Dst: %.0fMi %.0fKm", $b, $r, $dx * 0.62133785, $dx;
 
 return (1, @out);