Merge branch 'main' into dev

empowerplan · Dec 2, 2024 · 09098bc · 09098bc
2 parents 3fb0c09 + b92fc9a
commit 09098bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/config/settings/base.py b/config/settings/base.py
@@ -287,15 +287,15 @@ def __getitem__(self, item):  # noqa: D105, ANN001, ANN204
 MAP_ENGINE_CENTER_AT_STARTUP = [14.2, 52.45]
 MAP_ENGINE_ZOOM_AT_STARTUP = 8
 MAP_ENGINE_MIN_ZOOM = 8
-MAP_ENGINE_MAX_ZOOM = 15
+MAP_ENGINE_MAX_ZOOM = 14
 MAP_ENGINE_MAX_BOUNDS = [[12.6, 51.8], [16.1, 53.1]]
 
 # distill
 MAP_ENGINE_X_AT_MIN_Z = 137
 MAP_ENGINE_Y_AT_MIN_Z = 83
 MAP_ENGINE_X_OFFSET = 1  # Defines how many tiles to the right are added at first level
 MAP_ENGINE_Y_OFFSET = 1  # Defines how many tiles to the bottom are added at first level
-MAP_ENGINE_MAX_DISTILLED_ZOOM = 15
+MAP_ENGINE_MAX_DISTILLED_ZOOM = 14
 DISTILL = env.bool("MAP_ENGINE_USE_DISTILLED_MVTS", False)
 
 MAP_ENGINE_IMAGES = [

diff --git a/digiplan/static/js/results.js b/digiplan/static/js/results.js
@@ -83,7 +83,7 @@ PubSub.subscribe(eventTopics.MENU_RESULTS_SELECTED, showPreResultCharts);
 PubSub.subscribe(eventTopics.MENU_RESULTS_SELECTED, showSummaryPreResults);
 PubSub.subscribe(eventTopics.MENU_RESULTS_SELECTED, disableResultButtons);
 PubSub.subscribe(eventTopics.MENU_RESULTS_SELECTED, hideRegionChart);
-PubSub.subscribe(eventTopics.MENU_RESULTS_SELECTED, simulate);
+// PubSub.subscribe(eventTopics.MENU_RESULTS_SELECTED, simulate);
 PubSub.subscribe(eventTopics.SIMULATION_STARTED, startSimulationProgress);
 PubSub.subscribe(eventTopics.SIMULATION_STARTED, checkResultsPeriodically);
 PubSub.subscribe(eventTopics.SIMULATION_FINISHED, enableFutureResults);