wolfhece 2.2.13__py3-none-any.whl → 2.2.14__py3-none-any.whl

wolfhece/PyWMS.py

@@ -41,12 +41,16 @@ def getWalonmap(cat:Literal['IMAGERIE/ORTHO_2021', 'ALEA', 'CADMAP', 'LIDAXES',
 
     try:
         wms=WebMapService('https://geoservices.wallonie.be/arcgis/services/'
-                        + catloc+'/MapServer/WMSServer',version='1.3.0')
+                        + catloc+'/MapServer/WMSServer',version='1.3.0', timeout=5)
     except:
-        wms=WebMapService('https://eservices.minfin.fgov.be/arcgis/services/'
-                        + catloc+'/MapServer/WMSServer',version='1.3.0')
-        # wms=WebMapService('http://ccff02.minfin.fgov.be/geoservices/arcgis/services/'
-        #                 + catloc+'/MapServer/WMSServer',version='1.3.0')
+        try:
+            wms=WebMapService('https://eservices.minfin.fgov.be/arcgis/services/'
+                            + catloc+'/MapServer/WMSServer',version='1.3.0')
+            # wms=WebMapService('http://ccff02.minfin.fgov.be/geoservices/arcgis/services/'
+            #                 + catloc+'/MapServer/WMSServer',version='1.3.0')
+        except:
+            logging.warning(_('Impossible to get data from web services'))
+            return None
 
     ppkm = 300
     if w is None and h is None:
@@ -72,7 +76,7 @@ def getWalonmap(cat:Literal['IMAGERIE/ORTHO_2021', 'ALEA', 'CADMAP', 'LIDAXES',
         out = open('aqualim.png', 'wb')
         out.write(img.read())
         out.close()
-        return BytesIO(b'1')
+        return None
     else:
         mycontents=list(wms.contents)
         curcont=['0']
@@ -113,7 +117,7 @@ def getWalonmap(cat:Literal['IMAGERIE/ORTHO_2021', 'ALEA', 'CADMAP', 'LIDAXES',
             return BytesIO(img.read())
         except:
             logging.warning(_('Impossible to get data from web services'))
-            pass
+            return None
 
 def getVlaanderen(cat:Literal['Adpf'],
                 xl:float,
@@ -128,10 +132,10 @@ def getVlaanderen(cat:Literal['Adpf'],
 
     try:
         wms=WebMapService('https://geo.api.vlaanderen.be/'
-                        + catloc+'/wms',version='1.3.0')
+                        + catloc+'/wms',version='1.3.0', timeout=5)
     except:
         logging.warning(_('Impossible to get data from web services'))
-        return
+        return None
 
     ppkm = 300
     if w is None and h is None:
@@ -168,7 +172,7 @@ def getVlaanderen(cat:Literal['Adpf'],
             return BytesIO(img.read())
         except:
             logging.warning(_('Impossible to get data from web services'))
-            pass
+            return None
 
 
 def getIGNFrance(cat:str,epsg:str,xl,yl,xr,yr,w,h,tofile=True) -> BytesIO:
@@ -191,7 +195,7 @@ def getIGNFrance(cat:str,epsg:str,xl,yl,xr,yr,w,h,tofile=True) -> BytesIO:
         out = open('ignFrance.png', 'wb')
         out.write(img.read())
         out.close()
-        return BytesIO(b'1')
+        return None
     else:
         return BytesIO(img.read())
 
@@ -206,7 +210,7 @@ def getLifeWatch(cat:Literal['None'],
                 format:Literal['image/png', 'image/png; mode=8bit']='image/png') -> BytesIO:
 
     wms=WebMapService(f'https://maps.elie.ucl.ac.be/cgi-bin/mapserv72?map=/maps_server/lifewatch/mapfiles/LW_Ecotopes/latest/{cat}.map&SERVICE=wms',
-                        version='1.3.0')
+                        version='1.3.0', timeout=10)
 
     ppkm = 300
     if w is None and h is None:
@@ -249,7 +253,7 @@ def getLifeWatch(cat:Literal['None'],
         out = open('LifeWatch.png', 'wb')
         out.write(img.read())
         out.close()
-        return BytesIO(b'1')
+        return None
     else:
         mycontents=list(wms.contents)
         curcont=['lc_hr_raster'] # 'MS
@@ -266,7 +270,7 @@ def getLifeWatch(cat:Literal['None'],
             return BytesIO(img.read())
         except:
             logging.warning(_('Impossible to get data from web services'))
-            pass
+            return None
 
 if __name__=='__main__':
     # me=pyproj.CRS.from_epsg(27573)

wolfhece/apps/version.py

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

wolfhece/wolf_texture.py

@@ -317,7 +317,16 @@ class imagetexture(Element_To_Draw):
                 mybytes = getWalonmap(self.category + '/' + self.subcategory,
                                       self.xmin, self.ymin, self.xmax, self.ymax,
                                       self.width, self.height, False)
-            image = Image.open(mybytes)
+
+            if mybytes is None:
+                logging.warning(_('Error opening image file : ') + str(self.category + '/' + self.subcategory))
+                return
+
+            try:
+                image = Image.open(mybytes)
+            except Exception as e:
+                logging.warning(_('Error opening image file : ') + str(self.category + '/' + self.subcategory))
+                return
 
             glBindTexture(GL_TEXTURE_2D, self.idtexture[0])
             if self.subcategory[:5] == 'ORTHO':

{wolfhece-2.2.13.dist-info → wolfhece-2.2.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.13
+Version: 2.2.14
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece
@@ -75,19 +75,13 @@ Requires-Dist: contextily
 Requires-Dist: pefile
 Requires-Dist: wolfpydike
 
-Ce paquet contient l'interface graphique Python du logiciel WOLF (HECE - ULiège) de même que plusieurs outils de traitements topographique, hydraulique et hydrologique.
+This package contains the Python graphical interface for the WOLF software (HECE - ULiège), along with several tools for topographic, hydraulic, and hydrological processing.
 
-Les codes de calcul ne sont pas contenus dans ce paquet.
+The core numerical codes are not included in this package.
 
-Version 2.1.x compatible Numpy 1.23.5
-Version 2.2.x compatible Numpy 2.1.3
+- Version 2.1.x is compatible with Numpy 1.23.5.
+- Version 2.2.x is compatible with Numpy 2.1.3.
 
---
+Since version 2.2.11, we support Python 3.10 and 3.11.
 
-
-This package contains the Python graphical interface of the WOLF software (HECE - ULiège), as well as several topographic, hydraulic, and hydrological processing tools.
-
-The numerical codes are not included in this package.
-
-Version 2.1.x compatible Numpy 1.23.5
-Version 2.2.x compatible Numpy 2.1.3
+Python 3.12 and 3.13 are supported experimentally.

{wolfhece-2.2.13.dist-info → wolfhece-2.2.14.dist-info}/RECORD

@@ -18,7 +18,7 @@ wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=WT2UprotBUEA6rvs8kXfPRscKrhIL4_pya2UylzoBJE,50385
 wolfhece/PyVertexvectors.py,sha256=yPqE1rmqCSAucjNjSo1_srKHMwjqYWe0lx7S2Wbpryw,327905
-wolfhece/PyWMS.py,sha256=LWkQk3R7miiVal-n5K5P5ClSQJA_vi5ImBxYGuxCx9A,9122
+wolfhece/PyWMS.py,sha256=e6cMA72xLnpFZQtM99lItTyIfUQKz0f5f1iL_bwJVPQ,9303
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
 wolfhece/RatingCurve_xml.py,sha256=cUjReVMHFKtakA2wVey5zz6lCgHlSr72y7ZfswZDvTM,33891
@@ -60,7 +60,7 @@ wolfhece/tools2d_dll.py,sha256=oU0m9XYAf4CZsMoB68IuKeE6SQh-AqY7O5NVED8r9uw,13125
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
 wolfhece/wolf_array.py,sha256=PlImSCX5lUeoqPR7ogqak_Zl6dLyGn5EXUzeD_6-xAU,497218
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
-wolfhece/wolf_texture.py,sha256=IvFtekT5iLU2sivZOOlJXpE4CevjTQYSxHaOp4cH_wI,17723
+wolfhece/wolf_texture.py,sha256=KlT8g4dBmH819n8mqQ8pCHLGST1C5bd4OaR_et5wsUM,18092
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
 wolfhece/wolf_vrt.py,sha256=wbxXVN7TL9zgdyF79S-4e3pje6wJEAgBEfF_Y8kkzxs,14271
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
@@ -86,7 +86,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=eCPAUYscZPWDYKBHDBWum_VIcE7WXOCBe1GLHL3KUmU,3088
-wolfhece/apps/version.py,sha256=d7VnTStgGHxEQxAc33py4-P5wUeDm7KqWqqQhg67lVw,388
+wolfhece/apps/version.py,sha256=K1wI1QprwJhkLzJfrbY1MD9huUZViybAZpuclY2ssps,388
 wolfhece/apps/wolf.py,sha256=j_CgvsL8rwixbVvVD5Z0s7m7cHZ86gmFLojKGuetMls,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -333,8 +333,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=8PlMYrb_8jI8h9F0_EagpM
 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.13.dist-info/METADATA,sha256=uManH-6owmjo2fqAuRXToSiNmuGW07Z4EvZg4OnjwZQ,2908
-wolfhece-2.2.13.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-wolfhece-2.2.13.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.2.13.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.13.dist-info/RECORD,,
+wolfhece-2.2.14.dist-info/METADATA,sha256=Y7UYL2Y3HjkDspeALQzelJ9yNiWX4bx42gHbYLXjrJA,2731
+wolfhece-2.2.14.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+wolfhece-2.2.14.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.2.14.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.14.dist-info/RECORD,,