Refactor some more.

Goutte
1 parent c69afa1c
Showing 4 changed files with 57 additions and 47 deletions Show diff stats
web/run.py
web/static/js/swapp.js
web/static/js/swapp.ls
web/view/home.html.jinja2
@@ -271,8 +271,6 @@ def get_orbiter_csv(source):
     except:
         abort(400, "Invalid stopped_at parameter : '%s'." % stopped_at)
  
-
-    source_config = get_source_config(orbiter)
     # todo: iterate on models when there are many
     try:
         model_slug = source_config['models'][0]['slug']
@@ -75,6 +75,38 @@
       });
       return promise;
     };
+    SpaceWeather.prototype.createTimeSeries = function(data){
+      var timeSeries;
+      timeSeries = [];
+      this.configuration['parameters'].forEach(function(parameter){
+        var container, id, title;
+        container = this.configuration['time_series_container'];
+        id = parameter['id'];
+        title = parameter['title'];
+        if (!(id in data)) {
+          console.error("No data for id '" + id + "'.", data);
+        }
+        return timeSeries.push(new TimeSeries(id, title, data[id], container));
+      });
+      return timeSeries.forEach(function(ts){
+        ts.options['onMouseOver'] = function(){
+          return timeSeries.forEach(function(ts2){
+            return ts2.showCursor();
+          });
+        };
+        ts.options['onMouseOut'] = function(){
+          return timeSeries.forEach(function(ts2){
+            return ts2.hideCursor();
+          });
+        };
+        return ts.options['onMouseMove'] = function(t){
+          timeSeries.forEach(function(ts2){
+            return ts2.moveCursor(t);
+          });
+          return typeof orbits != 'undefined' && orbits !== null ? orbits.moveToDate(t) : void 8;
+        };
+      });
+    };
     return SpaceWeather;
   }());
   Source = (function(){
@@ -57,6 +57,25 @@ export class SpaceWeather
     )
     promise
  
+  createTimeSeries: (data) ->
+    timeSeries = []
+    @configuration['parameters'].forEach((parameter) ->
+      container = @configuration['time_series_container']
+      id = parameter['id'] ; title = parameter['title']
+      if id not of data then console.error("No data for id '#{id}'.", data)
+      timeSeries.push(new TimeSeries(id, title, data[id], container))
+    )
+    timeSeries.forEach((ts) ->
+      ts.options['onMouseOver'] = ->
+        timeSeries.forEach((ts2) -> ts2.showCursor())
+      ts.options['onMouseOut'] = ->
+        timeSeries.forEach((ts2) -> ts2.hideCursor())
+      ts.options['onMouseMove'] = (t) ->
+        timeSeries.forEach((ts2) -> ts2.moveCursor(t))
+        orbits?.moveToDate(t)
+    )
+
+
  
  
 class Source
@@ -213,53 +213,14 @@ jQuery().ready(function($){
  
   var sw = new SpaceWeather(configuration);
   sw.loadData('jupiter', '2016-01-01T00:00:00', '2023-01-01T00:00:00').then(
-      function (data) { console.log('OK', data); },
-      function (data) { console.log('Failed', data); }
+      function (data) {
+        console.log('OK', data);
+        sw.createTimeSeries(data);
+        orbits = new Orbits(configuration.sources, data['hci'], configuration.orbits_container);
+      },
+      function (data) { console.error('Failed to load SW data.', data); }
   );
  
-  d3.csv('{{ url_for('get_orbiter_csv', source='jupiter', started_at='2016-03-19T00:00:00', stopped_at='2022-01-01T00:00:00') }}', function(csv){
-    var timeFormat = d3.timeParse('%Y-%m-%dT%H:%M:%S%Z');
-    var data = {'hci': []};
-    configuration['parameters'].forEach(function(parameter){
-        data[parameter['id']] = [];
-    });
-    csv.forEach(function (d) {
-      var dtime = timeFormat(d['time']);
-      configuration['parameters'].forEach(function(parameter){
-        var id = parameter['id'];
-        data[id].push({x: dtime, y: parseFloat(d[id])});
-      });
-      if (d['xhci'] && d['yhci']) {
-        data['hci'].push({t: dtime, x: parseFloat(d['xhci']), y: parseFloat(d['yhci'])});
-      }
-    });
-
-    var container = '#time_series';
-
-    configuration['parameters'].forEach(function(parameter){
-      var id = parameter['id'];
-      var title = parameter['title'];
-      timeSeries.push(new TimeSeries(id, title, data[id], container));
-    });
-    // move outside (after promises)
-    timeSeries.forEach(function(ts){
-      ts.options['onMouseOver'] = function() {
-        timeSeries.forEach(function(ts2){ ts2.showCursor(); });
-      };
-      ts.options['onMouseOut'] = function() {
-        timeSeries.forEach(function(ts2){ ts2.hideCursor(); });
-      };
-      ts.options['onMouseMove'] = function(t) {
-        timeSeries.forEach(function(ts2){ ts2.moveCursor(t); });
-        if (orbits != null) orbits.moveToDate(t);
-      };
-    });
-
-
-    orbits = new Orbits(configuration.sources, data['hci'], configuration.orbits_container);
-
-  });
-
   var toggleTimeSeries = function(slug) {
     $('#time_series .'+slug).toggleClass('hidden');
   };