[ViewVC] Diff of: cvs/AnyEvent-GPSD/GPSD.pm

Comparing AnyEvent-GPSD/GPSD.pm (file contents):
Revision 1.1 by root, Wed Jul 2 04:57:02 2008 UTC vs.
Revision 1.4 by root, Fri Jul 18 01:31:12 2008 UTC

 C<snr> contains the signal strength in decibals (28+ is usually the
 minimum value for a good fix).
 C<fix> contains either C<1> to indicate that this satellite was used for
-the last position fix, C<0> otherwise.  EGNOS/WAAS etc. satellites will
+the last position fix, C<0> otherwise. EGNOS/WAAS etc. satellites will
 always show as C<0>, even if their correction info was used.
+The passed hash references are read-only.
 =item on_fix => $cb->({point})
-Called regularly. The C<{point}> hash contains at least the following
+Called regularly (usually about once/second), even when there is no
-members:
+connection to the GPSD (so is useful to update your idea of the current
+position). The passed hash reference must I<not> be modified in any way.
+If C<mode> is C<2> or C<3>, then the C<{point}> hash contains at least the
+following members, otherwise it is undefined which members exist. Members
+whose values are not known are C<undef> (usually the error values, speed
+and so on).
    time         when this fix was received (s)
    lat          latitude (S -90..90 N)
    lon          longitude (W -180..180 E)
 sub new {
    my $class = shift;
    my $self  = bless {
       @_,
+      interval => 1,
+      fix      => { time => AnyEvent->now, mode => 1 },
    }, $class;
+   $self->interval_timer;
    $self->connect;
    $self
 }
 sub retry {
    my ($self) = @_;
    delete $self->{fh};
+   delete $self->{command};
    Scalar::Util::weaken $self;
    $self->{retry_w} = AnyEvent->timer (after => 1, cb => sub {
       delete $self->{retry_w};
       $self->connect;
    });
+}
+# make sure we send "no fix" updates when we lose connectivity
+sub interval_timer {
+   my ($self) = @_;
+   $self->{interval_w} = AnyEvent->timer (after => $self->{interval}, cb => sub {
+      if (AnyEvent->now - $self->{fix}{time} > $self->{interval} * 1.9) {
+         $self->{fix}{mode} = 1;
+         $self->event (fix => $self->{fix});
+      }
+      $self->interval_timer;
+   });
+   Scalar::Util::weaken $self;
 }
 sub connect {
    my ($self) = @_;
             on_error  => sub {
                $self->event ("error");
                $self->retry;
             },
             on_eof    => sub {
-               $! = &Errno::EBADMSG;
+               $! = &Errno::EPIPE;
                $self->event ("error");
+               $self->log ("disconnect");
                $self->retry;
             },
             on_read   => sub {
                $_[0]{rbuf} =~ s/^([^\015\012]*)\015\012//
                   or return;
          ;
          $self->send ("w");
          $self->send ("o");
          $self->send ("y");
+         $self->send ("c");
          $self->event ("connect");
+         $self->log ("connect");
       } else {
          $self->event ("error");
       }
    };
 sub feed {
    my ($self, $line) = @_;
    $self->{now} = AnyEvent->now;
+   $self->log (raw => $line)
+      if $self->{logfh};
    unless ($line =~ /^GPSD,(.)=(.*)$/) {
       $! = &Errno::EBADMSG;
       $self->event ("error");
       return $self->retry;
    }
    my ($type, $data) = ($1, $2);
+   #warn "$type=$data\n";#d#
    $self->{state}{$type} = [$data => $self->{now}];
    if ($type eq "O") {
       my @data = split /\s+/, $data;
+      my $fix = $self->{fix};
-      my %fix = (time => $self->{now});
+      $fix->{time} = $self->{now};
       if (@data > 3) {
          # the gpsd time is virtually useless as it is truncated :/
-         $fix{$_} = shift @data for qw(tag _time _terr lat lon alt herr verr bearing speed vspeed berr serr vserr mode);
+         for (qw(tag _time _terr lat lon alt herr verr bearing speed vspeed berr serr vserr mode)) {
+            $type = shift @data;
+            $fix->{$_} = $type eq "?" ? undef : $type;
+         }
-         $fix{mode} = 2 if $fix{mode} eq "?"; # arbitrary choice
+         $fix->{mode} = 2 if $fix->{mode} eq "?"; # arbitrary choice
       } else {
-         $fix{mode} = 1;
+         $fix->{mode} = 1;
       }
-      $self->{fix} = \%fix;
-      $self->event (fix => \%fix);
+      $self->event (fix => $fix);
    } elsif ($type eq "Y") {
       my (undef, @sats) = split /:/, $data;
       $self->{satellite_info} = [map {
             fix => $sat[4],
          }
       } @sats];
       $self->event (satellite_update => $self->{satellite_info});
+   } elsif ($type eq "C") {
+      $self->{interval} = $data >= 1 ? $data * 1 : 1;
    }
    # we (wrongly) assume that gpsd responses are always in response
    # to an earlier command
 This returns an estimate of the current position based on the last fix and
 the time passed since then. Useful for interactive applications where you
 want more frequent updates, but not very useful to store, as the next fix
 might well be totally off.
-If the fix is older then C<$max_seconds> (default: C<1.9>) or if no fix is
+If the fix is older then C<$max_seconds> (default: C<1.9> times the update
-available, returns the empty list.
+interval, i.e. usually C<1.9> seconds) or if no fix is available, returns
+the empty list.
 =cut
 sub estimate {
    my ($self, $max) = @_;
-   $max ||= 1.9 unless defined $max;
+   $max ||= 1.9 * $self->{interval} unless defined $max;
    my $geo = $self->{geo_forward} ||= new Geo::Forward;
    my $fix = $self->{fix} or return;
    $fix->{mode} >= 2 or return;
       # if we likely have zero speed, return the point itself
       ($fix->{lat}, $fix->{lon})
    }
 }
+sub log {
+   my ($self, @arg) = @_;
+   syswrite $self->{logfh}, JSON::encode_json ([AnyEvent->time, @arg]) . "\n"
+      if $self->{logfh};
+}
+sub record_log {
+   my ($self, $path) = @_,
+   require JSON;
+   open $self->{logfh}, ">", $path
+      or Carp::croak "$path: $!";
+   $self->log (start => $VERSION);
+}
 =back
 =head1 SEE ALSO
 L<AnyEvent>.

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing AnyEvent-GPSD/GPSD.pm (file contents): Revision 1.1 by root, Wed Jul 2 04:57:02 2008 UTC vs. Revision 1.4 by root, Fri Jul 18 01:31:12 2008 UTC

Diff Legend

Comparing AnyEvent-GPSD/GPSD.pm (file contents):
Revision 1.1 by root, Wed Jul 2 04:57:02 2008 UTC vs.
Revision 1.4 by root, Fri Jul 18 01:31:12 2008 UTC