v.2.0.2

Author: Daniel

__init__.py

@@ -26,7 +26,7 @@
 __date__ = '2024-01-17'
 __copyright__ = '(C) 2024 by DPE'
 
-__version__ = "2.0.1"
+__version__ = "2.0.2"
 
 import sys
 from pathlib import Path

algorithms/BegrensSkadeExcavation.py

@@ -420,6 +420,12 @@ def processAlgorithm(self, parameters, context, feedback):
         )
         self.logger.info(f"PROCESS - bLongterm value: {bLongterm}")
 
+        if not bShortterm and not bLongterm:
+            error_msg = "Please choose Short term or Long term settlements, or both"
+            self.logger.error(error_msg)
+            feedback.reportError(error_msg)
+            return {}
+        
         bVulnerability = self.parameterAsBoolean(
             parameters,
             self.VULNERABILITY_ANALYSIS[0],
@@ -490,13 +496,7 @@ def processAlgorithm(self, parameters, context, feedback):
         #source_excavation_poly_as_json = Utils.getShapefileAsJson(path_source_excavation_poly, logger)
         self.logger.info(f"PROCESS - JSON structure: {source_excavation_poly_as_json}")
 
-        feedback.setProgress(30)
-        if not bShortterm and not bLongterm:
-            error_msg = "Please choose Short term or Long term settlements, or both"
-            self.logger.error(error_msg)
-            feedback.reportError(error_msg)
-            return {}
-        
+        feedback.setProgress(30)        
         if bShortterm:
             self.logger.info(f"PROCESS - ######## SHORTTERM ########")
             self.logger.info(f"PROCESS - Defining short term input")
@@ -514,14 +514,14 @@ def processAlgorithm(self, parameters, context, feedback):
         else:
             excavation_depth = None
             short_term_curve = None
-        
+            
+        source_raster_rock_surface = self.parameterAsRasterLayer(parameters, self.RASTER_ROCK_SURFACE[0], context )
+        self.logger.info(f"PROCESS - Rock raster DTM: {source_raster_rock_surface}")
         if bLongterm:
             self.logger.info(f"PROCESS - ######## LONGTERM ########")
             self.logger.info(f"PROCESS - Defining long term input")
 
         ############### HANDELING OF INPUT RASTER ################
-            source_raster_rock_surface = self.parameterAsRasterLayer(parameters, self.RASTER_ROCK_SURFACE[0], context )
-            self.logger.info(f"PROCESS - Rock raster DTM: {source_raster_rock_surface}")
             if source_raster_rock_surface is not None:
             ############### RASTER REPROJECT ################
                 if reproject_is_needed(source_raster_rock_surface, output_proj):
@@ -596,7 +596,8 @@ def processAlgorithm(self, parameters, context, feedback):
         #################  LOG PROJECTIONS #################
         feedback.pushInfo(f"PROCESS - CRS BUILDINGS-vector: {source_building_poly.crs().postgisSrid()}")
         feedback.pushInfo(f"PROCESS - CRS EXCAVATION-vector: {source_excavation_poly.crs().postgisSrid()}")
-        feedback.pushInfo(f"PROCESS - CRS DTB-raster: {source_raster_rock_surface.crs().postgisSrid()}")
+        if source_raster_rock_surface is not None:
+            feedback.pushInfo(f"PROCESS - CRS DTB-raster: {source_raster_rock_surface.crs().postgisSrid()}")
 
         ###### FEEDBACK ALL PARAMETERS #########
         feedback.pushInfo("PROCESS - Running mainBegrensSkade_Excavation...")

algorithms/BegrensSkadeTunnel.py

@@ -382,11 +382,17 @@ def initAlgorithm(self, config):
     def processAlgorithm(self, parameters, context, feedback):
         """
         Here is where the processing itself takes place.
-        """
+        """        
         bShortterm = self.parameterAsBoolean(parameters, self.SHORT_TERM_SETTLEMENT[0], context)
         self.logger.info(f"PROCESS - bShortterm value: {bShortterm}")
         bLongterm = self.parameterAsBoolean(parameters, self.LONG_TERM_SETTLEMENT[0], context)
         self.logger.info(f"PROCESS - bLongterm value: {bLongterm}")
+        if not bShortterm and not bLongterm:
+            error_msg = "Please choose Short term or Long term settlements, or both"
+            self.logger.error(error_msg)
+            feedback.reportError(error_msg)
+            return {}
+        
         bVulnerability = self.parameterAsBoolean(parameters, self.VULNERABILITY_ANALYSIS[0], context)
         self.logger.info(f"PROCESS - bVulnerability value: {bVulnerability}")
         bIntermediate = self.parameterAsBoolean(parameters, self.INTERMEDIATE_LAYERS[0], context)
@@ -446,13 +452,6 @@ def processAlgorithm(self, parameters, context, feedback):
         self.logger.info(f"PROCESS - JSON structure: {source_tunnel_poly_as_json}")
 
         feedback.setProgress(30)
-        
-        if not bShortterm and not bLongterm:
-            error_msg = "Please choose Short term or Long term settlements, or both"
-            self.logger.error(error_msg)
-            feedback.reportError(error_msg)
-            return {}
-        
         if bShortterm:
             tunnel_depth = self.parameterAsDouble(parameters, self.TUNNEL_DEPTH[0], context)
             tunnel_diameter = self.parameterAsDouble(parameters, self.TUNNEL_DIAM[0], context)
@@ -463,14 +462,14 @@ def processAlgorithm(self, parameters, context, feedback):
             tunnel_diameter = None
             volume_loss = None
             trough_width = None
-        
+            
+        source_raster_rock_surface = self.parameterAsRasterLayer(parameters, self.RASTER_ROCK_SURFACE[0], context )
+        self.logger.info(f"PROCESS - Rock raster DTM: {source_raster_rock_surface}")
         if bLongterm:
             self.logger.info(f"PROCESS - ######## LONGTERM ########")
             self.logger.info(f"PROCESS - Defining long term input")
 
         ############### HANDELING OF INPUT RASTER ################
-            source_raster_rock_surface = self.parameterAsRasterLayer(parameters, self.RASTER_ROCK_SURFACE[0], context )
-            self.logger.info(f"PROCESS - Rock raster DTM: {source_raster_rock_surface}")
             if source_raster_rock_surface is not None:
                 ############### RASTER REPROJECT ################
                 if reproject_is_needed(source_raster_rock_surface, output_proj):
@@ -499,7 +498,7 @@ def processAlgorithm(self, parameters, context, feedback):
             porewp_calc_type_english = self.CURVES_enum_porepressure[porepressure_index]
             porewp_calc_type = map_porepressure_curve_names(porewp_calc_type_english)
             tunnel_leakage = self.parameterAsDouble(parameters, self.TUNNEL_LEAKAGE[0], context)
-            porewp_red_at_site = self.parameterAsDouble(parameters, self.POREPRESSURE_REDUCTION[0], context)
+            porewp_red_at_site = self.parameterAsInt(parameters, self.POREPRESSURE_REDUCTION[0], context)
             dry_crust_thk = self.parameterAsDouble(parameters, self.DRY_CRUST_THICKNESS[0], context)
             dep_groundwater = self.parameterAsDouble(parameters, self.DEPTH_GROUNDWATER[0], context)
             density_sat = self.parameterAsDouble(parameters, self.SOIL_DENSITY[0], context)
@@ -543,7 +542,8 @@ def processAlgorithm(self, parameters, context, feedback):
         #################  LOG PROJECTIONS #################
         feedback.pushInfo(f"PROCESS - CRS BUILDINGS-vector: {source_building_poly.crs().postgisSrid()}")
         feedback.pushInfo(f"PROCESS - CRS EXCAVATION-vector: {source_tunnel_poly.crs().postgisSrid()}")
-        feedback.pushInfo(f"PROCESS - CRS DTB-raster: {source_raster_rock_surface.crs().postgisSrid()}")
+        if source_raster_rock_surface is not None:
+            feedback.pushInfo(f"PROCESS - CRS DTB-raster: {source_raster_rock_surface.crs().postgisSrid()}")
 
         ###### FEEDBACK ALL PARAMETERS #########
         feedback.pushInfo("PROCESS - Running mainBegrensSkade_Excavation...")

help/source/index.rst

@@ -4,7 +4,7 @@
    contain the root `toctree` directive.
 
 Welcome to GeovitaProcessingPlugin's documentation!
-============================================
+===================================================
 
 Contents:
 

metadata.txt

@@ -7,7 +7,7 @@ name=Geovita GIS Processing provider
 qgisMinimumVersion=3.28
 qgisMaximumVersion=3.99
 description=This plugin adds different Geovita custom processing algorithms to QGIS
-version=2.0.1
+version=2.0.2
 author=DPE
 [email protected]
 
@@ -28,7 +28,8 @@ repository=https://github.com/danpejobo/geovita_processing_plugin
 
 hasProcessingProvider=yes
 # Uncomment the following line and add your changelog:
-changelog=v.2.0.1 (30.01.2024)
+changelog=v.2.0.2 (01.02.2024)
+	- Fix unbound local reference to DTB-raster
 	- Fix bug with checking version. Undefined variable if version < 33200
 
 	v.2.0.0 (29.01.2024)

requirements.txt

@@ -5,7 +5,6 @@ charset-normalizer==3.3.2
 click==8.1.7
 colorama==0.4.6
 docutils==0.20.1
-GDAL==3.4.3
 idna==3.6
 imagesize==1.4.1
 Jinja2==3.1.3

utils/methodslib.py

@@ -91,14 +91,16 @@ def process_raster_for_impactmap(source_excavation_poly, dtb_raster_layer, clipp
     Returns:
     - Path: Path object of the processed raster in TIFF format.
     """
-    # Check if the running version of QGIS is lower than the requirement, and create temp_folder based on that
-    temp_folder = create_temp_folder_for_version(Qgis.QGIS_VERSION_INT, context if context else None)
+
 
     # Prepare processing context and feedback
     if not context:
         context = QgsProcessingContext()
     feedback = context.feedback() if context else QgsProcessingFeedback()
 
+    # Check if the running version of QGIS is lower than the requirement, and create temp_folder based on that
+    temp_folder = create_temp_folder_for_version(Qgis.QGIS_VERSION_INT, context)
+    
     for feature in source_excavation_poly.getFeatures():
         geom = feature.geometry()
         polygon_extent = geom.boundingBox() # Returns a QgsRectangle of the polygon feature
@@ -259,14 +261,14 @@ def reproject_layers(keep_interm_layer: bool,
     Returns:
     - Tuple: (reprojected_vector_path, reprojected_raster_path) Paths to the reprojected layers.
     """
-    # Check if the running version of QGIS is lower than the requirement, and create temp_folder based on that
-    temp_folder = create_temp_folder_for_version(Qgis.QGIS_VERSION_INT, context if context else None)
-
     # Prepare processing context and feedback
     if not context:
         context = QgsProcessingContext()
     feedback = context.feedback() if context else QgsProcessingFeedback()
 
+    # Check if the running version of QGIS is lower than the requirement, and create temp_folder based on that
+    temp_folder = create_temp_folder_for_version(Qgis.QGIS_VERSION_INT, context)
+    
     # Initialize reprojected layer variables
     reprojected_vector_layer = None
     reprojected_raster_layer = None
@@ -359,8 +361,11 @@ def create_temp_folder_for_version(qgis_version_int : int, context: QgsProcessin
     # Check if the running version of QGIS is lower than the requirement
     if qgis_version_int >= 33200 and context is not None:
         # For QGIS versions 3.32.0 and above
-        temp_folder = context.temporaryFolder()
+        temp_folder = Path(context.temporaryFolder())
+        temp_folder.mkdir(parents=True, exist_ok=True)
     else:
         # For older versions, or if no context is provided, use the global Processing temporary folder
-        temp_folder = QgsProcessingUtils.tempFolder()
-    return Path(temp_folder)
+        temp_folder = Path(QgsProcessingUtils.tempFolder())
+        temp_folder.mkdir(parents=True, exist_ok=True)
+        
+    return temp_folder