wolfhece 2.2.41__py3-none-any.whl → 2.2.42__py3-none-any.whl

wolfhece/PyDraw.py

@@ -3697,13 +3697,20 @@ class WolfMapViewer(wx.Frame):
             self._uts_menu = wx.Menu()
             self._ocs_menu = wx.Menu()
 
-            self._uts_crop = self._uts_menu.Append(wx.ID_ANY, _("Crop on active array"), _("Crop active array"))
-            self._uts_cropscreen = self._uts_menu.Append(wx.ID_ANY, _("Crop on screen"), _("Crop screen"))
+            self._uts_crop = self._uts_menu.Append(wx.ID_ANY, _("Crop on active array"), _("Crop UTS data (vectorized - shp, gpkg) on the active array extent"))
+            self._uts_cropscreen = self._uts_menu.Append(wx.ID_ANY, _("Crop on screen"), _("Crop UTS data (vectorized - shp, gpkg) on the current screen extent"))
             self._uts_map = self._uts_menu.Append(wx.ID_ANY, _("Map active array (WAL_UTS -> Manning)"), _("Map Walous UTS active array to Manning's n"))
             self._uts_legend = self._uts_menu.Append(wx.ID_ANY, _("Legend"), _("Legend"))
 
-            self._ocs_crop = self._ocs_menu.Append(wx.ID_ANY, _("Crop on active array"), _("Crop active array"))
-            self._ocs_cropscreen = self._ocs_menu.Append(wx.ID_ANY, _("Crop on screen"), _("Crop screen"))
+            self._ocs_crop_10m_2023 = self._ocs_menu.Append(wx.ID_ANY, _("Crop on active array (prepared data 10 m - 2023)"), _("Crop OCS data (matrix - geotif) on the active array extent using prepared 10m data"))
+            self._ocs_cropscreen_10m_2023 = self._ocs_menu.Append(wx.ID_ANY, _("Crop on screen (prepared data 10 m - 2023)"), _("Crop OCS data (matrix - geotif) on the current screen extent using prepared 10m data"))
+            self._ocs_menu.AppendSeparator()
+            self._ocs_crop_10m_2020 = self._ocs_menu.Append(wx.ID_ANY, _("Crop on active array (prepared data 10 m - 2020)"), _("Crop OCS data (matrix - geotif) on the active array extent using prepared 10m data"))
+            self._ocs_cropscreen_10m_2020 = self._ocs_menu.Append(wx.ID_ANY, _("Crop on screen (prepared data 10 m - 2020)"), _("Crop OCS data (matrix - geotif) on the current screen extent using prepared 10m data"))
+            self._ocs_menu.AppendSeparator()
+            self._ocs_crop = self._ocs_menu.Append(wx.ID_ANY, _("Crop on active array"), _("Crop OCS data (matrix - geotif) on the active array extent"))
+            self._ocs_cropscreen = self._ocs_menu.Append(wx.ID_ANY, _("Crop on screen"), _("Crop OCS data (matrix - geotif) on the current screen extent"))
+            self._ocs_menu.AppendSeparator()
             self._ocs_map = self._ocs_menu.Append(wx.ID_ANY, _("Map active array (WAL_OCS -> Hydrology)"), _("Map Walous OCS active array to Hydrology's landuse classification"))
             self._ocs_map = self._ocs_menu.Append(wx.ID_ANY, _("Map active array (WAL_OCS -> Manning)"), _("Map Walous OCS active array to Manning's n"))
             self._ocs_legend = self._ocs_menu.Append(wx.ID_ANY, _("Legend"), _("Legend"))
@@ -3832,9 +3839,9 @@ class WolfMapViewer(wx.Frame):
 
         itemlabel = item.ItemLabel
 
-        if itemlabel in [_("Crop on active array"), _("Crop on screen")]:
+        if _("Crop on active array") in itemlabel or _("Crop on screen") in itemlabel:
 
-            if itemlabel == _("Crop on screen"):
+            if _("Crop on screen") in itemlabel:
 
                 bounds = self.get_canvas_bounds(gridsize=1.)
 
@@ -3868,14 +3875,24 @@ class WolfMapViewer(wx.Frame):
             from .pywalous import update_palette_walous_ocs
 
             if self._walous_OCS_filepath is None:
-                dlg = wx.FileDialog(self, _("Choose the Walous OCS Tif file"), wildcard="Tif file (*.tif)|*.tif|all (*.*)|*.*", style=wx.FD_OPEN)
-                if dlg.ShowModal() == wx.ID_CANCEL:
-                    dlg.Destroy()
-                    return
 
-                self._walous_OCS_filepath = Path(dlg.GetPath())
-                dlg.Destroy()
+                if itemlabel in [_("Crop on active array (prepared data 10 m - 2023)"), _("Crop on screen (prepared data 10 m - 2023)")]:
+                    self._walous_OCS_filepath = toys_dataset('Walous_OCS', 'WALOUS_2023_lbt72_10m.tif')
+                elif itemlabel in [_("Crop on active array (prepared data 10 m - 2020)"), _("Crop on screen (prepared data 10 m - 2020)")]:
+                    self._walous_OCS_filepath = toys_dataset('Walous_OCS', 'WALOUS_2020_lbt72_10m.tif')
 
+                else:
+                    dlg = wx.FileDialog(self, _("Choose the Walous OCS Tif file"), wildcard="Tif file (*.tif)|*.tif|all (*.*)|*.*", style=wx.FD_OPEN)
+                    if dlg.ShowModal() == wx.ID_CANCEL:
+                        dlg.Destroy()
+                        return
+
+                    self._walous_OCS_filepath = Path(dlg.GetPath())
+                    dlg.Destroy()
+
+            if self._walous_OCS_filepath is None or not Path(self._walous_OCS_filepath).exists():
+                logging.error(_('No Walous OCS file -- Please set it'))
+                return
 
             dlg = wx.FileDialog(self, _("Choose the output file"), wildcard="Geotif (*.tif)|*.tif|all (*.*)|*.*", style=wx.FD_SAVE, defaultDir=str(def_outdrir))
             if dlg.ShowModal() == wx.ID_CANCEL:
@@ -3885,8 +3902,33 @@ class WolfMapViewer(wx.Frame):
             output = Path(dlg.GetPath())
             dlg.Destroy()
 
+            header_OCS = header_wolf.read_header(self._walous_OCS_filepath)
+            if header_OCS.dx != spatial_res:
+                # Adapt bounds to ensure that the rebin will be correct.
+                # If spatial_res is a multiple of header_OCS.dx, no need to change bounds.
+                # If not, change the bounds to ensure that the crop will include data in all footprints.
+
+                # Convert bvounds to list to be able to modify it
+                bounds = [list(bounds[0]), list(bounds[1])]
+
+                if (bounds[0][0] - header_OCS.origx) % header_OCS.dx != 0:
+                    bounds[0][0] = header_OCS.origx + ((bounds[0][0] - header_OCS.origx) // header_OCS.dx) * header_OCS.dx
+                if (bounds[0][1] - bounds[0][0]) % header_OCS.dx != 0:
+                    bounds[0][1] = bounds[0][0] + ((bounds[0][1] - bounds[0][0]) // header_OCS.dx + 1) * header_OCS.dx
+                if (bounds[1][0] - header_OCS.origy) % header_OCS.dy != 0:
+                    bounds[1][0] = header_OCS.origy + ((bounds[1][0] - header_OCS.origy) // header_OCS.dy) * header_OCS.dy
+                if (bounds[1][1] - bounds[1][0]) % header_OCS.dy != 0:
+                    bounds[1][1] = bounds[1][0] + ((bounds[1][1] - bounds[1][0]) // header_OCS.dy + 1) * header_OCS.dy
+
             locwalous = WolfArray(fname=self._walous_OCS_filepath,
-                                  crop = bounds)
+                                  crop = [bounds[0][0], bounds[0][1], bounds[1][0], bounds[1][1]])
+
+            if locwalous.dx != spatial_res:
+                locwalous.rebin(spatial_res / locwalous.dx, operation='min')
+                logging.info(_('Rebin to {} m because original data are {} m').format(spatial_res, locwalous.dx))
+                locwalous = WolfArray(mold=locwalous, crop = self.active_array.get_bounds())
+
+            locwalous.write_all(output)
 
             if Path(output).exists():
                 logging.info(_('File {} created').format(output))
@@ -3904,6 +3946,7 @@ class WolfMapViewer(wx.Frame):
             elif ret == wx.ID_YES:
                 walousarray = WolfArray(fname=output)
                 update_palette_walous_ocs(walousarray.mypal)
+                walousarray.reset_plot()
                 self.add_object('array', newobj=walousarray, id = 'walous_ocs_crop')
                 dlg.Destroy()
 
@@ -3920,6 +3963,10 @@ class WolfMapViewer(wx.Frame):
                 logging.warning(_('No active array -- Please activate data first'))
                 return
 
+            if self.active_array.wolftype != WOLF_ARRAY_FULL_SINGLE:
+                logging.error(_('Active array is not a Float32 array -- Please change it to Float32 before mapping'))
+                return
+
             vals = self.active_array.get_unique_values()
 
             if self._walous_layer is None:
@@ -3955,6 +4002,10 @@ class WolfMapViewer(wx.Frame):
                 logging.warning(_('No active array -- Please activate data first'))
                 return
 
+            if self.active_array.wolftype != WOLF_ARRAY_FULL_SINGLE:
+                logging.error(_('Active array is not a Float32 array -- Please change it to Float32 before mapping'))
+                return
+
             vals = self.active_array.get_unique_values()
 
             if self._walous_layer is None:
@@ -3995,7 +4046,6 @@ class WolfMapViewer(wx.Frame):
 
         if itemlabel in [_("Crop on active array"), _("Crop on screen")]:
 
-
             if itemlabel == _("Crop on screen"):
 
                 bounds = self.get_canvas_bounds(gridsize=1.)
@@ -4027,10 +4077,10 @@ class WolfMapViewer(wx.Frame):
                 def_outdrir = Path(self.active_array.filename).parent
                 spatial_res = self.active_array.dx
 
-            from .pywalous import Walous_data, WALOUS2MANNING_MAJ_NIV1, WALOUS2MANNING_MAJ_NIV2, update_palette_walous_uts
+            from .pywalous import Walous_data, WALOUS_UTS2MANNING_MAJ_NIV1, WALOUS_UTS2MANNING_MAJ_NIV2, update_palette_walous_uts
 
             if self._walous_UTS_filepath is None:
-                dlg = wx.FileDialog(self, _("Choose the Walous shape file"), wildcard="Shapefile (*.shp)|*.shp|all (*.*)|*.*", style=wx.FD_OPEN)
+                dlg = wx.FileDialog(self, _("Choose the Walous shape file"), wildcard="Geopackage (*.gpkg)|*.gpkg|Shapefile (*.shp)|*.shp|all (*.*)|*.*", style=wx.FD_OPEN)
                 if dlg.ShowModal() == wx.ID_CANCEL:
                     dlg.Destroy()
                     return
@@ -4054,7 +4104,7 @@ class WolfMapViewer(wx.Frame):
                 dlg.Destroy()
                 return
 
-            self._walous_layer = dlg.GetStringSelection()
+            self._walous_layer = 'UTS_' + dlg.GetStringSelection()
 
             locwalous = Walous_data(self._walous_UTS_filepath.parent, self._walous_UTS_filepath.name)
             ret = locwalous.rasterize(bounds=bounds,
@@ -4100,14 +4150,18 @@ class WolfMapViewer(wx.Frame):
                 logging.warning(_('No active array -- Please activate data first'))
                 return
 
+            if self.active_array.wolftype != WOLF_ARRAY_FULL_SINGLE:
+                logging.error(_('Active array is not a Float32 array -- Please change it to Float32 before mapping'))
+                return
+
             vals = self.active_array.get_unique_values()
 
             if self._walous_layer is None:
 
                 if vals[0] > 10:
-                    self._walous_layer = 'MAJ_NIV2'
+                    self._walous_layer = 'UTS_MAJ_NIV2'
                 else:
-                    self._walous_layer = 'MAJ_NIV1'
+                    self._walous_layer = 'UTS_MAJ_NIV1'
 
             dlg = DlgMapWalous2Manning(self, which=self._walous_layer)
 

wolfhece/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 2
-        self.patch = 41
+        self.patch = 42
 
     def __str__(self):
 

wolfhece/mesh2d/wolf2dprev.py

@@ -51,6 +51,8 @@ PREV_INFILTRATION_VAR_SIMPLE = -1  #INFILTRATION VARIABLE (RÉPARTITION UNIFORME
 PREV_INFILTRATION_VAR_MOD_MOMENTUM = -2  #INFILTRATION VARIABLE AVEC MOD QT MVT (RÉPARTITION NON UNIFORME DU DÉBIT INJECTÉ CALCULÉ SUR BASE DE L'ÉTAT HYDRODYNAMIQUE INSTANTANÉ)
 PREV_INFILTRATION_VAR_LINKED_ZONES = -3  #INFILTRATION/EXFILTRATION "INTERNE" VARIABLE (RÉPARTITION UNIFORME DU DÉBIT SUR BASE DE DEUX ZONES D'INFILTRATION)
 
+PREV_INFILTRATION_MODES = [PREV_INFILTRATION_NULL, PREV_INFILTRATION_SIMPLE, PREV_INFILTRATION_MOD_MOMENTUM, PREV_INFILTRATION_MOD_MOMENTUM_IMPOSED, PREV_INFILTRATION_VAR_SIMPLE, PREV_INFILTRATION_VAR_MOD_MOMENTUM, PREV_INFILTRATION_VAR_LINKED_ZONES]
+
 ##
 PREV_READ_TXT = 1
 PREV_READ_FINE = 2
@@ -968,8 +970,8 @@ class prev_parameters_blocks:
     def get_params_sediment(self) -> dict:
         """ Retourne les paramètres du modèle sédimentaire """
 
-        return {_('Model'): self.get_params_sediment_model(),
-                _('Drifting model'): self.get_params_sediment_drifting_model(),
+        return {_('Model'): self._get_params_sediment_model(),
+                _('Drifting model'): self._get_params_sediment_drifting_model(),
                 _('Porosity'): self._sed_porosity,
                 _('Mean diameter'): self._sed_d_mean,
                 _('Sediment density'): self._sed_s,
@@ -2127,48 +2129,74 @@ class prev_parameters_blocks:
                     'cd_c': self._infil_dev_c,
                     'cd_d': self._infil_dev_d}
 
-        elif self._infiltration_mode == 4:
-            return self.get_infiltration_momentum_correction_params()
+        elif self._infiltration_mode == PREV_INFILTRATION_MOD_MOMENTUM_IMPOSED:
+            return self.get_params_infiltration_momentum_correction()
 
         else:
             return {}
 
+    def get_infiltration_mode(self) -> int:
+        """ Retourne le mode d'infiltration """
+        return self._infiltration_mode
+
+    def set_infiltration_mode(self, mode:int) -> None:
+        """ Définit le mode d'infiltration
+
+        0 : PREV_INFILTRATION_NULL  - PAS D'INFILTRATION
+        1 : PREV_INFILTRATION_SIMPLE - INFILTRATION SIMPLE (RÉPARTITION UNIFORME DU DÉBIT INJECTÉ PAR FICHIER .INF)
+        2 : PREV_INFILTRATION_MOD_MOMENTUM - INFILTRATION AVEC MODIFICATION DE LA QT DE MVT (RÉPARTITION NON UNIFORME DU DÉBIT INJECTÉ PAR FICHIER .INF)
+        4 : PREV_INFILTRATION_MOD_MOMENTUM_IMPOSED - INFILTRATION AVEC MODIFICATION IMPOSÉE DE LA QT DE MVT (RÉPARTITION NON UNIFORME DU DÉBIT INJECTÉ PAR FICHIER .INF)
+        -1 : PREV_INFILTRATION_VAR_SIMPLE - INFILTRATION VARIABLE (RÉPARTITION UNIFORME DU DÉBIT INJECTÉ CALCULÉ SUR BASE DE L'ÉTAT HYDRODYNAMIQUE INSTANTANÉ)
+        -2 : PREV_INFILTRATION_VAR_MOD_MOMENTUM - INFILTRATION VARIABLE AVEC MOD QT MVT (RÉPARTITION NON UNIFORME DU DÉBIT INJECTÉ CALCULÉ SUR BASE DE L'ÉTAT HYDRODYNAMIQUE INSTANTANÉ)
+        -3 : PREV_INFILTRATION_VAR_LINKED_ZONES - INFILTRATION/EXFILTRATION "INTERNE" VARIABLE (RÉPARTITION UNIFORME DU DÉBIT SUR BASE DE DEUX ZONES D'INFILTRATION)
+
+        :param mode: mode d'infiltration
+        """
+        assert isinstance(mode, int), "mode must be an integer"
+        assert mode in PREV_INFILTRATION_MODES, f"mode must be in {PREV_INFILTRATION_MODES}"
+        self._infiltration_mode = mode
+
+    def reset_infiltration_mode(self) -> None:
+        """ Réinitialise le mode d'infiltration """
+        self._infiltration_mode = PREV_INFILTRATION_NULL
+
+
     def check_params_infiltration(self) -> tuple[bool, str]:
         """ Vérifie les paramètres d'infiltration """
 
         ret = '\nInfiltration\n************\n'
         valid = True
 
-        if self._infiltration_mode == 0:
+        if self._infiltration_mode == PREV_INFILTRATION_NULL:
             ret += _('Info: No infiltration\n')
-        elif self._infiltration_mode == 1:
+        elif self._infiltration_mode == PREV_INFILTRATION_SIMPLE:
             ret += _('Info: Simple infiltration\n')
-        elif self._infiltration_mode == 2:
+        elif self._infiltration_mode == PREV_INFILTRATION_MOD_MOMENTUM:
             ret += _('Info: Infiltration with momentum modification\n')
-        elif self._infiltration_mode == 4:
+        elif self._infiltration_mode == PREV_INFILTRATION_MOD_MOMENTUM_IMPOSED:
             ret += _('Info: Infiltration with imposed momentum modification\n')
-        elif self._infiltration_mode == -1:
+        elif self._infiltration_mode == PREV_INFILTRATION_VAR_SIMPLE:
             ret += _('Info: Variable infiltration\n')
-        elif self._infiltration_mode == -2:
+        elif self._infiltration_mode == PREV_INFILTRATION_VAR_MOD_MOMENTUM:
             ret += _('Info: Variable infiltration with momentum modification\n')
-        elif self._infiltration_mode == -3:
+        elif self._infiltration_mode == PREV_INFILTRATION_VAR_LINKED_ZONES:
             ret += _('Info: Variable infiltration/exfiltration (linked zone)\n')
 
         if self._infiltration_mode < 0:
             ret += _('Info: Coefficients a={self._infil_a}, b={self._infil_b}, c={self._infil_c}\n')
 
-            if self._infiltration_mode != -3 and self._infil_a == 0. and self._infil_b == 0. and self._infil_c == 0.:
+            if self._infiltration_mode != PREV_INFILTRATION_VAR_LINKED_ZONES and self._infil_a == 0. and self._infil_b == 0. and self._infil_c == 0.:
                 ret += _('Warning: No polynomial infiltration\n')
 
-            if self._infiltration_mode == -3 and self._infil_a == 0.:
+            if self._infiltration_mode == PREV_INFILTRATION_VAR_LINKED_ZONES and self._infil_a == 0.:
                 ret += _('Warning: No infiltration/exfiltration under bridge\n')
 
             ret += _('Info: Coefficients Cd={self._infil_dev_cd}, width={self._infil_dev_width}\n, zseuil={self._infil_dev_zseuil}')
 
-            if self._infiltration_mode != -3 and self._infil_dev_cd == 0. or self._infil_dev_width == 0.:
+            if self._infiltration_mode != PREV_INFILTRATION_VAR_LINKED_ZONES and self._infil_dev_cd == 0. or self._infil_dev_width == 0.:
                 ret += _('Warning: No weir exfiltration\n')
 
-            if self._infiltration_mode == -3 and (self._infil_dev_cd == 0. or self._infil_dev_width == 0.):
+            if self._infiltration_mode == PREV_INFILTRATION_VAR_LINKED_ZONES and (self._infil_dev_cd == 0. or self._infil_dev_width == 0.):
                 ret += _('Warning: No weir over bridge\n')
 
             ret += _('Info: Coefficients d={self._infil_var_d}, e={self._infil_var_e}\n')
@@ -2195,7 +2223,7 @@ class prev_parameters_blocks:
         self._infil_correction_ux = ux
         self._infil_correction_vy = vy
 
-        if self._infiltration_mode != 4:
+        if self._infiltration_mode != PREV_INFILTRATION_MOD_MOMENTUM_IMPOSED:
             logging.warning("To apply, you must set ninfil to 4")
         else:
             logging.info("Infiltration momentum correction applied")
@@ -2203,7 +2231,7 @@ class prev_parameters_blocks:
     def get_params_infiltration_momentum_correction(self) -> dict:
         """ Retourne les corrections de moment pour l'infiltration """
 
-        if self._infiltration_mode == 4:
+        if self._infiltration_mode == PREV_INFILTRATION_MOD_MOMENTUM_IMPOSED:
             return {'ux': self._infil_correction_ux,
                     'vy': self._infil_correction_vy}
         else:

wolfhece/models/walous_ocs.pal

@@ -0,0 +1,49 @@
+12
+0.0
+229
+234
+63
+1.0
+138
+138
+138
+2.0
+220
+15
+15
+3.0
+78
+78
+78
+4.0
+208
+208
+208
+5.0
+36
+97
+247
+6.0
+255
+255
+115
+7.0
+233
+255
+190
+8.0
+0
+50
+0
+9.0
+40
+200
+40
+80.0
+0
+120
+0
+90.0
+183
+232
+176

wolfhece/pywalous.py

@@ -23,6 +23,123 @@ import wx.grid
 from .PyTranslate import _
 from .PyPalette import wolfpalette
 
+"""
+Hydrology classification for Land Use in Wallonia:
+1 = forêt
+2 = prairie
+3 = culture
+4 = pavés/urbain
+5 = rivière
+6 = plan d'eau
+"""
+
+HYDROLOGY_LANDUSE_FR = {"forêt" : 1.,
+                        "prairie" : 2.,
+                        "culture" : 3.,
+                        "pavés/urbain" : 4.,
+                        "rivière" : 5.,
+                        "plan d'eau" : 6.,
+                     }
+
+HYDROLOGY_LANDUSE_EN = {"forest" : 1.,
+                        "meadow" : 2.,
+                        "crop" : 3.,
+                        "paved/urban" : 4.,
+                        "river" : 5.,
+                        "water body" : 6.,
+                        }
+
+# WALOUS OCS
+# ----------
+
+"""
+Extrait de https://metawal.wallonie.be/geonetwork/srv/api/records/86462606-4a21-49c8-ab9e-564ccba681b7/attachments/DescriptionLegende_WALOUS_OCS.pdf
+
+1. Revêtement artificiel du sol: cette classe reprend tous les revêtements artificiels du sol
+de nature peu ou pas perméable (ex béton, le bitume ou les pavés). Ceci comprend le réseau routier, les trottoirs, les terrasses, les parkings (les emplacements de parking semiperméables non végétalisés sont également dans cette catégorie) et les terrains ou pistes de sport en matériaux synthétiques.
+2. Constructions artificielles hors sol : cette classe reprend tous les bâtiments et autres constructions s'élevant au-dessus du sol.
+3. Réseau ferroviaire : cette classe reprend les rails et ballasts des chemins de fer encore en activité (les RaVEL entre dans la classe 1). Cette classe se différencie de la classe 1 par sa grande perméabilité.
+4. Sols nus : cette classe inclut tout type de roche mère n'étant couverte par des végétaux supérieurs à aucun moment de l'année. Ces sols sont soit naturels (roches affleurantes, falaises, berges caillouteuses…), soit générés par l'activité humaine (extraction, sols compactés, coupe à blanc de l'année…)
+5. Eaux de surface : cette classe comprend toutes les surfaces d'eau libre, naturelles ou artificielles. Ceci inclut donc à la fois les cours d'eau (rivières, fleuves et canaux) et les plans d'eau (mares, étangs, lacs, bassins de décantation, piscines extérieures).
+6. Couvert herbacé en rotation : cette classe reprend les parcelles combinant un couvert herbacé une partie de l'année et un sol nu temporairement mis à nu. On y retrouve toutes les cultures annuelles, ainsi que les prairies temporaires succédant à une culture annuelle.
+7. Couvert herbacé continu : cette classe reprend tous les sols recouverts par de la végétation herbacée tout au long de l'année. Cette végétation peut être d'origine naturelle (landes, mégaphorbiaies, tourbières, pelouses naturelles, végétation rudérale recolonisant une friche ou une ancienne coupe à blanc…), agricole (prés et prairies non labourés dans la saison) ou artificielle (jardin, terrains de sport, parcs…)
+8. Arbres résineux : cette classe comprend tous les arbres de plus de 3 m (isolés, en haie ou en peuplement) du groupe des résineux (gymnosperme).
+9. Arbres feuillus : cette classe comprend tous les arbres de plus de 3 m (isolés, en haie ou en peuplement) du groupe des feuillus (angiosperme).
+80. Arbustes résineux : cette classe comprend tous les arbres et arbustes de moins de 3 m (isolés, en haie ou en peuplement) du groupe des résineux (gymnosperme).
+90. Arbustes feuillus : cette classe comprend tous les arbres et arbuste de moins de 3 m (isolés, en haie ou en peuplement) du groupe des feuillus (angiosperme).
+
+
+<paletteEntry color="#8a8a8a" value="1" alpha="255" label="Revêtement artificiel au sol"/>
+<paletteEntry color="#dc0f0f" value="2" alpha="255" label="Constructions artificielles hors sol"/>
+<paletteEntry color="#4e4e4e" value="3" alpha="255" label="Réseau ferroviaire"/>
+<paletteEntry color="#d0d0d0" value="4" alpha="255" label="Sols nus"/>
+<paletteEntry color="#2461f7" value="5" alpha="255" label="Eaux de surface"/>
+<paletteEntry color="#ffff73" value="6" alpha="255" label="Couvert herbacé en rotation dans l'année (ex: culture annuelle)"/>
+<paletteEntry color="#e9ffbe" value="7" alpha="255" label="Couvert herbacé toute l'année"/>
+<paletteEntry color="#003200" value="8" alpha="255" label="Résineux (> 3m)"/>
+<paletteEntry color="#007800" value="80" alpha="255" label="Résineux (≤ 3m)"/>
+<paletteEntry color="#28c828" value="9" alpha="255" label="Feuillus (> 3m)"/>
+<paletteEntry color="#b7e8b0" value="90" alpha="255" label="Feuillus (≤ 3m)"/>
+<paletteEntry color="#e5ea3f" value="0" alpha="0" label="Pas de données"/>
+"""
+
+WALOUS_OCS = { "Revêtement artificiel au sol": 1.,
+              "Constructions artificielles hors sol": 2.,
+              "Réseau ferroviaire": 3.,
+              "Sols nus": 4.,
+              "Eaux de surface": 5.,
+              "Couvert herbacé en rotation dans l'année": 6.,
+              "Couvert herbacé toute l'année": 7.,
+              "Arbres résineux (>= 3m)": 8.,
+              "Arbres feuillus (>= 3m)": 9.,
+              "Arbustes résineux (< 3m)": 80.,
+              "Arbustes feuillus (< 3m)": 90.}
+
+WALOUS_OCS_COLORMAP = {
+    0.: (229, 234, 63, 0),       # #e5ea3f Pas de données
+    1.: (138, 138, 138, 255),    # #8a8a8a Revêtement artificiel au sol
+    2.: (220, 15, 15, 255),      # #dc0f0f Constructions artificielles hors sol
+    3.: (78, 78, 78, 255),       # #4e4e4e Réseau ferroviaire
+    4.: (208, 208, 208, 255),    # #d0d0d0 Sols nus
+    5.: (36, 97, 247, 255),      # #2461f7 Eaux de surface
+    6.: (255, 255, 115, 255),    # #ffff73 Couvert herbacé en rotation
+    7.: (233, 255, 190, 255),    # #e9ffbe Couvert herbacé continu
+    8.: (0, 50, 0, 255),         # #003200 Arbres résineux (> 3m)
+    9.: (40, 200, 40, 255),      # #28c828 Arbres feuillus (> 3m)
+    80.: (0, 120, 0, 255),       # #007800 Arbustes résineux (≤ 3m)
+    90.: (183, 232, 176, 255),   # #b7e8b0 Arbustes feuillus (≤ 3m)
+}
+
+WALOUS_OCS2MANNING = {1.: 0.02, # Revêtement artificiel au sol
+                     2.: 0.025, # Constructions artificielles hors sol
+                     3.: 0.04,  # Réseau ferroviaire
+                     4.: 0.04,  # Sols nus
+                     5.: 0.033,  # Eaux de surface
+                     6.: 0.04,  # Couvert herbacé en rotation dans l'année
+                     7.: 0.03,  # Couvert herbacé toute l'année
+                     8.: 0.04, # Résineux (> 3m)
+                     9.: 0.04,  # Feuillus (> 3m)
+                     80.: 0.03, # Résineux (≤ 3m)
+                     90.: 0.03, # Feuillus (≤ 3m)
+                     }
+
+
+WALOUS_OCS2HYDROLOGY = {1.: 4., # Revêtement artificiel au sol
+                    2.: 4., # Constructions artificielles hors sol
+                    3.: 4., # Réseau ferroviaire
+                    4.: 4., # Sols nus
+                    5.: 5., # Eaux de surface
+                    6.: 3., # Couvert herbacé en rotation dans l'année
+                    7.: 2., # Couvert herbacé toute l'année
+                    8.: 1., # Résineux (> 3m)
+                    9.: 1., # Feuillus (> 3m)
+                    80.: 3., # Arbustes résineux (< 3m)
+                    90.: 3.  # Arbustes feuillus (< 3m)
+                    }
+
+# WALOUS UTS
+# ----------
+
 WALOUS_UTS_MAJ_NIV1 = {'Production primaire': 1.,
                    'Production secondaire': 2.,
                    'Production tertiaire': 3.,
@@ -85,59 +202,37 @@ WALOUS_UTS_COLORMAP_MAJ_NIV2 = {11.: (153,230,0,255),
                             66.: (206,136,102,255),
                             70.: (255,255,190,255)}
 
-WALOUS_OCS = { "Couvert herbacé en rotation dans l'année": 1.,
-              "Couvert herbacé toute l'année": 2.,
-              "Résineux (>3 m)": 3.,
-              "Feuillus (> 3m)": 4.,
-              "Résineux (<= 3m)": 5.,
-              "Feuillus (<= 3m)": 6.,
-              "Sols nus": 7.,
-              "Eaux de surface": 8.,
-              "Revêtement artificiels au sol": 9.,
-              "Réseau ferroviaire": 10.,
-              "Constructions artificielles hors sol": 11.}
-
-WALOUS_OCS_COLORMAP = {1.: (255,254,162,255), # Couvert herbacé en rotation dans l'année
-                        2.: (253,254,194,255), # Couvert herbacé toute l'année
-                        3.: (3,49,5,255), # Résineux (>3 m)
-                        4.: (55,198,61,255), # Feuillus (> 3m)
-                        5.: (18,119,23,255), # Résineux (<= 3m)
-                        6.: (185,231,179,255), # Feuillus (<= 3m)
-                        7.: (208,208,208,255), # Sols nus
-                        8.: (45,101,242,255), # Eaux de surface
-                        9.: (138,138,138,255), # Revêtement artificiels au sol
-                        10.: (78,78,78,255), # Réseau ferroviaire
-                        11.: (199,22,19,255), # Constructions artificielles hors sol
-                        }
-
-HYDROLOGY_LANDUSE_FR = {"forêt" : 1.,
-                        "prairie" : 2.,
-                        "culture" : 3.,
-                        "pavés/urbain" : 4.,
-                        "rivière" : 5.,
-                        "plan d'eau" : 6.,
-                     }
+WALOUS_UTS2MANNING_MAJ_NIV1 = {1.: 0.04, # Production primaire
+                           2.: 0.02, # Production secondaire
+                           3.: 0.02, # Production tertiaire
+                           4.: 0.03, # Réseaux de transport, Logistique et réseaux d'utilité publique
+                           5.: 0.025,# Usage résidentiel
+                           6.: 0.04, # Autres usages
+                           7.: 0.05} # Zones naturelles
 
-HYDROLOGY_LANDUSE_EN = {"forest" : 1.,
-                        "meadow" : 2.,
-                        "crop" : 3.,
-                        "paved/urban" : 4.,
-                        "river" : 5.,
-                        "water body" : 6.,
-                        }
+WALOUS_UTS2MANNING_MAJ_NIV2 = {11.: 0.04, # Agriculture
+                           12.: 0.04, # Sylviculture
+                           13.: 0.04, # Industries Extractives
+                           14.: 0.04, # Aquaculture et pêche
+                           20.: 0.03, # Production secondaire non définie
+                           21.: 0.03, # Industrie de matières premières
+                           22.: 0.03, # Industrie lourde
+                           23.: 0.03, # Industrie légère
+                           24.: 0.03, # Production d'énergie
+                           31.: 0.02, # Service commerciaux
+                           32.: 0.02, # Services financiers, spécialisés et d'information
+                           33.: 0.02, # Services publics
+                           34.: 0.02, # Services culturels, Services de loisirs et Services récréatifs
+                           41.: 0.025, # Réseaux de transport
+                           42.: 0.02, # Services Logistiques et d'entreposage
+                           43.: 0.025, # Réseau d'utilité publique
+                           51.: 0.025, # Usage résidentiel permanent
+                           52.: 0.025, # Usage résidentiel avec d'autres usages compatibles
+                           53.: 0.025, # Autres usages résidentiels
+                           62.: 0.04, # Zones abandonnées
+                           66.: 0.04, # Usage inconnu
+                           70.: 0.05} # Zones naturelles
 
-MAPPING_WALOUS_TO_HYDROLOGY = {1.: 2., # Couvert herbacé en rotation dans l'année
-                       2.: 2., # Couvert herbacé toute l'année
-                       3.: 1., # Résineux (>3 m)
-                       4.: 1., # Feuillus (> 3m)
-                       5.: 3., # Résineux (<= 3m)
-                       6.: 3., # Feuillus (<= 3m)
-                       7.: 3., # Sols nus
-                       8.: 5., # Eaux de surface
-                       9.: 4., # Revêtement artificiels au sol
-                       10.: 4., # Constructions artificielles hors sol
-                       11.: 4., # Réseau ferroviaire
-                    }
 
 def get_palette_walous_uts(which:Literal['MAJ_NIV1', 'MAJ_NIV2']) -> wolfpalette:
     """
@@ -177,7 +272,7 @@ def get_palette_walous_ocs() -> wolfpalette:
 
     return locpal
 
-def update_palette_walous_uts(which:Literal['MAJ_NIV1', 'MAJ_NIV2'], pal:wolfpalette):
+def update_palette_walous_uts(which:Literal['UTS_MAJ_NIV1', 'UTS_MAJ_NIV2'], pal:wolfpalette):
     """
     Update the palette for WALOUS MAJ_NIV1
 
@@ -185,13 +280,13 @@ def update_palette_walous_uts(which:Literal['MAJ_NIV1', 'MAJ_NIV2'], pal:wolfpal
     :return : updated palette
     """
 
-    if which == 'MAJ_NIV1':
+    if which in ['UTS_MAJ_NIV1', 'MAJ_NIV1']:
         for k, v in WALOUS_UTS_COLORMAP_MAJ_NIV1.items():
-            pal.set_values_colors(values = list(WALOUS_UTS_MAJ_NIV1.values()),
+            pal.set_values_colors(values = [val - 1e-6 for val in list(WALOUS_UTS_MAJ_NIV1.values())],
                                  colors = list(WALOUS_UTS_COLORMAP_MAJ_NIV1.values()))
-    elif which == 'MAJ_NIV2':
+    elif which in ['UTS_MAJ_NIV2', 'MAJ_NIV2']:
         for k, v in WALOUS_UTS_COLORMAP_MAJ_NIV2.items():
-            pal.set_values_colors(values = list(WALOUS_UTS_MAJ_NIV2.values()),
+            pal.set_values_colors(values = [val - 1e-6 for val in list(WALOUS_UTS_MAJ_NIV2.values())],
                                  colors = list(WALOUS_UTS_COLORMAP_MAJ_NIV2.values()))
 
     pal.interval_cst = True
@@ -208,7 +303,7 @@ def update_palette_walous_ocs(pal:wolfpalette):
     """
 
     for k, v in WALOUS_OCS_COLORMAP.items():
-        pal.set_values_colors(values = list(WALOUS_OCS_COLORMAP.keys()),
+        pal.set_values_colors(values = [val - 1e-6 for val in list(WALOUS_OCS_COLORMAP.keys())],
                              colors = list(WALOUS_OCS_COLORMAP.values()))
 
     pal.interval_cst = True
@@ -217,71 +312,6 @@ def update_palette_walous_ocs(pal:wolfpalette):
     return 0
 
 
-WALOUS2MANNING_MAJ_NIV1 = {1.: 0.04, # Production primaire
-                           2.: 0.02, # Production secondaire
-                           3.: 0.02, # Production tertiaire
-                           4.: 0.03, # Réseaux de transport, Logistique et réseaux d'utilité publique
-                           5.: 0.025,# Usage résidentiel
-                           6.: 0.04, # Autres usages
-                           7.: 0.05} # Zones naturelles
-
-WALOUS2MANNING_MAJ_NIV2 = {11.: 0.04, # Agriculture
-                           12.: 0.04, # Sylviculture
-                           13.: 0.04, # Industries Extractives
-                           14.: 0.04, # Aquaculture et pêche
-                           20.: 0.03, # Production secondaire non définie
-                           21.: 0.03, # Industrie de matières premières
-                           22.: 0.03, # Industrie lourde
-                           23.: 0.03, # Industrie légère
-                           24.: 0.03, # Production d'énergie
-                           31.: 0.02, # Service commerciaux
-                           32.: 0.02, # Services financiers, spécialisés et d'information
-                           33.: 0.02, # Services publics
-                           34.: 0.02, # Services culturels, Services de loisirs et Services récréatifs
-                           41.: 0.025, # Réseaux de transport
-                           42.: 0.02, # Services Logistiques et d'entreposage
-                           43.: 0.025, # Réseau d'utilité publique
-                           51.: 0.025, # Usage résidentiel permanent
-                           52.: 0.025, # Usage résidentiel avec d'autres usages compatibles
-                           53.: 0.025, # Autres usages résidentiels
-                           62.: 0.04, # Zones abandonnées
-                           66.: 0.04, # Usage inconnu
-                           70.: 0.05} # Zones naturelles
-
-WALOUSOCS2MANNING = {1.: 0.04, # Couvert herbacé en rotation dans l'année
-                     2.: 0.04, # Couvert herbacé toute l'année
-                     3.: 0.04, # Résineux (>3 m)
-                     4.: 0.04, # Feuillus (> 3m)
-                     5.: 0.04, # Résineux (<= 3m)
-                     6.: 0.04, # Feuillus (<= 3m)
-                     7.: 0.02, # Sols nus
-                     8.: 0.033, # Eaux de surface
-                     9.: 0.02, # Revêtement artificiels au sol
-                     10.: 0.02, # Réseau ferroviaire
-                     11.: 0.02} # Constructions artificielles hors sol
-
-"""
-Hydrology classification for Land Use in Wallonia:
-1 = forêt
-2 = prairie
-3 = culture
-4 = pavés/urbain
-5 = rivière
-6 = plan d'eau
-"""
-WALOUS2HYDROLOGY = {1.: 2, # Couvert herbacé en rotation dans l'année
-                    2.: 2, # Couvert herbacé toute l'année
-                    3.: 1, # Résineux (>3 m)
-                    4.: 1, # Feillus (> 3m)
-                    5.: 3, # Résineux (<= 3m)
-                    6.: 3, # Feuillus (<= 3m)
-                    7.: 4, # Sols nus
-                    8.: 5, # Eaux de surface
-                    9.: 4, # Revêtement artificiels au sol
-                    10.: 4, # Réseau ferroviaire
-                    11.: 4, # Constructions artificielles hors sol
-                    }
-
 class Walous_data():
     """
     La donnée Walous est liée à l'utilisation des sols en Wallonie
@@ -297,18 +327,21 @@ class Walous_data():
     def __init__(self,
                  dir_data:str = '',
                  fn:str = 'WAL_UTS__2018_L72',
+                 extension:str = '.shp',
                  bounds:Union[list[float, float, float, float],list[list[float, float], list[float, float]]] = None) -> None:
         """
         Constructor
 
         :param dir_data : directory of the data
-        :param fn : filename without extension (shp)
+        :param fn : filename without extension
+        :param extension : extension of the file (.shp, .gpkg, ...)
         :param bounds : Two ways to set spatial bounds -- [xmin, ymin, xmax, ymax] or [[xmin, xmax], [ymin, ymax]]
 
         """
 
         self._dir = dir_data    # directory of the data
         self._fn  = fn          # filename without extension
+        self._extension = extension # extension of the file
         self._gdf = None        # geopandas dataframe
 
         if bounds is not None:
@@ -328,7 +361,7 @@ class Walous_data():
         if self._gdf is None or force:
             assert self._dir!="" and self._fn != ''
 
-            filepath = (Path(self._dir)/ self._fn).with_suffix('.shp')
+            filepath = (Path(self._dir)/ self._fn).with_suffix(self._extension)
 
             if filepath.exists():
                 if bounds is not None:
@@ -390,15 +423,15 @@ class Walous_data():
 
     def rasterize(self,
                   bounds:Union[list[float, float, float, float],list[list[float, float], list[float, float]]],
-                  layer:Literal['MAJ_NIV1','MAJ_NIV2'] ='MAJ_NIV1',
+                  layer:Literal['UTS_MAJ_NIV1','UTS_MAJ_NIV2'] = 'UTS_MAJ_NIV1',
                   fn_out:str = 'out.tif',
                   pixel_size:float = 0.5,
                   NoData_value:float = -99999.,
-                  num_type = gdal.GDT_Float32
+                  num_type = gdal.GDT_Float32,
                   ):
 
         """
-        Rasterization of polygon data to tif
+        Rasterization of polygon data to tif.
 
         :param bounds : [xmin, ymin, xmax, ymax] or [[xmin, xmax], [ymin, ymax]]
         :param layer : layer to rasterize
@@ -408,6 +441,8 @@ class Walous_data():
         :param num_type : type of the number
         """
 
+        layer = layer.upper().replace('UTS_', '')
+
         if bounds is None:
             logging.error('Bounds must be set')
             return None
@@ -438,10 +473,10 @@ class Walous_data():
         try:
 
             # Add a new column for mapping based on the desired layer
-            self._gdf['Mapping'] = np.float32(self._gdf[layer])
-
             if layer == 'MAJ_NIV2':
-                self._gdf['Mapping'] = np.float32(self._gdf['Mapping'].replace('_', ''))
+                self._gdf['Mapping'] = np.float32(self._gdf[layer].replace('_', ''))
+            else:
+                self._gdf['Mapping'] = np.float32(self._gdf[layer])
 
             source_ds:ogr.DataSource
             source_layer:ogr.Layer
@@ -485,7 +520,7 @@ class Walous_data():
 class  DlgMapWalous2Manning(wx.Dialog):
     """ Modal dialog for mapping WALOUS value to another ones """
 
-    def __init__(self, parent, title:str = _("Mapping WALOUS value to ..."), which:str = 'MAJ_NIV1'):
+    def __init__(self, parent, title:str = _("Mapping WALOUS value to ..."), which:Literal['UTS_MAJ_NIV1', 'UTS_MAJ_NIV2', 'OCS_MANNING', 'OCS_HYDROLOGY'] = 'UTS_MAJ_NIV1'):
 
         super(DlgMapWalous2Manning, self).__init__(parent, title=title, size=(450, 400))
 
@@ -495,7 +530,7 @@ class  DlgMapWalous2Manning(wx.Dialog):
 
         self._table = wx.grid.Grid(panel)
 
-        if which == 'MAJ_NIV1':
+        if which == 'UTS_MAJ_NIV1':
             self._table.CreateGrid(len(WALOUS_UTS_MAJ_NIV1), 3)
             self._table.SetColLabelValue(0, _("Name"))
             self._table.SetColLabelValue(1, _("Value - UTS"))
@@ -505,11 +540,11 @@ class  DlgMapWalous2Manning(wx.Dialog):
             for i, (k, v) in enumerate(WALOUS_UTS_MAJ_NIV1.items()):
                 self._table.SetCellValue(i, 0, str(k))
                 self._table.SetCellValue(i, 1, str(v))
-                self._table.SetCellValue(i, 2, str(WALOUS2MANNING_MAJ_NIV1[v]))
+                self._table.SetCellValue(i, 2, str(WALOUS_UTS2MANNING_MAJ_NIV1[v]))
                 self._table.SetCellAlignment(i, 1, wx.ALIGN_CENTER, wx.ALIGN_CENTER)
                 self._table.SetCellAlignment(i, 2, wx.ALIGN_CENTER, wx.ALIGN_CENTER)
 
-        elif which == 'MAJ_NIV2':
+        elif which == 'UTS_MAJ_NIV2':
             self._table.CreateGrid(len(WALOUS_UTS_MAJ_NIV2), 3)
             self._table.SetColLabelValue(0, _("Name"))
             self._table.SetColLabelValue(1, _("Value - UTS"))
@@ -519,7 +554,33 @@ class  DlgMapWalous2Manning(wx.Dialog):
             for i, (k, v) in enumerate(WALOUS_UTS_MAJ_NIV2.items()):
                 self._table.SetCellValue(i, 0, str(k))
                 self._table.SetCellValue(i, 1, str(v))
-                self._table.SetCellValue(i, 2, str(WALOUS2MANNING_MAJ_NIV2[v]))
+                self._table.SetCellValue(i, 2, str(WALOUS_UTS2MANNING_MAJ_NIV2[v]))
+                self._table.SetCellAlignment(i, 1, wx.ALIGN_CENTER, wx.ALIGN_CENTER)
+                self._table.SetCellAlignment(i, 2, wx.ALIGN_CENTER, wx.ALIGN_CENTER)
+
+        elif which == 'OCS_MANNING':
+            self._table.CreateGrid(len(WALOUS_OCS2MANNING), 3)
+            self._table.SetColLabelValue(0, _("Name"))
+            self._table.SetColLabelValue(1, _("Value - OCS"))
+            self._table.SetColLabelValue(2, _("Manning 'n'"))
+            self._table.HideRowLabels()
+            for i, (k, v) in enumerate(WALOUS_OCS.items()):
+                self._table.SetCellValue(i, 0, str(k))
+                self._table.SetCellValue(i, 1, str(v))
+                self._table.SetCellValue(i, 2, str(WALOUS_OCS2MANNING[v]))
+                self._table.SetCellAlignment(i, 1, wx.ALIGN_CENTER, wx.ALIGN_CENTER)
+                self._table.SetCellAlignment(i, 2, wx.ALIGN_CENTER, wx.ALIGN_CENTER)
+
+        elif which == 'OCS_HYDROLOGY':
+            self._table.CreateGrid(len(WALOUS_OCS2HYDROLOGY), 3)
+            self._table.SetColLabelValue(0, _("Name"))
+            self._table.SetColLabelValue(1, _("Value - OCS"))
+            self._table.SetColLabelValue(2, _("LandUse - Hydrology"))
+            self._table.HideRowLabels()
+            for i, (k, v) in enumerate(WALOUS_OCS2HYDROLOGY.items()):
+                self._table.SetCellValue(i, 0, str(k))
+                self._table.SetCellValue(i, 1, str(v))
+                self._table.SetCellValue(i, 2, str(WALOUS_OCS2HYDROLOGY[v]))
                 self._table.SetCellAlignment(i, 1, wx.ALIGN_CENTER, wx.ALIGN_CENTER)
                 self._table.SetCellAlignment(i, 2, wx.ALIGN_CENTER, wx.ALIGN_CENTER)
 
@@ -575,11 +636,11 @@ class  DlgMapWalousOCS2Manning(DlgMapWalous2Manning):
 
     def __init__(self, parent, title:str = _("Mapping WALOUS value to ...")):
 
-        super(DlgMapWalousOCS2Manning, self).__init__(parent, title= title)
+        super(DlgMapWalousOCS2Manning, self).__init__(parent, title= title, which='OCS_MANNING')
 
         self._table.SetColLabelValue(2, _("Land Use - OCS"))
 
-        for i, (k, v) in enumerate(WALOUSOCS2MANNING.items()):
+        for i, (k, v) in enumerate(WALOUS_OCS2MANNING.items()):
             self._table.SetColLabelValue(1, _("Value - OCS"))
             self._table.SetCellValue(i, 2, str(v))
 
@@ -593,11 +654,11 @@ class  DlgMapWalous2Hydrology(DlgMapWalous2Manning):
 
     def __init__(self, parent, title:str = _("Mapping WALOUS value to ...")):
 
-        super(DlgMapWalous2Hydrology, self).__init__(parent, title= title)
+        super(DlgMapWalous2Hydrology, self).__init__(parent, title= title, which='OCS_HYDROLOGY')
 
         self._table.SetColLabelValue(2, _("Land Use - OCS"))
 
-        for i, (k, v) in enumerate(WALOUS2HYDROLOGY.items()):
+        for i, (k, v) in enumerate(WALOUS_OCS2HYDROLOGY.items()):
             self._table.SetColLabelValue(1, _("Value - OCS"))
             self._table.SetCellValue(i, 2, str(v))
 

wolfhece/wolf_array.py

@@ -116,6 +116,30 @@ try:
 except ImportError as e:
     raise Exception(_('Error importing pydownloader module'))
 
+
+import math
+from fractions import Fraction
+
+def pgcd_decimal(a, b):
+    # Convertir les décimaux en fractions exactes
+    fa = Fraction(a).limit_denominator()
+    fb = Fraction(b).limit_denominator()
+
+    # Extraire les numérateurs et dénominateurs
+    num_a, den_a = fa.numerator, fa.denominator
+    num_b, den_b = fb.numerator, fb.denominator
+
+    # Mettre au même dénominateur
+    lcm_den = math.lcm(den_a, den_b)
+    a_int = num_a * (lcm_den // den_a)
+    b_int = num_b * (lcm_den // den_b)
+
+    # PGCD des entiers
+    pgcd_int = math.gcd(a_int, b_int)
+
+    # Revenir à l’échelle décimale
+    return pgcd_int / lcm_den
+
 WOLF_ARRAY_HILLSHAPE = -1
 WOLF_ARRAY_FULL_SINGLE = 1
 WOLF_ARRAY_FULL_DOUBLE = 2
@@ -7288,6 +7312,8 @@ class WolfArray(Element_To_Draw, header_wolf):
         else:
             return
 
+        need_wx = False
+
         raster:gdal.Dataset
         if crop is not None :
             if not os.path.exists(fn):
@@ -7297,44 +7323,47 @@ class WolfArray(Element_To_Draw, header_wolf):
             tmpdx = self.dx
 
             fn_crop = fn + '_crop.tif'
-            if type(crop) is np.ndarray:
-                pass
-            elif type(crop) is list:
-                pass
-            else:
-                if not self.wx_exists:
-                    logging.error(_('Crop must be a list or a numpy array with 4 values - xmin, xmax, ymin, ymax'))
-                    return
 
-                raster_in:gdal.Dataset
-                raster_in = gdal.Open(fn)
+            raster_in:gdal.Dataset
+            raster_in = gdal.Open(fn)
 
-                proj = raster_in.GetProjection()
-                # check if proj is epsg:31370
-                if 'Lambert 72' not in proj and "31370" not in proj:
-                    logging.error(_('{} projection is not Lambert 72 - EPSG:31370').format(fn))
+            proj = raster_in.GetProjection()
+            # check if proj is epsg:31370
+            if 'Lambert 72' not in proj and "31370" not in proj:
+                logging.error(_('{} projection is not Lambert 72 - EPSG:31370').format(fn))
 
-                    raster_in2 = gdal.Dataset()
-                    gdal.Warp(raster_in2, raster_in, dstSRS='EPSG:31370')
+                raster_in2 = gdal.Dataset()
+                gdal.Warp(raster_in2, raster_in, dstSRS='EPSG:31370')
 
-                    # Close the raster_in
-                    raster_in.FlushCache()
-                    raster_in = None
+                # Close the raster_in
+                raster_in.FlushCache()
+                raster_in = None
 
-                    raster_in = raster_in2
+                raster_in = raster_in2
 
-                    if raster_in is None:
-                        logging.error(_('Could not reproject the file {fn}'))
-                        return
+                if raster_in is None:
+                    logging.error(_('Could not reproject the file {fn}'))
+                    return
 
-                geotr = raster_in.GetGeoTransform()
-                self.dx = geotr[1]
-                self.dy = abs(geotr[5])
+            geotr = raster_in.GetGeoTransform()
+            self.dx = geotr[1]
+            self.dy = abs(geotr[5])
 
-                ulx = geotr[0]
-                uly = geotr[3]
-                llx = ulx + geotr[1] * raster_in.RasterXSize
-                lly = uly + geotr[5] * raster_in.RasterYSize
+            ulx = geotr[0]
+            uly = geotr[3]
+            llx = ulx + geotr[1] * raster_in.RasterXSize
+            lly = uly + geotr[5] * raster_in.RasterYSize
+
+            if type(crop) is np.ndarray:
+                pass
+            elif type(crop) in [list, tuple]:
+                pass
+            else:
+                if not self.wx_exists:
+                    logging.error(_('Crop must be a list or a numpy array with 4 values - xmin, xmax, ymin, ymax'))
+                    return
+
+                need_wx = True
 
                 newcrop = CropDialog(None, self.get_mapviewer())
 
@@ -7375,7 +7404,7 @@ class WolfArray(Element_To_Draw, header_wolf):
 
             xmin, xmax, ymin, ymax = crop
 
-            if self.wx_exists:
+            if need_wx:
 
                 with wx.FileDialog(None, _('Save the cropped file for later'), wildcard="Tiff files (*.tif)|*.tif",
                                     style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT) as fileDialog:
@@ -7393,15 +7422,13 @@ class WolfArray(Element_To_Draw, header_wolf):
 
                 fn  = fn_crop
             else:
-                from tempfile import NamedTemporaryFile
-                tmpfile = NamedTemporaryFile(suffix='.tif')
+                fn_tmp = '__tmp_wolf.tif'
 
                 if uly > lly:
-                    raster = gdal.Translate(str(tmpfile.name), fn, projWin=[xmin, ymax, xmax, ymin])
+                    raster = gdal.Translate(fn_tmp, fn, projWin=[xmin, ymax, xmax, ymin])
                 else:
-                    raster = gdal.Translate(str(tmpfile.name), fn, projWin=[xmin, ymin, xmax, ymax])
-
-                fn = str(tmpfile.name)
+                    raster = gdal.Translate(fn_tmp, fn, projWin=[xmin, ymin, xmax, ymax])
+                fn = fn_tmp
         else:
             raster = gdal.Open(fn)
 
@@ -7501,6 +7528,12 @@ class WolfArray(Element_To_Draw, header_wolf):
         raster.FlushCache()
         raster = None
 
+        try:
+            if fn_tmp == '__tmp_wolf.tif':
+                os.remove(fn_tmp)
+        except:
+            pass
+
     def add_ops_sel(self):
         """
         Adding selection manager and operations array
@@ -10254,7 +10287,7 @@ class WolfArray(Element_To_Draw, header_wolf):
             self.write_txt_header()
             self.write_array()
 
-    def get_rebin_shape_size(self, factor:float) -> tuple[tuple[int, int], tuple[float, float]]:
+    def get_rebin_shape_size(self, factor:float, reshape_array_if_necessary:bool = False) -> tuple[tuple[int, int], tuple[float, float]]:
         """
         Return the new shape after rebinning.
 
@@ -10274,13 +10307,44 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         newnbx = self.nbx
         newnby = self.nby
-        if np.mod(self.nbx,factor) != 0 or np.mod(self.nby,factor) != 0 :
-            newnbx = self.nbx
-            newnby = self.nby
-            if np.mod(self.nbx,factor) !=0:
-                newnbx = self.nbx + factor - np.mod(self.nbx,factor)
-            if np.mod(self.nby,factor) !=0:
-                newnby = self.nby + factor - np.mod(self.nby,factor)
+
+        if factor >=1.0:
+            # Decrease resolution
+            to_reshape = False
+            if np.mod(self.nbx,factor) != 0 or np.mod(self.nby,factor) != 0 :
+                newnbx = self.nbx
+                newnby = self.nby
+                if np.mod(self.nbx,factor) !=0:
+                    newnbx = int(self.nbx + factor - np.mod(self.nbx,factor))
+                    to_reshape = True
+                if np.mod(self.nby,factor) !=0:
+                    newnby = int(self.nby + factor - np.mod(self.nby,factor))
+                    to_reshape = True
+
+                if to_reshape and reshape_array_if_necessary:
+                    logging.warning(f"The shape ({self.nbx}, {self.nby}) is not a multiple of the factor {factor}")
+                    new_array = ma.masked_array(np.ones((newnbx, newnby), dtype= self.dtype) * self.nullvalue, dtype= self.dtype)
+                    new_array[:self.nbx, :self.nby] = self.array
+                    self.array = new_array
+        else:
+            # Increase resolution
+            if abs(int(1/factor) - 1/factor) > 1e-6:
+                # find the greatest common divisor of between self.dx and old_dx
+                gcd = pgcd_decimal(self.dx, self.dx * factor)
+                intermediate_factor = gcd / self.dx
+
+                [newnbx,newnby], [dx,dy] = self.get_rebin_shape_size(intermediate_factor)
+
+                factor = factor / intermediate_factor
+
+                if np.mod(newnbx,factor) != 0 or np.mod(newnby,factor) != 0 :
+                    if np.mod(newnbx,factor) !=0:
+                        newnbx = int(newnbx + factor - np.mod(newnbx,factor))
+                    if np.mod(newnby,factor) !=0:
+                        newnby = int(newnby + factor - np.mod(newnby,factor))
+
+                newdx = dx * factor
+                newdy = dy * factor
 
         newnbx = int(newnbx / factor)
         newnby = int(newnby / factor)
@@ -10327,6 +10391,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         """
 
+        op_str = operation
+        (testnbx, testnby), __ = self.get_rebin_shape_size(factor)
+
         if operation_matrix is not None:
             tmp_header = self.get_rebin_header(factor)
             if not operation_matrix.is_like(tmp_header):
@@ -10348,36 +10415,11 @@ class WolfArray(Element_To_Draw, header_wolf):
                 logging.error(_("Operator not supported -- Must be a string in ['sum', 'mean', 'min', 'max', 'median'] or a Rebin_Ops Enum"))
 
 
-        if np.mod(self.nbx,factor) != 0 or np.mod(self.nby,factor) != 0 :
-            # The shape is adjusted to be a multiple of the factor.
-            # Fill the array with nullvalue
-            newnbx = self.nbx
-            newnby = self.nby
-            if np.mod(self.nbx,factor) !=0:
-                newnbx = int(self.nbx + factor - np.mod(self.nbx,factor))
-            if np.mod(self.nby,factor) !=0:
-                newnby = int(self.nby + factor - np.mod(self.nby,factor))
-
-            # We ensure that the null_value is converted to the type of the array.
-            # Not doing so leads to a change in the array type because
-            # of numpy2 type promotion.
-            newarray = np.ma.masked_array( np.full((newnbx,newnby), self.nullvalue, dtype = self.dtype) )
-            #newarray = np.ma.ones((newnbx,newnby), dtype = self.dtype) * self.nullvalue
-            newarray[:self.nbx,:self.nby] = self.array
-            newarray.mask[:self.nbx,:self.nby] = self.array.mask
-            self.array = newarray
-
-            self.nbx = newnbx
-            self.nby = newnby
-
-        self.nbx = int(self.nbx / factor)
-        self.nby = int(self.nby / factor)
-
-        self.dx = self.dx * float(factor)
-        self.dy = self.dy * float(factor)
-        new_shape = (self.nbx, self.nby)
-
-        if factor>1.:
+        new_shape, (dx, dy) = self.get_rebin_shape_size(factor, reshape_array_if_necessary= True)
+
+        if factor >=1.0:
+            # Decrease resolution
+
             if operation_matrix is not None:
                 # Reshape the input array to split it into blocks of size f x f
                 reshaped_a = self.array.reshape(new_shape[0], int(factor), new_shape[1], int(factor))
@@ -10407,15 +10449,43 @@ class WolfArray(Element_To_Draw, header_wolf):
             self.set_nullvalue_in_mask()
         else:
 
-            if (int(1/factor) - 1/factor) > 1e-6:
+            # Increase resolution
+
+            if abs(int(1/factor) - 1/factor) > 1e-6:
                 logging.warning(f"The factor {factor} doesn't lead to an integer dimension for the Kronecker product")
+                logging.warning("The array will be rebinned firstly using the most common factor and then using the operation")
+
+                # find the greatest common divisor of between self.dx and old_dx
+                gcd  = pgcd_decimal(self.dx, self.dx * factor)
+                intermediate_factor = gcd / self.dx
+
+                logging.warning(f"The greatest common divisor is {gcd}")
+
+                tmp = WolfArray(mold=self, whichtype=self.wolftype)
+                tmp.rebin(intermediate_factor)
 
-            ones = np.ones( (int(1/factor), int(1/factor)), dtype=int)
-            self.array = np.kron(self.array, ones).astype(self.array.dtype)
+                if op_str is None:
+                    op_str = 'min'
 
+                tmp.rebin(factor / intermediate_factor, operation= op_str)
+                self.array = tmp.array
+                tmp.array = None
+                del tmp
+            else:
+
+                ones = np.ones( (int(1/factor), int(1/factor)), dtype=int)
+                self.array = np.kron(self.array, ones).astype(self.array.dtype)
 
             self.mask_data(self.nullvalue)
 
+        self.nbx = new_shape[0]
+        self.nby = new_shape[1]
+        self.dx = dx
+        self.dy = dy
+
+        assert isinstance(self.array, ma.MaskedArray), _('The array must be a masked array')
+        assert self.array.shape == (testnbx, testnby), _(f'Bad shape: {self.array.shape} != {(testnbx, testnby)}')
+
         self.count()
 
         # rebin must not change the type of the array

{wolfhece-2.2.41.dist-info → wolfhece-2.2.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.41
+Version: 2.2.42
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece

{wolfhece-2.2.41.dist-info → wolfhece-2.2.42.dist-info}/RECORD

@@ -9,7 +9,7 @@ wolfhece/MulticriteriAnalysis.py,sha256=vGmkzYagZohNe0XjwGJ6VUXcDPjOt80lNFthXpzx
 wolfhece/PandasGrid.py,sha256=etfVhIHzja4Z1EUY6BcDOKX-w7V-Xou1yaf0NMqmclo,4599
 wolfhece/PyConfig.py,sha256=13DDWjJdohYHwn1uRVHB0s8Jcwq_b9pwcwbAr8NlZyc,19667
 wolfhece/PyCrosssections.py,sha256=6K9xhupnIVXzLdsLTPN9e1v0xck9BdWZd0-EgpWg9us,133277
-wolfhece/PyDraw.py,sha256=d74OkFrQjN_41xk2jtlY53Pk2OgUD39gwUoOwmybKHU,737432
+wolfhece/PyDraw.py,sha256=jCXBonWGmqTQD9AXsii-yalFpUFLKTrfPP2wzh-57NE,741859
 wolfhece/PyGui.py,sha256=GpVRxNpR8WNDFyHnDvhtHFFsq_cZZlyVgSkFiS-ARYI,185342
 wolfhece/PyGuiHydrology.py,sha256=dmBlRO8AljsvCPH6eVt0l9ZLx7g5j7Ubl9Srk7ECwyA,34693
 wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
@@ -61,13 +61,13 @@ wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=NWaNeK0RSUeOkgukeogK9FLmQiDjGZ9yhqs9208fojM,46237
 wolfhece/pyshields.py,sha256=KMtUO5kD0lisKnJD1NsDz-qaY5DpFcmS4O3WkXtUSmo,27898
 wolfhece/pyviews.py,sha256=zuZjWUptRDm1MTE1PN4Xj_qSITnojgDMG0LlFIBH3SE,13739
-wolfhece/pywalous.py,sha256=6FTDh0dzKg7H6F7_YXEKT2gmE0OM_a8hvOLhEu4kRpY,26729
+wolfhece/pywalous.py,sha256=Vl0WH0OZLOguV4JWhfJNwo0CgGneyD3DznFbyfAME-w,32221
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=7hgfsLYAaE_rNKD-g8xsON8sdWvoV8vbqnGGxIayShE,14137
 wolfhece/tools2d_dll.py,sha256=TfvvmyZUqEZIH0uHwUCJf0bdmCks_AiidDt23Unsp5w,13550
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
 wolfhece/toolshydrology_dll.py,sha256=cIGyhxV8H5f7GXhDqAamM7uC0W0hQTou3eTkqZdnqBE,5656
-wolfhece/wolf_array.py,sha256=T0E46C-hmjJCGp66eHhOGohT_Wo7Jhp0hU6S_EPXYg4,576614
+wolfhece/wolf_array.py,sha256=39O7kYjksEbCC2yn0mu6AfabmVrBWrmoybbfjw4gfIQ,578890
 wolfhece/wolf_hist.py,sha256=fTEb60Q4TEwobdZsRU4CFXAId1eOKdWAqF8lnF1xEWc,3590
 wolfhece/wolf_texture.py,sha256=Pt1j_lX74p70Fj3y3qYxYMuN8gghVd8_ih1vFhTIdkA,23884
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
@@ -95,7 +95,7 @@ wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVz
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=EdGDN9NhudIiP7c3gVqj7dp4MWFB8ySizM_tpMnsgpE,3091
-wolfhece/apps/version.py,sha256=g5JvLHmxA33m1kAYqdyNA-LqHE0IxUtstI8t7gQzqQA,388
+wolfhece/apps/version.py,sha256=aOHEtZqRpvSjcC4VtpzMUp8extpQ1AUSw4MRuICsvz0,388
 wolfhece/apps/wolf.py,sha256=mRnjYsUu4KIsRuamdQWAINFMuwN4eJgMo9erG-hkZ70,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -243,7 +243,7 @@ wolfhece/mesh2d/config_manager.py,sha256=DcdxCIIs_dyC6ayJOBULeY364LONogL9PBaqBtC
 wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=r43pHHdCtmNp5R2zh1Ckb7EzwQDf6C4YMLwRFTl4KMc,5006
 wolfhece/mesh2d/gpu_2d.py,sha256=xyZst3ZSYmRp9G0kxlUvTahAiMC9sNEH0MRUlEjqFZI,25999
 wolfhece/mesh2d/simple_2d.py,sha256=wqENJwpUPxKQcpGIcymQXUj2KgkGWCVH6cs4Os9h9Gs,112581
-wolfhece/mesh2d/wolf2dprev.py,sha256=oK9r94CYJaeOBSv4s4mkuhLA8rCsnrkjG2sGW_zR1x0,493127
+wolfhece/mesh2d/wolf2dprev.py,sha256=823RckzGGCQ00h0uti-nL7JoVsAZ_Hv9C02lnvizDIg,495518
 wolfhece/models/5_coul.pal,sha256=OI1UqcNIDBpJn2k_VDel__r-hKjjvdob0eqinGCI3QY,160
 wolfhece/models/6_coul.pal,sha256=z7NK2dg0tAQBUweRQV54dIwJbPM1U5y1AR2LLw19Idw,148
 wolfhece/models/7_coul.pal,sha256=XTnnUyCE8ONokScB2YzYDnSTft7E6sppmr7P-XwMsCE,205
@@ -265,6 +265,7 @@ wolfhece/models/shields_cst.pal,sha256=zUGFI6HiL0bsHeOzcWNih3F9cxXKXLLZYA5rtqRbz
 wolfhece/models/vulnerability.pal,sha256=Fevrc_9owywLhbPMBunXDcrGXPJhARo9iSV1eOq3roA,106
 wolfhece/models/walous_niv1.pal,sha256=mHMjCB-ja47mV3ZsvDOhS2CEK8YN6ewOkf1W7l7JQ8k,138
 wolfhece/models/walous_niv2.pal,sha256=B5wt5-O88dpaiA6yR4uriOy0tfDVU_cms0Xr6Dw9ZGg,377
+wolfhece/models/walous_ocs.pal,sha256=DlicMO2qlH3_WPm_bwVBK6lTuUn2MXRcfIpkjl8D2oo,227
 wolfhece/models/waterdepths.pal,sha256=8rcQfuZOeLKzYv5sARPkhpvZYc1OToj3ZukcbuRUgIY,136
 wolfhece/models/white_black.pal,sha256=BKjVN1kuk1OtJB9S3uM5fxteWbggI3Pb8p9WdDptT4c,51
 wolfhece/opengl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -319,8 +320,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=u4C7CXe_bUyGKx7c_Bi0x9
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.2.41.dist-info/METADATA,sha256=r3CK5pZVkd6vWy34yNRUNSs-yzagEy7TbSM1vrGbG7c,2785
-wolfhece-2.2.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wolfhece-2.2.41.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
-wolfhece-2.2.41.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.41.dist-info/RECORD,,
+wolfhece-2.2.42.dist-info/METADATA,sha256=qjWwy3fkLflM8KkQ6xXqvlK-GY598fnWupRva1TyNPM,2785
+wolfhece-2.2.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wolfhece-2.2.42.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
+wolfhece-2.2.42.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.42.dist-info/RECORD,,