Continue refacto for multiple targets.

Goutte
1 parent 961953c4
Showing 5 changed files with 28 additions and 20 deletions Show diff stats
config.yml
web/run.py
web/static/js/swapp.js
web/static/js/swapp.ls
web/view/home.html.jinja2
@@ -61,7 +61,7 @@ amda: &quot;http://cdpp.irap.omp.eu/BASE/DDService/getDataUrl.php?dataSet={dataSet}&amp;S
 # `title` appears on mouse hover
 # `locked` is for sources that are "coming soon"
 # `default` sources are shown to incoming visitors, others need user activation
-sources:
+targets:
     - type: 'planet'
       slug: 'mercury'
       name: 'Mercury'
@@ -101,7 +101,7 @@ sources:
           - slug: 'tao_mars_sw'
             started_at: "1990-01-01T01:30:00"
             stopped_at: "2017-02-19T00:00:00"
-      locked: true
+      locked: false
       default: true
     - type: 'planet'
       slug: 'jupiter'
@@ -167,9 +167,9 @@ sources:
 #Jupiter		tao_jup_sw	1990-01-01T01:00	2017-02-19T00:00
 #Saturn		tao_sat_sw	1990-01-01T01:30	2017-02-19T00:00
  
-models:
-    jupiter:
-        name: Jupiter
-        model: tao_jup_sw
-        started_at: "1990-01-01T01:30:00"
-        stopped_at: "2017-02-19T00:00:00"
+#models:
+#    jupiter:
+#        name: Jupiter
+#        model: tao_jup_sw
+#        started_at: "1990-01-01T01:30:00"
+#        stopped_at: "2017-02-19T00:00:00"
@@ -156,7 +156,7 @@ def datetime_from_list(time_list):
  
  
 def get_source_config(slug):
-    for s in config['sources']:
+    for s in config['targets']:
         if s['slug'] == slug:
             return s
     raise Exception("No source found for slug '%s'." % slug)
@@ -224,10 +224,10 @@ def favicon():
 @app.route("/index.html")
 def home():
     return render_view('home.html.jinja2', {
-        'sources': config['sources'],
-        'planets': [s for s in config['sources'] if s['type'] == 'planet'],
-        'probes':  [s for s in config['sources'] if s['type'] == 'probe'],
-        'comets':  [s for s in config['sources'] if s['type'] == 'comet'],
+        'targets': config['targets'],
+        'planets': [s for s in config['targets'] if s['type'] == 'planet'],
+        'probes':  [s for s in config['targets'] if s['type'] == 'probe'],
+        'comets':  [s for s in config['targets'] if s['type'] == 'comet'],
     })
  
  
@@ -4,7 +4,7 @@
   GOLDEN_RATIO = 2 / (1 + Math.sqrt(5));
   out$.SpaceWeather = SpaceWeather = (function(){
     SpaceWeather.displayName = 'SpaceWeather';
-    var prototype = SpaceWeather.prototype, constructor = SpaceWeather;
+    var timeSeries, prototype = SpaceWeather.prototype, constructor = SpaceWeather;
     function SpaceWeather(configuration){
       var configs, res$, k, this$ = this;
       this.configuration = configuration;
@@ -108,9 +108,9 @@
       });
       return promise;
     };
+    timeSeries = [];
     SpaceWeather.prototype.createTimeSeries = function(source, data){
-      var timeSeries, this$ = this;
-      timeSeries = [];
+      var this$ = this;
       this.configuration['parameters'].forEach(function(parameter){
         var container, id, title;
         container = this.configuration['time_series_container'];
@@ -78,8 +78,8 @@ export class SpaceWeather
     )
     promise
  
+  timeSeries = []
   createTimeSeries: (source, data) ->
-    timeSeries = []
     @configuration['parameters'].forEach((parameter) ->
       container = @configuration['time_series_container']
       id = parameter['id'] ; title = parameter['title']
@@ -68,11 +68,10 @@
 {#    <div class="loader"><div class="hole"></div></div>#}
   </main>
 </div>
-
-
 {% endblock %}
  
  
+
 {% block styles %}
   <style>
     html, body {
@@ -149,6 +148,7 @@
 {% endblock %}
  
  
+
 {% block scripts_footer %}
 <script type="application/javascript" src="{{ static('js/vendor/d3.min.js') }}"></script>
 <script type="application/javascript" src="{{ static('js/swapp.js') }}"></script>
@@ -173,6 +173,15 @@ var configuration = {
       maxDate: '2017-02-19T00:00:00',
       orbit: { a: 5.45516759, b: 4.95155843 },
       img: '{{ static('img/target/jupiter_128.png') }}'
+    },
+    mars: {
+      slug: 'mars',
+      name: 'Mars',
+      active: true,
+      minDate: '1990-01-01T01:30:00',
+      maxDate: '2017-02-19T00:00:00',
+      orbit: { a: 5.25516759, b: 4.85155843 },
+      img: '{{ static('img/target/mars_128.png') }}'
     }
   },
 {# todo @Nicolas Define -somehow- error margins of each parameter #}
@@ -227,5 +236,4 @@ jQuery().ready(function($){
   window.addEventListener('resize', function() { sw.resize(); });
 });
 </script>
-
 {% endblock %}