get the location regex right and use it everywhere

[spider.git] / cmd / set / sys_location.pl

diff --git a/cmd/set/sys_location.pl b/cmd/set/sys_location.pl
index 903a5796526e7173074aabae7ed31b1495d8889c..58fb6ae5b5c7467818149f4ae2780f5c8b9e0151 100644 (file)
--- a/cmd/set/sys_location.pl
+++ b/cmd/set/sys_location.pl
@@ -17,7 +17,8 @@ $line =~ s/^\s+//;
 $line =~ s/\s+$//;
 
 return (1, $self->msg('loce1')) if !$line;
-return (1, $self->msg('loce2', $line)) unless $line =~ /\d+ \d+ [NnSs] \d+ \d+ [EeWw]/o;
+return (1, $self->msg('loce3', uc $line)) if is_qra($line);
+return (1, $self->msg('loce2', $line)) unless is_latlong($line);
 
 $user = DXUser->get_current($call);
 if ($user) {
@@ -25,7 +26,7 @@ if ($user) {
        my ($lat, $long) = DXBearing::stoll($line);
        $user->lat($lat);
        $user->long($long);
-       DXProt::broadcast_all_ak1a(DXProt::pc41($call, 3, $line), $DXProt::me);
+       DXChannel::broadcast_all_nodes(DXProt::pc41($call, 3, $line), $main::me);
        if (!$user->qra) {
                my $qra = DXBearing::lltos($lat, $long);
                $user->qra($qra);