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

wolfhece/lifewatch.py

@@ -269,7 +269,7 @@ def get_LifeWatch_bounds(year:int,
                                         'RGBA',
                                         'Palette'] = 'WolfArray',
                          force_size:bool= True,
-                                        ) -> WolfArray | np.ndarray | Image.Image:
+                                        ) -> tuple[WolfArray | np.ndarray | Image.Image, tuple[float, float, float, float]]:
 
 
     if year not in YEARS:
@@ -297,7 +297,10 @@ def get_LifeWatch_bounds(year:int,
     mybytes = getLifeWatch(f'{MAP_LW}_{year}',
                         xmin, ymin,     # Lower left corner
                         xmax, ymax,     # Upper right corner
-                        w=MAX_PIXELS, h=None, # Width and height of the image [pixels]
+                        # Previous version was w=MAX_SIZE, h=None
+                        # but that ignores the computation of w,h above.
+                        # Moreover it makes it hard to get a specific size/resolution.
+                        w, h, # Width and height of the image [pixels]
                         tofile=False,   # Must be False to get bytes --> save the image to ".\Lifewatch.png" if True
                         format='image/png; mode=8bit')
 
@@ -366,7 +369,7 @@ def get_LifeWatch_center_width_height(year: int,
                                            'NUMPY',
                                            'RGB',
                                            'RGBA',
-                                           'Palette'] = 'WolfArray') -> WolfArray | np.ndarray | Image.Image:
+                                           'Palette'] = 'WolfArray') -> tuple[WolfArray | np.ndarray | Image.Image, tuple[float, float, float, float]]:
     """
     Get the LifeWatch map for the given year and center
     :param year: year of the map

wolfhece/picc.py

@@ -14,17 +14,58 @@ from typing import List, Union
 from shapely.geometry import Polygon, Point
 import logging
 import wx
-
+import geopandas as gpd
+import numpy as np
 from .PyTranslate import _
 from .PyVertexvectors import Zones, zone, vector, wolfvertex
 from .PyVertex import cloud_vertices, getRGBfromI, getIfromRGB
 from .drawing_obj import Element_To_Draw
 from .wolf_array import WolfArray
 
+def bbox_creation(study_area_path):
+    
+    gdf = gpd.read_file(study_area_path)
+    bounds = gdf.total_bounds  # [minx, miny, maxx, maxy]
+    minx, miny, maxx, maxy = bounds
+
+    points = [
+        (minx, miny),  # coin inférieur gauche
+        (minx, maxy),  # coin supérieur gauche
+        (maxx, maxy),  # coin supérieur droit
+        (maxx, miny),  # coin inférieur droit
+        (minx, miny)   # contour fermé
+    ]
+    bbox = Polygon(points)
+    return bbox
+
+def adding_layer_to_zone(fn:Path, bbox:Polygon = None, ZonesPicc: Zones = None):
+    """
+    Add other layers informations to the picc zones
+    ! Need GEOREF_ID as principal "name" of the zone !
+    """
+    content = gpd.read_file(fn, bbox=bbox)
+    if bbox is not None:
+        # filter content
+        content = content.cx[bbox.bounds[0]:bbox.bounds[2], bbox.bounds[1]:bbox.bounds[3]]
+        
+    for row in content.iterrows(): #lire picc
+        _, row = row
+        keys = list(row.keys())
+        keys.remove('geometry') #already into vectors (.myvectors)
+        keys = ['GEOREF_ID', 'NATUR_CODE', 'NATUR_DESC']
+        for zones in ZonesPicc.myzones: #lire Zones
+            for vector in zones.myvectors: 
+                if str(vector) == str(row['GEOREF_ID']) : #si le même id, alors compléter
+                    for key in keys:
+                        read_value = []
+                        read_value.append(row[key])
+                        arr = np.array(read_value, dtype=str)
+                        zones.add_values(key=str(key), values=arr)
+    return print("Traitement des layers spécifiques du PICC terminé")
+    
 class Picc_data(Element_To_Draw):
     """
     Read and show PICC data -- see https://geoportail.wallonie.be/georeferentiel/PICC
-
     """
 
     def __init__(self,
@@ -33,13 +74,15 @@ class Picc_data(Element_To_Draw):
                  mapviewer = None,
                  need_for_wx:bool = False,
                  data_dir:Path = Path(r'./data/PICC'),
-                 bbox:Union[Polygon, list[float]] = None) -> None:
+                 bbox:Union[Polygon, list[float]] = None,
+                 filename_vector:str='PICC_Vesdre.shp',
+                 filename_point:str='PICC_Vesdre_points.shp') -> None:
 
         super().__init__(idx = idx, plotted = plotted, mapviewer = mapviewer, need_for_wx= need_for_wx)
 
         self.data_dir = data_dir
-        self._filename_vector = 'Wallonie.gdb' #'PICC_Vesdre.shp'
-        self._filename_points = 'ADRESS_POINT.shp' #'PICC_Vesdre_points.shp'
+        self._filename_vector = filename_vector
+        self._filename_points = filename_point
         self.zones = None
         self.cloud = None
         self._colors = {'Habitation': [255, 0, 0], 'Annexe': [0, 255, 0], 'Culture, sport ou loisir': [0, 0, 255], 'Autre': [10, 10, 10]}
@@ -120,7 +163,7 @@ class Picc_data(Element_To_Draw):
                 self.cloud.myprop.color = getIfromRGB([0, 0, 255])
             else:
                 logging.error(_('Point file not found : {}').format(pointfile))
-
+                
                 if self.mapviewer is not None:
                     dlg = wx.FileDialog(None, _('Select a point file'), wildcard="Shapefile (*.shp)|*.shp|Gpkg (*.gpkg)|*.gpkg", style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
                     if dlg.ShowModal() == wx.ID_CANCEL:
@@ -139,7 +182,80 @@ class Picc_data(Element_To_Draw):
                     except:
                         logging.error(_('File not found : {}').format(pathname))
 
+        
 
+    def read_vectors_cloud_picc(self, data_dir:Path = None, path_vector:str = r"PICC_Vesdre.shp", path_points:str = r"PICC_Vesdre_points.shp", 
+                                bbox:Union[Polygon, list[float]] = None, column:str = "GEOREF_ID", additional_layers:bool = None) -> None:
+        """
+        Complete reading of the PICC files : vectors (.shp) and clouds (.shp). For the vectors, read any attributes that exist, a priori :
+        ['NATUR_CODE', 'NATUR_DESC', 'PRECIS_XY', 'PRECIS_Z', 'TECH_LEVE','DATE_LEVE', 'DATE_CREAT', 'DATE_MODIF', 'DATE_TRANS', 'CODE_WALTO']
+        Pay attention, this uses directly Zone() but may be slow for a large raster. Use "create_zone_picc"
+        """
+        if data_dir is None:
+            data_dir = self.data_dir
+            
+        logging.info('*PICC reading and Zone creation')
+        self._filename_vector = path_vector 
+        vector_file = data_dir / self._filename_vector
+        if  vector_file.exists():
+            #Charger la Zones contenants les zone (GEOREF_ID, vectors)
+            self.zones = Zones(data_dir / self._filename_vector, bbox = bbox, colname = column)
+            #Ajouter des attributs du PICC ['GEOREF_ID', 'NATUR_CODE', 'NATUR_DESC', 'PRECIS_XY', 'PRECIS_Z', 'TECH_LEVE', 'DATE_LEVE', 'DATE_CREAT', 'DATE_MODIF', 'DATE_TRANS', 'CODE_WALTO']
+            if additional_layers == True:
+                adding_layer_to_zone(data_dir / self._filename_vector, bbox = bbox, ZonesPicc=self.zones)
+        else :
+            print('Not existing vector file at the given paths!')
+            self.zones = None
+    
+        self._filename_points = path_points
+        pointfile = data_dir / self._filename_points
+        
+        #if pointfile.exists():
+        #    self.cloud = cloud_vertices(data_dir / self._filename_points, bbox = bbox)
+        #else:
+        #    self.cloud = None
+        #    print('Not existing point file at the given paths!')
+        
+        return self.zones, self.cloud
+        
+    def filter_by_name(self, path_vector:str, path_points:str, name:str="Habitation", 
+                        bbox:Union[Polygon, list[float]] = None):
+        """
+        Filter the PICC by a name of 'NATUR_DESC' attribute, and only keeps properties ['GEOREF_ID', 'NATUR_CODE', 'NATUR_DESC']
+        """
+        
+        if  path_vector.exists():
+            gdf = gpd.read_file(path_vector, include_fields=["geometry", 'GEOREF_ID', 'NATUR_CODE', 'NATUR_DESC'], bbox=bbox)
+            self.gdf_filtered = gdf[gdf["NATUR_DESC"] == name]
+            
+        else :
+            print('Not existing vector file at the given paths!')
+            self.zones = None
+    
+        #self._filename_points = path_points
+        #pointfile = data_dir / self._filename_points
+
+        return self.gdf_filtered
+    
+    def create_zone_picc(self, path_vector:str = r"PICC_Vesdre.shp", path_points:str = r"PICC_Vesdre_points.shp", name:str="Habitation",
+                                bbox:Union[Polygon, list[float]] = None, column:str = "GEOREF_ID"):
+        
+        """Complete reading of the PICC files : vectors (.shp) and clouds (.shp). For the vectors, read any attributes that exist, among
+        ['NATUR_CODE', 'NATUR_DESC', 'PRECIS_XY', 'PRECIS_Z', 'TECH_LEVE','DATE_LEVE', 'DATE_CREAT', 'DATE_MODIF', 'DATE_TRANS', 'CODE_WALTO']
+        For now, path_points not used but may be useful later
+        """
+        
+        #Filtering from the start
+        self.gdf_filtered = self.filter_by_name(path_vector, path_points, name, bbox)
+        
+        #Creating the Zone with desired attributes
+        Zones_picc = Zones()
+        Zones_picc.import_GeoDataFrame(self.gdf_filtered, bbox, colname=column)
+        return Zones_picc
+                
+                        
+    
+    
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """ Plot data in OpenGL context
 
@@ -227,8 +343,8 @@ class Picc_data(Element_To_Draw):
 
         else:
             logging.warning(_('No mapviewer to activate zone !'))
-
-    def extrude_polygons(self, dest_array: WolfArray):
+    
+    def extrude_polygons(self, dest_array):
         """ Extrude the active polygon along the z-axis """
 
         if self.zones is not None:

wolfhece/pyLandUseFlanders.py

@@ -0,0 +1,146 @@
+import numpy as np
+import logging
+from pathlib import Path
+from enum import Enum
+
+from osgeo import gdal, osr
+
+from .wolf_array import WolfArray
+
+class Legend_LU_Flanders_NL(Enum):
+    """
+    Enum for Legend Land Use Flanders
+    """
+    HUIZEN_EN_TUINEN = {"color": "#ff0000", "quantity": 1, "label": "Huizen en tuinen"}
+    INDUSTRIE = {"color": "#8400a8", "quantity": 2, "label": "Industrie"}
+    COMMERCIELE_DOELEINDEN = {"color": "#ff00c5", "quantity": 3, "label": "Commerciële doeleinden"}
+    DIENSTEN = {"color": "#002673", "quantity": 4, "label": "Diensten"}
+    TRANSPORTINFRASTRUCTUUR = {"color": "#686868", "quantity": 5, "label": "Transportinfrastructuur"}
+    RECREATIE = {"color": "#ffaa00", "quantity": 6, "label": "Recreatie"}
+    LANDBOUWGEBOUWEN_EN_INFRASTRUCTUUR = {"color": "#a87000", "quantity": 7, "label": "Landbouwgebouwen en -infrastructuur"}
+    OVERIGE_BEBOWDE_TERREINEN = {"color": "#cccccc", "quantity": 8, "label": "Overige bebouwde terreinen"}
+    OVERIGE_ONBEBOWDE_TERREINEN = {"color": "#828282", "quantity": 9, "label": "Overige onbebouwde terreinen"}
+    ACTIEVE_GROEVES = {"color": "#dfe6a9", "quantity": 10, "label": "Actieve groeves"}
+    LUCHTHAVENS = {"color": "#df73ff", "quantity": 11, "label": "Luchthavens"}
+    BOS = {"color": "#267300", "quantity": 12, "label": "Bos"}
+    AKKER = {"color": "#ffffbe", "quantity": 13, "label": "Akker"}
+    GRASLAND_IN_LANDBOUWGEBRUIK = {"color": "#a3ff73", "quantity": 14, "label": "Grasland in landbouwgebruik"}
+    STRUIKGEWAS = {"color": "#897044", "quantity": 15, "label": "Struikgewas"}
+    BRAAKLIGGEND_EN_DUINEN = {"color": "#ffd37f", "quantity": 16, "label": "Braakliggend en duinen"}
+    WATER = {"color": "#005ce6", "quantity": 17, "label": "Water"}
+    MOERAS = {"color": "#00a884", "quantity": 18, "label": "Moeras"}
+    OVERIGE_GRASLANDEN = {"color": "#82ca5b", "quantity": 19, "label": "Overige graslanden"}
+
+class Legend_LU_Flanders_EN(Enum):
+    """
+    Enum for Legend Land Use Flanders in English
+    """
+    HOUSES_AND_GARDENS = {"color": "#ff0000", "quantity": 1, "label": "Houses and gardens"}
+    INDUSTRY = {"color": "#8400a8", "quantity": 2, "label": "Industry"}
+    COMMERCIAL_PURPOSES = {"color": "#ff00c5", "quantity": 3, "label": "Commercial purposes"}
+    SERVICES = {"color": "#002673", "quantity": 4, "label": "Services"}
+    TRANSPORT_INFRASTRUCTURE = {"color": "#686868", "quantity": 5, "label": "Transport infrastructure"}
+    RECREATION = {"color": "#ffaa00", "quantity": 6, "label": "Recreation"}
+    AGRICULTURAL_BUILDINGS_AND_INFRASTRUCTURE = {"color": "#a87000", "quantity": 7, "label": "Agricultural buildings and infrastructure"}
+    OTHER_BUILT_UP_LAND = {"color": "#cccccc", "quantity": 8, "label": "Other built-up land"}
+    OTHER_UNBUILT_LAND = {"color": "#828282", "quantity": 9, "label": "Other unbuilt land"}
+    ACTIVE_QUARRIES = {"color": "#dfe6a9", "quantity": 10, "label": "Active quarries"}
+    AIRPORTS = {"color": "#df73ff", "quantity": 11, "label": "Airports"}
+    FOREST = {"color": "#267300", "quantity": 12, "label": "Forest"}
+    CROP_LAND = {"color": "#ffffbe", "quantity": 13, "label": "Crop land"}
+    GRASSLAND_IN_AGRICULTURAL_USE = {"color": "#a3ff73", "quantity": 14, "label": "Grassland in agricultural use"}
+    SHRUB_LAND = {"color": "#897044", "quantity": 15, "label": "Shrub land"}
+    FALLOW_AND_DUNES = {"color": "#ffd37f", "quantity": 16, "label": "Fallow and dunes"}
+    WATER = {"color": "#005ce6", "quantity": 17, "label": "Water"}
+    MARSHLAND = {"color": "#00a884", "quantity": 18, "label": "Marshland"}
+    OTHER_GRASSLANDS = {"color": "#82ca5b", "quantity": 19, "label": "Other grasslands"}
+
+class Legend_LU_Flanders_FR(Enum):
+    """ 
+    Enum for Legend Land Use Flanders in French
+    """
+    MAISONS_ET_JARDINS = {"color": "#ff0000", "quantity": 1, "label": "Maisons et jardins"}
+    INDUSTRIE = {"color": "#8400a8", "quantity": 2, "label": "Industrie"}
+    USAGES_COMMERCIAUX = {"color": "#ff00c5", "quantity": 3, "label": "Usages commerciaux"}
+    SERVICES = {"color": "#002673", "quantity": 4, "label": "Services"}
+    INFRASTRUCTURE_DE_TRANSPORT = {"color": "#686868", "quantity": 5, "label": "Infrastructure de transport"}
+    LOISIRS = {"color": "#ffaa00", "quantity": 6, "label": "Loisirs"}
+    BÂTIMENTS_AGRICOLES_ET_INFRASTRUCTURE = {"color": "#a87000", "quantity": 7, "label": "Bâtiments agricoles et infrastructure"}
+    AUTRES_TERRAINS_BÂTIS = {"color": "#cccccc", "quantity": 8, "label": "Autres terrains bâtis"}
+    AUTRES_TERRAINS_NON_BÂTIS = {"color": "#828282", "quantity": 9, "label": "Autres terrains non bâtis"}
+    CARRIÈRES_ACTIVES = {"color": "#dfe6a9", "quantity": 10, "label": "Carrières actives"}
+    AÉROPORTS = {"color": "#df73ff", "quantity": 11, "label": "Aéroports"}
+    FORÊT = {"color": "#267300", "quantity": 12, "label": "Forêt"}
+    CULTURES = {"color": "#ffffbe", "quantity": 13, "label": "Cultures"}
+    PRAIRIES_EN_UTILISATION_AGRICOLE = {"color": "#a3ff73", "quantity": 14, "label": "Prairies en utilisation agricole"}
+    LANDES_ARBUSTIVES = {"color": "#897044", "quantity": 15, "label": "Landes arbustives"}
+    TERRES_EN_FRICHE_ET_DUNES = {"color": "#ffd37f", "quantity": 16, "label": "Terres en friche et dunes"}
+    EAU = {"color": "#005ce6", "quantity": 17, "label": "Eau"}
+    MARAIS = {"color": "#00a884", "quantity": 18, "label": "Marais"}
+    AUTRES_TERRAINS_ENHERBES = {"color": "#82ca5b", "quantity": 19, "label": "Autres terrains enherbés"}
+
+FLANDERS_OCS_COLORMAP = {
+    1.: (255,0,0,255), # Maisons et jardins,
+    2.: (132,0,168,255), # Industrie
+    3.: (255,0,197,255), # Usages commerciaux
+    4.: (0,38,115,255), # Services
+    5.: (104,104,104,255), # Infrastructure de transport
+    6.: (255,170,0,255), # Loisirs
+    7.: (168,112,0,255), # Bâtiments agricoles et infrastructure
+    8.: (204,204,204,255), # Autres terrains bâtis
+    9.: (130,130,130,255), # Autres terrains non bâtis
+    10.: (223,230,169,255), # Carrières actives 
+    11.: (223,115,255,255), # Aéroports
+    12.: (38,115,0,255), # Forêt    
+    13.: (255,255,190,255), # Cultures
+    14.: (163,255,115,255), # Prairies en utilisation agricole
+    15.: (137,112,68,255), # Landes arbustives
+    16.: (255,211,127,255), # Terres en friche et dunes
+    17.: (0,92,230,255), # Eau
+    18.: (0,168,132,255), # Marais
+    19.: (130,202,91,255), # Autres terrains enherbés
+    }
+
+MAPPING_FLANDERS_TO_WALOUS = {
+    1.: 11., # Maisons et jardins -> Construction artificielles hors sol
+    2.: 11., # Industrie -> Revêtement artificiels au sol
+    3.: 9., # Usages commerciaux -> Revêtement artificiels au sol
+    4.: 9., # Services -> Revêtement artificiels au sol
+    5.: 10., # Infrastructure de transport -> Réseau ferroviaire
+    6.: 9., # Loisirs -> Revêtement artificiels au sol
+    7.: 9., # Bâtiments agricoles et infrastructure -> Revêtement artificiels au sol
+    8.: 9., # Autres terrains bâtis -> Revêtement artificiels au sol
+    9.: 7., # Autres terrains non bâtis -> Sols nus
+    10.: 7., # Carrières actives -> Sols nus
+    11.: 8., # Aéroports -> Revêtement artificiels au sol
+    12.: 4., # Forêt -> Feuillus (> 3m)
+    13.: 1., # Cultures -> Couvert herbacé en rotation dans l'année
+    14.: 1., # Prairies en utilisation agricole -> Couvert herbacé en rotation dans l'année
+    15.: 6., # Landes arbustives -> Feuillus (<= 3m)
+    16.: 7., # Terres en friche et dunes -> Sols nus
+    17.: 8., # Eau -> Eaux de surface
+    18.: 8., # Marais -> Eaux de surface
+    19.: 2., # Autres terrains enherbés -> Couvert herbacé toute l'année
+}
+
+MAPPING_FLANDERS_TO_HYDROLOGY = {
+    1.: 4., # Maisons et jardins -> Pavés/urbain
+    2.: 4., # Industrie -> Pavés/urbain
+    3.: 4., # Usages commerciaux -> Pavés/urbain
+    4.: 4., # Services -> Pavés/urbain
+    5.: 4., # Infrastructure de transport -> Pavés/urbain
+    6.: 4., # Loisirs -> Pavés/urbain
+    7.: 4., # Bâtiments agricoles et infrastructure -> Pavés/urbain
+    8.: 4., # Autres terrains bâtis -> Pavés/urbain
+    9.: 3., # Autres terrains non bâtis -> Culture
+    10.: 3., # Carrières actives -> Culture
+    11.: 4., # Aéroports -> Pavés/urbain
+    12.: 1., # Forêt -> Forêt
+    13.: 3., # Cultures -> Culture
+    14.: 3., # Prairies en utilisation agricole -> Culture
+    15.: 3., # Landes arbustives -> Culture
+    16.: 3., # Terres en friche et dunes -> Culture
+    17.: 6., # Eau -> Plan d'eau
+    18.: 6., # Marais -> Plan d'eau
+    19.: 2., # Autres terrains enherbés -> Prairie
+}

wolfhece/pydownloader.py

@@ -42,6 +42,7 @@ class DownloadFiles(Enum):
     TXTFILES = ('txt',)
     CSVFILES = ('csv',)
     DXFFILES = ('dxf',)
+    ZIPFILES = ('zip',)
 
 class DonwloadDirectories(Enum):
     """ Enum to define the directories for downloads. """
@@ -79,7 +80,7 @@ def clean_url(url: str) -> str:
         raise ValueError(f"Invalid URL: {url}. Must start with http://, https://, or ftp://")
     return cleaned_url.strip()
 
-def download_file(url: str, destination: Union[str, Path] = None, download_type: DownloadType = DownloadType.HTTP, load_from_cache:bool = True) -> None:
+def download_file(url: str, destination: Union[str, Path] = None, download_type: DownloadType = DownloadType.HTTP, load_from_cache:bool = True):
     """ Download a file from the specified URL to the destination path.
 
     :param url: The URL of the file to download.