wolfhece 2.1.111__py3-none-any.whl → 2.1.113__py3-none-any.whl

wolfhece/PyDraw.py

@@ -6760,7 +6760,7 @@ class WolfMapViewer(wx.Frame):
 
             # Création d'une nouvelle vue
             newview = WolfViews(mapviewer=self)
-            self.add_object('array', newobj=newarray)
+            self.add_object('views', newobj=newview)
 
         elif itemlabel==_('Create Wolf2D manager ...'):
             autoscale = False

wolfhece/apps/version.py

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

wolfhece/irm_qdf.py

@@ -271,8 +271,16 @@ class Qdf_IRM():
 
         self.store = store_path
 
+
+        # This one will hold Qdf data of one locality. If it is None it means no
+        # data has been loaded.
+        self.qdf = None
+
         if force_import:
-            self.importfromwebsite(store_path, ins=ins)
+            # Import all QDF's from IRM
+            Qdf_IRM.importfromwebsite(store_path, ins=ins)
+        self._code = None
+        self._name = None
 
         if code !=0:
             if self.ins_read_excel(code=str(code)):
@@ -289,6 +297,11 @@ class Qdf_IRM():
             else:
                 logging.debug(f"Name {name} not found in the store")
 
+    def has_data_for_locality(self) -> bool:
+        """ Has this instance been initialized with data from a locality ?
+        """
+        return self.qdf is not None
+
     @property
     def name(self):
         return self._name
@@ -326,8 +339,8 @@ class Qdf_IRM():
 
 
     @classmethod
-    def importfromwebsite(cls, store_path= 'irm', verbose:bool= False, waitingtime:float= .01, ins:Literal['2018', '2019', '2025', 2018, 2019, 2025] = 2018):
-        """ Import Excel files for all municipalities from the IRM website
+    def importfromwebsite(cls, store_path= 'irm', verbose:bool= False, waitingtime:float= .01, ins:Literal['2018', '2019', '2025', 2018, 2019, 2025] = 2018, ins_code: int = None):
+        """ Import Excel files for one or all municipalities from the IRM website
 
         :param store_path: Where to store the downloaded data. Directory will be created if it doesn't exists.
         :param verbose: If `True`, will print some progress information.
@@ -339,29 +352,43 @@ class Qdf_IRM():
                             of each station (will make sure we don't overwhelm IRM's website).
 
         :param ins: The year of the INS codes to use.
+        :param code: Restricts the data download to a specific NIS code. `None` means full download.
         """
         import requests
 
         myloc = Localities(ins)
 
-        if not path.exists(store_path):
-            mkdir(store_path)
+        if ins_code is not None:
+            codes_to_load = [ins_code]
+        else:
+            if not path.exists(store_path):
+                mkdir(store_path)
+            codes_to_load = myloc.inscode2name
 
-        for key,myins in enumerate(myloc.inscode2name):
+        for key,myins in enumerate(codes_to_load):
             #chaîne URL du fichier Excel
             url="https://www.meteo.be//resources//climatology//climateCity//xls//IDF_table_INS"+str(myins)+".xlsx"
             #Obtention du fichiers depuis le site web de l'IRM
             response=requests.get(url)
 
             if str(response.content).find("Page not found")==-1 :
+
+                # Make sure we create the store path only if we have
+                # something to put inside.
+                if ins_code is not None and not path.exists(store_path):
+                    mkdir(store_path)
+
                 file=open(path.join(store_path,str(myins)+".xlsx"), 'wb')
                 file.write(response.content)
                 file.close()
                 if verbose:
                     if callable(verbose):
-                        verbose(key/len(myloc.inscode2name))
+                        verbose(key/len(codes_to_load))
                     else:
                         print(myins)
+            else:
+                #logging.error(response.content)
+                logging.error(f"Failed to load IRM data: {url} --> {response}")
 
             sleep(waitingtime)