diff --git a/geest/core/algorithms/__init__.py b/geest/core/algorithms/__init__.py
index 9b347131..1c241905 100644
--- a/geest/core/algorithms/__init__.py
+++ b/geest/core/algorithms/__init__.py
@@ -1,3 +1,3 @@
from .area_iterator import AreaIterator
from .population_processor import PopulationRasterProcessingTask
-from .wee_score_processor import WEEScoreProcessingTask
+from .wee_score_processor import WEEByPopulationScoreProcessingTask
diff --git a/geest/core/algorithms/wee_score_processor.py b/geest/core/algorithms/wee_score_processor.py
index d82819c2..f21ae775 100644
--- a/geest/core/algorithms/wee_score_processor.py
+++ b/geest/core/algorithms/wee_score_processor.py
@@ -16,12 +16,12 @@
from geest.core.algorithms import AreaIterator
-class WEEScoreProcessingTask(QgsTask):
+class WEEByPopulationScoreProcessingTask(QgsTask):
"""
- A QgsTask subclass for calculating WEE SCORE using raster algebra.
+ A QgsTask subclass for calculating WEE x Population SCORE using raster algebra.
It iterates over study areas, calculates the WEE SCORE using aligned input rasters
- (GEEST and POP), combines the resulting rasters into a VRT, and applies a QML style.
+ (WEE and POP), combines the resulting rasters into a VRT, and applies a QML style.
Args:
study_area_gpkg_path (str): Path to the GeoPackage containing study area masks.
@@ -70,7 +70,7 @@ def run(self) -> bool:
Executes the WEE SCORE calculation task.
"""
try:
- self.calculate_wee_score()
+ self.calculate_score()
self.generate_vrt()
return True
except Exception as e:
@@ -121,9 +121,9 @@ def validate_rasters(
log_message("Validation successful: rasters are aligned.")
- def calculate_wee_score(self) -> None:
+ def calculate_score(self) -> None:
"""
- Calculates WEE SCORE using raster algebra and saves the result for each area.
+ Calculates WEE by POP SCORE using raster algebra and saves the result for each area.
"""
area_iterator = AreaIterator(self.study_area_gpkg_path)
for index, (_, _, _, _) in enumerate(area_iterator):
@@ -136,15 +136,17 @@ def calculate_wee_score(self) -> None:
)
wee_layer = QgsRasterLayer(wee_path, "WEE")
pop_layer = QgsRasterLayer(population_path, "POP")
- self.validate_rasters(wee_layer, pop_layer)
+ self.validate_rasters(wee_layer, pop_layer, dimension_check=False)
- output_path = os.path.join(self.output_dir, f"wee_score_{index}.tif")
+ output_path = os.path.join(
+ self.output_dir, f"wee_by_population_score_{index}.tif"
+ )
if not self.force_clear and os.path.exists(output_path):
log_message(f"Reusing existing raster: {output_path}")
self.output_rasters.append(output_path)
continue
- log_message(f"Calculating WEE SCORE for area {index}")
+ log_message(f"Calculating WEE by POP SCORE for area {index}")
params = {
"INPUT_A": wee_layer,
@@ -168,11 +170,11 @@ def calculate_wee_score(self) -> None:
def generate_vrt(self) -> None:
"""
- Combines all WEE SCORE rasters into a single VRT and applies a QML style.
+ Combines all WEE SCORE rasters into a single VRT and ap plies a QML style.
"""
- vrt_path = os.path.join(self.output_dir, "wee_score.vrt")
- qml_path = os.path.join(self.output_dir, "wee_score.qml")
- source_qml = resources_path("resources", "qml", "wee_score_style.qml")
+ vrt_path = os.path.join(self.output_dir, "wee_by_population_score.vrt")
+ qml_path = os.path.join(self.output_dir, "wee_by_population_score.qml")
+ source_qml = resources_path("resources", "qml", "wee_by_population_score.qml")
params = {
"INPUT": self.output_rasters,
diff --git a/geest/core/workflows/analysis_aggregation_workflow.py b/geest/core/workflows/analysis_aggregation_workflow.py
index c4698e43..febffaa3 100644
--- a/geest/core/workflows/analysis_aggregation_workflow.py
+++ b/geest/core/workflows/analysis_aggregation_workflow.py
@@ -2,7 +2,10 @@
from qgis.core import QgsFeedback, QgsProcessingContext
from qgis.analysis import QgsRasterCalculator, QgsRasterCalculatorEntry
from .aggregation_workflow_base import AggregationWorkflowBase
-from geest.core.algorithms import PopulationRasterProcessingTask, WEEScoreProcessingTask
+from geest.core.algorithms import (
+ PopulationRasterProcessingTask,
+ WEEByPopulationScoreProcessingTask,
+)
from geest.utilities import resources_path
from geest.core import JsonTreeItem
@@ -55,9 +58,14 @@ def __init__(
feedback=self.feedback,
)
population_processor.run()
- wee_processor = WEEScoreProcessingTask(
+ wee_processor = WEEByPopulationScoreProcessingTask(
study_area_gpkg_path=self.gpkg_path,
working_directory=self.working_directory,
force_clear=False,
)
wee_processor.run()
+ # Shamelessly hard coded for now, needs to move to the wee processor class
+ output = os.path.join(
+ self.working_directory, "wee_score", "wee_by_population_score.vrt"
+ )
+ item.setAttribute("wee_by_population", output)
diff --git a/geest/gui/panels/tree_panel.py b/geest/gui/panels/tree_panel.py
index 2f5fd022..4c48d712 100644
--- a/geest/gui/panels/tree_panel.py
+++ b/geest/gui/panels/tree_panel.py
@@ -476,6 +476,13 @@ def update_action_text():
menu.addAction(clear_results_action)
menu.addAction(run_item_action)
menu.addAction(add_to_map_action)
+ add_wee_by_population = QAction("Add WEE by Pop to Map")
+ add_wee_by_population.triggered.connect(
+ lambda: self.add_to_map(
+ item, key="wee_by_population", layer_name="WEE by Population"
+ )
+ )
+ menu.addAction(add_wee_by_population)
add_study_area_layers_action = QAction("Add Study Area to Map", self)
add_study_area_layers_action.triggered.connect(self.add_study_area_to_map)
menu.addAction(add_study_area_layers_action)
@@ -870,13 +877,14 @@ def add_study_area_to_map(self):
f"Added layer: {layer.name()} to group: {geest_group.name()}"
)
- def add_to_map(self, item):
+ def add_to_map(self, item, key="result_file", layer_name=None):
"""Add the item to the map."""
- layer_uri = item.attribute(f"result_file")
-
+ layer_uri = item.attribute(f"{key}")
+ log_message(f"Adding {layer_uri} for key {key} to map")
if layer_uri:
- layer_name = item.data(0)
+ if not layer_name:
+ layer_name = item.data(0)
layer = QgsRasterLayer(layer_uri, layer_name)
if not layer.isValid():
diff --git a/geest/resources/qml/15Classes.qml b/geest/resources/qml/wee_by_population_score.qml
similarity index 100%
rename from geest/resources/qml/15Classes.qml
rename to geest/resources/qml/wee_by_population_score.qml
diff --git a/test/test_data/points/fake_childcare.gpkg b/test/test_data/points/fake_childcare.gpkg
new file mode 100644
index 00000000..d9486608
Binary files /dev/null and b/test/test_data/points/fake_childcare.gpkg differ
diff --git a/test/test_data/points/fake_primary_schools.gpkg b/test/test_data/points/fake_primary_schools.gpkg
new file mode 100644
index 00000000..ed65014c
Binary files /dev/null and b/test/test_data/points/fake_primary_schools.gpkg differ
diff --git a/test/test_data/wee_score/accessibility/Accessibility_score_combined.qml b/test/test_data/wee_score/accessibility/Accessibility_score_combined.qml
new file mode 100644
index 00000000..f632630a
--- /dev/null
+++ b/test/test_data/wee_score/accessibility/Accessibility_score_combined.qml
@@ -0,0 +1,177 @@
+
+
+
+ 1
+ 1
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MinMax
+ WholeRaster
+ Estimated
+ 0.02
+ 0.98
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+