Merge pull request #547 from gkahiu/fix_report_scenario_layer

Fix Scenario Layer in Analysis Report

src/cplus_plugin/lib/reports/generator.py

@@ -566,9 +566,9 @@ def _load_template(self) -> bool:
 
 
 class DuplicatableRepeatPageReportGenerator(BaseScenarioReportGenerator):
-    """Incorporates extra functionality duplicating a repeat page.
+    """Incorporates extra functionality for duplicating a repeat page.
 
-    Subclass must have `_repeat_gae` and `_repeat_page_num` members.
+    Subclass must have `_repeat_page` and `_repeat_page_num` members.
     """
 
     def duplicate_repeat_page(self, position: int) -> bool:
@@ -1575,6 +1575,25 @@ def _get_activity_layer_in_project(
 
         return matching_tree_layers[0].layer()
 
+    def _update_main_map_layer(self):
+        """Update the main map to only contain the output scenario layer."""
+        main_map_item: QgsLayoutItemMap = self._layout.itemById("map_one_scenario")
+        if main_map_item is None:
+            tr_msg = tr("Could not find the main map")
+            self._error_messages.append(tr_msg)
+            return
+
+        if self._scenario_layer is None:
+            tr_msg = tr(
+                "Scenario layer is empty. Unable to set layer in the main map item."
+            )
+            self._error_messages.append(tr_msg)
+            return
+
+        main_map_item.setFollowVisibilityPreset(False)
+        main_map_item.setLayers([self._scenario_layer])
+        main_map_item.refresh()
+
     def _update_main_map_legend(self):
         """Textual adjustments to the main map legend."""
         legend_item: QgsLayoutItemLegend = self._layout.itemById("legend_main_map")
@@ -1614,7 +1633,7 @@ def _update_main_map_legend(self):
                     tree_layer, activity_node_indices
                 )
 
-                # Removing the tree layer band title
+                # Remove the tree layer band title
                 QgsLegendRenderer.setNodeLegendStyle(tree_layer, QgsLegendStyle.Hidden)
 
                 model.refreshLayerLegend(tree_layer)
@@ -1757,6 +1776,9 @@ def _run(self) -> ReportResult:
         # Populate table with priority weighting values
         self._populate_scenario_weighting_values()
 
+        # Set scenario layer in scenario map item
+        self._update_main_map_layer()
+
         # Update the legend for the main map
         self._update_main_map_legend()
 

src/cplus_plugin/tasks.py

@@ -2152,8 +2152,13 @@ def run_highest_position_analysis(self, temporary_output=False):
             passed_extent_box[3],
         )
 
+        # We explicitly set the created_date since the current implementation
+        # of the data model means that the attribute value is set only once when
+        # the class is loaded hence subsequent instances will have the same value.
         self.scenario_result = ScenarioResult(
-            scenario=self.scenario, scenario_directory=self.scenario_directory
+            scenario=self.scenario,
+            scenario_directory=self.scenario_directory,
+            created_date=datetime.datetime.now(),
         )
 
         try: