added flight duration in the path infobox

Author: rossengeorgiev

js/app.js

@@ -308,6 +308,21 @@ var updateTimebox = function(date) {
     elm.find(".local").text("Local: "+a+'-'+b+'-'+c+' '+e+':'+f+':'+g+" UTC"+((z<0)?"-":"+")+z);
 }
 
+var format_time_friendly = function(start, end) {
+    var dt = Math.floor((end - start) / 1000);
+    if(dt < 0) return null;
+
+    if(dt < 60) return dt + 's';
+    else if(dt < 3600) return Math.floor(dt/60)+'m';
+    else if(dt < 86400) {
+        dt = Math.floor(dt/60);
+        return Math.floor(dt/60)+'h '+(dt % 60)+'m';
+    } else {
+        dt = Math.floor(dt/3600);
+        return Math.floor(dt/24)+'d '+(dt % 24)+'h';
+    }
+}
+
 // runs every second
 var updateTime = function(date) {
     // update timebox
@@ -322,18 +337,8 @@ var updateTime = function(date) {
         elm.each(function(k,v) {
             var e = $(v);
             var ts = e.attr('data-timestamp');
-            var dt = Math.floor((now - ts) / 1000);
-            if(dt < 0) return;
-
-            if(dt < 60) e.text(dt+'s ago'); // less than a minute
-            else if(dt < 3600) e.text(Math.floor(dt/60)+'m ago'); // less than an hour
-            else if(dt < 86400) { // less than a day
-                dt = Math.floor(dt/60);
-                e.text(Math.floor(dt/60)+'h '+(dt % 60)+'m ago');
-            } else {
-                dt = Math.floor(dt/3600); // hours
-                e.text(Math.floor(dt/24)+'d '+(dt % 24)+'h ago');
-            }
+            var str = format_time_friendly(ts, now);
+            if(str) e.text(str + ' ago');
         });
     }
 }

js/tracker.js

@@ -867,7 +867,9 @@ var mapInfoBox_handle_path = function(event) {
         value = Math.round(value/10)/100 + " km";
     }
 
-    mapInfoBox.setContent("<pre><b>Length:</b> " + value + "</pre>");
+    var duration = ("vehicle" in this) ? "\n<b>Duration:</b> " + format_time_friendly(this.vehicle.start_time, convert_time(this.vehicle.curr_position.gps_time)) : '';
+
+    mapInfoBox.setContent("<pre><b>Length:</b> " + value + duration + "</pre>");
     mapInfoBox.setPosition(event.latLng);
     mapInfoBox.open(map);
 }
@@ -1070,7 +1072,8 @@ function addPosition(position) {
                             graph_data_updated: false,
                             graph_data: [],
                             graph_yaxes: [],
-                            updated: false
+                            updated: false,
+                            start_time: 2147483647000
                             };
 
         // deep copy yaxes config for graph
@@ -1193,6 +1196,12 @@ function addPosition(position) {
         vehicle.curr_position = position;
     }
 
+    // record the start of flight
+    var newts = convert_time(vehicle.curr_position.gps_time);
+    if(newts < vehicle.start_time) {
+        vehicle.start_time = newts;
+    }
+
     // record the highest altitude
     if(parseFloat(position.gps_alt) > vehicle.max_alt) {
         vehicle.max_alt = parseFloat(position.gps_alt);