resegment: fix method=baseline (join MultiPolygon)

Author: Robert Sachunsky

ocrd_cis/ocropy/common.py

@@ -1279,12 +1279,12 @@ def lines2regions(binary, llabels,
         sepmask = 1-morph.keep_marked(1-sepmask, lbinary>0)
         DSAVE('sepmask', [sepmask,binary])
     objects = [None] + morph.find_objects(llabels)
-    #centers = measurements.center_of_mass(binary, llabels, np.unique(llabels))
-    def center(obj):
-        if morph.sl.empty(obj):
-            return [0,0]
-        return morph.sl.center(obj)
-    centers = list(map(center, objects[1:]))
+    # centers = measurements.center_of_mass(binary, llabels, np.unique(llabels))
+    # def center(obj):
+    #     if morph.sl.empty(obj):
+    #         return [0,0]
+    #     return morph.sl.center(obj)
+    # centers = list(map(center, objects[1:]))
     if scale is None:
         scale = psegutils.estimate_scale(binary, zoom)
     bincounts = np.bincount(lbinary.flatten())
@@ -1448,7 +1448,7 @@ def find_topological():
                     seplab, nseps = morph.label(sepm)
                     if nseps == 0:
                         return
-                    sepind = np.unique(seplab)
+                    # sepind = np.unique(seplab)
                     # (but keep only those with large fg i.e. ignore white-space seps)
                     seplabs, counts = np.unique(seplab * bin, return_counts=True)
                     kept = np.in1d(seplab.ravel(), seplabs[counts > scale * min_line])

ocrd_cis/ocropy/resegment.py

@@ -52,7 +52,7 @@ def __init__(self, *args, **kwargs):
         self.ocrd_tool = get_ocrd_tool()
         kwargs['ocrd_tool'] = self.ocrd_tool['tools'][TOOL]
         kwargs['version'] = self.ocrd_tool['version']
-        super(OcropyResegment, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def process(self):
         """Resegment lines of the workspace.
@@ -118,7 +118,7 @@ def process(self):
             self.add_metadata(pcgts)
             page_id = pcgts.pcGtsId or input_file.pageId or input_file.ID
             page = pcgts.get_Page()
-            
+
             page_image, page_coords, page_image_info = self.workspace.image_from_page(
                 page, page_id, feature_selector='binarized')
             if self.parameter['dpi'] > 0:
@@ -266,9 +266,9 @@ def _process_segment(self, parent, parent_image, parent_coords, page_id, zoom, l
                         continue
                     line_polygon = baseline_of_segment(line, parent_coords)
                     line_ltr = line_polygon[0,0] < line_polygon[-1,0]
-                    line_polygon = make_valid(LineString(line_polygon).buffer(
+                    line_polygon = make_valid(join_polygons(LineString(line_polygon).buffer(
                         # left-hand side if left-to-right, and vice versa
-                        scale * (-1) ** line_ltr, single_sided=True))
+                        scale * (-1) ** line_ltr, single_sided=True), loc=line.id))
                     line_polygon = np.array(line_polygon.exterior, np.int)[:-1]
                     line_y, line_x = draw.polygon(line_polygon[:, 1],
                                                   line_polygon[:, 0],