wolfhece 2.2.28__py3-none-any.whl → 2.2.30__py3-none-any.whl

wolfhece/PyWMS.py

@@ -293,9 +293,12 @@ def getNGI(cat:Literal['orthoimage_coverage',
                 tofile=True,
                 format:Literal['image/png', 'image/GeoTIFF']='image/png') -> BytesIO:
 
-    wms=WebMapService(f'https://wms.ngi.be/inspire/ortho/service?',
-                        version='1.3.0', timeout=10)
-
+    try:
+        wms=WebMapService(f'https://wms.ngi.be/inspire/ortho/service?',
+                            version='1.3.0', timeout=10)
+    except:
+        logging.warning(_('Impossible to get data from web services'))
+        return None
     ppkm = 300
     if w is None and h is None:
         real_w = (xr-xl)/1000

wolfhece/__init__.py

@@ -11,10 +11,37 @@ except ImportError as e:
     # print(e)
     raise Exception(_('Error importing GDAL library\nPlease ensure GDAL is installed and the Python bindings are available\n\ngdal wheels can be found at https://github.com/cgohlke/geospatial-wheels'))
 
+try:
+    import pyproj
+except ImportError as e:
+    raise ImportError(_('pyproj is not installed. Please install it to use this function.')) from e
+
 from .apps.version import WolfVersion
 from packaging.version import Version
+from pathlib import Path
+
+
+def ensure_ntv2grid_exists():
+    """
+    Check if the NTV2 grid file exists in the expected location.
+    """
+
+    from shutil import copyfile
+
+    # print('Version de pyproj :', pyproj.__version__)
+    files = ['be_ign_bd72lb72_etrs89lb08.tif', 'be_ign_hBG18.tif', 'be_ign_README.txt']
+
+    pyproj_datadir = Path(pyproj.datadir.get_data_dir())
+
+    for file in files:
+        if not (pyproj_datadir / file).exists():
+            # copy the NTV2 grid file to the pyproj data directory
+            ntv2_grid_path = Path(__file__).parent / 'lb7208_ntv2' / file
+            copyfile(ntv2_grid_path, pyproj_datadir / file)
+            print(f"Copied {file} to {pyproj_datadir}")
 
 __version__ = WolfVersion().get_version()
+ensure_ntv2grid_exists()
 
 def is_enough(version: str) -> bool:
     """

wolfhece/acceptability/acceptability.py

@@ -8,7 +8,7 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
-from .Parallels import parallel_gpd_clip, parallel_v2r, parallel_datamod 
+from .Parallels import parallel_gpd_clip, parallel_v2r, parallel_datamod
 from .func import data_modification, compute_vulnerability, compute_vulnerability4scenario
 from .func import match_vulnerability2sim, compute_acceptability, shp_to_raster, clip_layer
 from .func import Accept_Manager, cleaning_directory, EXTENT, Vulnerability_csv, compute_code
@@ -316,13 +316,13 @@ def Vulnerability(main_dir:str = 'Data',
 
     """
 
-    #Call of the Manager Class --> allows structure 
+    #Call of the Manager Class --> allows structure
     manager = Accept_Manager(main_dir,
                              Study_area,
                              scenario=scenario,
                              Vuln_csv=Vuln_csv,
                              Intermediate_csv=Intermediate_csv)
- 
+
     if not manager.check_before_vulnerability():
         logging.error("The necessary files are missing - Verify logs for more information")
         return
@@ -340,7 +340,7 @@ def Vulnerability(main_dir:str = 'Data',
         cleaning_directory(manager.TMP_SCEN_DIR)
 
         if 10 in steps or steps_vulnerability.CREATE_RASTERS_VULN in steps:
-            compute_vulnerability(manager) 
+            compute_vulnerability(manager)
             done.append(steps_vulnerability.CREATE_RASTERS_VULN)
 
         if 11 in steps or steps_vulnerability.CREATE_RASTERS_CODE in steps:
@@ -382,12 +382,12 @@ def Vulnerability(main_dir:str = 'Data',
         if TMAX is None:
             logging.error("The file for the maximum return period is missing")
             return
-        
+
         match_vulnerability2sim(manager.SA_MASKED_RIVER,    manager.OUT_MASKED_RIVER,   TMAX)
         match_vulnerability2sim(manager.SA_VULN,            manager.OUT_VULN,           TMAX)
         match_vulnerability2sim(manager.SA_CODE,            manager.OUT_CODE,           TMAX)
         done.append(steps_vulnerability.MATCH_SIMUL)
-           
+
     if 4 in steps or steps_vulnerability.APPLY_SCENARIOSVULN in steps:
         if os.path.exists(manager.OUT_VULN):
             existence=False
@@ -398,7 +398,7 @@ def Vulnerability(main_dir:str = 'Data',
         else :
             logging.error(f"The baseline vulnerability does not exist ({manager.OUT_VULN}). Please, compute first the vulnerability without scenarios vuln_.")
         done.append(steps_vulnerability.APPLY_SCENARIOSVULN)
-    #Delete _scenario folder is no scenario  
+    #Delete _scenario folder is no scenario
     if os.path.isdir(manager.OUT_WITHVULN) and not os.listdir(manager.OUT_WITHVULN):
             os.rmdir(manager.OUT_WITHVULN)
     return done
@@ -409,7 +409,7 @@ def Acceptability(main_dir:str = 'Vesdre',
                   coeff_auto:bool = True,
                   Ponderation_csv:str = 'Ponderation.csv',
                   resample_size:int = 100,
-                  steps:list[int] | list[steps_acceptability] = [1,2,3,4,5,6]): 
+                  steps:list[int] | list[steps_acceptability] = [1,2,3,4,5,6]):
     """ Compute acceptability for the scenario """
 
     done = []
@@ -418,30 +418,35 @@ def Acceptability(main_dir:str = 'Vesdre',
                              Study_area,
                              scenario=scenario,
                              Ponderation_csv=Ponderation_csv)
-    
-    # Load the vulnerability raster **for the scenario**, and check if an assembly exists and is asked by the user 
-    # Initialization of lists to read/ write according to the needed steps   
+
+    # Load the vulnerability raster **for the scenario**, and check if an assembly exists and is asked by the user
+    # Initialization of lists to read/ write according to the needed steps
     VulneToCompute, PathsToSaveA, PathsToSaveA100 = [], [], []
-    if 4 in steps or steps_acceptability.COMPUTE_BASELINE_WITHOUT_SCENARIOS in steps: 
+    if 4 in steps or steps_acceptability.COMPUTE_BASELINE_WITHOUT_SCENARIOS in steps:
         VulneToCompute.append(manager.OUT_VULN)
         PathsToSaveA.append(manager.OUT_ACCEPT)
         PathsToSaveA100.append(manager.OUT_ACCEPT_RESAMP)
         river_trace = manager.OUT_MASKED_RIVER
 
-    if 5 in steps or steps_acceptability.COMPUTE_WITH_SCENARIOS in steps: 
-        river_trace = manager.wich_river_trace()        
+    if 5 in steps or steps_acceptability.COMPUTE_WITH_SCENARIOS in steps:
+        river_trace = manager.wich_river_trace()
         change_vuln_files = [Path(a) for a in glob.glob(str(manager.IN_CH_SA_SC / "vuln_*.tif")) + glob.glob(str(manager.IN_CH_SA_SC / "vuln_*.tiff"))]
         if len(change_vuln_files) != 0:
             VulneToCompute.append(manager.OUT_VULN_Stif)
             PathsToSaveA.append(manager.OUT_ACCEPT_Stif)
             PathsToSaveA100.append(manager.OUT_ACCEPT_RESAMP_Stif)
-        else : 
+        else :
             logging.info("No vulnerability rasters in CHANGE_VULNE. The code goes on without them.")
+
+    if len(VulneToCompute) == 0:
+        logging.error("No vulnerability rasters to compute acceptability. Please, compute the vulnerability first.")
+        return done
+
     for i in range(len(VulneToCompute)) :
         vulne = gdal.Open(str(VulneToCompute[i]))
         saveA = PathsToSaveA[i]
         saveA100 = PathsToSaveA100[i]
-        # Load the river mask     
+        # Load the river mask
         riv = gdal.Open(str(river_trace))
 
         # Get the geotransform and projection for the output tiff
@@ -566,7 +571,7 @@ def Acceptability(main_dir:str = 'Vesdre',
 
                 comb += part_accept[curT] * float(pond["Ponderation"][curT])
 
-            y_pixels, x_pixels = comb.shape 
+            y_pixels, x_pixels = comb.shape
 
             driver = gdal.GetDriverByName('GTiff')
 
@@ -583,14 +588,14 @@ def Acceptability(main_dir:str = 'Vesdre',
             dataset.SetGeoTransform(geotrans)
             dataset.SetProjection(proj)
             band = dataset.GetRasterBand(1)
-            band.WriteArray(comb)  
-            band.FlushCache()  
+            band.WriteArray(comb)
+            band.FlushCache()
             dataset.SetGeoTransform(geotrans)
             dataset.SetProjection(proj)
             dataset = None
 
             done.append(steps_acceptability.COMPUTE_MEAN_ACCEPT)
-        
+
         if 6 in steps or steps_acceptability.RESAMPLING in steps:
             if os.path.exists(manager.OUT_ACCEPT):
                 Agg = gdal.Warp(str(saveA100),