tweaks to telemtry graph

* sparse data is now visiable (data being more than 3 minutes apart)
* hovering over the graph, will also update the day/night overlay with
the specific datetime, if it's turned on (useful for long flights)
* hovering over the graph places a marker on the polyline, the marker
will now be placed on the correct position

Author: rossengeorgiev

cache.manifest

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# version 165
+# version 176
 
 # gogole maps files
 http://maps.google.com/maps/api/js?v=3.10&sensor=false&key=AIzaSyCOqkcNey4CCyG4X0X5qxHAhCgD8g5DwXg

js/plot_config.js

@@ -90,9 +90,8 @@ function updateLegend() {
             } else {
                 y = p1[1] + (p2[1] - p1[1]) * (pos.x - p1[0]) / (p2[0] - p1[0]);
             }
-            y = y.toFixed(2);
 
-            if((p1 && p1[1] == null) || (p2 && p2[1] == null)) y = null;
+            y = ((p1 && p1[1] == null) || (p2 && p2[1] == null)) ? null : y.toFixed(2);
         }
         legend.eq(i).text(series.label.replace(/=.*/, "= " + y));
     }
@@ -117,9 +116,23 @@ function updateLegend() {
 
     if(follow_vehicle != -1 && vehicles[follow_vehicle].positions.length) {
         // adjust index for null data points
-        j = j - vehicles[follow_vehicle].graph_data[0].nulls;
+        var null_count = 0;
+        var data_ref = vehicles[follow_vehicle].graph_data[0];
+
+        if(j > data_ref.data.length / 2) {
+            for(var i = data_ref.data.length - 1; i > j; i--) null_count += (data_ref.data[i][1] == null) ? 1 : 0;
+            null_count = data_ref.nulls - null_count * 2;
+        } else {
+            for(var i = 0; i < j; i++) null_count += (data_ref.data[i][1] == null) ? 1 : 0;
+            null_count *= 2;
+        }
+
         // update position
-        polyMarker.setPosition(vehicles[follow_vehicle].positions[j]);
+        polyMarker.setPosition(vehicles[follow_vehicle].positions[j - null_count]);
+
+        // adjust nite overlay
+        nite.setDate(new Date(data_ref.data[j][0]));
+        nite.refresh();
     }
 }
 

js/tracker.js

@@ -776,7 +776,7 @@ function addPosition(position) {
 
             vehicle_info.image_src = host_url + markers_url + "hab_nyan.gif";
 
-            // whats nyan only purpose? Make people happy, of course. And how? 
+            // whats nyan only purpose? Make people happy, of course. And how?
             var rainbow = ["#ff0000", "#fc9a00", "#f6ff00", "#38ff01", "#009aff","#0000ff"];
             vehicle_info.polyline = [];
 
@@ -869,7 +869,13 @@ function updateGraph(idx, reset_selection) {
 
     if(polyMarker) polyMarker.setPosition(null);
 
-    if(reset_selection) delete plot_options.xaxis;
+    if(reset_selection) {
+        delete plot_options.xaxis;
+
+        // reset nite overlay
+        nite.setDate(null);
+        nite.refresh();
+    }
 
     // replot graph, with this vehicle data, and this vehicles yaxes config
     plot = $.plot(plot_holder, vehicles[idx].graph_data, $.extend(false, plot_options, {yaxes:vehicles[idx].graph_yaxes}));
@@ -889,9 +895,15 @@ function graphAddLastPosition(idx) {
         var ts_last_idx = data[0].data.length - 1;
         var ts_last = data[0].data[ts_last_idx][0];
 
-        //insert gap when there are 2mins, or more, without telemetry
-        if(ts_last + 120000 < ts) {
-            $.each(data, function(k,v) { v.data.push([ts_last+1, null]); v.nulls += 1; })
+        //insert gap when there are 3mins, or more, without telemetry
+        var gap_size = 180000; // 3 mins in milis
+
+        if(ts_last + gap_size < ts) {
+            $.each(data, function(k,v) {
+                v.data.push([ts_last+gap_size, v.data[v.data.length - 1][1]]);
+                v.data.push([ts_last+gap_size+1, null]);
+                v.nulls += 2;
+            })
         }
 
         // update the selection upper limit to the latest timestamp, only if the upper limit is equal to the last timestamp
@@ -929,6 +941,7 @@ function graphAddLastPosition(idx) {
                         label: k + " = 0",
                         key: k,
                         yaxis: i + 1,
+                        nulls: 0,
                         data: []
                       };