From 26733e9f9e38f46c2e0ec253b7c1e716e5f442b1 Mon Sep 17 00:00:00 2001
From: Goutte <antoine.goutenoir@gmail.com>
Date: Fri, 19 Oct 2018 16:04:44 +0200
Subject: [PATCH] Make the animation queue feel more natural, and mention UTC in the page embedded doc.

---
 CHANGELOG.md              |  5 ++---
 web/static/js/main.js     | 23 ++++++++++-------------
 web/view/home.html.jinja2 |  6 +++---
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c930604..e9e1602 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,14 +28,12 @@ et prendre aussi
 
 ## Future ?
 
-- [ ] Enable p67
 - [ ] Layer : Auroral Emissions
 - [ ] Set the log level to _error_ in production (see `web/run.py`)
 - [ ] Add a README to the download tarball (no tarball anymore)
-- [ ] Rework the images of Rosetta and Juno
+- [ ] Rework the icons of Rosetta and Juno
 - [ ] Optimize data aggregation (numpy vectorization?)
 - [ ] IE compat, if you can (I can't)
-- [ ] Make date format in time series configurable to DayOfYear
 
 
 ## 1.6
@@ -46,6 +44,7 @@ et prendre aussi
 - [x] Rewrite everything using ES6 instead of Livescript
 - [x] Force domain re-sizing of time series to be sequential
 - [x] Fix broken, confusing ticks on time series
+- [x] Make date format in time series saner
 
 
 ## 1.5
diff --git a/web/static/js/main.js b/web/static/js/main.js
index b1f52a1..e4c21e5 100644
--- a/web/static/js/main.js
+++ b/web/static/js/main.js
@@ -438,10 +438,10 @@
                 }).bind(ts);
 
                 ts.options['onDblClick'] = () => {
-                    let ref$;
-                    app.resetZoom();
-                    if ((ref$ = $("#zoom_controls_help")) != null) {
-                        ref$.remove();
+                    app.resetZoom(ts);
+                    let zoom_controls_help = $("#zoom_controls_help");
+                    if (zoom_controls_help) {
+                        zoom_controls_help.remove();
                     }
                     return true;
                 };
@@ -517,7 +517,6 @@
             let max_stopped_at;
             let formatted_started_at;
             let formatted_stopped_at;
-            let zoomedOnVisible;
             if (stopped_at < started_at) {
                 let tmp_at = started_at;
                 started_at = stopped_at;
@@ -542,16 +541,14 @@
                 let tsv_length = tsv.length;
                 let starting_ts_key = tsv.indexOf(starting_ts);
                 if (starting_ts_key === -1) starting_ts_key = 0;
-                zoomedOnVisible = new Promise((resolve, reject) => {
-                    console.log("Zoom on invisible time series…");
-                    let tsv_zoom_on_next;
-                    tsv_zoom_on_next = i => {
+                const zoomedOnVisible = new Promise((resolve, reject) => {
+                    console.log("Zoom on visible time series…");
+                    const tsv_zoom_on_next = i => {
                         if (i >= tsv_length) {
                             resolve();
                             return;
                         }
-                        let ts;
-                        ts = tsv[(i+starting_ts_key)%tsv_length];
+                        let ts = tsv[(Math.ceil(i/2)*(i%2>0?1:-1)+starting_ts_key+tsv_length)%tsv_length];
                         ts.zoomIn(started_at, stopped_at)
                           .then(() => tsv_zoom_on_next(i + 1));
                     };
@@ -575,8 +572,8 @@
             return this;
         }
 
-        resetZoom() {
-            this.resizeDomain(this.started_at, this.stopped_at);
+        resetZoom(starting_ts) {
+            this.resizeDomain(this.started_at, this.stopped_at, starting_ts);
             return this;
         }
 
diff --git a/web/view/home.html.jinja2 b/web/view/home.html.jinja2
index 8bc5770..1d5792f 100755
--- a/web/view/home.html.jinja2
+++ b/web/view/home.html.jinja2
@@ -69,10 +69,10 @@
 
       <form id="form_time_interval" action="#">
         <div class="mdl-textfield mdl-js-textfield">
-          <input type="date" id="started_at" name="started_at" title="The date of the beginning of the interval to observe." class="mdl-textfield__input">
-          <input type="date" id="stopped_at" name="stopped_at" title="The date of the end of the interval to observe. (exclusive)" class="mdl-textfield__input">
+          <input type="date" id="started_at" name="started_at" title="The UTC date of the beginning of the interval to observe." class="mdl-textfield__input">
+          <input type="date" id="stopped_at" name="stopped_at" title="The UTC date of the end of the interval to observe. (exclusive)" class="mdl-textfield__input">
         </div>
-        <input type="submit" id="apply_new_interval" value="Load new interval" title="Two years maximum. This may take a while." class="mdl-button mdl-js-button mdl-js-ripple-effect">
+        <input type="submit" id="apply_new_interval" value="Load new interval" title="Two years maximum. This may take a while. UTC." class="mdl-button mdl-js-button mdl-js-ripple-effect">
       </form>
     </details>
 
--
libgit2 0.21.2