Add probes and comets. (still locked)

Goutte
1 parent 11662eed
Showing 4 changed files with 143 additions and 24 deletions Show diff stats
config.yml
web/run.py
web/view/home.html.jinja2
web/view/layout.html.jinja2
@@ -35,6 +35,68 @@ authors:
       role: Project Coordinator
       mail: vincent.genot@irap.omp.eu
+# `slug` used internally, and should match [a-z0-9]+
+# `name` is displayed
+# `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:
+    - type: 'planet'
+      slug: 'mercury'
+      name: 'Mercury'
+      title: 'Mercury (coming soon)'
+      locked: true
+      default: true
+    - type: 'planet'
+      slug: 'venus'
+      name: 'Venus'
+      title: 'Venus (coming soon)'
+      locked: true
+      default: true
+    - type: 'planet'
+      slug: 'earth'
+      name: 'Earth'
+      title: 'Earth (coming soon)'
+      locked: true
+      default: true
+    - type: 'planet'
+      slug: 'mars'
+      name: 'Mars'
+      title: 'Mars (coming soon)'
+      locked: true
+      default: true
+    - type: 'planet'
+      slug: 'jupiter'
+      name: 'Jupiter'
+      title: 'Jupiter'
+      locked: false
+      default: true
+    - type: 'planet'
+      slug: 'saturn'
+      name: 'Saturn'
+      title: 'Saturn (coming soon)'
+      locked: true
+      default: true
+    - type: 'probe'
+      slug: 'rosetta'
+      name: 'Rosetta'
+      title: 'Rosetta (coming soon)'
+      locked: true
+      default: false
+    - type: 'probe'
+      slug: 'juno'
+      name: 'Juno'
+      title: 'Juno (coming soon)'
+      locked: true
+      default: false
+    - type: 'comet'
+      slug: 'tchouri'
+      name: 'Tchouri'
+      title: 'Tchouri (coming soon)'
+      locked: true
+      default: false
+
+
 # Tao Model OMNI_input
 #Rosetta  	tao_ros_sw	2014-01-01T00:00	2017-01-21T00:00
 #Juno cruise	tao_juno_sw	2012-01-01T00:00	2016-11-02T22:00
@@ -157,7 +157,12 @@ def favicon():
 @app.route("/home.html")
 @app.route("/index.html")
 def home():
-    return render_view('home.html.jinja2', {})
+    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'],
+    })
 @app.route("/inspect")
@@ -194,19 +199,23 @@ def get_csv():
     times = cdf_handle.variables['Time']
     data_v = cdf_handle.variables['V']
     data_b = cdf_handle.variables['B']
+    data_t = cdf_handle.variables['T']
+    data_n = cdf_handle.variables['N']
     data_p = cdf_handle.variables['P_dyn']
+    data_a = cdf_handle.variables['Delta_angle']
     cw.writerow((
         'time',
         'vrad', 'vtan', 'vlen',
-        'magn', 'pdyn'
+        'magn', 'temp', 'pdyn', 'dens', 'angl'
     ))
-    for time, datum_v, datum_b, datum_p in zip(times, data_v, data_b, data_p):
+    for time, datum_v, datum_b, datum_t, datum_p, datum_n, datum_a in \
+            zip(times, data_v, data_b, data_t, data_n, data_p, data_a):
         vrad = datum_v[0]
         vtan = datum_v[1]
         cw.writerow((
             datetime_from_list(time).strftime("%Y-%m-%dT%H:%M:%S+00:00"),
             vrad, vtan, sqrt(vrad * vrad + vtan * vtan),
-            datum_b, datum_p
+            datum_b, datum_t, datum_n, datum_p, datum_a
         ))
     cdf_handle.close()
@@ -232,6 +241,7 @@ def get_orbiter_csv(orbiter):
         abort(400, "Invalid stopped_at parameter : '%s'." % stopped_at)
     # Grab the list of netCDF files from Myriam's API todo
+    #
     si = StringIO.StringIO()
     cw = csv_writer(si)
@@ -11,10 +11,33 @@
     <span class="mdl-layout-title">Planets</span>
     <section id="orbiters_filters">
-      <img title="Jupiter" src="{{ static('img/planet/jupiter_128.png') }}" width="64px" height="64px" alt="Jupiter">
-      <img title="Earth (coming soon)" src="{{ static('img/planet/earth_128.png') }}" width="64px" height="64px" alt="Earth (locked)" class="locked">
-      <img title="Mars (coming soon)" src="{{ static('img/planet/mars_128.png') }}" width="64px" height="64px" alt="Mars (locked)" class="locked">
+{% for planet in planets %}
+      <img title="{{ planet.title }}" src="{{ static('img/planet/'~planet.slug~'_128.png') }}" width="64px" height="64px" alt="{{ planet.name }}" class="{{ 'locked' if planet.locked }}">
+{% endfor %}
     </section>
+
+    <br>
+    <hr class="clear">
+
+    <span class="mdl-layout-title">Probes</span>
+
+    <section id="orbiters_filters">
+{% for probe in probes %}
+      <img title="{{ probe.title }}" src="{{ static('img/probe/'~probe.slug~'_128.png') }}" width="64px" height="64px" alt="{{ probe.name }}" class="{{ 'locked' if probe.locked }}">
+{% endfor %}
+    </section>
+
+    <br>
+    <hr class="clear">
+
+    <span class="mdl-layout-title">Comets</span>
+
+    <section id="orbiters_filters">
+{% for comet in comets %}
+      <img title="{{ comet.title }}" src="{{ static('img/comet/'~comet.slug~'_128.png') }}" width="64px" height="64px" alt="{{ comet.name }}" class="{{ 'locked' if comet.locked }}">
+{% endfor %}
+    </section>
+
     <br>
     <hr class="clear">
@@ -22,16 +45,13 @@
     <nav id="parameters" class="mdl-navigation">
       <a class="mdl-navigation__link parameter active" data-ts-slug="pdyn" href="">Dynamic Pressure</a>
-      <a class="mdl-navigation__link parameter active" data-ts-slug="magn" href="">Magnetism</a>
+      <a class="mdl-navigation__link parameter active" data-ts-slug="magn" href="">B Tangential</a>
       <a class="mdl-navigation__link parameter active" data-ts-slug="vlen" href="">Velocity</a>
+      <a class="mdl-navigation__link parameter active" data-ts-slug="temp" href="">Temperature</a>
+      <a class="mdl-navigation__link parameter active" data-ts-slug="dens" href="">Density</a>
+      <a class="mdl-navigation__link parameter active" data-ts-slug="angl" href="">Angle Source-Sun-Earth</a>
     </nav>
-    <span class="mdl-layout-title">Options</span>
-
-    <nav class="mdl-navigation">
-      <a class="mdl-navigation__link" href="">How is this done?</a>
-      <a class="mdl-navigation__link" href="">More...</a>
-    </nav>
   </div>
   <main class="mdl-layout__content">
@@ -99,6 +119,9 @@
       stroke-width: 1px;
       stroke-dasharray: 5px;
     }
+    #orbiters_filters {
+      padding-left: 17px;
+    }
     #orbiters_filters img {
       float: left;
     }
@@ -155,11 +178,14 @@ jQuery().ready(function($){
   d3.csv('{{ url_for('get_csv') }}', function(csv){
     var timeFormat = d3.timeParse('%Y-%m-%dT%H:%M:%S%Z');
-    var data = {'pdyn': [], 'magn': [], 'vlen': []};
+    var data = {'pdyn': [], 'magn': [], 'vlen': [], 'temp': [], 'dens': [], 'angl': []};
     csv.forEach(function (d) {
       data['pdyn'].push({x: timeFormat(d['time']), y: parseFloat(d['pdyn'])});
       data['magn'].push({x: timeFormat(d['time']), y: parseFloat(d['magn'])});
       data['vlen'].push({x: timeFormat(d['time']), y: parseFloat(d['vlen'])});
+      data['temp'].push({x: timeFormat(d['time']), y: parseFloat(d['temp'])});
+      data['dens'].push({x: timeFormat(d['time']), y: parseFloat(d['dens'])});
+      data['angl'].push({x: timeFormat(d['time']), y: parseFloat(d['angl'])});
     });
     var container = '#time_series';
@@ -172,7 +198,15 @@ jQuery().ready(function($){
     timeSeries.push(new TimeSeries(
         'vlen', 'Velocity (km/s)', data['vlen'], container
     ));
-
+    timeSeries.push(new TimeSeries(
+        'temp', 'Temperature (K)', data['temp'], container
+    ));
+    timeSeries.push(new TimeSeries(
+        'dens', 'Density N (cm⁻³)', data['dens'], container
+    ));
+    timeSeries.push(new TimeSeries(
+        'angl', 'Angle T-S-E (deg)', data['angl'], container
+    ));
     // move outside after promises
     timeSeries.forEach(function(ts){
       ts.options['onMouseOver'] = function() {
@@ -32,7 +32,7 @@
       <header class="mdl-layout__header">
         <div class="mdl-layout__header-row">
-          <span class="mdl-layout-title">CDPP / Space Weather Online</span>
+          <span class="mdl-layout-title">CDPP / Solar Wind Prediction @ Planets</span>
           <!-- Add spacer, to align navigation to the right -->
           <div class="mdl-layout-spacer"></div>
           <!-- Navigation. We hide it in small screens. -->
@@ -67,14 +67,27 @@
       <footer class="mdl-mini-footer">
         <div class="mdl-mini-footer__left-section">
-          <div class="mdl-logo">v{{ version }}</div>
+{#          <div class="mdl-logo">v{{ version }}</div>#}
+
+          <p class="disclaimer">
+              The <a href="http://www.europlanet-2020-ri.eu/">Europlanet 2020 Research Infrastructure</a> project has received funding
+              <br>
+              from the <a href="https://ec.europa.eu/programmes/horizon2020/">European Union's Horizon 2020</a> research and innovation programme
+              under grant agreement N°&nbsp;654208.
+          </p>
+
 {#          <img class="logo" src="{{ static('img/logo/logo_cnrs.png') }}" alt="CNRS" id="logo-cnrs" />#}
-          <ul class="mdl-mini-footer__link-list">
-            <li><a href="#">Help</a></li>
-            <li><a href="#">Sources</a></li>
-            <li><a href="#">Authors</a></li>
-            <li><a href="#">Privacy & Terms</a></li>
-          </ul>
+{#          <ul class="mdl-mini-footer__link-list">#}
+{#            <li><a href="#">Help?</a></li>#}
+{#            <li><a href="#">Sources</a></li>#}
+{#            <li><a href="#">Authors</a></li>#}
+{#            <li><a href="#">License</a></li>#}
+{#          </ul>#}
+        </div>
+        <div class="mdl-mini-footer__right-section">
+          <img class="logo" src="{{ static('img/logo/logo_cdpp.png') }}" alt="CDPP" id="logo_cdpp" />
+          &nbsp;&nbsp;&nbsp;
+          <img class="logo" src="{{ static('img/logo/logo_europlanet.png') }}" alt="Europlanet" id="logo_europlanet" />
         </div>
       </footer>