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

wolfhece/hydrometry/kiwis.py

@@ -57,6 +57,8 @@ KIWIS WebServices command :
     checkValueLimit	checks value limitations for time range value requests
 """
 
+TIMEOUT = 5
+
 URL_SERVICE = 'https://hydrometrie.wallonie.be/services'
 URL_SERVICE_WATERINFO = 'https://download.waterinfo.be/tsmdownload'
 URL_SERVICE_HICWS = 'https://hicws.vlaanderen.be'
@@ -400,6 +402,13 @@ class hydrometry():
         if url=='':
             self.url=URL_SPW
 
+            # check if url is responding
+            try:
+                requests.get(self.url, timeout=TIMEOUT)
+            except requests.exceptions.RequestException as e:
+                logging.error(f"Error connecting to {self.url}: {e}")
+                return
+
         if urltoken=='':
             self.urltoken=URL_TOKEN
 
@@ -413,7 +422,7 @@ class hydrometry():
             self.get_sites()
             self.get_stations()
             self.get_groups()
-            self.save_struct(self.dir)
+            self.save_struct()
         except Exception as e:
             print('Error in hydrometry init :', e)
             self.realstations = None
@@ -501,7 +510,11 @@ class hydrometry():
         """
 
         if dir=='':
-            return
+            if self.dir:
+                dir = self.dir
+            else:
+                logging.warning('No directory to save structure')
+                return
 
         dir = Path(dir)
         dir.mkdir(parents=True, exist_ok=True)
@@ -572,7 +585,7 @@ class hydrometry():
         # returnfields += 'ts_id,ts_name,'
         # returnfields += 'ts_unitname,ts_unitsymbol,'
 
-        if self.dir!='' and self.get_path(self.dir, 'stations.csv').exists():
+        if self.dir!='' and self.get_path(self.dir,'stations.csv').exists():
             self.stations = pd.read_csv(self.get_path(self.dir, 'stations.csv'),index_col=0)
         elif self.url!='':
             try:
@@ -583,14 +596,16 @@ class hydrometry():
                                             +'&ca_sta_returnfields='+ca_sta_returnfields \
                                             +'&orderby=station_no', \
                                             verify=True, \
-                                            headers=self._header).json()
+                                            headers=self._header,
+                                            timeout=TIMEOUT).json()
                 else:
                     json_data = requests.get(self._get_commandstr(kiwis_command.getStationList, 'json') \
                                             +'&metadata=true' \
                                             +'&returnfields='+returnfields \
                                             +'&orderby=station_no', \
                                             verify=True, \
-                                            headers=self._header)
+                                            headers=self._header,
+                                            timeout=TIMEOUT)
 
                     json_data = json_data.text.replace('\x1a', ' ')
                     json_data = json.loads(json_data)
@@ -802,7 +817,9 @@ class hydrometry():
                                              '&timeseriesgroup_id='+str(group_id)+
                                              '&orderby=station_no'+
                                              returnFields,
-                                             verify=True, headers=self._header).json()
+                                             verify=True,
+                                             headers=self._header,
+                                             timeout=TIMEOUT).json()
                     stations = pd.DataFrame(json_data[1:], columns = json_data[0])
                 else:
                     logging.error(f'{time} not found in Enum')
@@ -831,7 +848,10 @@ class hydrometry():
                                      '&timeseriesgroup_id='+str(group_id)+
                                      '&orderby=station_no'+
                                      returnFields,
-                                     verify=True, headers=self._header).json()
+                                     verify=True,
+                                     headers=self._header,
+                                     timeout=TIMEOUT).json()
+
             stations = pd.DataFrame(json_data[1:], columns = json_data[0])
 
             return stations
@@ -844,7 +864,11 @@ class hydrometry():
         if self.dir!='' and self.get_path(self.dir, 'sites.csv').exists() and not forcerequest:
             self.sites = pd.read_csv(self.get_path(self.dir, 'sites.csv'),index_col=0)
         elif self.url!='' or forcerequest:
-            json_data = requests.get(self._get_commandstr(kiwis_command.getSiteList),verify=True, headers=self._header).json()
+            json_data = requests.get(self._get_commandstr(kiwis_command.getSiteList),
+                                     verify=True,
+                                     headers=self._header,
+                                     timeout=TIMEOUT).json()
+
             self.sites = pd.DataFrame(json_data[1:], columns = json_data[0])
         else:
             self.sites = None
@@ -857,7 +881,10 @@ class hydrometry():
         if self.dir!='' and self.get_path(self.dir, 'groups.csv').exists() and not forcerequest:
             self.groups = pd.read_csv(self.get_path(self.dir, 'groups.csv'),index_col=0)
         elif self.url!='' or forcerequest:
-            json_data = requests.get(self._get_commandstr(kiwis_command.getGroupList),verify=True, headers=self._header).json()
+            json_data = requests.get(self._get_commandstr(kiwis_command.getGroupList),
+                                     verify=True,
+                                     headers=self._header,
+                                     timeout=TIMEOUT).json()
             self.groups = pd.DataFrame(json_data[1:], columns = json_data[0])
         else:
             self.groups = None
@@ -878,7 +905,11 @@ class hydrometry():
         if self.dir!='' and self.get_path(self.dir, 'requests.csv').exists() and not forcerequest:
             self.requests = pd.read_csv(self.get_path(self.dir, 'requests.csv'),index_col=0)
         elif self.url!='' or forcerequest:
-            json_data = requests.get(self._get_commandstr(kiwis_command.getrequestinfo),verify=True, headers=self._header).json()
+            json_data = requests.get(self._get_commandstr(kiwis_command.getrequestinfo),
+                                     verify=True,
+                                     headers=self._header,
+                                     timeout=TIMEOUT).json()
+
             self.requests = pd.DataFrame(json_data[0]['Requests'])
         else:
             self.requests = None
@@ -913,7 +944,9 @@ class hydrometry():
         json_data = requests.get(self._get_commandstr(kiwis_command.getTimeseriesList)
                                  +'&station_id='+str(id)
                                  +'&format=json'
-                                 ,verify=True, headers=self._header).json()
+                                 ,verify=True,
+                                 headers=self._header,
+                                 timeout=TIMEOUT).json()
 
         try:
             if json_data[0] == 'No matches.':
@@ -978,7 +1011,7 @@ class hydrometry():
 
         id,list=self.timeseries_list(stationname=stationname,stationcode=stationcode)
         filename = self._get_filename_list(stationname,stationcode)
-        list.to_csv(dir / filename)
+        list.to_csv(self.get_path(dir,filename))
 
     def timeseries(self, stationname:str='', stationcode:str='', stationid:str='',
                    dir:str='',
@@ -1027,7 +1060,8 @@ class hydrometry():
                                         "station_id":str(id),
                                         "ts_name":ts_name,
                                         "timezone":timezone})
-                                        ,verify=True).json()
+                                        ,verify=True,
+                                        timeout=TIMEOUT).json()
                 if len(json_data)==1:
                     return None
 
@@ -1090,7 +1124,9 @@ class hydrometry():
                                     "to":todate.strftime("%Y-%m-%dT%H:%M:%S"),
                                     # "format":"json",
                                     "timezone":timezone})
-                                    ,verify=True, headers=self._header).json()
+                                    ,verify=True,
+                                    headers=self._header,
+                                    timeout=TIMEOUT).json()
 
             df = pd.DataFrame(json_data[0]['data'], columns = json_data[0]['columns'].split(','))
             df.set_index('Timestamp', inplace = True)
@@ -1139,7 +1175,8 @@ class hydrometry():
                                         "ts_name":ts_name,
                                         "timezone":timezone})+
                                         "&returnfields=Timestamp,Quality%20Code"
-                                        ,verify=True).json()
+                                        ,verify=True,
+                                        timeout=TIMEOUT).json()
                 if len(json_data)==1:
                     return None
 
@@ -1189,7 +1226,9 @@ class hydrometry():
                                     "to":todate.strftime("%Y-%m-%dT%H:%M:%S"),
                                     "timezone":timezone})+
                                     "&returnfields=Timestamp,Quality%20Code"
-                                    ,verify=True, headers=self._header).json()
+                                    ,verify=True,
+                                    headers=self._header,
+                                    timeout=TIMEOUT).json()
 
             df = pd.DataFrame(json_data[0]['data'], columns = json_data[0]['columns'].split(','))
             df.set_index('Timestamp', inplace = True)

wolfhece/hydrometry/kiwis_wolfgui.py

@@ -13,13 +13,14 @@ import logging
 
 from ..drawing_obj import Element_To_Draw
 
-try:
-    # Trying to import the hydrometry_hece module from the hydrometry_hece package
-    # containing the KEY access to the SPW server
-    from ..hydrometry_hece.kiwis_hece import hydrometry_hece as hydrometry
-except:
-    # If the hydrometry_hece module is not found, we import the hydrometry module from the hydrometry package
-    from .kiwis import hydrometry
+# try:
+#     # Trying to import the hydrometry_hece module from the hydrometry_hece package
+#     # containing the KEY access to the SPW server
+#     from ..hydrometry_hece.kiwis_hece import hydrometry_hece as hydrometry
+# except:
+#     # If the hydrometry_hece module is not found, we import the hydrometry module from the hydrometry package
+#     from .kiwis import hydrometry
+from .kiwis import hydrometry
 
 from .kiwis_gui import hydrometry_gui
 from ..PyVertex import cloud_vertices, wolfvertex, Cloud_Styles, getIfromRGB, getRGBfromI

wolfhece/lazviewer/laz_viewer.py

@@ -95,12 +95,12 @@ class Classification_LAZ():
             10 : ['Ponts', 'Les ponts ont été classés à part pour améliorer la définition du MNT. Ils ont été ouverts grâce',Colors.rgb_withalpha_float('lightyellow1',1.)],
             11 : ['Mur de berges', 'Mur et muret en berge de la Vesdre dépassant le sol à des vocation de réaliser une modélisation 3D hydraulique avec ces obstacles.',Colors.rgb_withalpha_float('red1',1.)],
             13 : ['Inconnu', 'A vérifier auSPW', Colors.rgb_withalpha_float('lightslategray',.2)],
-            15 : ['Tranche d\'eau', 'Echo intermédiaire dans l\’eau n\’appartenant ni à la surface d\’eau ni au fond du lit', Colors.rgb_withalpha_float('lightblue',.2)],
-            16 : ['Surface bathymétrique', 'Fond du lit de la Vesdre et de ses affluents et des autres surfaces d\’eau mesurées à partir du scanner 3 FWF discrétisé',Colors.rgb_withalpha_float('sandybrown',1.)],
+            15 : [r'Tranche d\'eau', r'Echo intermédiaire dans l\’eau n\’appartenant ni à la surface d\’eau ni au fond du lit', Colors.rgb_withalpha_float('lightblue',.2)],
+            16 : ['Surface bathymétrique', r'Fond du lit de la Vesdre et de ses affluents et des autres surfaces d\’eau mesurées à partir du scanner 3 FWF discrétisé',Colors.rgb_withalpha_float('sandybrown',1.)],
             17 : ['Surface bathymétrique incertaine', 'Surface bathymétrique sur les zones peu profondes principalement sous végétation où les intensités des échos sont parfois trop faibles pour avoir la certitude qu\’ils représentent le fond de rivière. La classe 17 est néanmoins plus certaine que la classe 18. Elle est utilisée dans la génération des MNT par défaut.',Colors.rgb_withalpha_float('rosybrown',.5)],
-            19 : ['Surface d\eau calculée', 'Points sous échantillonnés de la surface d\’eau ayant servis à faire les calculs de correction de réfraction bathymétrique',Colors.rgb_withalpha_float('lightblue',.2)],
+            19 : [r'Surface d\eau calculée', r'Points sous échantillonnés de la surface d\’eau ayant servis à faire les calculs de correction de réfraction bathymétrique',Colors.rgb_withalpha_float('lightblue',.2)],
             20 : ['Surface bathymétrique incertaine profonde', 'Surface bathymétrique sur les zones plus profondes principalement au centre de la rivière où les intensités des échos sont parfois trop faibles pour avoir la certitude qu\’ils représentent le fond de rivière. Non utilisée dans la génération du MNT. + Surface proche bathy mais potentiellement émergée pour les scanner 1 à 3',Colors.rgb_withalpha_float('lightblue',.5)],
-            29 : ['Surface d\'eau héliportée', 'La hauteur d\’eau du vol héliporté étant largement supérieure (de 30 à 40cm au vol Titan, les points matérialisant cette surface ont été reclassés dans cette classe séparée pour ne pas perturbé le reste du nuage de point.',Colors.rgb_withalpha_float('cyan',.3)]}
+            29 : [r'Surface d\'eau héliportée', r'La hauteur d\’eau du vol héliporté étant largement supérieure (de 30 à 40cm au vol Titan, les points matérialisant cette surface ont été reclassés dans cette classe séparée pour ne pas perturbé le reste du nuage de point.',Colors.rgb_withalpha_float('cyan',.3)]}
 
     def callback_colors(self):
         """ Update from wx GUI """

wolfhece/mesh2d/wolf2dprev.py

@@ -1748,6 +1748,29 @@ class prev_parameters_blocks:
 
             self.parent._scheme_centered_slope = 2
 
+    @property
+    def is_Manning_surface_friction(self) -> bool:
+        """ Retourne True si le modèle de surface de friction est de type Manning-Strickler """
+        i, name = self.get_params_surface_friction()
+        if i in [0, 1, 2, 3, 4, 5, 6, 7]:
+            return True
+        else:
+            return False
+
+    @property
+    def is_manning_strickler(self) -> bool:
+        """ Retourne True si le modèle de surface de friction est de type Manning-Strickler """
+        return self.is_Manning_surface_friction
+
+    @property
+    def is_Colebrook_surface_friction(self) -> bool:
+        """ Retourne True si le modèle de surface de friction est de type Colebrook """
+        i, name = self.get_params_surface_friction()
+        if i in [-3, -34, -5]:
+            return True
+        else:
+            return False
+
     def get_params_surface_friction(self) -> tuple[int, str]:
 
             if self._friction_law == 0:

wolfhece/pyshields.py

@@ -15,7 +15,7 @@ from scipy.optimize import root_scalar
 from typing import Literal
 import logging
 
-from .friction_law import f_barr_bathurst
+from .friction_law import f_barr_bathurst, f_colebrook, f_colebrook_pure
 
 RHO_PUREWATER = 1000. # kg/m3
 RHO_SEAWATER = 1025.  # kg/m3
@@ -530,6 +530,26 @@ def get_friction_slope_2D_Manning(q:float, h:float, n:float) -> float:
 
       return j
 
+def get_friction_slope_2D_Colebrook(q:float, h:float, K:float) -> float:
+      """
+      Compute friction slope j for 2D flow with Colebrook-White friction law
+
+      :param q : discharge [m3/s]
+      :param h : water depth [m]
+      :param K : Colebrook-White friction coefficient [m]
+      """
+
+      four_hydraulic_radius = 4.0 * h
+
+      if four_hydraulic_radius > 0.:
+            reynolds = (q/h) * four_hydraulic_radius / KIN_VISCOSITY # u*4h/nu == 4q/nu
+            k_sur_D = K / four_hydraulic_radius
+            j = f_colebrook(k_sur_D, reynolds) / four_hydraulic_radius * (q/h)**2.0/2.0/GRAVITY
+      else:
+            j = 0.
+
+      return j
+
 def get_shear_velocity_2D_Manning(q:float, h:float, n:float) -> float:
       """
       Compute shear velocity u_* for 2D flow with Manning/Strickler friction law
@@ -542,7 +562,23 @@ def get_shear_velocity_2D_Manning(q:float, h:float, n:float) -> float:
 
       j = get_friction_slope_2D_Manning(q,h,n)
 
-      ushear = (h*j*GRAVITY)**0.5
+      ushear = (GRAVITY*h*j)**0.5
+
+      return ushear
+
+def get_shear_velocity_2D_Colebrook(q:float, h:float, K:float) -> float:
+      """
+      Compute shear velocity u_* for 2D flow with Colebrook-White friction law
+
+      :param j : friction slope [-]
+      :param h : water depth [m]
+      :param q : discharge [m3/s]
+      :param K : Colebrook-White friction coefficient [m]
+      """
+
+      j = get_friction_slope_2D_Colebrook(q,h,K)
+
+      ushear = (GRAVITY*h*j)**0.5
 
       return ushear
 

wolfhece/wolf_array.py

@@ -7976,6 +7976,9 @@ class WolfArray(Element_To_Draw, header_wolf):
         if type(other) == float:
             if other != 0.:
                 newArray.array = np.ma.masked_array(self.array * other, self.array.mask, dtype=self.array.dtype)
+            else:
+                logging.debug(_('Multiplication by 0'))
+                newArray.array = np.ma.masked_array(self.array * other, self.array.mask, dtype=self.array.dtype)
         else:
             newArray.array = np.ma.masked_array(self.array * other.array, self.array.mask, dtype=self.array.dtype)
         newArray.count()
@@ -10120,7 +10123,7 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if first_mask_data:
             self.mask_data(self.nullvalue)
-    
+
         if update_palette:
             self.updatepalette(0)
 
@@ -10155,7 +10158,7 @@ class WolfArray(Element_To_Draw, header_wolf):
                                    self.origx + self.dx * self.nbx,
                                    self.origy,
                                    self.origy + self.dy * self.nby),
-                            alpha=np.select([self.array.mask.T, ~self.array.mask.T], 
+                            alpha=np.select([self.array.mask.T, ~self.array.mask.T],
                                             [np.zeros(self.shape).T, np.ones(self.shape).T]))
         else:
             im = ax.imshow(self.array.transpose(),
@@ -10166,7 +10169,7 @@ class WolfArray(Element_To_Draw, header_wolf):
                                    self.origy,
                                    self.origy + self.dy * self.nby),
                            vmin=vmin, vmax=vmax,
-                           alpha=np.select([self.array.mask.T, ~self.array.mask.T], 
+                           alpha=np.select([self.array.mask.T, ~self.array.mask.T],
                                            [np.zeros(self.shape).T, np.ones(self.shape).T])                           )
         ax.set_aspect('equal')
 
@@ -12090,13 +12093,13 @@ class WolfArrayMB(WolfArray):
 
         return newArray
 
-    def plot_matplotlib(self, 
-                        figax:tuple=None, 
-                        getdata_im:bool=False, 
-                        update_palette:bool=True, 
-                        vmin:float=None, vmax:float=None, 
-                        figsize:tuple=None, 
-                        Walonmap:bool=False, 
+    def plot_matplotlib(self,
+                        figax:tuple=None,
+                        getdata_im:bool=False,
+                        update_palette:bool=True,
+                        vmin:float=None, vmax:float=None,
+                        figsize:tuple=None,
+                        Walonmap:bool=False,
                         cat:str='IMAGERIE/ORTHO_2022_ETE',
                         first_mask_data:bool=True):
         """
@@ -12157,12 +12160,12 @@ class WolfArrayMB(WolfArray):
         # Convert to single block
         single_block = self.as_WolfArray()
 
-        return single_block.plot_matplotlib(figax=figax, 
-                                            getdata_im=getdata_im, 
-                                            update_palette=update_palette, 
-                                            vmin=vmin, vmax=vmax, 
-                                            figsize=figsize, 
-                                            Walonmap=Walonmap, 
+        return single_block.plot_matplotlib(figax=figax,
+                                            getdata_im=getdata_im,
+                                            update_palette=update_palette,
+                                            vmin=vmin, vmax=vmax,
+                                            figsize=figsize,
+                                            Walonmap=Walonmap,
                                             cat=cat,
                                             first_mask_data=first_mask_data)
 

wolfhece/wolf_texture.py

@@ -26,7 +26,7 @@ import math
 import numpy as np
 
 from .PyTranslate import _
-from .PyWMS import getIGNFrance, getWalonmap, getVlaanderen, getLifeWatch
+from .PyWMS import getIGNFrance, getWalonmap, getVlaanderen, getLifeWatch, getNGI, getCartoweb, getOrthoPostFlood2021, getAlaro
 from .textpillow import Font_Priority, Text_Image,Text_Infos
 from .drawing_obj import Element_To_Draw
 
@@ -121,7 +121,7 @@ class genericImagetexture(Element_To_Draw):
 
         self.update_minmax()
 
-        self.oldview = [self.xmin, self.xmax, self.ymin, self.ymax, self.width, self.height]
+        self.oldview = [self.xmin, self.xmax, self.ymin, self.ymax, self.width, self.height, self.time]
 
         self.load()
 
@@ -189,7 +189,7 @@ class genericImagetexture(Element_To_Draw):
 
         self.update_minmax()
 
-        self.newview = [self.xmin, self.xmax, self.ymin, self.ymax, self.width, self.height]
+        self.newview = [self.xmin, self.xmax, self.ymin, self.ymax, self.width, self.height, self.time]
         if self.newview != self.oldview:
             self.load()
             self.oldview = self.newview
@@ -254,7 +254,9 @@ class imagetexture(Element_To_Draw):
                  xmin:float, xmax:float, ymin:float, ymax:float,
                  width:int = 1000, height:int = 1000,
                  France:bool = False, epsg='31370', Vlaanderen:bool = False,
-                 LifeWatch:bool = False) -> None:
+                 LifeWatch:bool = False, IGN_Belgium:bool = False,
+                 IGN_Cartoweb:bool = False, postFlood2021:bool = False,
+                 Alaro:bool = False) -> None:
 
         super().__init__(label+cat+subc, plotted=False, mapviewer=mapviewer, need_for_wx=False)
 
@@ -266,6 +268,10 @@ class imagetexture(Element_To_Draw):
         self.France = France
         self.Vlaanderen = Vlaanderen
         self.LifeWatch = LifeWatch
+        self.IGN_Belgium = IGN_Belgium
+        self.IGN_Cartoweb = IGN_Cartoweb
+        self.postFlood2021 = postFlood2021
+        self.Alaro = Alaro
 
         self.epsg = epsg
 
@@ -276,6 +282,10 @@ class imagetexture(Element_To_Draw):
         self.idtexture = (GLuint * 1)()
         self.idx = 'texture_{}'.format(self.idtexture)
 
+        self.time = None
+        self.alpha = 1.0
+        self.force_alpha = False
+
         try:
             glGenTextures(1, self.idtexture)
         except:
@@ -288,7 +298,7 @@ class imagetexture(Element_To_Draw):
         self.category = cat  # .upper()
         self.name = label
         self.subcategory = subc  # .upper()
-        self.oldview = [self.xmin, self.xmax, self.ymin, self.ymax, self.width, self.height]
+        self.oldview = [self.xmin, self.xmax, self.ymin, self.ymax, self.width, self.height, self.time]
 
         self.load()
 
@@ -313,6 +323,26 @@ class imagetexture(Element_To_Draw):
                 mybytes = getLifeWatch(self.category + '_' + self.subcategory,
                                        self.xmin, self.ymin, self.xmax, self.ymax,
                                        self.width, self.height, False)
+            elif self.IGN_Belgium:
+                mybytes = getNGI(self.subcategory,
+                                       self.xmin, self.ymin, self.xmax, self.ymax,
+                                       self.width, self.height, False)
+
+            elif self.IGN_Cartoweb:
+                mybytes = getCartoweb(self.subcategory,
+                                       self.xmin, self.ymin, self.xmax, self.ymax,
+                                       self.width, self.height, False)
+
+            elif self.postFlood2021:
+                mybytes = getOrthoPostFlood2021(self.subcategory,
+                                       self.xmin, self.ymin, self.xmax, self.ymax,
+                                       self.width, self.height, False)
+
+            elif self.Alaro:
+                mybytes = getAlaro(self.subcategory,
+                                       self.xmin, self.ymin, self.xmax, self.ymax,
+                                       self.width, self.height, False, time= self.time)
+
             else:
                 mybytes = getWalonmap(self.category + '/' + self.subcategory,
                                       self.xmin, self.ymin, self.xmax, self.ymax,
@@ -323,20 +353,51 @@ class imagetexture(Element_To_Draw):
                 return
 
             try:
-                image = Image.open(mybytes)
+                if isinstance(mybytes, bytes | BytesIO):
+                    image = Image.open(mybytes)
+
+                    if image.mode != 'RGBA':
+                        image = image.convert('RGBA')
+
+                    if self.force_alpha:
+                        if self.alpha < 0.0:
+                            self.alpha = 0.0
+                        if self.alpha > 1.0:
+                            self.alpha = 1.0
+
+                        alpha = Image.new('L', image.size, int(self.alpha * 255))
+
+                        image.putalpha(alpha)
+
+                elif isinstance(mybytes, str):
+                    image = Image.open(mybytes).convert('RGB')
+
+                    if image.width != self.width or image.height != self.height:
+                        image = image.resize((self.width, self.height), Image.ANTIALIAS)
+
+                    image_memory = BytesIO()
+                    image.save(image_memory, format='PNG')
+                    image = Image.open(image_memory)
+
+                elif isinstance(mybytes, Image.Image):
+                    image = mybytes
+                else:
+                    logging.error(_('Unknown type of image file : ') + str(type(mybytes)))
+                    return
+
             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':
-                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, self.width, self.height, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.width, image.height, 0, GL_RGBA, GL_UNSIGNED_BYTE,
                              image.tobytes())
             elif image.mode == 'RGB':
-                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, self.width, self.height, 0, GL_RGB, GL_UNSIGNED_BYTE,
+                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, image.width, image.height, 0, GL_RGB, GL_UNSIGNED_BYTE,
                              image.tobytes())
             else:
-                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, self.width, self.height, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.width, image.height, 0, GL_RGBA, GL_UNSIGNED_BYTE,
                              image.tobytes())
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)
@@ -357,10 +418,10 @@ class imagetexture(Element_To_Draw):
         self.xmax = cx + dx * coeff
         self.ymin = cy - dy * coeff
         self.ymax = cy + dy * coeff
-        self.width = self.mapviewer.canvaswidth * 2 * coeff
-        self.height = self.mapviewer.canvasheight * 2 * coeff
+        self.width = int(self.mapviewer.canvaswidth * 2 * coeff)
+        self.height = int(self.mapviewer.canvasheight * 2 * coeff)
 
-        self.newview = [self.xmin, self.xmax, self.ymin, self.ymax, self.width, self.height]
+        self.newview = [self.xmin, self.xmax, self.ymin, self.ymax, self.width, self.height, self.time]
         if self.newview != self.oldview:
             self.load()
             self.oldview = self.newview
@@ -440,7 +501,7 @@ class Text_Image_Texture(genericImagetexture):
             self.width = self.myImage.width
             self.height = self.myImage.height
 
-        self.oldview = [self.xmin, self.xmax, self.ymin, self.ymax, self.width, self.height]
+        self.oldview = [self.xmin, self.xmax, self.ymin, self.ymax, self.width, self.height, self.time]
 
     def findscale(self):