diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ad85e2..51496b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,19 +28,25 @@ et prendre aussi
## Future ?
-- [ ] Set the log level to _error_ in production (see `web/run.py`)
- [ ] Rework the images of Rosetta and Juno
- [ ] Optimize data aggregation (numpy vectorization?)
-- [ ] IE compat, if you can (I can't)
- [ ] Bump D3JS to v5 (and its promises)
- [ ] Enable p67
+- [ ] IE compat, if you can (mouahahahahaha good luck)
- [ ] Fix the warmup on the prod server (I was kicked out, do it yourselves)
+- [ ] Set the log level to _error_ in production (see `web/run.py` -- DIY)
## 1.9
-- [ ] Auroral Emissions (Jupiter)
-- [ ] Auroral Emissions Fixes
+- [x] Auroral Emissions (Jupiter)
+- [x] Auroral Emissions Fixes
+- [x] Enable the Input selector
+
+
+## 1.8.3
+
+- [x] Fix whitespaces
## 1.8.2
diff --git a/VERSION b/VERSION
index 57f5271..32f0dad 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v1.8.2
+v1.9
diff --git a/config.yml b/config.yml
index 54e847f..bbe4b64 100644
--- a/config.yml
+++ b/config.yml
@@ -59,7 +59,7 @@ layers:
- slug: "hstjupiterobservations"
name: "HST Jupiter"
desc: "Hubble Space Telescope Jupiter Observations"
- live: false
+ live: true
- slug: "hstsaturnobservations"
name: "HST Saturn"
desc: "Hubble Space Telescope Saturn Observations"
@@ -240,6 +240,8 @@ targets:
- slug: 'tao_jup_sta'
sb:
- slug: 'tao_jup_stb'
+ tap:
+ target_name: 'Jupiter'
locked: false
default: false
- type: 'planet'
diff --git a/web/run.py b/web/run.py
index a3c2ed7..b5098a7 100755
--- a/web/run.py
+++ b/web/run.py
@@ -1582,7 +1582,6 @@ def download_auroral_catalog_csv(target):
filename = "%s_auroral_catalog.csv" % (target)
local_csv_file = join(CACHE_DIR, filename)
-
target_name = tc['tap']['target_name']
emissions = retrieve_auroral_emissions(target_name)
diff --git a/web/static/js/main.js b/web/static/js/main.js
index 8daff58..e497e53 100644
--- a/web/static/js/main.js
+++ b/web/static/js/main.js
@@ -386,7 +386,7 @@
targetButton.addClass('empty');
break;
}
- target.active = false
+ target.active = false;
targetButton.addClass('failed');
targetButton.removeClass('loading');
this$.hideLoader();
@@ -531,7 +531,7 @@
if (h in this._image_preview_layers_data) {
resolve(app._image_preview_layers_data[h]);
} else {
- let url_route = "saturn_auroral_catalog.csv"; // FIXME
+ let url_route = target_slug + "_auroral_catalog.csv";
let url = app.configuration['api']['root'] + url_route;
//url += "/" + url_route; // Extra / yields havoc -- flask?
let d3csv = d3.csv(url, csv => {
diff --git a/web/view/home.html.jinja2 b/web/view/home.html.jinja2
index 2e08a1d..b8c0990 100755
--- a/web/view/home.html.jinja2
+++ b/web/view/home.html.jinja2
@@ -145,7 +145,7 @@
{% endfor %}
-
+
@@ -391,6 +391,7 @@ jQuery().ready(function($){
});
return s < 2;
};
+
$(".targets-filters .target:not(.locked)").on("click", function(e){
if ($(this).hasClass('loading')) return false;
var switch_on = ! $(this).hasClass('active');
@@ -404,6 +405,7 @@ jQuery().ready(function($){
}
return false;
});
+
parameters.find(".parameter").click(function(e){
var switch_on = ! $(this).hasClass('active');
var parameter_slug = $(this).attr('data-ts-slug');
@@ -416,15 +418,21 @@ jQuery().ready(function($){
}
return false;
});
+
$('#apply_new_interval').on("click", function(e){
var started_at = moment($("#started_at").val());
var stopped_at = moment($("#stopped_at").val());
sw.resizeDomain(started_at, stopped_at);
return false;
});
+
$('#apply_new_input').on("click", function(e){
var new_input_slug = $("input[name='input_slug']:checked").val();
- window.location = "?input_slug="+new_input_slug;
+ var started_at = $("#started_at").val();
+ var stopped_at = $("#stopped_at").val();
+ window.location = "?input_slug="+new_input_slug+
+ "&started_at="+started_at+
+ "&stopped_at="+stopped_at;
return false;
});
@@ -435,6 +443,20 @@ jQuery().ready(function($){
else { sw.hideCatalogLayer(catalog_slug); }
});
+ $('#option-layer-hstjupiterobservations').on("click", function(e){
+ var that = $(this);
+ var catalog_slug = $(this).attr('value');
+ var checked = $(this).prop('checked');
+ if (checked) {
+ $(this).addClass('loading');
+ sw.showImagePreviewLayer("jupiter", catalog_slug).finally( function(){
+ that.removeClass('loading');
+ });
+ } else {
+ sw.hideImagePreviewLayer("jupiter", catalog_slug);
+ }
+ });
+
$('#option-layer-hstsaturnobservations').on("click", function(e){
var that = $(this);
var catalog_slug = $(this).attr('value');
--
libgit2 0.21.2