Merge pull request #181 from osundwajeff/fix-unbound-error-ookla

Fix unbound error

Author: timlinux

config.json

@@ -18,7 +18,7 @@
     "author": "Kartoza for and with The World Bank",
     "email": "info@kartoza.com, gost@worldbank.org",
     "description": "Gender Enabling Environments Spatial Tool",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "changelog": "* Added OOKLA Downloader\\n* Added GHSL Downloader \\n* Added variable distance ACLED Buffer. \\* Fix analysis report.",
     "server": false
   }

geest/core/osm_downloaders/osm_data_downloader_base.py

@@ -294,20 +294,20 @@ def process_line_response(self) -> None:
         # )
         # pipeline = transform.coordinateOperation().projString()
 
-        # log_message(f"Proj4 operation: {pipeline}")
-        processing.run(
+        result = processing.run(
             "native:reprojectlayer",
             {
                 "INPUT": f"{self.output_path}|layername={self.filename}_4326",
                 "TARGET_CRS": self.output_crs,
                 "CONVERT_CURVED_GEOMETRIES": False,
-                # "OPERATION": "+proj=pipeline +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=utm +zone=36 +ellps=WGS84",
-                # The proj4 pipeline string is only available in QGIS >= 3.26
-                # "OPERATION": pipeline,
                 "OUTPUT": f"ogr:dbname='{self.output_path}' table=\"{self.filename}\" (geom)",  # noqa E231
             },
         )
-        self.feedback.setProgress(100)  # Set progress complete
+
+        if not (result and "OUTPUT" in result):
+            raise RuntimeError(f"Failed to reproject OSM data to {self.output_crs.authid()}")
+
+        self.feedback.setProgress(100)
 
         total_end = time.perf_counter()
         log_message(f"GeoPackage written to: {self.output_path} table: {self.filename}")  # noqa E231

geest/core/workflows/index_score_with_ookla_workflow.py

@@ -174,11 +174,13 @@ def _process_features_for_area(
 
         if not final_geom or final_geom.isEmpty():
             log_message(f"No Ookla coverage in area {index} after intersection, skipping rasterization.")
-        else:
-            scored_layer = self.create_scored_boundary_layer(
-                clip_area=final_geom,
-                index=index,
-            )
+            return None
+
+        # Create scored layer only if we have valid geometry
+        scored_layer = self.create_scored_boundary_layer(
+            clip_area=final_geom,
+            index=index,
+        )
         self.progressChanged.emit(60.0)  # We just use nominal intervals for progress
 
         # Rasterize

geest/core/workflows/osm_transport_polyline_per_cell_workflow.py

@@ -67,13 +67,19 @@ def __init__(
                 level=Qgis.Warning,
             )
             layer_path = self.attributes.get("osm_transport_polyline_per_cell_layer_source", None)
+
             if not layer_path:
                 log_message(
-                    "No points layer found in osm_transport_polyline_per_cell_layer_source.",
+                    "No osm_transport_polyline_per_cell_layer_source found, trying road_network_layer_path.",
                     tag="Geest",
                     level=Qgis.Warning,
                 )
-                return False
+                layer_path = self.attributes.get("road_network_layer_path", None)
+
+                if not layer_path:
+                    error_msg = "No transport layer found. Please configure a data source or download the active transport network."
+                    log_message(error_msg, tag="Geest", level=Qgis.Critical)
+                    raise ValueError(error_msg)
 
         self.features_layer = QgsVectorLayer(layer_path, "OSM Transport Layer", "ogr")
 

geest/gui/geest_dock.py

@@ -186,7 +186,9 @@ def __init__(self, parent: Optional[QWidget] = None, json_file: Optional[str] =
                     self.stacked_widget.setCurrentIndex(ROAD_NETWORK_PANEL),
                     self.road_network_widget.set_working_directory(self.create_project_widget.working_dir),
                     self.road_network_widget.set_reference_layer(self.create_project_widget.reference_layer()),
-                    self.road_network_widget.set_crs(self.create_project_widget.crs()),
+                    self.road_network_widget.set_crs(
+                        self.create_project_widget.crs(working_directory=self.create_project_widget.working_dir)
+                    ),
                 ][
                     -1
                 ]  # The [-1] ensures the lambda returns the last value
@@ -362,7 +364,7 @@ def on_panel_changed(self, index: int) -> None:
             log_message(f"Setting road network panel working directory to: {working_directory}")
             self.road_network_widget.set_working_directory(working_directory)
             self.road_network_widget.set_reference_layer(self.create_project_widget.reference_layer())
-            self.road_network_widget.set_crs(self.create_project_widget.crs())
+            self.road_network_widget.set_crs(self.create_project_widget.crs(working_directory=working_directory))
         elif index == TREE_PANEL:
             log_message("Switched to Tree panel")
             # self.tree_widget.set_working_directory(self.setup_widget.working_dir)

geest/gui/panels/create_project_panel.py

@@ -294,8 +294,34 @@ def reference_layer(self):
         """Get the admin boundary reference layer."""
         return self.layer_combo.currentLayer()
 
-    def crs(self):
-        """Get the crs for the Geest project."""
+    def crs(self, working_directory=None):
+        """Get the crs for the Geest project.
+
+        If study area already exists, return its CRS.
+        Otherwise, calculate CRS from the boundary layer.
+
+        Args:
+            working_directory: Optional working directory path. If not provided, uses self.working_dir
+        """
+        # Use provided working_directory, otherwise fall back to self.working_dir
+        work_dir = working_directory or self.working_dir
+
+        # First, try to get CRS from existing study area
+        if work_dir and os.path.exists(work_dir):
+            study_area_gpkg = os.path.join(work_dir, "study_area", "study_area.gpkg")
+            if os.path.exists(study_area_gpkg):
+                try:
+                    study_area_layer = QgsVectorLayer(
+                        f"{study_area_gpkg}|layername=study_area_polygons", "study_area", "ogr"
+                    )
+                    if study_area_layer.isValid():
+                        crs = study_area_layer.crs()
+                        self.crs_label.setText(f"CRS: {crs.authid()}")
+                        return crs
+                except Exception as e:
+                    log_message(f"Could not load study area CRS: {e}", level=Qgis.Warning)
+
+        # If no study area exists yet, calculate CRS from boundary layer
         crs = None
         if self.use_boundary_crs.isChecked():
             log_message("Using boundary CRS")