BERATools 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

beratools/core/algo_vertex_optimization.py

@@ -27,7 +27,7 @@ import beratools.core.algo_common as algo_common
 import beratools.core.algo_cost as algo_cost
 import beratools.core.constants as bt_const
 import beratools.core.tool_base as bt_base
-import beratools.tools.common as bt_common
+import beratools.utility.spatial_common as sp_common
 from beratools.core import algo_dijkstra
 
 
@@ -251,36 +251,26 @@ class _Vertex:
             if len(self.anchors) == 4:
                 seed_line = sh_geom.LineString(self.anchors[0:2])
 
-                raster_clip, out_meta = bt_common.clip_raster(
-                    self.in_raster, seed_line, self.line_radius
-                )
+                raster_clip, out_meta = sp_common.clip_raster(self.in_raster, seed_line, self.line_radius)
                 raster_clip, _ = algo_cost.cost_raster(raster_clip, out_meta)
                 centerline_1 = find_lc_path(raster_clip, out_meta, seed_line)
                 seed_line = sh_geom.LineString(self.anchors[2:4])
 
-                raster_clip, out_meta = bt_common.clip_raster(
-                    self.in_raster, seed_line, self.line_radius
-                )
+                raster_clip, out_meta = sp_common.clip_raster(self.in_raster, seed_line, self.line_radius)
                 raster_clip, _ = algo_cost.cost_raster(raster_clip, out_meta)
                 centerline_2 = find_lc_path(raster_clip, out_meta, seed_line)
 
                 if centerline_1 and centerline_2:
-                    intersection = algo_common.intersection_of_lines(
-                        centerline_1, centerline_2
-                    )
+                    intersection = algo_common.intersection_of_lines(centerline_1, centerline_2)
             elif len(self.anchors) == 2:
                 seed_line = sh_geom.LineString(self.anchors)
 
-                raster_clip, out_meta = bt_common.clip_raster(
-                    self.in_raster, seed_line, self.line_radius
-                )
+                raster_clip, out_meta = sp_common.clip_raster(self.in_raster, seed_line, self.line_radius)
                 raster_clip, _ = algo_cost.cost_raster(raster_clip, out_meta)
                 centerline_1 = find_lc_path(raster_clip, out_meta, seed_line)
 
                 if centerline_1:
-                    intersection = algo_common.closest_point_to_line(
-                        self.get_vertex(), centerline_1
-                    )
+                    intersection = algo_common.closest_point_to_line(self.get_vertex(), centerline_1)
         except Exception as e:
             print(e)
 
@@ -308,22 +298,17 @@ class VertexGrouping:
         in_raster,
         search_distance,
         line_radius,
-        out_line,
         processes,
-        verbose,
-        in_layer=None,
-        out_layer=None,
+        call_mode,
+        layer=None,
     ):
         self.in_line = in_line
+        self.in_layer = layer
         self.in_raster = in_raster
         self.line_radius = float(line_radius)
         self.search_distance = float(search_distance)
-        self.out_line = out_line
         self.processes = processes
-        self.verbose = verbose
-        self.parallel_mode = bt_const.PARALLEL_MODE
-        self.in_layer = in_layer
-        self.out_layer = out_layer
+        self.call_mode = call_mode
 
         self.crs = None
         self.vertex_grp = []
@@ -333,12 +318,7 @@ class VertexGrouping:
         self.line_visited = None
 
         # calculate cost raster footprint
-        self.cost_footprint = algo_common.generate_raster_footprint(
-            self.in_raster, latlon=False
-        )
-
-    def set_parallel_mode(self, parallel_mode):
-        self.parallel_mode = parallel_mode
+        self.cost_footprint = algo_common.generate_raster_footprint(self.in_raster, latlon=False)
 
     def create_vertex_group(self, line_obj):
         """
@@ -378,18 +358,17 @@ class VertexGrouping:
         self.vertex_grp.append(vertex_obj)
 
     def create_all_vertex_groups(self):
-        self.line_list = algo_common.prepare_lines_gdf(
-            self.in_line, layer=self.in_layer, proc_segments=True
-        )
+        print(f"Preparing lines...{self.in_line}", flush=True)
+        print("create_all_vertex_groups")
+        print(f"in_file: {self.in_line}, in_layer: {self.in_layer}")
+        self.line_list = algo_common.prepare_lines_gdf(self.in_line, layer=self.in_layer, proc_segments=True)
         self.sindex = STRtree([item.geometry[0] for item in self.line_list])
         self.line_visited = [{0: False, -1: False} for _ in range(len(self.line_list))]
 
         i = 0
         for line_no in range(len(self.line_list)):
             if not self.line_visited[line_no][0]:
-                line = _SingleLine(
-                    self.line_list[line_no], line_no, 0, self.search_distance
-                )
+                line = _SingleLine(self.line_list[line_no], line_no, 0, self.search_distance)
 
                 if not line.is_valid:
                     print(f"Line {line['line_no']} is invalid")
@@ -400,9 +379,7 @@ class VertexGrouping:
                 i += 1
 
             if not self.line_visited[line_no][-1]:
-                line = _SingleLine(
-                    self.line_list[line_no], line_no, -1, self.search_distance
-                )
+                line = _SingleLine(self.line_list[line_no], line_no, -1, self.search_distance)
 
                 if not line.is_valid:
                     print(f"Line {line['line_no']} is invalid")
@@ -424,9 +401,11 @@ class VertexGrouping:
                 ]
 
     def save_all_layers(self, line_file):
+        out_file, out_layer = sp_common.decode_file_layer(line_file)
         line_file = Path(line_file)
         lines = pd.concat(self.line_list)
-        lines.to_file(line_file, layer=self.out_layer)
+        lines.to_file(out_file, layer=out_layer)
+        print(f"Saved output to: {line_file}", flush=True)
 
         aux_file = line_file
         if line_file.suffix == ".shp":
@@ -452,9 +431,10 @@ class VertexGrouping:
         anchors = gpd.GeoDataFrame(geometry=anchors, crs=lines.crs)
         vertices = gpd.GeoDataFrame(geometry=vertices, crs=lines.crs)
 
-        lc_paths.to_file(aux_file, layer="lc_paths")
-        anchors.to_file(aux_file, layer="anchors")
-        vertices.to_file(aux_file, layer="vertices")
+        if bt_const.BT_DEBUGGING:
+            lc_paths.to_file(aux_file, layer="lc_paths")
+            anchors.to_file(aux_file, layer="anchors")
+            vertices.to_file(aux_file, layer="vertices")
 
     def compute(self):
         vertex_grp = bt_base.execute_multiprocessing(
@@ -462,8 +442,7 @@ class VertexGrouping:
             self.vertex_grp,
             "Vertex Optimization",
             self.processes,
-            1,
-            verbose=self.verbose,
+            self.call_mode,
         )
 
         self.vertex_grp = vertex_grp