Merge branch 'beta', pred.alt + query mode fixes

fcfa587 - fix pred.alt. not showing on clipped graphs
5bf3d63 - invalid qm and empty query reset qmode

Author: rossengeorgiev

js/app.js

@@ -121,6 +121,7 @@ function load_hash(no_refresh) {
                 break;
             case "qm":
                 def.mode = v.replace(/_/g, ' ');
+                if(modeList.indexOf(def.mode) == -1) def.mode = (is_mobile) ? modeDefaultMobile : modeDefault;
                 break;
             case "q":
                 def.query = v;
@@ -1011,11 +1012,14 @@ $(window).ready(function() {
 
        if(text === wvar.query) return;
 
+       // when running an empty search, it's probably best to reset the query mode
+
        wvar.query = text;
        stopFollow();
        zoomed_in = false;
        wvar.zoom = true;
 
+       if(text === "") { wvar.mode = null; }
        clean_refresh(wvar.mode, true);
    });
 });

js/gmaps_extentions.js

@@ -175,6 +175,10 @@ google.maps.DropDownControl.prototype.setVisible = function(isVisible) {
     this.div_.style.display = (isVisible) ? 'block' : 'none';
 };
 
+google.maps.DropDownControl.prototype.select = function(text) {
+    this.header.innerHTML = (this.options.headerPrefix || "") + text;
+};
+
 // simple status control
 
 google.maps.StatusTextControl = function(options) {

js/tracker.js

@@ -331,7 +331,12 @@ function clean_refresh(text, force) {
     if(ajax_inprogress) return false;
 
     stopAjax();
+
+    // reset mode if, invalid mode is specified
+    if(modeList.indexOf(text) == -1) text = (is_mobile) ? modeDefaultMobile : modeDefault;
+
     wvar.mode = text;
+    tmpC.select(text);
 
     position_id = 0;
 
@@ -1916,20 +1921,22 @@ function updateGraph(vcallsign, reset_selection) {
         updateTimebox(new Date());
     }
 
-    if(vcallsign === null) return;
+    if(vcallsign === null || !vehicles.hasOwnProperty(vcallsign)) return;
 
     var series = vehicles[vcallsign].graph_data;
 
     // if we are drawing the plot for the fisrt time
     // and the dataset is too large, we set an initial selection of the last 7 days
     if(!plot_options.hasOwnProperty('xaxis')) {
         if(series.length && series[0].data.length > 4001) {
-            var end = series[0].data.length - 1;
+            var last = series[0].data.length - 1;
+            var end_a = series[0].data[last][0];
+            var end_b = (series[1].data.length) ? series[1].data[series[1].data.length - 1][0] : 0;
 
             plot_options.xaxis = {
                 superzoom: 1,
-                min: series[0].data[end-4000][0],
-                max: series[0].data[end][0],
+                min: series[0].data[last-4000][0],
+                max: Math.max(end_a, end_b),
             };
 
         }
@@ -2638,7 +2645,9 @@ function update(response) {
         end: function(ctx) {
 
           // update graph is current vehicles is followed
-          if(follow_vehicle !== null && vehicles[follow_vehicle].graph_data_updated) updateGraph(follow_vehicle, false);
+          if(follow_vehicle !== null &&
+             vehicles.hasOwnProperty(follow_vehicle) &&
+             vehicles[follow_vehicle].graph_data_updated) updateGraph(follow_vehicle, false);
 
           // store in localStorage
           offline.set('positions', ctx.lastPositions);