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

wolfhece/apps/version.py

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

wolfhece/pywalous.py

@@ -22,6 +22,8 @@ import wx.grid
 
 from .PyTranslate import _
 from .PyPalette import wolfpalette
+from .wolf_array import WolfArray, header_wolf
+
 
 """
 Hydrology classification for Land Use in Wallonia:
@@ -339,8 +341,8 @@ class Walous_data():
 
         """
 
-        self._dir = dir_data    # directory of the data
-        self._fn  = fn          # filename without extension
+        self._dir = str(dir_data)    # directory of the data
+        self._fn  = str(fn)          # filename without extension
         self._extension = extension # extension of the file
         self._gdf = None        # geopandas dataframe
 
@@ -402,6 +404,8 @@ class Walous_data():
 
             chdir(detsdir)
 
+            fnout = str((Path(fnout)).with_suffix(self._extension))
+
             self._gdf.to_file(basename(fnout))
 
             chdir(curdir)
@@ -753,3 +757,143 @@ class Walous_OCS_Legend(wx.Dialog):
 
     def close(self):
         self.Destroy()
+
+
+def get_array_WALOUS_OCS(fname:Path, spatial_res:float, bounds:Union[list[float, float, float, float],list[list[float, float], list[float, float]]]) -> Union[WolfArray, None]:
+    """ Get WALOUS OCS as WolfArray
+
+    :param fname: path to the WALOUS OCS file
+    :param spatial_res: desired spatial resolution (in m)
+    :param bounds: [xmin, ymin, xmax, ymax] or [[xmin, xmax], [ymin, ymax]]
+    :return: WolfArray or None if error
+    """
+
+    if not fname.exists():
+        logging.error(_('WALOUS OCS file not found: {}').format(fname))
+        return None
+
+    # Convert bounds to [[xmin, xmax], [ymin, ymax]] if needed
+    if len(bounds)==4:
+        bounds = [[bounds[0], bounds[2]], [bounds[1], bounds[3]]]
+
+    # Convert bvounds to list to be able to modify it
+    bounds = [list(bounds[0]), list(bounds[1])]
+
+    bounds_copy = [list(bounds[0]), list(bounds[1])]
+
+    header_OCS = header_wolf.read_header(fname)
+    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.
+
+        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=fname, 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 = bounds_copy)
+
+    return locwalous
+
+def get_array_WALOUS_OCS_2023_10m(spatial_res:float, bounds:Union[list[float, float, float, float],list[list[float, float], list[float, float]]]) -> Union[WolfArray, None]:
+    """ Get WALOUS OCS 2023 as WolfArray
+
+    :param spatial_res: desired spatial resolution (in m)
+    :param bounds: [xmin, ymin, xmax, ymax] or [[xmin, xmax], [ymin, ymax]]
+    :return: WolfArray or None if error
+    """
+
+    from wolfhece.pydownloader import toys_dataset
+
+    fname = toys_dataset(dir='Walous_OCS', file='WALOUS_2023_lbt72_10m.tif')
+
+    return get_array_WALOUS_OCS(fname, spatial_res, bounds)
+
+def get_array_WALOUS_OCS_2023_4m(spatial_res:float, bounds:Union[list[float, float, float, float],list[list[float, float], list[float, float]]]) -> Union[WolfArray, None]:
+    """ Get WALOUS OCS 2023 as WolfArray
+
+    :param spatial_res: desired spatial resolution (in m)
+    :param bounds: [xmin, ymin, xmax, ymax] or [[xmin, xmax], [ymin, ymax]]
+    :return: WolfArray or None if error
+    """
+
+    from wolfhece.pydownloader import toys_dataset
+
+    fname = toys_dataset(dir='Walous_OCS', file='WALOUS_2023_lbt72_4m.tif')
+
+    return get_array_WALOUS_OCS(fname, spatial_res, bounds)
+
+def get_array_WALOUS_OCS_2020_10m(spatial_res:float, bounds:Union[list[float, float, float, float],list[list[float, float], list[float, float]]]) -> Union[WolfArray, None]:
+    """ Get WALOUS OCS 2020 as WolfArray
+
+    :param spatial_res: desired spatial resolution (in m)
+    :param bounds: [xmin, ymin, xmax, ymax] or [[xmin, xmax], [ymin, ymax]]
+    :return: WolfArray or None if error
+    """
+
+    from wolfhece.pydownloader import toys_dataset
+
+    fname = toys_dataset(dir='Walous_OCS', file='WALOUS_2020_lbt72_10m.tif')
+
+    return get_array_WALOUS_OCS(fname, spatial_res, bounds)
+
+def get_array_WALOUS_OCS_2020_4m(spatial_res:float, bounds:Union[list[float, float, float, float],list[list[float, float], list[float, float]]]) -> Union[WolfArray, None]:
+    """ Get WALOUS OCS 2020 as WolfArray
+
+    :param spatial_res: desired spatial resolution (in m)
+    :param bounds: [xmin, ymin, xmax, ymax] or [[xmin, xmax], [ymin, ymax]]
+    :return: WolfArray or None if error
+    """
+
+    from wolfhece.pydownloader import toys_dataset
+
+    fname = toys_dataset(dir='Walous_OCS', file='WALOUS_2020_lbt72_4m.tif')
+
+    return get_array_WALOUS_OCS(fname, spatial_res, bounds)
+
+def get_array_WALOUS_UTS(fname:Path, fnout:Path, spatial_res:float, bounds:Union[list[float, float, float, float],list[list[float, float], list[float, float]]], which:Literal['UTS_MAJ_NIV1', 'UTS_MAJ_NIV2'] = 'UTS_MAJ_NIV1') -> Union[WolfArray, None]:
+    """ Get WALOUS UTS as WolfArray
+
+    :param fname: path to the WALOUS UTS file
+    :param spatial_res: desired spatial resolution (in m)
+    :param bounds: [xmin, ymin, xmax, ymax] or [[xmin, xmax], [ymin, ymax]]
+    :param which: which level to use ('UTS_MAJ_NIV1' or 'UTS_MAJ_NIV2')
+    :return: WolfArray or None if error
+    """
+
+    fname = Path(fname)
+    fnout = Path(fnout)
+
+    if not fname.exists():
+        logging.error(_('WALOUS UTS file not found: {}').format(fname))
+        return None
+
+    # Convert bounds to [[xmin, xmax], [ymin, ymax]] if needed
+    if len(bounds)==4:
+        bounds = [[bounds[0], bounds[2]], [bounds[1], bounds[3]]]
+
+    # Convert bvounds to list to be able to modify it
+    bounds = [list(bounds[0]), list(bounds[1])]
+
+    bounds_copy = [list(bounds[0]), list(bounds[1])]
+
+    locwalous = Walous_data(fname.parent, fname.name, extension=fname.suffix, bounds=bounds)
+    ret = locwalous.rasterize(bounds=bounds, layer= which, fn_out=fnout.with_suffix('.tif'), pixel_size=spatial_res)
+
+    ret = Path(ret)
+
+    if ret.exists():
+        locwalous_array = WolfArray(fname=ret)
+        return locwalous_array
+    else:
+        return None

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.42
+Version: 2.2.43
 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.42.dist-info → wolfhece-2.2.43.dist-info}/RECORD

@@ -61,7 +61,7 @@ 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=Vl0WH0OZLOguV4JWhfJNwo0CgGneyD3DznFbyfAME-w,32221
+wolfhece/pywalous.py,sha256=qF_hzmVFBjM3JP6RV4tbKEVTBsiOGcBJ_O82uoX2Rxg,38595
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=7hgfsLYAaE_rNKD-g8xsON8sdWvoV8vbqnGGxIayShE,14137
 wolfhece/tools2d_dll.py,sha256=TfvvmyZUqEZIH0uHwUCJf0bdmCks_AiidDt23Unsp5w,13550
@@ -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=aOHEtZqRpvSjcC4VtpzMUp8extpQ1AUSw4MRuICsvz0,388
+wolfhece/apps/version.py,sha256=kWgIrbzo3PaJpeEetSvb9-zhutuO1cGL5wg1gqsJFDM,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
@@ -320,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.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,,
+wolfhece-2.2.43.dist-info/METADATA,sha256=6-h2-a9g7o3Tg99jRn5s_izELlJ5gWaMZSPzG6SlW0A,2785
+wolfhece-2.2.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wolfhece-2.2.43.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
+wolfhece-2.2.43.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.43.dist-info/RECORD,,