wolfhece 2.1.21__py3-none-any.whl → 2.1.23__py3-none-any.whl

wolfhece/PyVertexvectors.py

@@ -1172,6 +1172,22 @@ class vector:
 
         coords=self.asnparray()
         return Polygon(coords)
+    
+    def asshapely_pol3D(self) -> Polygon:
+        """
+        Conversion des coordonnées en Polygon Shapely
+        """
+
+        coords=self.asnparray3d()
+        return Polygon(coords)
+    
+    def asshapely_ls3d(self) -> LineString:
+        """
+        Conversion des coordonnées en Linestring Shapely
+        """
+
+        coords=self.asnparray3d()
+        return LineString(coords)
 
     def asshapely_ls(self) -> LineString:
         """
@@ -3967,7 +3983,12 @@ class Zones(wx.Frame, Element_To_Draw):
         return len(self.myzones)
 
     def import_shapefile(self, fn:str, bbox:Polygon = None):
-        """ Import shapefile by using geopandas """
+        """ 
+        Import shapefile by using geopandas 
+        
+        Shapefile == 1 zone
+
+        """
 
         content = gpd.read_file(fn, bbox=bbox)
 
@@ -3987,6 +4008,60 @@ class Zones(wx.Frame, Element_To_Draw):
             newzone = zone(name=name, parent = self, fromshapely = poly)
             self.add_zone(newzone)
 
+    def export_to_shapefile(self, filename:str):
+        """ 
+        Export to shapefile.
+
+        The first vector of each zone will be exported.
+
+        If you want to export all vectors, you have to use "export_shape" of the zone object.
+        
+        FIXME: Add support of data fields
+        """
+
+        import geopandas as gpd
+
+        names=[]
+        geoms=[]
+
+        # One zone is a polygon
+        for curzone in self.myzones:
+            if curzone.nbvectors == 0:
+                logging.warning(_('Zone {} contains no vector'.format(curzone.myname)))
+                continue
+            
+            elif curzone.nbvectors>1:
+                logging.warning(_('Zone {} contains more than one vector -- only the first one will be exported'.format(curzone.myname)))
+
+            names.append(curzone.myname)
+            for curvect in curzone.myvectors[:1]:
+                if curvect.is2D:
+                    if curvect.closed:
+                        geoms.append(curvect.asshapely_pol())
+                    else:
+                        geoms.append(curvect.asshapely_ls())
+                else:
+                    if curvect.closed:
+                        geoms.append(curvect.asshapely_pol3D())
+                    else:
+                        geoms.append(curvect.asshapely_ls3d())
+
+        gdf = gpd.GeoDataFrame({'id':names,'geometry':geoms})
+        gdf.crs = 'EPSG:31370'
+
+        gdf.to_file(filename)
+
+    def export_active_zone_to_shapefile(self, filename:str):
+        """ 
+        Export the active_zone to shapefile.
+        """
+
+        if self.active_zone is None:
+            logging.warning(_('No active zone'))
+            return
+        
+        self.active_zone.export_shape(filename)
+    
     def import_gdb(self, fn:str, bbox:Polygon = None):
         """ Import gdb by using geopandas and Fiona"""
 
@@ -4302,7 +4377,7 @@ class Zones(wx.Frame, Element_To_Draw):
         """
         self.plotted = False
 
-    def saveas(self, filename=''):
+    def saveas(self, filename:str=''):
         """
         Sauvegarde sur disque
 
@@ -4313,18 +4388,22 @@ class Zones(wx.Frame, Element_To_Draw):
         if filename!='':
             self.filename=filename
 
-        if self.filename.endswith('.vecz'):
-            self.force3D=True #on veut un fichier 3D --> forcage du paramètre
+        if self.filename.endswith('.shp'):
+            self.export_to_shapefile(self.filename)
 
-        with open(self.filename, 'w') as f:
-            f.write(f'{self.tx} {self.ty}'+'\n')
-            f.write(str(self.nbzones)+'\n')
-            for curzone in self.myzones:
-                curzone.save(f)
+        else:
+            if self.filename.endswith('.vecz'):
+                self.force3D=True #on veut un fichier 3D --> forcage du paramètre
 
-        with open(self.filename + '.extra', 'w') as f:
-            for curzone in self.myzones:
-                curzone.save_extra(f)
+            with open(self.filename, 'w') as f:
+                f.write(f'{self.tx} {self.ty}'+'\n')
+                f.write(str(self.nbzones)+'\n')
+                for curzone in self.myzones:
+                    curzone.save(f)
+
+            with open(self.filename + '.extra', 'w') as f:
+                for curzone in self.myzones:
+                    curzone.save_extra(f)
 
     def OnClose(self, e):
         """

wolfhece/apps/version.py

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