branches/gpst.near/xgraph-fix.patch

   1 Index: tests/run-tests.pl
   2 ===================================================================
   3 --- tests/run-tests.pl  (revision 1817)
   4 +++ tests/run-tests.pl  (working copy)
   5 @@ -56,6 +56,29 @@
   6  $Opt{'help'} && usage(0);
   7  $Opt{'version'} && print_version();
   8
   9 +testcmd("../gpst -o xgraph multitrack.gpx", # {{{
  10 +    <<END,
  11 +-0.1448208 51.4968987
  12 +-0.1448824 51.4968266
  13 +-0.1449938 51.4968227
  14 +-0.1453202 51.4969040
  15 +move -0.1453398 51.4969214
  16 +-0.1455514 51.4969816
  17 +-0.1457489 51.4970224
  18 +-0.1457804 51.4970452
  19 +move -0.1458608 51.4970680
  20 +-0.1460047 51.4971658
  21 +-0.1461614 51.4972469
  22 +move -0.1462394 51.4972731
  23 +-0.1463232 51.4973437
  24 +-0.1462949 51.4973337
  25 +-0.1462825 51.4973218
  26 +-0.1462732 51.4973145
  27 +END
  28 +);
  29 +
  30 +# }}}
  31 +
  32  diag("Testing XML routines...");
  33
  34  # txt_to_xml() and xml_to_txt() {{{
  35 Index: GPST.pm
  36 ===================================================================
  37 --- GPST.pm     (revision 1817)
  38 +++ GPST.pm     (working copy)
  39 @@ -115,6 +115,10 @@
  40                  );
  41              }
  42              # }}}
  43 +        } elsif($Dat{'format'} eq "xgraph") {
  44 +            if (length($Dat{'lat'}) && length($Dat{'lon'})) {
  45 +                $Retval .= "$Dat{'lon'}\t$Dat{'lat'}";
  46 +            }
  47          }
  48      }
  49      return $Retval;
  50 Index: gpst
  51 ===================================================================
  52 --- gpst        (revision 1817)
  53 +++ gpst        (working copy)
  54 @@ -519,7 +519,7 @@
  55              } elsif (/^xmaplog /) {
  56                  ($Opt{'output-format'} eq "csv")
  57                      && ($Opt{'save-to-file'} eq "\n")
  58 -                    && print("\n");
  59 +                    && ($found_move = 1);
  60              } elsif (/^$/) {
  61                  ($Opt{'output-format'} eq "csv")
  62                      && ($Opt{'save-to-file'} eq "\n")
  63 @@ -870,7 +870,7 @@
  64                  $Line .= sprintf("<pause>%s</pause>\n",
  65                                   sec_to_readable($ep_time-$last_time));
  66              } elsif ($Opt{'output-format'} eq "csv") {
  67 -                $Line .= sprintf("# Pause: %s\n# move\n",
  68 +                $Line .= sprintf("# Pause: %s\n",
  69                                   sec_to_readable($ep_time-$last_time));
  70              }
  71          }
  72 @@ -896,8 +896,10 @@
  73                                   $1);
  74              }
  75          } elsif ($Opt{'output-format'} eq "xgraph") {
  76 -            $pause_len && ($Line .= "move ");
  77 -            ($Line .= "$Dat{'lon'} $Dat{'lat'}\n");
  78 +            if ($print_pos) {
  79 +                $pause_len && ($Line .= "move ");
  80 +                ($Line .= "$Dat{'lon'} $Dat{'lat'}\n");
  81 +            }
  82          } elsif($Opt{'output-format'} eq "gpstrans") {
  83              my ($gpt_lat, $gpt_lon) =
  84                 (ddd_to_dms($Dat{'lat'}), ddd_to_dms($Dat{'lon'}));
  85 @@ -976,8 +978,8 @@
  86              if ($Opt{'output-format'} eq "gpsml") {
  87                  $Line = "<break/>\n$Line";
  88              }
  89 -            (!$pause_len && ($Opt{'output-format'} eq "xgraph"))
  90 -                && ($Line .= "move $Line");
  91 +            # (!$pause_len && ($Opt{'output-format'} eq "xgraph"))
  92 +                # && ($Line .= "move $Line");
  93              ($Opt{'output-format'} eq "clean") && ($Line .= "\n");
  94              if ($Opt{'output-format'} eq "gpx") {
  95                  $Line .= "$Spc$Spc$Spc$Spc</trkseg>\n" .