v.3.1.1 (#11)

danpejobo · Daniel · web-flow · commit 030c3a237419 · 2024-03-04T15:23:41.000Z
* Configure and dd dev-environment * try to get testing to work * testfile * add workflow_dispatch to action * add pycodestyle to makefile * remove qgis 3_22 * trying tests again * test * update action * try another pth * update path in github action * edit path * edit variable * add debug step * add directory * edit paths * edit paths * update import statement and tests * update tests * add _init__ to submodule in github action * edit path * update test paths * edit paths * add submodule * tests update * update test * edit test * tests * test import error * update tests * edit test * update test * test case * short only * test case * run test on main/dev on push/pull-req * add test calls * error in yml file * edit tests * update testcase * edit test case * try cp testfiles * edit steps * edit test and settings * edit test * update test * restructure repo * restructure repo * update readme * update readme * edit readme * update readme * edit makefile to reflect new repo structure * update paths in github actions * edit action and test * change name on utils to utilities * edit github action * edit check plugin load * edit tests, add badge to readme * edit tests * update test * try to fix import. relative to absolute * edit docstring * update docstring * update docstring * update test * edit test * update test * update test * update test * update test * update test * update testing * update test * test update * update test, add feedback if exception * change to absolute import * edit test * edit test * update text for output feature name variable * update test * update test and add test badge to readme * add issue templates * update test * change testcase CRS * exclude long-term from test * update test * remove redundant logger * edit util reproject raster "TARGET_CRS" * edit test * edit test * add context to temp folder * add prefix to logging and feedback in @reproject_layers * try to use postprocessing * edit test * remove intermediate option * remove intermediate laayers #2 * edit algorithm to postprocess * add QgsProcessingException * edit param input for reproject * edit reproject * edit begrensskade * update test * edit post-process * try to edit the addlayerstask * edit test and log values to reproject * edit reproject * is child added * try with reproject raster change input and source_crs * try postprocess with addlayerstask class * add tests and test data * format code * edit add layers class * add docstring to postprocess * edit tests for excavation module * update testcase * remove tricky "lower()" call to raster path. * edit wrong testnumber * add tests to impact map * edit tests * update test. error in calling alg. * update parameters - test for tunnel * update readme * update readme * update testcase * edit copyright dates * edit sub-processes parameters * v.3.0.0 * fix bug in vulnerability analysis: optional fields input allowed * update test with coverage * test - try with coverage * test w/o coverage * edit test_suite * v.3.1.0 * Edit excavation algorithm where a layer had same name. Fix bug in labels in styles * v.3.1.1 * Add versioning to the algorithms @ prep v.3.1.1 * v.3.1.1 changelog --------- Co-authored-by: Daniel <naturogfrihet@gmail.com>
diff --git a/geovita_processing_plugin/__init__.py b/geovita_processing_plugin/__init__.py
@@ -26,7 +26,7 @@
 __date__ = '2024-01-17'
 __copyright__ = '(C) 2024 by DPE'
 
-__version__ = "3.1.0"
+__version__ = "3.1.1"
 
 import sys
 from pathlib import Path
diff --git a/geovita_processing_plugin/algorithms/BegrensSkadeExcavation.py b/geovita_processing_plugin/algorithms/BegrensSkadeExcavation.py
@@ -108,13 +108,17 @@ def __init__(self):
             "BegrensSkadeII_QGIS_EXCAVATION.log",
             "EXCAVATION_LOGGER",
         ).get_logger()
-        self.logger.info("__INIT__ - Finished initialize BegrensSkadeExcavation ")
+        
+        # Retrieve version number from BaseAlgorithm class "GvBaseProcessingAlgorithms"
+        self.version = self.getVersion()
+        self.logger.info(f"__INIT__ - VERSION: {self.version} ")
 
         # instanciate variables used in postprocessing to add layers to GUI
         self.feature_name = None  # Default value
         self.layers_info = {}
         self.styles_dir_path = Path()
         self.add_layers_task = AddLayersTask()
+        self.logger.info("__INIT__ - Finished initialize BegrensSkadeExcavation ")
 
     def tr(self, string):
         return QCoreApplication.translate("Processing", string)
@@ -482,6 +486,9 @@ def processAlgorithm(self, parameters, context, feedback):
         Here is where the processing itself takes place.
         """
         self.logger.info("PROCESS - Starting the processing")
+        feedback.pushInfo(
+                f"PROCESS - Version: {self.version}"
+            )
         # Retrieve the feature source and sink. The 'dest_id' variable is used
         # to uniquely identify the feature sink, and must be included in the
         # dictionary returned by the processAlgorithm function.
@@ -849,7 +856,7 @@ def processAlgorithm(self, parameters, context, feedback):
                         "shape_path": output_shapefiles[0],
                         "style_name": "BUILDING-TOTAL-RISK-SELLMENT_risk_tots.qml",
                     },
-                    "BUILDING-TOTAL-ANGLE": {
+                    "BUILDING-RISK-ANGLE": {
                         "shape_path": output_shapefiles[0],
                         "style_name": "BUILDING-TOTAL-RISK-ANGLE_risk_angle.qml",
                     },
diff --git a/geovita_processing_plugin/algorithms/BegrensSkadeImpactMap.py b/geovita_processing_plugin/algorithms/BegrensSkadeImpactMap.py
@@ -107,13 +107,17 @@ def __init__(self):
         self.logger = CustomLogger(
             log_dir_path, "BegrensSkadeII_QGIS_IMPACTMAP.log", "IMPACTMAP_LOGGER"
         ).get_logger()
-        self.logger.info("__INIT__ - Finished initialize BegrensSkadeImpactMap ")
+        
+        # Retrieve version number from BaseAlgorithm class "GvBaseProcessingAlgorithms"
+        self.version = self.getVersion()
+        self.logger.info(f"__INIT__ - VERSION: {self.version} ")
 
         # instanciate variables used in postprocessing to add layers to GUI
         self.feature_name = None  # Default value
         self.layers_info = {}
         self.styles_dir_path = Path()
         self.add_layers_task = AddLayersTask()
+        self.logger.info("__INIT__ - Finished initialize BegrensSkadeImpactMap ")
 
     def name(self):
         """
@@ -397,6 +401,9 @@ def processAlgorithm(self, parameters, context, feedback):
         """
         Here is where the processing itself takes place.
         """
+        feedback.pushInfo(
+                f"PROCESS - Version: {self.version}"
+            )
         bShortterm = self.parameterAsBoolean(
             parameters, self.SHORT_TERM_SETTLEMENT[0], context
         )
diff --git a/geovita_processing_plugin/algorithms/BegrensSkadeTunnel.py b/geovita_processing_plugin/algorithms/BegrensSkadeTunnel.py
@@ -108,13 +108,17 @@ def __init__(self):
         self.logger = CustomLogger(
             log_dir_path, "BegrensSkadeII_QGIS_TUNNEL.log", "TUNNEL_LOGGER"
         ).get_logger()
-        self.logger.info("__INIT__ - Finished initialize BegrensSkadeTunnel ")
+        
+        # Retrieve version number from BaseAlgorithm class "GvBaseProcessingAlgorithms"
+        self.version = self.getVersion()
+        self.logger.info(f"__INIT__ - VERSION: {self.version} ")
 
         # instanciate variables used in postprocessing to add layers to GUI
         self.feature_name = None  # Default value
         self.layers_info = {}
         self.styles_dir_path = Path()
         self.add_layers_task = AddLayersTask()
+        self.logger.info("__INIT__ - Finished initialize BegrensSkadeTunnel ")
 
     def name(self):
         """
@@ -501,6 +505,9 @@ def processAlgorithm(self, parameters, context, feedback):
         """
         Here is where the processing itself takes place.
         """
+        feedback.pushInfo(
+                f"PROCESS - Version: {self.version}"
+            )
         bShortterm = self.parameterAsBoolean(
             parameters, self.SHORT_TERM_SETTLEMENT[0], context
         )
diff --git a/geovita_processing_plugin/algorithms/base_algorithm.py b/geovita_processing_plugin/algorithms/base_algorithm.py
@@ -32,8 +32,12 @@
 
 from qgis.core import (QgsProcessingAlgorithm)
 
+from geovita_processing_plugin import __version__  # Import version from package's __init__.py
+
 
 class GvBaseProcessingAlgorithms(QgsProcessingAlgorithm):
     """
     Base class for Geovita algorithms.
-    """
+    """
+    def getVersion(self):
+        return __version__
diff --git a/geovita_processing_plugin/metadata.txt b/geovita_processing_plugin/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=3.1.0
+version=3.1.1
 author=DPE
 email=dpe@geovita.no
 
@@ -28,7 +28,12 @@ repository=https://github.com/danpejobo/geovita_processing_plugin
 
 hasProcessingProvider=yes
 # Uncomment the following line and add your changelog:
-changelog=v.3.1.0 (14.02.2024)
+changelog=v.3.1.1 (04.03.2024)
+	- Add version logging and feedback.
+	- Fix for two layers having the same name in the excavation algorithm (thus only one showing in TOC)
+	- Fix "label" attributes for the styles to the excavation and tunnel algorithms
+
+	v.3.1.0 (14.02.2024)
 	- Minor fix in vulnerability analysis for excavation and tunnel. Fields can be omitted (i.e corresponding analysis are dropped). Any combination of the three vulnerability fields can be assessed.
 
 	v.3.0.0 (09.02.2024)
diff --git a/geovita_processing_plugin/styles.zip b/geovita_processing_plugin/styles.zip
