Merge branch 'dev' of github.com:rl-institut-private/digiplan into dev

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project tries to adhere to [Semantic Versioning](https://semver.org/spe
 - update funding information
 
 ### Fixed
+- show choropleth on revisit of status quo
 
 ## [1.0.1] - 2023-11-01
 ### Added

digiplan/static/js/menu.js

@@ -1,4 +1,4 @@
-import {resultsTabs, futureDropdown} from "./elements.js";
+import {resultsTabs, statusquoDropdown, futureDropdown} from "./elements.js";
 
 const menuNextBtn = document.getElementById("menu_next_btn");
 const menuPreviousBtn = document.getElementById("menu_previous_btn");
@@ -26,12 +26,14 @@ chartTab.addEventListener("click", function () {
 PubSub.subscribe(eventTopics.MENU_STATUS_QUO_SELECTED, setMapChartViewVisibility);
 PubSub.subscribe(eventTopics.MENU_STATUS_QUO_SELECTED, showMapView);
 PubSub.subscribe(eventTopics.MENU_STATUS_QUO_SELECTED, hidePotentialLayers);
+PubSub.subscribe(eventTopics.MENU_STATUS_QUO_SELECTED, reactivateChoropleth);
 PubSub.subscribe(eventTopics.MENU_SETTINGS_SELECTED, setMapChartViewVisibility);
 PubSub.subscribe(eventTopics.MENU_SETTINGS_SELECTED, showMapView);
 PubSub.subscribe(eventTopics.MENU_SETTINGS_SELECTED, deactivateChoropleth);
 PubSub.subscribe(eventTopics.MENU_SETTINGS_SELECTED, terminateSimulation);
 PubSub.subscribe(eventTopics.MENU_RESULTS_SELECTED, setMapChartViewVisibility);
 PubSub.subscribe(eventTopics.MENU_RESULTS_SELECTED, hidePotentialLayers);
+PubSub.subscribe(eventTopics.MENU_RESULTS_SELECTED, reactivateChoropleth);
 PubSub.subscribe(eventTopics.MAP_VIEW_SELECTED, setResultsView);
 PubSub.subscribe(eventTopics.CHART_VIEW_SELECTED, setResultsView);
 
@@ -92,6 +94,23 @@ function setMapChartViewVisibility(msg) {
     return logMessage(msg);
 }
 
+function reactivateChoropleth(msg) {
+    let choropleth = "";
+    let infoToolTip = "";
+    if (msg === eventTopics.MENU_STATUS_QUO_SELECTED) {
+        choropleth = statusquoDropdown.value;
+        infoToolTip = statusquoDropdown.options[statusquoDropdown.selectedIndex].title;
+    } else {
+        choropleth = futureDropdown.value;
+        infoToolTip = futureDropdown.options[futureDropdown.selectedIndex].title;
+    }
+    if (choropleth !== "") {
+        PubSub.publish(mapEvent.CHOROPLETH_SELECTED, choropleth);
+    }
+    document.getElementById("info_tooltip_results").title = statusquoDropdown.options[statusquoDropdown.selectedIndex].title;
+    return logMessage(msg);
+}
+
 function setResultsView(msg) {
     if (msg === eventTopics.CHART_VIEW_SELECTED) {
         futureDropdown.parentElement.setAttribute("style", "display: none !important");