Merge 'beta'; pred.alt graph yaxis scaling +twaeks

fd8d2dd - always first fetch predictions after clean_refresh()
1bfe441 - scale y-axis based on pred.alt as well

Author: rossengeorgiev

js/tracker.js

@@ -86,8 +86,8 @@ var plot_options = {
         mode: "x"
     },
     yaxes: [
-        {show: false, min: 0 },
-        {show: false, min: 0 },
+        {show: false, min: 0, max: 0},
+        {show: false, min: 0, max: 0},
         {show: false, min: 0 },
         {show: false, min: 0 },
         {show: false, min: 0 },
@@ -1048,7 +1048,15 @@ function redrawPrediction(vcallsign) {
     for(var i = 0, ii = data.length; i < ii; i++) {
         latlng = new google.maps.LatLng(data[i].lat, data[i].lon);
         line.push(latlng);
-        graph_data.push([parseInt(data[i].time)*1000, parseInt(data[i].alt)]);
+
+        // pred.alt for graph
+        var alt = parseInt(data[i].alt);
+        graph_data.push([parseInt(data[i].time)*1000, alt]);
+        // adjust y-range
+        if(alt > vehicle.graph_yaxes[0].max) {
+            vehicle.graph_yaxes[0].max = alt;
+            vehicle.graph_yaxes[1].max = vehicle.graph_yaxes[0].max;
+        }
 
         if(parseFloat(data[i].alt) > max_alt) {
             max_alt = parseFloat(data[i].alt);
@@ -2259,6 +2267,8 @@ function refresh() {
     complete: function(request, textStatus) {
         clearTimeout(periodical);
         periodical = setTimeout(refresh, timer_seconds * 1000);
+
+        if(periodical_predictions === null) refreshPredictions();
     }
   });
 }
@@ -2453,7 +2463,8 @@ function initHabitat() {
 }
 
 
-var periodical, periodical_receivers, periodical_predictions;
+var periodical, periodical_receivers;
+var periodical_predictions = null;
 var timer_seconds = 15;
 
 function startAjax() {
@@ -2467,9 +2478,6 @@ function startAjax() {
 
     //periodical_listeners = setInterval(refreshReceivers, 60 * 1000);
     refreshReceivers();
-
-    //periodical_predictions = setInterval(refreshPredictions, 2 * timer_seconds * 1000);
-    refreshPredictions();
 }
 
 function stopAjax() {
@@ -2478,6 +2486,7 @@ function stopAjax() {
     if(ajax_positions) ajax_positions.abort();
 
     clearTimeout(periodical_predictions);
+    periodical_predictions = null;
     if(ajax_predictions) ajax_predictions.abort();
 }