Update and fix preview plots for data ordering

content/js/data_download.js

@@ -291,8 +291,10 @@ var update_previews = function(){
 
     if ($('#last_x_days').is(':checked')) {
         var timeRangeInfo = '-' + 24 * Number(val_or_place('#x_days')) + ':00:00';
-        if(met)met.displayRecent(timeRangeInfo);
-        if(buoy)buoy.displayRecent(timeRangeInfo);
+        if (met)
+            met.displayRecent(timeRangeInfo);
+        if (buoy)
+            buoy.displayRecent(timeRangeInfo);
     } else if ($('#date_range').is(':checked')) {
         var start = $('#Start-date-picker').val().split(' ').join('T')+':00';
         var end = $('#End-date-picker').val().split(' ').join('T')+':00';

content/js/meteorogram/controller.js

@@ -65,11 +65,13 @@ function API(div, controlDiv, plotsInfo) {
             myDispatcher.dispatch({status: ('hide' + varName), 'emit': 'checkboxEmitter','location':this.div});
         },
 
-        displayRecent: function(start_time) {
+        displayRecent: function(start_time, interval) {
+            // interval, if not provided, will be determined based on start time
             myDispatcher.dispatch({
                 'status': 'get_since_now',
                 'emit': 'plotEmitter',
                 'time': start_time,
+                'interval': interval
             });
         },
 

content/js/meteorogram/dispatcher.js

@@ -81,6 +81,7 @@ function getDispatcher() {
                     this.emit(
                         action.status,
                         action.time,
+                        action.interval,
                         this.plotsInfo,
                         this.div);
                 }else if (action.status == 'update_table') {
@@ -178,9 +179,9 @@ function getDispatcher() {
         Plot.initPlot(div, plotOrder, plotsInfo);
     });
 
-    plotEmitter.on("get_since_now",function(time, plotsInfo, div){
+    plotEmitter.on("get_since_now", function(time, interval, plotsInfo, div) {
         var interval = dataAccess.requestPlotUpdate(div, plotsInfo, time,
-            undefined, undefined, undefined, stopUpdate);
+            undefined, interval, undefined, stopUpdate);
         startUpdate(time, interval, plotsInfo);
     });
 

content/js/meteorogram/plot/data.js

@@ -62,10 +62,11 @@ function plotting(url, var_names, plotsInfo, div, update, err_callback) {
                         console.info("No new data downloaded");
                         return;
                     } else {
-                        dates = dates.slice(startIndex);
                         for (var i = 0; i < var_names.length; i++) {
                             dataObj[var_names[i]] = allData[var_names[i]].slice(startIndex);
                         }
+                        dates = dates.slice(startIndex);
+                        dataObj.dates = dates;
                     }
                 } else {
                     // replace the entire data array

content/js/meteorogram/plot/update.js

@@ -21,8 +21,9 @@ function replaceData(graphDiv, plotsInfo, dataObj, update) {
     var plotName;
     var plotInfo;
     var trace_anc_data;
-    var ancHandled = [];
+    // var ancHandled = [];
     var plotHandled = [];
+    var dataObjUpdated = [];
     var updateChanges = {
         x: [],
         y: [],
@@ -45,35 +46,44 @@ function replaceData(graphDiv, plotsInfo, dataObj, update) {
                     // update the Z data instead of the traditional 'y' data
                     // assumes Y doesn't update between calls
                     _.each(elem.var_names, function (var_name, var_index) {
+                        if (! dataObjUpdated.includes(var_name)) {
                             _.each(dataObj[var_name], function (data_elem) {
                                 graphDiv.data[traceIndex + index]['z'][var_index].shift();
                                 graphDiv.data[traceIndex + index]['z'][var_index].push(data_elem);
                             });
                             dataObj[var_name] = graphDiv.data[traceIndex + index]['z'][var_index];
+                            dataObjUpdated.push(var_name);
+                        }
                     });
                 } else {
                     // scatter plots, assume the y data is the data being updated
                     _.each(elem.var_names, function (var_name) {
+                        if (! dataObjUpdated.includes(var_name)) {
                             _.each(dataObj[var_name], function (data_elem) {
                                 graphDiv.data[traceIndex + index]['y'].shift();
                                 graphDiv.data[traceIndex + index]['y'].push(data_elem);
                             });
                             // hold on to the array to create probe text
                             dataObj[var_name] = graphDiv.data[traceIndex + index]['y'];
+                            dataObjUpdated.push(var_name);
+                        }
                     });
 
                     trace_anc_data = graphDiv.data[traceIndex + index]['anc_data'];
                     _.each(elem.anc_variables, function (anc_name, anc_index) {
-                        if (ancHandled.includes(anc_name)) {
-                            trace_anc_data[anc_index] = dataObj[anc_name];
-                            return;
-                        }
+                        // make sure we have any ancillary data updated
+                        // but don't write it to the graphDiv "cache", will
+                        // do that in the next large block of code
+                        // yes, we are modifying this data in place, but we'll
+                        // overwrite it later
+                        if (! dataObjUpdated.includes(anc_name)) {
                             _.each(dataObj[anc_name], function (data_elem) {
                                 trace_anc_data[anc_index].shift();
                                 trace_anc_data[anc_index].push(data_elem);
                             });
-                        dataObj[anc_name] = graphDiv.data[traceIndex + index]['anc_data'][anc_index];
-                        ancHandled.push(anc_name);
+                            dataObj[anc_name] = graphDiv.data[traceIndex + index]['anc_data'][anc_index].slice();
+                            dataObjUpdated.push(anc_name);
+                        }
                     });
                 }
             });

content/js/meteorogram/site_configs.js

@@ -82,11 +82,14 @@ var siteConfigs = {
                 ],
                 yaxis: {
                     title: 'Relative Humidity (%)',
-                    range: [-0.5, 100.5],
+                    range: [-0.5, 110.0], // a little above 100 to show the 100 line
+                    tickvals: [0, 20, 40, 60, 80, 100],
+                    ticktext: ['0', '20', '40', '60', '80', '100'],
                     convert_value: null,
                     units: ' %',
-                    precision: 2,
-                    step: 5.0,
+                    precision: 1,
+                    step: 2.0,
+                    zeroline: true,
                 },
             },
             wind_speed: {

content/pages/data_download.html

@@ -170,7 +170,6 @@
             </div>
             <div class="col-xs-12 form-group">
                 <button class="btn btn-primary" id="submit">Submit</button>
-                <!--TODO: Fix preview implementation-->
                 <button class="btn btn-default" id="preview-btn">Show Preview</button>
             </div>
         </div>