Added regularized option for vector output (#104)

* Add rectangularize option for vector output

* Rename regularize function

Author: giswqs

samgeo/common.py

@@ -1714,11 +1714,28 @@ def sam_map_gui(sam, basemap="SATELLITE", repeat_mode=True, out_dir=None, **kwar
         layout=widgets.Layout(width=widget_width, padding=padding),
         style=style,
     )
+
+    rectangular = widgets.Checkbox(
+        value=False,
+        description="Regularize",
+        layout=widgets.Layout(width="130px", padding=padding),
+        style=style,
+    )
+
+    colorpicker = widgets.ColorPicker(
+        concise=False,
+        description="Color",
+        value="#ffff00",
+        layout=widgets.Layout(width="140px", padding=padding),
+        style=style,
+    )
+
     buttons = widgets.VBox(
         [
             radio_buttons,
             widgets.HBox([fg_count, bg_count]),
             opacity_slider,
+            widgets.HBox([rectangular, colorpicker]),
             widgets.HBox(
                 [segment_button, save_button, reset_button],
                 layout=widgets.Layout(padding="0px 4px 0px 4px"),
@@ -1950,6 +1967,8 @@ def segment_button_click(change):
                         )
                         if m.find_layer("Masks") is not None:
                             m.remove_layer(m.find_layer("Masks"))
+                        if m.find_layer("Regularized") is not None:
+                            m.remove_layer(m.find_layer("Regularized"))
 
                         if hasattr(sam, "prediction_fp") and os.path.exists(
                             sam.prediction_fp
@@ -1966,6 +1985,21 @@ def segment_button_click(change):
                                 layer_name="Masks",
                                 zoom_to_layer=False,
                             )
+
+                            if rectangular.value:
+                                vector = filename.replace(".tif", ".gpkg")
+                                vector_rec = filename.replace(".tif", "_rect.gpkg")
+                                raster_to_vector(filename, vector)
+                                regularize(vector, vector_rec)
+                                vector_style = {"color": colorpicker.value}
+                                m.add_vector(
+                                    vector_rec,
+                                    layer_name="Regularized",
+                                    style=vector_style,
+                                    info_mode=None,
+                                    zoom_to_layer=False,
+                                )
+
                         except:
                             pass
                         output.clear_output()
@@ -1984,7 +2018,10 @@ def filechooser_callback(chooser):
                     filename = chooser.selected
                     shutil.copy(sam.prediction_fp, filename)
                     vector = filename.replace(".tif", ".gpkg")
-                    raster_to_gpkg(filename, vector)
+                    raster_to_vector(filename, vector)
+                    if rectangular.value:
+                        vector_rec = filename.replace(".tif", "_rect.gpkg")
+                        regularize(vector, vector_rec)
 
                     fg_points = [
                         [marker.location[1], marker.location[0]]
@@ -2040,9 +2077,13 @@ def reset_button_click(change):
             segment_button.value = False
             reset_button.value = False
             opacity_slider.value = 0.5
+            rectangular.value = False
+            colorpicker.value = "#ffff00"
             output.clear_output()
             try:
                 m.remove_layer(m.find_layer("Masks"))
+                if m.find_layer("Regularized") is not None:
+                    m.remove_layer(m.find_layer("Regularized"))
                 m.clear_drawings()
                 if hasattr(m, "fg_markers"):
                     m.user_rois = None
@@ -2284,7 +2325,7 @@ def text_sam_gui(sam, basemap="SATELLITE", out_dir=None, **kwargs):
         description="Box threshold:",
         min=0,
         max=1,
-        value=0.5,
+        value=0.25,
         step=0.01,
         readout=True,
         continuous_update=True,
@@ -2297,7 +2338,7 @@ def text_sam_gui(sam, basemap="SATELLITE", out_dir=None, **kwargs):
         min=0,
         max=1,
         step=0.01,
-        value=0.5,
+        value=0.25,
         readout=True,
         continuous_update=True,
         layout=widgets.Layout(width=widget_width, padding=padding),
@@ -2332,6 +2373,21 @@ def opacity_changed(change):
 
     opacity_slider.observe(opacity_changed, "value")
 
+    rectangular = widgets.Checkbox(
+        value=False,
+        description="Regularize",
+        layout=widgets.Layout(width="130px", padding=padding),
+        style=style,
+    )
+
+    colorpicker = widgets.ColorPicker(
+        concise=False,
+        description="Color",
+        value="#ffff00",
+        layout=widgets.Layout(width="140px", padding=padding),
+        style=style,
+    )
+
     segment_button = widgets.ToggleButton(
         description="Segment",
         value=False,
@@ -2365,6 +2421,7 @@ def opacity_changed(change):
         text_slider,
         cmap_dropdown,
         opacity_slider,
+        widgets.HBox([rectangular, colorpicker]),
         widgets.HBox(
             [segment_button, save_button, reset_button],
             layout=widgets.Layout(padding="0px 4px 0px 4px"),
@@ -2433,6 +2490,8 @@ def segment_button_click(change):
                     sam.output = filename
                     if m.find_layer(layer_name) is not None:
                         m.remove_layer(m.find_layer(layer_name))
+                    if m.find_layer(f"{layer_name}_rect") is not None:
+                        m.remove_layer(m.find_layer(f"{layer_name} Regularized"))
                     if os.path.exists(filename):
                         try:
                             m.add_raster(
@@ -2444,6 +2503,21 @@ def segment_button_click(change):
                                 zoom_to_layer=False,
                             )
                             m.layer_name = layer_name
+
+                            if rectangular.value:
+                                vector = filename.replace(".tif", ".gpkg")
+                                vector_rec = filename.replace(".tif", "_rect.gpkg")
+                                raster_to_vector(filename, vector)
+                                regularize(vector, vector_rec)
+                                vector_style = {"color": colorpicker.value}
+                                m.add_vector(
+                                    vector_rec,
+                                    layer_name=f"{layer_name} Regularized",
+                                    style=vector_style,
+                                    info_mode=None,
+                                    zoom_to_layer=False,
+                                )
+
                             output.clear_output()
                         except Exception as e:
                             print(e)
@@ -2456,9 +2530,11 @@ def filechooser_callback(chooser):
                 try:
                     filename = chooser.selected
                     shutil.copy(sam.output, filename)
-                    vector = filename.replace(".tif", ".shp")
+                    vector = filename.replace(".tif", ".gpkg")
                     raster_to_vector(filename, vector)
-
+                    if rectangular.value:
+                        vector_rec = filename.replace(".tif", "_rect.gpkg")
+                        regularize(vector, vector_rec)
                 except Exception as e:
                     print(e)
 
@@ -2524,3 +2600,32 @@ def reset_button_click(change):
     m.toolbar_control = toolbar_control
 
     return m
+
+
+def regularize(source, output=None, crs="EPSG:4326", **kwargs):
+    """Regularize a polygon GeoDataFrame.
+
+    Args:
+        source (str | gpd.GeoDataFrame): The input file path or a GeoDataFrame.
+        output (str, optional): The output file path. Defaults to None.
+
+
+    Returns:
+        gpd.GeoDataFrame: The output GeoDataFrame.
+    """
+    if isinstance(source, str):
+        gdf = gpd.read_file(source)
+    elif isinstance(source, gpd.GeoDataFrame):
+        gdf = source
+    else:
+        raise ValueError("The input source must be a GeoDataFrame or a file path.")
+
+    polygons = gdf.geometry.apply(lambda geom: geom.minimum_rotated_rectangle)
+    result = gpd.GeoDataFrame(geometry=polygons, data=gdf.drop("geometry", axis=1))
+
+    if crs is not None:
+        result.to_crs(crs, inplace=True)
+    if output is not None:
+        result.to_file(output, **kwargs)
+    else:
+        return result