X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fqra.pl;h=6269a0d57093336783d9ce9004bf12b84e2f4aab;hb=9cac31473878fc88778cb13d843fa77c5fd33d65;hp=8e91cf5fcda534a3c6855aac2eb326ea442f05f3;hpb=e853e515f070fdf091235fdd7428c760d2b5bb86;p=spider.git

diff --git a/cmd/show/qra.pl b/cmd/show/qra.pl
index 8e91cf5f..6269a0d5 100644
--- a/cmd/show/qra.pl
+++ b/cmd/show/qra.pl
@@ -1,33 +1,61 @@
 #
-# show the distance and bearing each QRA locator
+# show the distance and bearing to a  QRA locator
+#
+# you can enter two qra locators and it will calc the distance between them
 #
 # $Id$
 #
 
 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) {
 	push @out, $self->msg('heade1');
-	$lat = $main::mylat;
-	$long = $main::mylong;
+	$lat = $main::mylatitude;
+	$long = $main::mylongitude;
 }
 
-foreach $l (@list) {
-	# locators --->
-	if (DXBearing::is_qra($l) || $l =~ /^[A-Za-z][A-Za-z]\d\d$/) {
-		my $qra = uc $l;
-		$qra .= 'MM' if $l =~ /^[A-Za-z][A-Za-z]\d\d$/;
-		
-		my ($qlat, $qlong) = DXBearing::qratoll($qra);
-		my ($b, $dx) = DXBearing::bdist($lat, $long, $qlat, $qlong);
-		my ($r, $rdx) = DXBearing::bdist($qlat, $qlong, $lat, $long);
-		push @out, sprintf "%-9s Bearing: %.0f Recip: %.0f %.0fKm %.0fMi", $qra, $b, $r, $dx, $dx * 0.62133785;
-	}
+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;
+
+# convert a lat/long into a qra locator
+if ($ll) {
+	my ($llat, $llong) = DXBearing::stoll($line);
+	return (1, "QRA $line = " . DXBearing::lltoqra($llat, $llong)); 
 }
 
+unshift @list, $self->user->qra if @list == 1 && $self->user->qra;
+unshift @list, DXBearing::lltoqra($lat, $long) unless @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$/);
+
+my $l = uc $list[1];
+
+$fll = DXBearing::lltos($lat, $long);
+my ($qlat, $qlong) = DXBearing::qratoll($l);
+$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 = '';
+
+$to = "->\U$list[1]($tll)" if $f;
+my $from = "\U$list[0]($fll)" ;
+
+push @out, sprintf "$from$to To: %.0f Fr: %.0f Dst: %.0fMi %.0fKm", $b, $r, $dx * 0.62133785, $dx;
+
 return (1, @out);