Fix polygon mask test

kartoza · Dec 27, 2024 · 928c090 · 928c090
1 parent 6963a37
commit 928c090
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/geest/core/algorithms/opportunities_polygon_mask.py b/geest/core/algorithms/opportunities_polygon_mask.py
@@ -125,19 +125,19 @@ def __init__(
             log_message(f"{self.study_area_gpkg_path}|ayername=study_area_clip_polygon")
             del layer
 
-        log_message("Initialized WEE Subnational Area Aggregation Processing Task")
+        log_message("Initialized WEE Opportunities Polygon Mask Processing Task")
 
     def run(self) -> bool:
         """
-        Executes the WEE Subnational Area Aggregation Processing Task calculation task.
+        Executes the WEE Opportunities Polygon Mask Processing Task calculation task.
         """
         try:
             self.mask()
             self.apply_qml_style(
                 source_qml=resources_path(
-                    "resources", "qml", "wee_by_population_vector_score.qml"
+                    "resources", "qml", "wee_by_population_score.qml"
                 ),
-                qml_path=os.path.join(self.output_dir, "subnational_aggregation.qml"),
+                qml_path=os.path.join(self.output_dir, "wee_by_population_score.qml"),
             )
             return True
         except Exception as e:
@@ -149,7 +149,7 @@ def mask(self) -> None:
         """Fix geometries then use mask vector to calculate masked WEE SCORE or WEE x Population Score layer."""
 
         params = {
-            "INPUT": self.aggregation_layer,
+            "INPUT": self.mask_areas_layer,
             "METHOD": 1,  # Structure method
             "OUTPUT": "TEMPORARY_OUTPUT",
         }
@@ -163,7 +163,7 @@ def mask(self) -> None:
             "RASTER_BAND": 1,
             "COLUMN_PREFIX": "_",
             "STATISTICS": [9],  # Majority
-            "OUTPUT": os.path.join(self.output_dir, "subnational_aggregation.gpkg"),
+            "OUTPUT": os.path.join(self.output_dir, "polygon_mask.gpkg"),
         }
         processing.run("native:zonalstatisticsfb", params)
 

diff --git a/test/test_data/wee_score/masks/polygon_mask.gpkg b/test/test_data/wee_score/masks/polygon_mask.gpkg
diff --git a/test/test_data/wee_score/masks/polygon_mask.gpkg-shm b/test/test_data/wee_score/masks/polygon_mask.gpkg-shm
diff --git a/test/test_data/wee_score/masks/polygon_mask.gpkg-wal b/test/test_data/wee_score/masks/polygon_mask.gpkg-wal
diff --git a/test/test_data/wee_score/wee_score.qgz b/test/test_data/wee_score/wee_score.qgz
diff --git a/test/test_polygon_opportunities_mask.py b/test/test_polygon_opportunities_mask.py
@@ -22,7 +22,7 @@ def setUpClass(cls):
         cls.context = QgsProcessingContext()
         cls.feedback = QgsFeedback()
         cls.mask_areas_path = os.path.join(
-            cls.working_directory, "mask", "mask.gpkg|layername=mask"
+            cls.working_directory, "masks", "polygon_mask.gpkg|layername=polygon_mask"
         )
         cls.study_area_gpkg_path = os.path.join(
             cls.working_directory, "study_area", "study_area.gpkg"
@@ -41,7 +41,7 @@ def setUp(self):
 
     def test_initialization(self):
         self.assertTrue(
-            self.task.output_dir.endswith("wee_masks"),
+            self.task.output_dir.endswith("opportunity_masks"),
             msg=f"Output directory is {self.task.output_dir}",
         )
         self.assertEqual(self.task.target_crs.authid(), "EPSG:32620")