Commit ebf98c263ce69d2dd7c72e47ba823071273ba260
1 parent
6f9a3852
Exists in
master
and in
3 other branches
Update orbiters' title.
Showing
1 changed file
with
6 additions
and
4 deletions
Show diff stats
web/view/home.html.jinja2
... | ... | @@ -11,9 +11,9 @@ |
11 | 11 | <span class="mdl-layout-title">Orbiters</span> |
12 | 12 | |
13 | 13 | <section id="orbiters_filters"> |
14 | - <img src="{{ static('img/planet/jupiter_128.png') }}" width="64px" height="64px" alt="Jupiter"> | |
15 | - <img src="{{ static('img/planet/earth_128.png') }}" width="64px" height="64px" alt="Earth (locked)" class="locked"> | |
16 | - <img src="{{ static('img/planet/mars_128.png') }}" width="64px" height="64px" alt="Mars (locked)" class="locked"> | |
14 | + <img title="Jupiter" src="{{ static('img/planet/jupiter_128.png') }}" width="64px" height="64px" alt="Jupiter"> | |
15 | + <img title="Earth (coming soon)" src="{{ static('img/planet/earth_128.png') }}" width="64px" height="64px" alt="Earth (locked)" class="locked"> | |
16 | + <img title="Mars (coming soon)" src="{{ static('img/planet/mars_128.png') }}" width="64px" height="64px" alt="Mars (locked)" class="locked"> | |
17 | 17 | </section> |
18 | 18 | <br> |
19 | 19 | <hr class="clear"> |
... | ... | @@ -175,15 +175,17 @@ jQuery().ready(function($){ |
175 | 175 | }; |
176 | 176 | ts.options['onMouseMove'] = function(t) { |
177 | 177 | timeSeries.forEach(function(ts2){ ts2.moveCursor(t); }); |
178 | + if (orbits != null) orbits.moveToDate(t); | |
178 | 179 | }; |
179 | 180 | }); |
180 | 181 | |
181 | 182 | }); |
182 | 183 | |
183 | 184 | d3.csv('{{ url_for('get_astral_coordinates_csv') }}', function(csv){ |
185 | + var timeFormat = d3.timeParse('%Y-%m-%dT%H:%M:%S%Z'); | |
184 | 186 | var data = []; |
185 | 187 | csv.forEach(function (d) { |
186 | - data.push({x: parseFloat(d['x_hci']), y: parseFloat(d['y_hci'])}); | |
188 | + data.push({t: timeFormat(d['time']), x: parseFloat(d['x_hci']), y: parseFloat(d['y_hci'])}); | |
187 | 189 | }); |
188 | 190 | |
189 | 191 | orbits = new Orbits(orbiters, data, '#orbits'); | ... | ... |