wolfhece 2.2.37__py3-none-any.whl → 2.2.39__py3-none-any.whl

wolfhece/PyWMS.py

@@ -216,10 +216,14 @@ def getLifeWatch(cat:Literal['None'],
     wms=WebMapService(f'https://maps.elie.ucl.ac.be/cgi-bin/mapserv72?map=/maps_server/lifewatch/mapfiles/LW_Ecotopes/latest/{cat}.map&SERVICE=wms',
                         version='1.3.0', timeout=10)
 
-    ppkm = 300
+    # _p_ixel _p_er _k_ilo_m_etre
+    ppkm = 500
+
     if w is None and h is None:
+        # Bounding dimensions width in kilometres
         real_w = (xr-xl)/1000
         real_h = (yr-yl)/1000
+        # Size in pixels of the requested area.
         w = int(real_w * ppkm)
         h = int(real_h * ppkm)
     elif w is None:
@@ -235,6 +239,8 @@ def getLifeWatch(cat:Literal['None'],
         # w = int(real_w * ppkm)
         h = int(real_h * ppkm)
 
+    # If we ask for too many pixels, well, we reduce the number
+    # of pixels we ask for (keeping the aspect ratio)
     MAXSIZE = 2048
     if w > MAXSIZE:
         pond = w / MAXSIZE
@@ -250,6 +256,8 @@ def getLifeWatch(cat:Literal['None'],
                     #    styles=['default'],
                        srs='EPSG:31370',
                        bbox=(xl,yl,xr,yr),
+                       # Width/Height of map output, in pixels.
+                       # See: https://docs.geoserver.org/stable/en/user/services/wms/reference.html#getmap
                        size=(w,h),
                        format='image/png',
                        transparent=False)
@@ -540,41 +548,49 @@ def get_Alaro_legend(layer:str):
     """
     import requests
     from io import BytesIO
-    layers = ['10_m_u__wind_component',
-                         '10_m_v__wind_component',
-                         '2_m_Max_temp_since_ppp',
-                         '2_m_Min_temp_since_ppp',
-                         '2_m_dewpoint_temperature',
-                         '2_m_temperature',
-                         '2m_Relative_humidity',
-                         'Convective_rain',
-                         'Convective_snow',
-                         'Geopotential',
-                         'Inst_flx_Conv_Cld_Cover',
-                         'Inst_flx_High_Cld_Cover',
-                         'Inst_flx_Low_Cld_Cover',
-                         'Inst_flx_Medium_Cld_Cover',
-                         'Inst_flx_Tot_Cld_cover',
-                         'Large_scale_rain',
-                         'Large_scale_snow',
-                         'Mean_sea_level_pressure',
-                         'Relative_humidity',
-                         'Relative_humidity_isobaric',
-                         'SBL_Meridian_gust',
-                         'SBL_Zonal_gust',
-                         'Specific_humidity',
-                         'Surf_Solar_radiation',
-                         'Surf_Thermal_radiation',
-                         'Surface_CAPE',
-                         'Surface_Temperature',
-                         'Surface_orography',
-                         'Temperature',
-                         'Total_precipitation',
-                         'U-velocity',
-                         'V-velocity',
-                         'Vertical_velocity',
-                         'Wet_Bulb_Poten_Temper',
-                         'freezing_level_zeroDegC_isotherm']
+    # layers = ['10_m_u__wind_component',
+    #             '10_m_v__wind_component',
+    #             '2_m_Max_temp_since_ppp',
+    #             '2_m_Min_temp_since_ppp',
+    #             '2_m_dewpoint_temperature',
+    #             '2_m_temperature',
+    #             '2m_Relative_humidity',
+    #             'Convective_rain',
+    #             'Convective_snow',
+    #             'Geopotential',
+    #             'Inst_flx_Conv_Cld_Cover',
+    #             'Inst_flx_High_Cld_Cover',
+    #             'Inst_flx_Low_Cld_Cover',
+    #             'Inst_flx_Medium_Cld_Cover',
+    #             'Inst_flx_Tot_Cld_cover',
+    #             'Large_scale_rain',
+    #             'Large_scale_snow',
+    #             'Mean_sea_level_pressure',
+    #             'Relative_humidity',
+    #             'Relative_humidity_isobaric',
+    #             'SBL_Meridian_gust',
+    #             'SBL_Zonal_gust',
+    #             'Specific_humidity',
+    #             'Surf_Solar_radiation',
+    #             'Surf_Thermal_radiation',
+    #             'Surface_CAPE',
+    #             'Surface_Temperature',
+    #             'Surface_orography',
+    #             'Temperature',
+    #             'Total_precipitation',
+    #             'U-velocity',
+    #             'V-velocity',
+    #             'Vertical_velocity',
+    #             'Wet_Bulb_Poten_Temper',
+    #             'freezing_level_zeroDegC_isotherm']
+    layers = ['2_m_temperature',
+              'Surface_Temperature',
+                'Convective_rain',
+                'Convective_snow',
+                'Large_scale_rain',
+                'Large_scale_snow',
+                'Mean_sea_level_pressure',
+                'Total_precipitation',]
 
     layers_lowercase = [l.lower() for l in layers]
     if layer.lower() not in layers_lowercase:

wolfhece/acceptability/acceptability.py

@@ -5,7 +5,7 @@ Date: 2024
 Copyright (c) 2024 University of Liege. All rights reserved.
 
 This script and its content are protected by copyright law. Unauthorized
-copying or distribution of this file, via any medium, is strictly prohibited.
+copying or distribution of this file, via any medium, is strictly prohibited.batch_creation_and_interpolation
 """
 
 from .Parallels import parallel_gpd_clip, parallel_v2r, parallel_datamod
@@ -13,6 +13,7 @@ from .func import data_modification, compute_vulnerability, compute_vulnerabilit
 from .func import match_vulnerability2sim, compute_acceptability, shp_to_raster, clip_layer
 from .func import Accept_Manager, cleaning_directory, EXTENT, Vulnerability_csv, compute_code
 
+from ..PyTranslate import _
 import pandas as pd
 import os
 from osgeo import gdal
@@ -52,6 +53,7 @@ class steps_vulnerability(Enum):
     APPLY_MODIFS = 2
     MATCH_SIMUL = 3
     APPLY_SCENARIOSVULN = 4
+    APPLY_SCENARIOSVULN_BUG = 42
 
     @classmethod
     def get_list_names(cls):
@@ -215,7 +217,7 @@ def Base_data_creation(main_dir:str = 'Data',
 
             shp:gpd.GeoDataFrame = gpd.read_file(in_file)
 
-            nb_lines, _ = shp.shape
+            nb_lines, unused = shp.shape
             if nb_lines > 0:
                 shp["Path"]  = curlayer
                 shp["Vulne"] = vulnerability_csv.get_vulnerability_level(curlayer)
@@ -391,13 +393,18 @@ def Vulnerability(main_dir:str = 'Data',
     if 4 in steps or steps_vulnerability.APPLY_SCENARIOSVULN in steps:
         if os.path.exists(manager.OUT_VULN):
             existence=False
-            existence = manager.create_vrtIfExists(manager.OUT_VULN, manager.IN_CH_SA_SC, manager.OUT_VULN_VRT, name="vuln")
-            if existence == True :
-                logging.info("Scenarios have been applied to the vulnerability matrix see _scenarios")
+            existence, fail = manager.create_vrtIfExists(manager.OUT_VULN, manager.IN_CH_SA_SC, manager.OUT_VULN_VRT, name="vuln")
+            if existence == None:
+                logging.error(_(f"Error in MNT_ files type : {fail}. Please correct them (int8 and Null value = 127)."))
+                return done.append(steps_vulnerability.APPLY_SCENARIOSVULN_BUG)
+            
+            elif existence == True :
                 manager.translate_vrt2tif(manager.OUT_VULN_VRT, manager.OUT_VULN_S)
+                logging.info("Scenarios have been applied to the vulnerability matrix see _scenarios")
         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
     if os.path.isdir(manager.OUT_WITHVULN) and not os.listdir(manager.OUT_WITHVULN):
             os.rmdir(manager.OUT_WITHVULN)
@@ -429,7 +436,7 @@ def Acceptability(main_dir:str = 'Vesdre',
         river_trace = manager.OUT_MASKED_RIVER
 
     if 5 in steps or steps_acceptability.COMPUTE_WITH_SCENARIOS in steps:
-        river_trace = manager.wich_river_trace()
+        river_trace = manager.wich_river_trace(True)
         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)
@@ -563,8 +570,8 @@ def Acceptability(main_dir:str = 'Vesdre',
             assert len(pond) == len(return_periods), "The number of ponderations is not equal to the number of return periods"
 
             # Initialize the combined acceptability matrix -- Ponderate mean of the local acceptability
-            comb = np.zeros(part_accept[return_periods[-1]].shape, dtype=np.float32)
-
+            comb = np.zeros(part_accept[return_periods[0]].shape, dtype=np.float32)
+            
             for curT in return_periods:
                 assert part_accept[curT].dtype == np.float32, "The dtype of the acceptability matrix is not np.float32"
                 assert part_accept[curT].shape == comb.shape, "The shape of the acceptability matrix is not the right one"