do not count segment jumps in track length and duration

diff --git a/js/map.js b/js/map.js
index f9ce632f83c9ecdb2d497bc159b16025a52d0177..f6b9d86200761cff1e12d65afb1d2b0f9bc661ea 100644 (file)
--- a/js/map.js
+++ b/js/map.js
@@ -745,7 +745,9 @@ function calcTrackDuration() {
   var tDuration = 0;
   if (gTrack.length > 1) {
     for (var i = 1; i < gTrack.length; i++) {
   var tDuration = 0;
   if (gTrack.length > 1) {
     for (var i = 1; i < gTrack.length; i++) {

-      tDuration += (gTrack[i].time - gTrack[i-1].time);
+      if (!gTrack[i].beginSegment) {
+        tDuration += (gTrack[i].time - gTrack[i-1].time);
+      }

     }
   }
   return Math.round(tDuration / 1000); // The timestamps are in ms but we return seconds.
     }
   }
   return Math.round(tDuration / 1000); // The timestamps are in ms but we return seconds.


@@ -756,7 +758,9 @@ function calcTrackLength() {
   var tLength = 0;
   if (gTrack.length > 1) {
     for (var i = 1; i < gTrack.length; i++) {
   var tLength = 0;
   if (gTrack.length > 1) {
     for (var i = 1; i < gTrack.length; i++) {

-      tLength += getPointDistance(gTrack[i-1].coords, gTrack[i].coords);
+      if (!gTrack[i].beginSegment) {
+        tLength += getPointDistance(gTrack[i-1].coords, gTrack[i].coords);
+      }

     }
   }
   return tLength;
     }
   }
   return tLength;

diff --git a/manifest.appcache b/manifest.appcache
index 64cfc967c74fc33cdfd246a2af9839e8e1aa7300..1726e68264d6f9ae16c11f51d09bdbd54cc02d21 100644 (file)
--- a/manifest.appcache
+++ b/manifest.appcache
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
 CACHE MANIFEST
 

-# 2014-11-02
+# 2014-11-06

 index.html
 manifest.webapp
 js/map.js
 index.html
 manifest.webapp
 js/map.js