RED-8666

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/redaction/DocumentStructure.java

@@ -5,7 +5,6 @@ import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Stream;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -55,13 +54,6 @@ public class DocumentStructure implements Serializable {
 
     }
 
-    @Schema(description = "Object containing the extra field names, a duplicate paragraph has in its properties field.")
-    public static class DuplicateParagraphProperties implements Serializable {
-
-        public static final String UNSORTED_TEXTBLOCK_ID = "utbid";
-
-    }
-
     public static final String RECTANGLE_DELIMITER = ";";
 
 
@@ -123,8 +115,6 @@ public class DocumentStructure implements Serializable {
         Map<String, String> properties;
         @Schema(description = "All child Entries of this Entry.", example = "[1, 2, 3]")
         List<EntryData> children;
-        @Schema(description = "Describes the origin of the semantic node", example = "[ALGORITHM]")
-        Set<LayoutEngine> engines;
 
 
         @Override

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/redaction/LayoutEngine.java

@@ -1,6 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
-
-public enum LayoutEngine {
-    ALGORITHM,
-    AI
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/queue/LayoutParsingType.java

@@ -6,5 +6,5 @@ public enum LayoutParsingType {
     DOCUMINE,
 
     DOCSTRUM,
-    DOCSTRUM_XY
+    DOCSTRUM_ROW_WISE
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingPipeline.java

@@ -1,5 +1,7 @@
 package com.knecon.fforesight.service.layoutparser.processor;
 
+import static com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType.DOCSTRUM;
+import static com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType.DOCSTRUM_ROW_WISE;
 import static java.lang.String.format;
 
 import java.awt.geom.Rectangle2D;
@@ -26,9 +28,9 @@ import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsi
 import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationDocument;
 import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage;
+import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationSection;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
 import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage;
-import com.knecon.fforesight.service.layoutparser.processor.model.table.Cell;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.CleanRulings;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
@@ -100,35 +102,28 @@ public class LayoutParsingPipeline {
         log.info("Starting layout parsing for {}", layoutParsingRequest.identifier());
 
         File originFile = layoutParsingStorageService.getOriginFile(layoutParsingRequest.originFileStorageId());
-        File viewerDocumentFile = layoutParsingStorageService.getViewerDocFile(layoutParsingRequest.viewerDocumentStorageId())
-                .orElse(originFile);
+        File viewerDocumentFile = layoutParsingStorageService.getViewerDocFile(layoutParsingRequest.viewerDocumentStorageId()).orElse(originFile);
 
         VisualLayoutParsingResponse visualLayoutParsingResponse = new VisualLayoutParsingResponse();
-        if (layoutParsingRequest.visualLayoutParsingFileId()
-                .isPresent()) {
-            visualLayoutParsingResponse = layoutParsingStorageService.getVisualLayoutParsingFile(layoutParsingRequest.visualLayoutParsingFileId()
-                                                                                                         .get());
+        if (layoutParsingRequest.visualLayoutParsingFileId().isPresent()) {
+            visualLayoutParsingResponse = layoutParsingStorageService.getVisualLayoutParsingFile(layoutParsingRequest.visualLayoutParsingFileId().get());
         }
 
         ImageServiceResponse imageServiceResponse = new ImageServiceResponse();
-        if (layoutParsingRequest.imagesFileStorageId()
-                .isPresent()) {
-            imageServiceResponse = layoutParsingStorageService.getImagesFile(layoutParsingRequest.imagesFileStorageId()
-                                                                                     .get());
+        if (layoutParsingRequest.imagesFileStorageId().isPresent()) {
+            imageServiceResponse = layoutParsingStorageService.getImagesFile(layoutParsingRequest.imagesFileStorageId().get());
         }
 
         TableServiceResponse tableServiceResponse = new TableServiceResponse();
-        if (layoutParsingRequest.tablesFileStorageId()
-                .isPresent()) {
-            tableServiceResponse = layoutParsingStorageService.getTablesFile(layoutParsingRequest.tablesFileStorageId()
-                                                                                     .get());
+        if (layoutParsingRequest.tablesFileStorageId().isPresent()) {
+            tableServiceResponse = layoutParsingStorageService.getTablesFile(layoutParsingRequest.tablesFileStorageId().get());
         }
 
         ClassificationDocument classificationDocument = parseLayout(layoutParsingRequest.layoutParsingType(),
-                                                                    originFile,
-                                                                    imageServiceResponse,
-                                                                    tableServiceResponse,
-                                                                    visualLayoutParsingResponse,
+                originFile,
+                imageServiceResponse,
+                tableServiceResponse,
+                visualLayoutParsingResponse,
                 layoutParsingRequest.identifier().toString());
 
         log.info("Building document graph for {}", layoutParsingRequest.identifier());
@@ -161,25 +156,25 @@ public class LayoutParsingPipeline {
                 .numberOfPages(documentGraph.getNumberOfPages())
                 .duration(System.currentTimeMillis() - start)
                 .message(format("""
-                                        Layout parsing has finished in %.02f s.
-                                        identifiers: %s
-                                        %s
-                                        Files have been saved with Ids:
-                                        Structure: %s
-                                        Text: %s
-                                        Positions: %s
-                                        PageData: %s
-                                        Simplified Text: %s
-                                        Viewer Doc: %s""",
-                                ((float) (System.currentTimeMillis() - start)) / 1000,
-                                layoutParsingRequest.identifier(),
-                                buildSemanticNodeCountMessage(documentGraph.getNumberOfPages(), documentGraph.buildSemanticNodeCounts()),
-                                layoutParsingRequest.structureFileStorageId(),
-                                layoutParsingRequest.textBlockFileStorageId(),
-                                layoutParsingRequest.positionBlockFileStorageId(),
-                                layoutParsingRequest.pageFileStorageId(),
-                                layoutParsingRequest.simplifiedTextStorageId(),
-                                layoutParsingRequest.viewerDocumentStorageId()))
+                                Layout parsing has finished in %.02f s.
+                                identifiers: %s
+                                %s
+                                Files have been saved with Ids:
+                                Structure: %s
+                                Text: %s
+                                Positions: %s
+                                PageData: %s
+                                Simplified Text: %s
+                                Viewer Doc: %s""",
+                        ((float) (System.currentTimeMillis() - start)) / 1000,
+                        layoutParsingRequest.identifier(),
+                        buildSemanticNodeCountMessage(documentGraph.getNumberOfPages(), documentGraph.buildSemanticNodeCounts()),
+                        layoutParsingRequest.structureFileStorageId(),
+                        layoutParsingRequest.textBlockFileStorageId(),
+                        layoutParsingRequest.positionBlockFileStorageId(),
+                        layoutParsingRequest.pageFileStorageId(),
+                        layoutParsingRequest.simplifiedTextStorageId(),
+                        layoutParsingRequest.viewerDocumentStorageId()))
                 .build();
 
     }
@@ -200,14 +195,14 @@ public class LayoutParsingPipeline {
     private String buildSemanticNodeCountMessage(int numberOfPages, Map<NodeType, Long> semanticNodeCounts) {
 
         return String.format("%d pages with %d sections, %d headlines, %d paragraphs, %d tables with %d cells, %d headers, and %d footers parsed",
-                             numberOfPages,
-                             semanticNodeCounts.get(NodeType.SECTION) == null ? 0 : semanticNodeCounts.get(NodeType.SECTION),
-                             semanticNodeCounts.get(NodeType.HEADLINE) == null ? 0 : semanticNodeCounts.get(NodeType.HEADLINE),
-                             semanticNodeCounts.get(NodeType.PARAGRAPH) == null ? 0 : semanticNodeCounts.get(NodeType.PARAGRAPH),
-                             semanticNodeCounts.get(NodeType.TABLE) == null ? 0 : semanticNodeCounts.get(NodeType.TABLE),
-                             semanticNodeCounts.get(NodeType.TABLE_CELL) == null ? 0 : semanticNodeCounts.get(NodeType.TABLE_CELL),
-                             semanticNodeCounts.get(NodeType.HEADER) == null ? 0 : semanticNodeCounts.get(NodeType.HEADER),
-                             semanticNodeCounts.get(NodeType.FOOTER) == null ? 0 : semanticNodeCounts.get(NodeType.FOOTER));
+                numberOfPages,
+                semanticNodeCounts.get(NodeType.SECTION) == null ? 0 : semanticNodeCounts.get(NodeType.SECTION),
+                semanticNodeCounts.get(NodeType.HEADLINE) == null ? 0 : semanticNodeCounts.get(NodeType.HEADLINE),
+                semanticNodeCounts.get(NodeType.PARAGRAPH) == null ? 0 : semanticNodeCounts.get(NodeType.PARAGRAPH),
+                semanticNodeCounts.get(NodeType.TABLE) == null ? 0 : semanticNodeCounts.get(NodeType.TABLE),
+                semanticNodeCounts.get(NodeType.TABLE_CELL) == null ? 0 : semanticNodeCounts.get(NodeType.TABLE_CELL),
+                semanticNodeCounts.get(NodeType.HEADER) == null ? 0 : semanticNodeCounts.get(NodeType.HEADER),
+                semanticNodeCounts.get(NodeType.FOOTER) == null ? 0 : semanticNodeCounts.get(NodeType.FOOTER));
     }
 
 
@@ -224,7 +219,11 @@ public class LayoutParsingPipeline {
         addNumberOfPagesToTrace(originDocument.getNumberOfPages(), Files.size(originFile.toPath()));
         Map<Integer, List<TableCells>> pdfTableCells = cvTableParsingAdapter.buildCvParsedTablesPerPage(tableServiceResponse);
         Map<Integer, List<ClassifiedImage>> pdfImages = imageServiceResponseAdapter.buildClassifiedImagesPerPage(imageServiceResponse);
-        Map<Integer, List<ClassifiedImage>> signatures = visualLayoutParsingAdapter.buildExtractedSignaturesPerPage(visualLayoutParsingResponse);
+        Map<Integer, List<ClassifiedImage>> signatures = new HashMap<>();
+        if (signatures.size() > 0) {
+            visualLayoutParsingAdapter.buildExtractedSignaturesPerPage(visualLayoutParsingResponse);
+        }
+
         ClassificationDocument classificationDocument = new ClassificationDocument();
         List<ClassificationPage> classificationPages = new ArrayList<>();
 
@@ -263,14 +262,12 @@ public class LayoutParsingPipeline {
             PDRectangle cropbox = pdPage.getCropBox();
             CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(pdfTableCells.get(pageNumber), stripper.getRulings());
 
-            List<Cell> emptyTableCells = tableExtractionService.findCells(cleanRulings.getHorizontal(), cleanRulings.getVertical());
-
             ClassificationPage classificationPage = switch (layoutParsingType) {
                 case REDACT_MANAGER -> redactManagerBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
                 case TAAS -> taasBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
                 case DOCUMINE -> docuMineBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
-                case DOCSTRUM -> docstrumBlockificationService.blockify(stripper.getTextPositionSequences(), emptyTableCells, false);
-                case DOCSTRUM_XY -> docstrumBlockificationService.blockify(stripper.getTextPositionSequences(), emptyTableCells, true);
+                case DOCSTRUM -> docstrumBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical(), true);
+                case DOCSTRUM_ROW_WISE -> docstrumBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical(), false);
             };
             classificationPage.setCleanRulings(cleanRulings);
             classificationPage.setRotation(rotation);
@@ -289,17 +286,13 @@ public class LayoutParsingPipeline {
             }
 
             if (signatures.containsKey(pageNumber)) {
-                if (classificationPage.getImages() == null || classificationPage.getImages().size() == 0) {
-                    classificationPage.setImages(signatures.get(pageNumber));
-                } else {
-                    classificationPage.getImages().addAll(signatures.get(pageNumber));
-                }
+                classificationPage.setImages(signatures.get(pageNumber));
             }
 
-            tableExtractionService.extractTables(emptyTableCells, classificationPage);
+            tableExtractionService.extractTables(cleanRulings, classificationPage);
 
-            if (layoutParsingType == LayoutParsingType.DOCSTRUM || layoutParsingType == LayoutParsingType.DOCSTRUM_XY) {
-                docstrumBlockificationService.combineBlocks(classificationPage);
+            if (layoutParsingType == DOCSTRUM || layoutParsingType == DOCSTRUM_ROW_WISE) {
+                // docstrumBlockificationService.combineBlocks(classificationPage); //todo 8666
             }
 
             buildPageStatistics(classificationPage);
@@ -317,27 +310,26 @@ public class LayoutParsingPipeline {
             case TAAS -> taasClassificationService.classifyDocument(classificationDocument);
             case DOCUMINE -> docuMineClassificationService.classifyDocument(classificationDocument);
             case REDACT_MANAGER -> redactManagerClassificationService.classifyDocument(classificationDocument);
-            case DOCSTRUM_XY -> redactManagerClassificationService.classifyDocument(classificationDocument);
-            case DOCSTRUM -> redactManagerClassificationService.classifyDocument(classificationDocument);
+            case DOCSTRUM_ROW_WISE -> redactManagerClassificationService.classifyDocument(classificationDocument);
         }
 
         log.info("Building Sections for {}", identifier);
 
-//        if (layoutParsingType == DOCSTRUM || layoutParsingType == DOCSTRUM_XY) {
-//            // Currently for debugging return paragraphs as sections, because there is a merging logic in sectionBuilder
-//            List<ClassificationSection> sections = new ArrayList<>();
-//            for (var page : classificationPages) {
-//                page.getTextBlocks().forEach(block -> {
-//                    block.setPage(page.getPageNumber());
-//                    var section = sectionsBuilderService.buildTextBlock(List.of(block), "a");
-//                    sections.add(section);
-//                });
-//            }
-//            classificationDocument.setSections(sections);
-//        } else {
-        sectionsBuilderService.buildSections(classificationDocument);
-        sectionsBuilderService.addImagesToSections(classificationDocument);
-//        }
+        if (layoutParsingType == DOCSTRUM || layoutParsingType == DOCSTRUM_ROW_WISE) {
+            // Currently for debugging return paragraphs as sections, because there is a merging logic in sectionBuilder
+            List<ClassificationSection> sections = new ArrayList<>();
+            for (var page : classificationPages) {
+                page.getTextBlocks().forEach(block -> {
+                    block.setPage(page.getPageNumber());
+                    var section = sectionsBuilderService.buildTextBlock(List.of(block), "a");
+                    sections.add(section);
+                });
+            }
+            classificationDocument.setSections(sections);
+        } else {
+            sectionsBuilderService.buildSections(classificationDocument);
+            sectionsBuilderService.addImagesToSections(classificationDocument);
+        }
         return classificationDocument;
     }
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/AbstractPageBlock.java

@@ -6,14 +6,12 @@ import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageB
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public abstract class AbstractPageBlock extends Rectangle {
+public abstract class AbstractPageBlock {
 
     @JsonIgnore
     protected float minX;
@@ -47,6 +45,12 @@ public abstract class AbstractPageBlock extends Rectangle {
     }
 
 
+    public boolean containsBlock(TextPageBlock other, float threshold) {
+
+        return this.minX <= other.getMinX() + threshold && this.maxX >= other.getMaxX() - threshold && this.minY <= other.getMinY() + threshold && this.maxY >= other.getMaxY() - threshold;
+    }
+
+
     public boolean contains(AbstractPageBlock other) {
 
         return this.minX <= other.minX && this.maxX >= other.maxX && this.minY >= other.minY && this.maxY <= other.maxY;
@@ -96,7 +100,13 @@ public abstract class AbstractPageBlock extends Rectangle {
 
         return this.minX - threshold <= apb.getMaxX() && this.maxX + threshold >= apb.getMinX();
     }
-    
+
+
+    public boolean intersects(AbstractPageBlock apb) {
+
+        return this.minY < apb.getMaxY() && this.maxY >= apb.getMinY() && this.minX < apb.getMaxX() && this.maxX > apb.getMinX();
+    }
+
 
     public abstract boolean isEmpty();
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Document.java

@@ -10,11 +10,11 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -30,9 +30,6 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class Document implements GenericSemanticNode {
 
-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
-
     Set<Page> pages;
     DocumentTree documentTree;
     Integer numberOfPages;
@@ -51,7 +48,7 @@ public class Document implements GenericSemanticNode {
     public TextBlock getTextBlock() {
 
         if (textBlock == null) {
-            textBlock = GenericSemanticNode.super.getTextBlock();
+            textBlock = streamTerminalTextBlocksInOrder().collect(new TextBlockCollector());
         }
         return textBlock;
     }
@@ -59,14 +56,13 @@ public class Document implements GenericSemanticNode {
 
     public List<Section> getMainSections() {
 
-        return streamChildrenOfType(NodeType.SECTION).map(node -> (Section) node)
-                .collect(Collectors.toList());
+        return streamChildrenOfType(NodeType.SECTION).map(node -> (Section) node).collect(Collectors.toList());
     }
 
 
     public Stream<TextBlock> streamTerminalTextBlocksInOrder() {
 
-        return streamAllNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getTextBlock);
+        return streamAllNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock);
     }
 
 
@@ -87,16 +83,13 @@ public class Document implements GenericSemanticNode {
     @Override
     public Headline getHeadline() {
 
-        return streamAllSubNodesOfType(NodeType.HEADLINE).map(node -> (Headline) node)
-                .findFirst()
-                .orElse(Headline.builder().build());
+        return streamAllSubNodesOfType(NodeType.HEADLINE).map(node -> (Headline) node).findFirst().orElse(Headline.builder().build());
     }
 
 
     private Stream<SemanticNode> streamAllNodes() {
 
-        return documentTree.allEntriesInOrder()
-                .map(DocumentTree.Entry::getNode);
+        return documentTree.allEntriesInOrder().map(DocumentTree.Entry::getNode);
     }
 
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/DuplicatedParagraph.java

@@ -1,34 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import java.util.stream.Stream;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.SuperBuilder;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@SuperBuilder
-public class DuplicatedParagraph extends Paragraph {
-
-    TextBlock unsortedLeafTextBlock;
-
-
-    @Override
-    public TextBlock getTextBlock() {
-
-        return Stream.of(leafTextBlock, unsortedLeafTextBlock).collect(new TextBlockCollector());
-
-    }
-
-
-    @Override
-    public String toString() {
-
-        return super.toString();
-    }
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Footer.java

@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity;
@@ -27,9 +26,6 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class Footer implements GenericSemanticNode {
 
-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
-
     List<Integer> treeId;
     TextBlock leafTextBlock;
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Header.java

@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity;
@@ -27,8 +26,6 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class Header implements GenericSemanticNode {
 
-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
     List<Integer> treeId;
     TextBlock leafTextBlock;
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Headline.java

@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity;
@@ -27,8 +26,6 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class Headline implements GenericSemanticNode {
 
-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
     List<Integer> treeId;
     TextBlock leafTextBlock;
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Image.java

@@ -8,7 +8,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity;
@@ -30,9 +29,6 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class Image implements GenericSemanticNode {
 
-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
-
     List<Integer> treeId;
     String id;
 
@@ -70,9 +66,7 @@ public class Image implements GenericSemanticNode {
     @Override
     public TextBlock getTextBlock() {
 
-        return streamAllSubNodes().filter(SemanticNode::isLeaf)
-                .map(SemanticNode::getLeafTextBlock)
-                .collect(new TextBlockCollector());
+        return streamAllSubNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).collect(new TextBlockCollector());
     }
 
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/ImageType.java

@@ -6,8 +6,6 @@ public enum ImageType {
     LOGO,
     FORMULA,
     SIGNATURE,
-
-    SIGNATURE_VISUAL,
     OTHER,
     OCR;
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Paragraph.java

@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity;
@@ -18,17 +17,13 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.FieldDefaults;
-import lombok.experimental.SuperBuilder;
 
 @Data
-@SuperBuilder
+@Builder
 @AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PROTECTED)
+@FieldDefaults(level = AccessLevel.PRIVATE)
 public class Paragraph implements GenericSemanticNode {
 
-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
-
     List<Integer> treeId;
     TextBlock leafTextBlock;
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Section.java

@@ -6,11 +6,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -27,8 +27,6 @@ import lombok.extern.slf4j.Slf4j;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class Section implements GenericSemanticNode {
 
-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
     List<Integer> treeId;
 
     TextBlock textBlock;
@@ -52,8 +50,7 @@ public class Section implements GenericSemanticNode {
 
     public boolean hasTables() {
 
-        return streamAllSubNodesOfType(NodeType.TABLE).findAny()
-                .isPresent();
+        return streamAllSubNodesOfType(NodeType.TABLE).findAny().isPresent();
     }
 
 
@@ -61,7 +58,7 @@ public class Section implements GenericSemanticNode {
     public TextBlock getTextBlock() {
 
         if (textBlock == null) {
-            textBlock = GenericSemanticNode.super.getTextBlock();
+            textBlock = streamAllSubNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).collect(new TextBlockCollector());
         }
         return textBlock;
     }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/SemanticNode.java

@@ -12,7 +12,6 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.Boundary;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
@@ -20,7 +19,6 @@ import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.E
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector;
 import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
 
 public interface SemanticNode {
@@ -40,10 +38,7 @@ public interface SemanticNode {
      *
      * @return TextBlock containing all AtomicTextBlocks that are located under this Node.
      */
-    default TextBlock getTextBlock() {
-
-        return streamAllSubNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getTextBlock).collect(new TextBlockCollector());
-    }
+    TextBlock getTextBlock();
 
 
     /**
@@ -340,23 +335,6 @@ public interface SemanticNode {
     }
 
 
-    /**
-     * returns the set of layoutengines.
-     *
-     * @return set of layoutengines.
-     */
-    Set<LayoutEngine> getEngines();
-
-
-    /**
-     * adds a layoutengine to the set.
-     */
-    default void addEngine(LayoutEngine engine) {
-
-        getEngines().add(engine);
-    }
-
-
     /**
      * Streams all children located directly underneath this node in the DocumentTree.
      *
@@ -448,7 +426,6 @@ public interface SemanticNode {
     /**
      * TODO: this produces unwanted results for sections spanning multiple columns.
      * Computes the Union of the bounding boxes of all children recursively.
-     *
      * @return The union of the BoundingBoxes of all children
      */
     private Map<Page, Rectangle2D> getBBoxFromChildren() {

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Table.java

@@ -12,7 +12,6 @@ import java.util.Set;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity;
@@ -32,8 +31,6 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class Table implements SemanticNode {
 
-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
     List<Integer> treeId;
     DocumentTree documentTree;
 
@@ -56,7 +53,8 @@ public class Table implements SemanticNode {
      */
     public Stream<RedactionEntity> streamEntitiesWhereRowContainsStringsIgnoreCase(List<String> strings) {
 
-        return IntStream.range(0, numberOfRows).boxed()
+        return IntStream.range(0, numberOfRows)
+                .boxed()
                 .filter(row -> rowContainsStringsIgnoreCase(row, strings))
                 .flatMap(this::streamRow)
                 .map(TableCell::getEntities)
@@ -73,11 +71,8 @@ public class Table implements SemanticNode {
      */
     public boolean rowContainsStringsIgnoreCase(Integer row, List<String> strings) {
 
-        String rowText = streamRow(row).map(TableCell::getTextBlock)
-                .collect(new TextBlockCollector()).getSearchText().toLowerCase(Locale.ROOT);
-        return strings.stream()
-                .map(String::toLowerCase)
-                .allMatch(rowText::contains);
+        String rowText = streamRow(row).map(TableCell::getTextBlock).collect(new TextBlockCollector()).getSearchText().toLowerCase(Locale.ROOT);
+        return strings.stream().map(String::toLowerCase).allMatch(rowText::contains);
     }
 
 
@@ -90,13 +85,9 @@ public class Table implements SemanticNode {
      */
     public Stream<RedactionEntity> streamEntitiesWhereRowHasHeaderAndValue(String header, String value) {
 
-        List<Integer> vertebrateStudyCols = streamHeaders().filter(headerNode -> headerNode.containsString(header))
-                .map(TableCell::getCol)
-                .toList();
+        List<Integer> vertebrateStudyCols = streamHeaders().filter(headerNode -> headerNode.containsString(header)).map(TableCell::getCol).toList();
         return streamTableCells().filter(tableCellNode -> vertebrateStudyCols.stream()
-                        .anyMatch(vertebrateStudyCol -> getCell(tableCellNode.getRow(), vertebrateStudyCol).containsString(value)))
-                .map(TableCell::getEntities)
-                .flatMap(Collection::stream);
+                .anyMatch(vertebrateStudyCol -> getCell(tableCellNode.getRow(), vertebrateStudyCol).containsString(value))).map(TableCell::getEntities).flatMap(Collection::stream);
     }
 
 
@@ -109,13 +100,9 @@ public class Table implements SemanticNode {
      */
     public Stream<RedactionEntity> streamEntitiesWhereRowHasHeaderAndAnyValue(String header, List<String> values) {
 
-        List<Integer> colsWithHeader = streamHeaders().filter(headerNode -> headerNode.containsString(header))
-                .map(TableCell::getCol)
-                .toList();
+        List<Integer> colsWithHeader = streamHeaders().filter(headerNode -> headerNode.containsString(header)).map(TableCell::getCol).toList();
         return streamTableCells().filter(tableCellNode -> colsWithHeader.stream()
-                        .anyMatch(colWithHeader -> getCell(tableCellNode.getRow(), colWithHeader).containsAnyString(values)))
-                .map(TableCell::getEntities)
-                .flatMap(Collection::stream);
+                .anyMatch(colWithHeader -> getCell(tableCellNode.getRow(), colWithHeader).containsAnyString(values))).map(TableCell::getEntities).flatMap(Collection::stream);
     }
 
 
@@ -127,15 +114,12 @@ public class Table implements SemanticNode {
      */
     public Stream<RedactionEntity> streamEntitiesWhereRowContainsEntitiesOfType(List<String> types) {
 
-        List<Integer> rowsWithEntityOfType = IntStream.range(0, numberOfRows).boxed()
-                .filter(rowNumber -> streamEntityTypesInRow(rowNumber).anyMatch(existingType -> types.stream()
-                        .anyMatch(typeToCheck -> typeToCheck.equals(existingType))))
+        List<Integer> rowsWithEntityOfType = IntStream.range(0, numberOfRows)
+                .boxed()
+                .filter(rowNumber -> streamEntityTypesInRow(rowNumber).anyMatch(existingType -> types.stream().anyMatch(typeToCheck -> typeToCheck.equals(existingType))))
                 .toList();
 
-        return rowsWithEntityOfType.stream()
-                .flatMap(this::streamRow)
-                .map(TableCell::getEntities)
-                .flatMap(Collection::stream);
+        return rowsWithEntityOfType.stream().flatMap(this::streamRow).map(TableCell::getEntities).flatMap(Collection::stream);
     }
 
 
@@ -147,24 +131,18 @@ public class Table implements SemanticNode {
      */
     public Stream<RedactionEntity> streamEntitiesWhereRowContainsNoEntitiesOfType(List<String> types) {
 
-        List<Integer> rowsWithNoEntityOfType = IntStream.range(0, numberOfRows).boxed()
-                .filter(rowNumber -> streamEntityTypesInRow(rowNumber).noneMatch(existingType -> types.stream()
-                        .anyMatch(typeToCheck -> typeToCheck.equals(existingType))))
+        List<Integer> rowsWithNoEntityOfType = IntStream.range(0, numberOfRows)
+                .boxed()
+                .filter(rowNumber -> streamEntityTypesInRow(rowNumber).noneMatch(existingType -> types.stream().anyMatch(typeToCheck -> typeToCheck.equals(existingType))))
                 .toList();
 
-        return rowsWithNoEntityOfType.stream()
-                .flatMap(this::streamRow)
-                .map(TableCell::getEntities)
-                .flatMap(Collection::stream);
+        return rowsWithNoEntityOfType.stream().flatMap(this::streamRow).map(TableCell::getEntities).flatMap(Collection::stream);
     }
 
 
     private Stream<String> streamEntityTypesInRow(Integer rowNumber) {
 
-        return streamRow(rowNumber).map(TableCell::getEntities)
-                .flatMap(Collection::stream)
-                .map(RedactionEntity::getType)
-                .distinct();
+        return streamRow(rowNumber).map(TableCell::getEntities).flatMap(Collection::stream).map(RedactionEntity::getType).distinct();
     }
 
 
@@ -181,8 +159,7 @@ public class Table implements SemanticNode {
             throw new IllegalArgumentException(format("row %d, col %d is out of bounds for number of rows of %d and number of cols %d", row, col, numberOfRows, numberOfCols));
         }
         int idx = row * numberOfCols + col;
-        return (TableCell) documentTree.getEntryById(treeId).getChildren()
-                .get(idx).getNode();
+        return (TableCell) documentTree.getEntryById(treeId).getChildren().get(idx).getNode();
     }
 
 
@@ -219,8 +196,7 @@ public class Table implements SemanticNode {
      */
     public Stream<TableCell> streamCol(int col) {
 
-        return IntStream.range(0, numberOfRows).boxed()
-                .map(row -> getCell(row, col));
+        return IntStream.range(0, numberOfRows).boxed().map(row -> getCell(row, col));
     }
 
 
@@ -232,11 +208,9 @@ public class Table implements SemanticNode {
      */
     public Stream<TableCell> streamRow(int row) {
 
-        return IntStream.range(0, numberOfCols).boxed()
-                .map(col -> getCell(row, col));
+        return IntStream.range(0, numberOfCols).boxed().map(col -> getCell(row, col));
     }
 
-
     /**
      * Streams all TableCells row-wise and filters them with header == true.
      *
@@ -257,8 +231,7 @@ public class Table implements SemanticNode {
      */
     public Stream<TableCell> streamHeadersForCell(int row, int col) {
 
-        return Stream.concat(streamRow(row), streamCol(col))
-                .filter(TableCell::isHeader);
+        return Stream.concat(streamRow(row), streamCol(col)).filter(TableCell::isHeader);
     }
 
 
@@ -331,7 +304,7 @@ public class Table implements SemanticNode {
     public TextBlock getTextBlock() {
 
         if (textBlock == null) {
-            textBlock = SemanticNode.super.getTextBlock();
+            textBlock = streamAllSubNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).collect(new TextBlockCollector());
         }
         return textBlock;
     }
@@ -342,8 +315,6 @@ public class Table implements SemanticNode {
 
         return treeId.toString() + ": " + NodeType.TABLE + ": #cols: " + numberOfCols + ", #rows: " + numberOfRows + ", " + this.getTextBlock().buildSummary();
     }
-
-
     @Override
     public Map<Page, Rectangle2D> getBBox() {
 
@@ -352,5 +323,4 @@ public class Table implements SemanticNode {
         }
         return bBoxCache;
     }
-
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/TableCell.java

@@ -7,7 +7,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity;
@@ -27,8 +26,6 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class TableCell implements GenericSemanticNode {
 
-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
     List<Integer> treeId;
     int row;
     int col;
@@ -87,16 +84,14 @@ public class TableCell implements GenericSemanticNode {
 
     private TextBlock buildTextBlock() {
 
-        return streamAllSubNodes().filter(SemanticNode::isLeaf)
-                .map(SemanticNode::getLeafTextBlock)
-                .collect(new TextBlockCollector());
+        return streamAllSubNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).collect(new TextBlockCollector());
     }
 
 
     @Override
     public String toString() {
 
-        return treeId + ": " + NodeType.TABLE_CELL + ": " + this.getTextBlock().buildSummary();
+        return treeId + ": " + NodeType.TABLE_CELL + ": " + this.buildTextBlock().buildSummary();
     }
 
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/image/ClassifiedImage.java

@@ -4,21 +4,18 @@ import java.awt.geom.Rectangle2D;
 
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.ImageType;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
 @Data
 @RequiredArgsConstructor
-@AllArgsConstructor
 public class ClassifiedImage {
 
     @NonNull
     private Rectangle2D position;
     @NonNull
     private ImageType imageType;
-    private boolean sourceByAi;
     private boolean isAppendedToSection;
     @NonNull
     private boolean hasTransparency;

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/table/Cell.java

@@ -1,7 +1,6 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.table;
 
 import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -37,12 +36,6 @@ public class Cell extends Rectangle {
     }
 
 
-    public Cell(Rectangle2D r) {
-
-        super((float) r.getY(), (float) r.getX(), (float) r.getWidth(), (float) r.getHeight());
-    }
-
-
     public void addTextBlock(TextPageBlock textBlock) {
 
         textBlocks.add(textBlock);
@@ -83,4 +76,14 @@ public class Cell extends Rectangle {
         return this.getHeight() >= MIN_SIZE && this.getWidth() >= MIN_SIZE;
     }
 
+    public boolean nearlyIntersects(Cell other) {
+
+        if (this.getHeight() <= 0 || other.getHeight() <= 0) {
+            return false;
+        }
+        double x0 = this.getX() + 2;
+        double y0 = this.getY() + 2;
+        return (other.x + other.width > x0 && other.y + other.height > y0 && other.x < x0 + this.getWidth() - 2 && other.y < y0 + this.getHeight() - 2);
+    }
+
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/table/Ruling.java

@@ -20,8 +20,7 @@ import lombok.extern.slf4j.Slf4j;
 @SuppressWarnings("all")
 public class Ruling extends Line2D.Float {
 
-    public static final int PERPENDICULAR_UNIT_EXPAND_AMOUNT = 2;
-    public static final int COLINEAR_OR_PARALLEL_UNIT_EXPAND_AMOUNT = 2;
+    private static int PERPENDICULAR_PIXEL_EXPAND_AMOUNT = 2;
 
 
     public Ruling(Point2D p1, Point2D p2) {
@@ -111,8 +110,8 @@ public class Ruling extends Line2D.Float {
         });
 
         for (Ruling h : horizontals) {
-            sos.add(new SortObject(SOType.HLEFT, h.getLeft() - PERPENDICULAR_UNIT_EXPAND_AMOUNT, h));
-            sos.add(new SortObject(SOType.HRIGHT, h.getRight() + PERPENDICULAR_UNIT_EXPAND_AMOUNT, h));
+            sos.add(new SortObject(SOType.HLEFT, h.getLeft() - PERPENDICULAR_PIXEL_EXPAND_AMOUNT, h));
+            sos.add(new SortObject(SOType.HRIGHT, h.getRight() + PERPENDICULAR_PIXEL_EXPAND_AMOUNT, h));
         }
 
         for (Ruling v : verticals) {
@@ -152,7 +151,7 @@ public class Ruling extends Line2D.Float {
                             if (i == null) {
                                 continue;
                             }
-                            rv.put(i, new Ruling[]{h.getKey().expand(PERPENDICULAR_UNIT_EXPAND_AMOUNT), so.ruling.expand(PERPENDICULAR_UNIT_EXPAND_AMOUNT)});
+                            rv.put(i, new Ruling[]{h.getKey().expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT), so.ruling.expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT)});
                         } catch (UnsupportedOperationException e) {
                             log.info("Some line are oblique, ignoring...");
                             continue;
@@ -268,7 +267,7 @@ public class Ruling extends Line2D.Float {
     }
 
 
-    public boolean nearlyIntersects(Ruling another) {
+    public boolean nearlyIntersects(Ruling another, int colinearOrParallelExpandAmount) {
 
         if (this.intersectsLine(another)) {
             return true;
@@ -277,9 +276,9 @@ public class Ruling extends Line2D.Float {
         boolean rv = false;
 
         if (this.perpendicularTo(another)) {
-            rv = this.expand(PERPENDICULAR_UNIT_EXPAND_AMOUNT).intersectsLine(another);
+            rv = this.expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT).intersectsLine(another);
         } else {
-            rv = this.expand(COLINEAR_OR_PARALLEL_UNIT_EXPAND_AMOUNT).intersectsLine(another.expand(COLINEAR_OR_PARALLEL_UNIT_EXPAND_AMOUNT));
+            rv = this.expand(colinearOrParallelExpandAmount).intersectsLine(another.expand(colinearOrParallelExpandAmount));
         }
 
         return rv;
@@ -320,8 +319,8 @@ public class Ruling extends Line2D.Float {
 
     public Point2D intersectionPoint(Ruling other) {
 
-        Ruling this_l = this.expand(PERPENDICULAR_UNIT_EXPAND_AMOUNT);
-        Ruling other_l = other.expand(PERPENDICULAR_UNIT_EXPAND_AMOUNT);
+        Ruling this_l = this.expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT);
+        Ruling other_l = other.expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT);
         Ruling horizontal, vertical;
 
         if (!this_l.intersectsLine(other_l)) {

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/table/TablePageBlock.java

@@ -3,7 +3,6 @@ package com.knecon.fforesight.service.layoutparser.processor.model.table;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -12,7 +11,6 @@ import java.util.TreeMap;
 import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.PageBlockType;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
-import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -21,7 +19,6 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class TablePageBlock extends AbstractPageBlock {
 
-    public static final double CELL_AREA_CONTAINED_THRESHOLD = 0.98;
     private final TreeMap<CellPosition, Cell> cellTreeMap = new TreeMap<>();
 
     private final int rotation;
@@ -96,7 +93,7 @@ public class TablePageBlock extends AbstractPageBlock {
 
     /**
      * Detect header cells (either first row or first column):
-     * Column is marked as header if originalCell text is bold and row originalCell text is not bold.
+     * Column is marked as header if cell text is bold and row cell text is not bold.
      * Defaults to row.
      */
     private void computeHeaders() {
@@ -104,7 +101,7 @@ public class TablePageBlock extends AbstractPageBlock {
         if (rows == null) {
             rows = computeRows();
         }
-        // A bold originalCell is a header originalCell as long as every originalCell to the left/top is bold, too
+        // A bold cell is a header cell as long as every cell to the left/top is bold, too
         // we move from left to right and top to bottom
         for (int rowIndex = 0; rowIndex < rows.size(); rowIndex++) {
             List<Cell> rowCells = rows.get(rowIndex);
@@ -260,19 +257,15 @@ public class TablePageBlock extends AbstractPageBlock {
             for (Float x : sortedUniqueX) {
 
                 if (prevY != null && prevX != null) {
-                    var cellFromGridStructure = new Cell(new Point2D.Float(prevX, prevY), new Point2D.Float(x, y));
+                    var cell = new Cell(new Point2D.Float(prevX, prevY), new Point2D.Float(x, y));
 
-                    if (cellFromGridStructure.hasMinimumSize()) {
+                    if (cell.hasMinimumSize()) {
 
                         cells.stream()
-                                .map(originalCell -> new CellWithIntersection(originalCell, RectangleTransformations.calculateIntersectedArea(cellFromGridStructure, originalCell)))
-                                .filter(cellWithIntersection -> cellWithIntersection.intersectedArea > 0)
-                                .filter(cellWithIntersection -> cellWithIntersection.originalCell.getArea() > cellWithIntersection.intersectedArea * CELL_AREA_CONTAINED_THRESHOLD)
-                                .max(Comparator.comparing(CellWithIntersection::intersectedArea))
-                                .map(CellWithIntersection::originalCell)
-                                .ifPresent(matchingCell -> cellFromGridStructure.getTextBlocks().addAll(matchingCell.getTextBlocks()));
+                                .filter(cell::nearlyIntersects)
+                                .forEach(intersectingCell -> cell.getTextBlocks().addAll(intersectingCell.getTextBlocks()));
 
-                        row.add(cellFromGridStructure);
+                        row.add(cell);
                     }
                 }
                 prevX = x;
@@ -412,9 +405,4 @@ public class TablePageBlock extends AbstractPageBlock {
         return sb.toString();
     }
 
-
-    record CellWithIntersection(Cell originalCell, double intersectedArea) {
-
-    }
-
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/RedTextPosition.java

@@ -46,8 +46,12 @@ public class RedTextPosition {
     private String fontName;
 
 
+    @JsonIgnore
+    private int textSequence;
+
+
     @SneakyThrows
-    public static RedTextPosition fromTextPosition(TextPosition textPosition) {
+    public static RedTextPosition fromTextPosition(TextPosition textPosition, int textSequence) {
 
         var pos = new RedTextPosition();
         BeanUtils.copyProperties(textPosition, pos);
@@ -63,6 +67,7 @@ public class RedTextPosition {
         position[3] = textPosition.getHeightDir();
 
         pos.setPosition(position);
+        pos.setTextSequence(textSequence);
         return pos;
     }
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/TextPageBlock.java

@@ -53,9 +53,6 @@ public class TextPageBlock extends AbstractPageBlock {
     @JsonIgnore
     private PageBlockType classification;
 
-    @JsonIgnore
-    private boolean toDuplicate;
-
 
     @JsonIgnore
     public TextDirection getDir() {

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/TextPositionSequence.java

@@ -43,9 +43,9 @@ public class TextPositionSequence implements CharSequence {
     }
 
 
-    public TextPositionSequence(List<TextPosition> textPositions, int page, boolean isParagraphStart) {
+    public TextPositionSequence(List<TextPosition> textPositions, int page, boolean isParagraphStart, int textSequence) {
 
-        this.textPositions = textPositions.stream().map(RedTextPosition::fromTextPosition).collect(Collectors.toList());
+        this.textPositions = textPositions.stream().map(textPosition -> RedTextPosition.fromTextPosition(textPosition, textSequence)).collect(Collectors.toList());
         this.page = page;
         this.dir = TextDirection.fromDegrees(textPositions.get(0).getDir());
         this.rotation = textPositions.get(0).getRotation();
@@ -133,9 +133,9 @@ public class TextPositionSequence implements CharSequence {
     }
 
 
-    public void add(TextPosition textPosition) {
+    public void add(TextPosition textPosition, int textSequence) {
 
-        this.textPositions.add(RedTextPosition.fromTextPosition(textPosition));
+        this.textPositions.add(RedTextPosition.fromTextPosition(textPosition, textSequence));
 
         this.dir = TextDirection.fromDegrees(textPositions.get(0).getDir());
         this.rotation = textPositions.get(0).getRotation();

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/adapter/VisualLayoutParsingAdapter.java

@@ -24,7 +24,6 @@ public class VisualLayoutParsingAdapter {
 
     private static String SIGNATURES = "signature";
 
-
     public Map<Integer, List<VisualLayoutParsingResult>> buildExtractedTablesPerPage(VisualLayoutParsingResponse visualLayoutParsingResponse) {
 
         Map<Integer, List<VisualLayoutParsingResult>> tableCells = new HashMap<>();
@@ -35,17 +34,12 @@ public class VisualLayoutParsingAdapter {
 
     }
 
-
     public Map<Integer, List<ClassifiedImage>> buildExtractedSignaturesPerPage(VisualLayoutParsingResponse visualLayoutParsingResponse) {
 
         Map<Integer, List<ClassifiedImage>> signatures = new HashMap<>();
-        if (visualLayoutParsingResponse.getData() != null) {
-            visualLayoutParsingResponse.getData()
-                    .forEach(tableData -> signatures.computeIfAbsent(tableData.getPage_idx() + 1, tableCell -> new ArrayList<>())
-                            .addAll(convertSignatures(tableData.getPage_idx()+1, tableData.getBoxes())));
-        }
-        return signatures;
+            visualLayoutParsingResponse.getData().forEach(tableData -> signatures.computeIfAbsent(tableData.getPage_idx(), tableCell -> new ArrayList<>()).addAll(convertSignatures(tableData.getPage_idx(), tableData.getBoxes())));
 
+            return signatures;
     }
 
 
@@ -69,17 +63,14 @@ public class VisualLayoutParsingAdapter {
 
     }
 
-
     public List<ClassifiedImage> convertSignatures(int pageNumber, List<VisualLayoutParsingBox> tableObjects) {
 
         List<ClassifiedImage> signatures = new ArrayList<>();
 
         tableObjects.stream().forEach(t -> {
-            if (t.getLabel().equals(SIGNATURES)) {
-                ClassifiedImage signature = new ClassifiedImage(new Rectangle2D.Float(t.getBox().getX1(),
-                        t.getBox().getY1(),
-                        t.getBox().getX2() - t.getBox().getX1(),
-                        t.getBox().getY2() - t.getBox().getY1()), ImageType.SIGNATURE, true, false, false, pageNumber);
+            if(t.getLabel().equals(SIGNATURES)) {
+                ClassifiedImage signature = new ClassifiedImage(new Rectangle2D.Float(t.getBox().getX1(),t.getBox().getY1(),t.getBox().getX2() - t.getBox().getX1(),t.getBox().getY2() - t.getBox().getY1()),
+                        ImageType.SIGNATURE,false,pageNumber);
 
                 signatures.add(signature);
             }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/RulingCleaningService.java

@@ -1,21 +1,21 @@
 package com.knecon.fforesight.service.layoutparser.processor.services;
 
-import static com.knecon.fforesight.service.layoutparser.processor.utils.GeometricComparators.X_FIRST_RULING_COMPARATOR;
-
+import java.awt.geom.Line2D;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 
 import com.knecon.fforesight.service.layoutparser.processor.model.table.CleanRulings;
-import com.knecon.fforesight.service.layoutparser.processor.model.table.Rectangle;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.Ruling;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableCells;
-import com.knecon.fforesight.service.layoutparser.processor.utils.UnionFind;
+import com.knecon.fforesight.service.layoutparser.processor.utils.DoubleComparisons;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -25,145 +25,26 @@ import lombok.extern.slf4j.Slf4j;
 @RequiredArgsConstructor
 public class RulingCleaningService {
 
-    private static final float THRESHOLD_X_VERTICAL = 1;
-    private static final float THRESHOLD_Y_VERTICAL = 2;
-    private static final float THRESHOLD_X_HORIZONTAL = 2;
-    private static final float THRESHOLD_Y_HORIZONTAL = 3;
+    private static final float THRESHOLD_Y = 6;
+    private static final float THRESHOLD_X = 2;
 
 
     public CleanRulings getCleanRulings(List<TableCells> tableCells, List<Ruling> rulings) {
 
-        Rulings verticalAndHorizontalRulingLines;
-
         if (!rulings.isEmpty()) {
-            verticalAndHorizontalRulingLines = extractVerticalAndHorizontalRulingLines(rulings);
-        } else {
-            verticalAndHorizontalRulingLines = getRulingsFromParsedCells(tableCells);
+            snapPoints(rulings);
         }
 
-        verticalAndHorizontalRulingLines.verticalLines.sort(X_FIRST_RULING_COMPARATOR);
-        verticalAndHorizontalRulingLines.horizontalLines.sort(X_FIRST_RULING_COMPARATOR);
-        verticalAndHorizontalRulingLines = cleanRulings(verticalAndHorizontalRulingLines);
-
-        return CleanRulings.builder().vertical(verticalAndHorizontalRulingLines.verticalLines()).horizontal(verticalAndHorizontalRulingLines.horizontalLines()).build();
-    }
-
-
-    private Rulings cleanRulings(Rulings rulings) {
-
-        List<List<Rectangle>> groupedOverlappingVerticalRectangles = groupOverlappingRectangles(rulings.verticalLines.stream()
-                                                                                                        .map(RulingCleaningService::getOverlapRectangle)
-                                                                                                        .distinct()
-                                                                                                        .toList());
-        List<Ruling> cleanedVerticalRulings = groupedOverlappingVerticalRectangles.stream()
-                .map(rectList -> getXCenteredRuling(Rectangle.boundingBoxOf(rectList)))
-                .toList();
-
-        List<List<Rectangle>> groupedOverlappingHorizontalRectangles = groupOverlappingRectangles(rulings.horizontalLines.stream()
-                                                                                                          .map(RulingCleaningService::getOverlapRectangle)
-                                                                                                          .distinct()
-                                                                                                          .toList());
-
-        List<Ruling> cleanedHorizontalRulings = groupedOverlappingHorizontalRectangles.stream()
-                .map(rectList -> getYCenteredRuling(Rectangle.boundingBoxOf(rectList)))
-                .collect(Collectors.toList());
-
-        return new Rulings(cleanedVerticalRulings, cleanedHorizontalRulings);
-    }
-
-
-    private List<List<Rectangle>> groupOverlappingRectangles(List<Rectangle> rectangles) {
-
-        UnionFind<Rectangle> unionFind = new UnionFind<>();
-        for (int i = 0; i < rectangles.size(); i++) {
-            for (int j = i + 1; j < rectangles.size(); j++) {
-                Rectangle rectangle1 = rectangles.get(i);
-                Rectangle rectangle2 = rectangles.get(j);
-
-                // we can stop early when we are too far off because of x-y-sorting
-                if(rectangle1.getRight() < rectangle2.getLeft() && rectangle1.getBottom() < rectangle2.getTop()) {
-                    break;
-                }
-
-                if (rectangle1.intersects(rectangle2)) {
-                    unionFind.union(rectangle1, rectangle2);
-                }
-            }
-        }
-
-        Map<Rectangle, List<Rectangle>> groups = new HashMap<>();
-        for (Rectangle rectangle : rectangles) {
-            Rectangle root = unionFind.find(rectangle);
-            groups.computeIfAbsent(root, k -> new ArrayList<>()).add(rectangle);
-        }
-        return new ArrayList<>(groups.values());
-    }
-
-
-    private static Rectangle getOverlapRectangle(Ruling ruling) {
-
-        float top;
-        float left;
-        float w;
-        float h;
-
-        if (ruling.x1 < ruling.x2) {
-            left = ruling.x1;
-            w = ruling.x2 - ruling.x1;
-        } else {
-            left = ruling.x2;
-            w = ruling.x1 - ruling.x2;
-        }
-        if (ruling.y1 < ruling.y2) {
-            top = ruling.y1;
-            h = ruling.y2 - ruling.y1;
-        } else {
-            top = ruling.y2;
-            h = ruling.y1 - ruling.y2;
-        }
-
-        if (ruling.horizontal()) {
-            return new Rectangle(top - THRESHOLD_Y_HORIZONTAL, left - THRESHOLD_X_HORIZONTAL, w + 2 * THRESHOLD_X_HORIZONTAL, h + 2 * THRESHOLD_Y_HORIZONTAL);
-        } else {
-            return new Rectangle(top - THRESHOLD_Y_VERTICAL, left - THRESHOLD_X_VERTICAL, w + 2 * THRESHOLD_X_VERTICAL, h + 2 * THRESHOLD_Y_VERTICAL);
-        }
-    }
-
-
-    public static Ruling getXCenteredRuling(Rectangle rectangle) {
-
-        float x = (float) rectangle.getCenterX();
-        float y1 = rectangle.getTop();
-        float y2 = rectangle.getBottom();
-
-        Point2D point1 = new Point2D.Float(x, y1 + THRESHOLD_Y_VERTICAL);
-        Point2D point2 = new Point2D.Float(x, y2 - THRESHOLD_Y_VERTICAL);
-
-        return new Ruling(point1, point2);
-    }
-
-
-    public static Ruling getYCenteredRuling(Rectangle rectangle) {
-
-        float x1 = rectangle.getLeft();
-        float x2 = rectangle.getRight();
-        float y = (float) rectangle.getCenterY();
-
-        Point2D point1 = new Point2D.Float(x1 + THRESHOLD_X_HORIZONTAL, y);
-        Point2D point2 = new Point2D.Float(x2 - THRESHOLD_X_HORIZONTAL, y);
-
-        return new Ruling(point1, point2);
-    }
-
-
-    private Rulings extractVerticalAndHorizontalRulingLines(List<Ruling> rulings) {
-
         List<Ruling> vrs = new ArrayList<>();
         for (Ruling vr : rulings) {
             if (vr.vertical()) {
                 vrs.add(vr);
             }
         }
+        if (vrs.isEmpty()) {
+            vrs.addAll(extractVerticalRulings(tableCells));
+        }
+        List<Ruling> verticalRulingLines = collapseOrientedRulings(vrs);
 
         List<Ruling> hrs = new ArrayList<>();
         for (Ruling hr : rulings) {
@@ -171,26 +52,98 @@ public class RulingCleaningService {
                 hrs.add(hr);
             }
         }
-        return new Rulings(vrs, hrs);
+        if (hrs.isEmpty()) {
+            hrs.addAll(extractHorizontalRulings(tableCells));
+        }
+        List<Ruling> horizontalRulingLines = collapseOrientedRulings(hrs);
+
+        return CleanRulings.builder().vertical(verticalRulingLines).horizontal(horizontalRulingLines).build();
     }
 
 
-    private Rulings getRulingsFromParsedCells(List<TableCells> tableCells) {
+    public void snapPoints(List<? extends Line2D.Float> rulings) {
 
-        List<Ruling> vrs = extractVerticalRulingsFromParsedCells(tableCells);
-        List<Ruling> hrs = extractHorizontalRulingsFromParsedCells(tableCells);
-        return new Rulings(vrs, hrs);
+        // collect points and keep a Line -> p1,p2 map
+        Map<Line2D.Float, Point2D[]> linesToPoints = new HashMap<>();
+        List<Point2D> points = new ArrayList<>();
+        for (Line2D.Float r : rulings) {
+            Point2D p1 = r.getP1();
+            Point2D p2 = r.getP2();
+            linesToPoints.put(r, new Point2D[]{p1, p2});
+            points.add(p1);
+            points.add(p2);
+        }
+
+        // snap by X
+        points.sort(Comparator.comparingDouble(Point2D::getX));
+
+        List<List<Point2D>> groupedPoints = new ArrayList<>();
+        groupedPoints.add(new ArrayList<>(Collections.singletonList(points.get(0))));
+
+        for (Point2D p : points.subList(1, points.size() - 1)) {
+            List<Point2D> last = groupedPoints.get(groupedPoints.size() - 1);
+            if (Math.abs(p.getX() - last.get(0).getX()) < THRESHOLD_X) {
+                groupedPoints.get(groupedPoints.size() - 1).add(p);
+            } else {
+                groupedPoints.add(new ArrayList<>(Collections.singletonList(p)));
+            }
+        }
+
+        for (List<Point2D> group : groupedPoints) {
+            float avgLoc = 0;
+            for (Point2D p : group) {
+                avgLoc += p.getX();
+            }
+            avgLoc /= group.size();
+            for (Point2D p : group) {
+                p.setLocation(avgLoc, p.getY());
+            }
+        }
+        // ---
+
+        // snap by Y
+        points.sort(Comparator.comparingDouble(Point2D::getY));
+
+        groupedPoints = new ArrayList<>();
+        groupedPoints.add(new ArrayList<>(Collections.singletonList(points.get(0))));
+
+        for (Point2D p : points.subList(1, points.size() - 1)) {
+            List<Point2D> last = groupedPoints.get(groupedPoints.size() - 1);
+            if (Math.abs(p.getY() - last.get(0).getY()) < THRESHOLD_Y) {
+                groupedPoints.get(groupedPoints.size() - 1).add(p);
+            } else {
+                groupedPoints.add(new ArrayList<>(Collections.singletonList(p)));
+            }
+        }
+
+        for (List<Point2D> group : groupedPoints) {
+            float avgLoc = 0;
+            for (Point2D p : group) {
+                avgLoc += p.getY();
+            }
+            avgLoc /= group.size();
+            for (Point2D p : group) {
+                p.setLocation(p.getX(), avgLoc);
+            }
+        }
+        // ---
+
+        // finally, modify lines
+        for (Map.Entry<Line2D.Float, Point2D[]> ltp : linesToPoints.entrySet()) {
+            Point2D[] p = ltp.getValue();
+            ltp.getKey().setLine(p[0], p[1]);
+        }
     }
 
 
-    private List<Ruling> extractVerticalRulingsFromParsedCells(List<TableCells> tableCells) {
+    private Collection<? extends Ruling> extractVerticalRulings(List<TableCells> cvParsedTableCells) {
 
         List<Ruling> vrs = new ArrayList<>();
 
-        if (tableCells != null) {
-            for (TableCells tableCell : tableCells) {
-                Ruling leftLine = createRuling(tableCell.getX0(), tableCell.getX0(), tableCell.getY0(), tableCell.getY1());
-                Ruling rightLine = createRuling(tableCell.getX1(), tableCell.getX1(), tableCell.getY0(), tableCell.getY1());
+        if (cvParsedTableCells != null) {
+            for (TableCells cvParsedTableCell : cvParsedTableCells) {
+                Ruling leftLine = createRuling(cvParsedTableCell.getX0(), cvParsedTableCell.getX0(), cvParsedTableCell.getY0(), cvParsedTableCell.getY1());
+                Ruling rightLine = createRuling(cvParsedTableCell.getX1(), cvParsedTableCell.getX1(), cvParsedTableCell.getY0(), cvParsedTableCell.getY1());
                 vrs.add(leftLine);
                 vrs.add(rightLine);
             }
@@ -199,18 +152,19 @@ public class RulingCleaningService {
     }
 
 
-    private List<Ruling> extractHorizontalRulingsFromParsedCells(List<TableCells> tableCells) {
+    private Collection<? extends Ruling> extractHorizontalRulings(List<TableCells> cvParsedTableCells) {
 
         List<Ruling> hrs = new ArrayList<>();
 
-        if (tableCells != null) {
-            for (TableCells tableCell : tableCells) {
-                Ruling topLine = createRuling(tableCell.getX0(), tableCell.getX1(), tableCell.getY1(), tableCell.getY1());
-                Ruling baseLine = createRuling(tableCell.getX0(), tableCell.getX1(), tableCell.getY0(), tableCell.getY0());
+        if (cvParsedTableCells != null) {
+            for (TableCells cvParsedTableCell : cvParsedTableCells) {
+                Ruling topLine = createRuling(cvParsedTableCell.getX0(), cvParsedTableCell.getX1(), cvParsedTableCell.getY1(), cvParsedTableCell.getY1());
+                Ruling baseLine = createRuling(cvParsedTableCell.getX0(), cvParsedTableCell.getX1(), cvParsedTableCell.getY0(), cvParsedTableCell.getY0());
                 hrs.add(topLine);
                 hrs.add(baseLine);
             }
         }
+
         return hrs;
     }
 
@@ -236,8 +190,46 @@ public class RulingCleaningService {
     }
 
 
-    private record Rulings(List<Ruling> verticalLines, List<Ruling> horizontalLines) {
+    private List<Ruling> collapseOrientedRulings(List<Ruling> lines) {
 
+        int COLINEAR_OR_PARALLEL_PIXEL_EXPAND_AMOUNT = 1;
+        return collapseOrientedRulings(lines, COLINEAR_OR_PARALLEL_PIXEL_EXPAND_AMOUNT);
+    }
+
+
+    private List<Ruling> collapseOrientedRulings(List<Ruling> lines, int expandAmount) {
+
+        ArrayList<Ruling> rv = new ArrayList<>();
+        lines.sort((a, b) -> {
+            final float diff = a.getPosition() - b.getPosition();
+            return Float.compare(diff == 0 ? a.getStart() - b.getStart() : diff, 0f);
+        });
+
+        for (Ruling next_line : lines) {
+            Ruling last = rv.isEmpty() ? null : rv.get(rv.size() - 1);
+            // if current line colinear with next, and are "close enough": expand current line
+            if (last != null && DoubleComparisons.feq(next_line.getPosition(), last.getPosition()) && last.nearlyIntersects(next_line, expandAmount)) {
+                final float lastStart = last.getStart();
+                final float lastEnd = last.getEnd();
+
+                final boolean lastFlipped = lastStart > lastEnd;
+                final boolean nextFlipped = next_line.getStart() > next_line.getEnd();
+
+                boolean differentDirections = nextFlipped != lastFlipped;
+                float nextS = differentDirections ? next_line.getEnd() : next_line.getStart();
+                float nextE = differentDirections ? next_line.getStart() : next_line.getEnd();
+
+                final float newStart = lastFlipped ? Math.max(nextS, lastStart) : Math.min(nextS, lastStart);
+                final float newEnd = lastFlipped ? Math.min(nextE, lastEnd) : Math.max(nextE, lastEnd);
+                last.setStartEnd(newStart, newEnd);
+                assert !last.oblique();
+            } else if (next_line.length() == 0) {
+                continue;
+            } else {
+                rv.add(next_line);
+            }
+        }
+        return rv;
     }
 
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/TableExtractionService.java

@@ -1,33 +1,85 @@
 package com.knecon.fforesight.service.layoutparser.processor.services;
 
-import static com.knecon.fforesight.service.layoutparser.processor.utils.GeometricComparators.CELL_SIZE_COMPARATOR;
-import static com.knecon.fforesight.service.layoutparser.processor.utils.GeometricComparators.RECTANGLE_SIZE_COMPARATOR;
-
+import java.awt.geom.Point2D;
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
+import java.util.Set;
 
 import org.springframework.stereotype.Service;
 
 import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.Cell;
+import com.knecon.fforesight.service.layoutparser.processor.model.table.CleanRulings;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.Rectangle;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.Ruling;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.TablePageBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
 import com.knecon.fforesight.service.layoutparser.processor.utils.DoubleComparisons;
-import com.knecon.fforesight.service.layoutparser.processor.utils.RectangularIntersectionFinder;
-import com.knecon.fforesight.service.layoutparser.processor.utils.SpreadsheetFinder;
 
 @Service
 public class TableExtractionService {
 
+    private static final int MAX_TABLE_OUTER_POINT_TOLERANCE = 10;
     private static final int MAX_TABLE_CONTAINED_CELLS_WITH_TEXT = 1;
-    private static final int TEXT_BLOCK_CONTAINMENT_TOLERANCE = 2;
-    private static final double TABLE_UNIFORMITY_THRESHOLD = 0.7;
+    private static final float SPREADSHEET_AREA_TOLERANCE = 0.001f;
+
+    private static final Comparator<Point2D> X_FIRST_POINT_COMPARATOR = (point1, point2) -> {
+
+        int rv = 0;
+        float point1X = DoubleComparisons.round(point1.getX(), 2);
+        float point1Y = DoubleComparisons.round(point1.getY(), 2);
+        float point2X = DoubleComparisons.round(point2.getX(), 2);
+        float point2Y = DoubleComparisons.round(point2.getY(), 2);
+
+        if (point1X > point2X) {
+            rv = 1;
+        } else if (point1X < point2X) {
+            rv = -1;
+        } else if (point1Y > point2Y) {
+            rv = 1;
+        } else if (point1Y < point2Y) {
+            rv = -1;
+        }
+        return rv;
+    };
+    private static final Comparator<Point2D> Y_FIRST_POINT_COMPARATOR = (point1, point2) -> {
+
+        int rv = 0;
+        float point1X = DoubleComparisons.round(point1.getX(), 2);
+        float point1Y = DoubleComparisons.round(point1.getY(), 2);
+        float point2X = DoubleComparisons.round(point2.getX(), 2);
+        float point2Y = DoubleComparisons.round(point2.getY(), 2);
+
+        if (point1Y > point2Y) {
+            rv = 1;
+        } else if (point1Y < point2Y) {
+            rv = -1;
+        } else if (point1X > point2X) {
+            rv = 1;
+        } else if (point1X < point2X) {
+            rv = -1;
+        }
+        return rv;
+    };
+
+    private static final Comparator<Cell> CELL_SIZE_COMPARATOR = (cell1, cell2) -> {
+
+        Double cell1Size = cell1.getHeight() * cell1.getWidth();
+        Double cell2Size = cell2.getHeight() * cell2.getWidth();
+        return cell1Size.compareTo(cell2Size);
+    };
+
+    private static final Comparator<Rectangle> RECTANGLE_SIZE_COMPARATOR = (rect1, rect2) -> {
+
+        Double rect1Size = rect1.getHeight() * rect1.getWidth();
+        Double rect2Size = rect2.getHeight() * rect2.getWidth();
+        return rect1Size.compareTo(rect2Size);
+    };
 
 
     /**
@@ -40,18 +92,19 @@ public class TableExtractionService {
      * <p>
      * DirAdj (Text direction adjusted) values can not be used here.
      *
-     * @param emptyCells The cells used to build the table.
-     * @param page       Page object that contains textblocks and statistics.
+     * @param cleanRulings The lines used to build the table.
+     * @param page         Page object that contains textblocks and statistics.
      */
 
-    public void extractTables(List<Cell> emptyCells, ClassificationPage page) {
+    public void extractTables(CleanRulings cleanRulings, ClassificationPage page) {
 
+        List<Cell> cells = findCells(cleanRulings.getHorizontal(), cleanRulings.getVertical());
         // sort cells by size (height * width) ascending so that textBlocks are always assigned to the smallest cells that contain them
-        emptyCells.sort(CELL_SIZE_COMPARATOR);
+        cells.sort(CELL_SIZE_COMPARATOR);
 
         for (AbstractPageBlock abstractPageBlock : page.getTextBlocks()) {
             TextPageBlock textBlock = (TextPageBlock) abstractPageBlock;
-            for (Cell cell : emptyCells) {
+            for (Cell cell : cells) {
                 if (cell.hasMinimumSize() && doesCellContainTextBlock(cell, textBlock)) {
                     cell.addTextBlock(textBlock);
                     break;
@@ -59,10 +112,10 @@ public class TableExtractionService {
             }
         }
 
-        var cells = new ArrayList<>(new HashSet<>(emptyCells));
+        cells = new ArrayList<>(new HashSet<>(cells));
         DoubleComparisons.sort(cells, Rectangle.ILL_DEFINED_ORDER);
 
-        List<Rectangle> spreadsheetAreas = SpreadsheetFinder.findSpreadsheetsFromCells(cells);
+        List<Rectangle> spreadsheetAreas = findSpreadsheetsFromCells(cells);
         // sort spreadsheetAreas by size (height * width) ascending so that cells are placed in the smallest tables first
         // this way no cell duplication occurs when tables are contained in other tables and only the most inner table contains the cells
         spreadsheetAreas.sort(RECTANGLE_SIZE_COMPARATOR);
@@ -77,10 +130,12 @@ public class TableExtractionService {
                 }
             }
 
-            var containedCellsWithText = containedCells.stream().filter(cell -> !cell.getTextBlocks().isEmpty()).toList();
+            var containedCellsWithText = containedCells.stream()
+                    .filter(cell -> !cell.getTextBlocks().isEmpty())
+                    .count();
 
             // verify if table would contain fewer cells with text than the threshold allows
-            if (containedCellsWithText.size() >= MAX_TABLE_CONTAINED_CELLS_WITH_TEXT && checkIfTableCellsAreUniform(containedCells)) {
+            if (containedCellsWithText >= MAX_TABLE_CONTAINED_CELLS_WITH_TEXT) {
                 tables.add(new TablePageBlock(containedCells, area, page.getRotation()));
                 cells.removeAll(containedCells);
             }
@@ -97,7 +152,11 @@ public class TableExtractionService {
             if (position != -1) {
                 page.getTextBlocks().add(position, table);
 
-                var toBeRemoved = table.getCells().stream().map(Cell::getTextBlocks).flatMap(List::stream).toList();
+                var toBeRemoved = table.getCells()
+                        .stream()
+                        .map(Cell::getTextBlocks)
+                        .flatMap(List::stream)
+                        .toList();
                 // remove text blocks from the page that were also added with the table (from its contained cells)
                 page.getTextBlocks().removeAll(toBeRemoved);
             }
@@ -105,21 +164,6 @@ public class TableExtractionService {
     }
 
 
-    private boolean checkIfTableCellsAreUniform(List<Cell> containedCells) {
-
-        if (containedCells.size() <= 2) {
-            return true;
-        }
-
-        Map<Long, List<Long>> cellsGroupedByRoundedWidth = containedCells.stream()
-                .map(Rectangle::getWidth)
-                .map(size -> Math.round(size / 10.0) * 10)
-                .collect(Collectors.groupingBy(Long::longValue));
-
-        return (double) cellsGroupedByRoundedWidth.size() / containedCells.size() <= TABLE_UNIFORMITY_THRESHOLD;
-    }
-
-
     private boolean doesCellContainTextBlock(Cell cell, TextPageBlock textBlock) {
 
         double x = textBlock.getPdfMinX();
@@ -131,13 +175,225 @@ public class TableExtractionService {
         }
         double x0 = cell.getX();
         double y0 = cell.getY();
-        return (x >= x0 - TEXT_BLOCK_CONTAINMENT_TOLERANCE && y >= y0 - TEXT_BLOCK_CONTAINMENT_TOLERANCE && (x + w) <= x0 + cell.getWidth() + 2 * TEXT_BLOCK_CONTAINMENT_TOLERANCE && (y + h) <= y0 + cell.getHeight() + 2 * TEXT_BLOCK_CONTAINMENT_TOLERANCE);
+        return (x >= x0 - 2 && y >= y0 - 2 && (x + w) <= x0 + cell.getWidth() + 2 && (y + h) <= y0 + cell.getHeight() + 2);
     }
 
 
-    public static List<Cell> findCells(List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {
+    private List<Cell> findCells(List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {
+
+        // Fix for 211.pdf
+        for (Ruling r : horizontalRulingLines) {
+            if (r.getX2() < r.getX1()) {
+                double a = r.getX2();
+                r.x2 = (float) r.getX1();
+                r.x1 = (float) a;
+            }
+        }
+
+        List<Cell> cellsFound = new ArrayList<>();
+        Map<Point2D, Ruling[]> intersectionPoints = Ruling.findIntersections(horizontalRulingLines, verticalRulingLines);
+        List<Point2D> intersectionPointsList = new ArrayList<>(intersectionPoints.keySet());
+        intersectionPointsList.sort(Y_FIRST_POINT_COMPARATOR);
+
+        for (int i = 0; i < intersectionPointsList.size(); i++) {
+            Point2D topLeft = intersectionPointsList.get(i);
+            Ruling[] hv = intersectionPoints.get(topLeft);
+
+            // CrossingPointsDirectlyBelow( topLeft );
+            List<Point2D> xPoints = new ArrayList<>();
+            // CrossingPointsDirectlyToTheRight( topLeft );
+            List<Point2D> yPoints = new ArrayList<>();
+
+            for (Point2D p : intersectionPointsList.subList(i, intersectionPointsList.size())) {
+                if (p.getX() == topLeft.getX() && p.getY() > topLeft.getY()) {
+                    xPoints.add(p);
+                }
+                if (p.getY() == topLeft.getY() && p.getX() > topLeft.getX()) {
+                    yPoints.add(p);
+                }
+            }
+            outer:
+            for (Point2D xPoint : xPoints) {
+                // is there a vertical edge b/w topLeft and xPoint?
+                if (!hv[1].equals(intersectionPoints.get(xPoint)[1])) {
+                    continue;
+                }
+                for (Point2D yPoint : yPoints) {
+                    // is there a horizontal edge b/w topLeft and yPoint ?
+                    if (!hv[0].equals(intersectionPoints.get(yPoint)[0])) {
+                        continue;
+                    }
+                    Point2D btmRight = new Point2D.Float((float) yPoint.getX(), (float) xPoint.getY());
+                    if (intersectionPoints.containsKey(btmRight)
+                        && intersectionPoints.get(btmRight)[0].equals(intersectionPoints.get(xPoint)[0])
+                        && intersectionPoints.get(btmRight)[1].equals(intersectionPoints.get(yPoint)[1])) {
+                        cellsFound.add(new Cell(topLeft, btmRight));
+                        break outer;
+                    }
+                }
+            }
+        }
+
+        // TODO create cells for vertical ruling lines with aligned endpoints at the top/bottom of a grid
+        // that aren't connected with an horizontal ruler?
+        // see: https://github.com/jazzido/tabula-extractor/issues/78#issuecomment-41481207
+
+        return cellsFound;
+    }
+
+
+    private List<Rectangle> findSpreadsheetsFromCells(List<? extends Rectangle> cells) {
+        // via: http://stackoverflow.com/questions/13746284/merging-multiple-adjacent-rectangles-into-one-polygon
+        List<Rectangle> rectangles = new ArrayList<>();
+        Set<Point2D> pointSet = new HashSet<>();
+        Map<Point2D, Point2D> edgesH = new HashMap<>();
+        Map<Point2D, Point2D> edgesV = new HashMap<>();
+
+        for (Rectangle cell : cells) {
+            for (Point2D pt : cell.getPoints()) {
+                if (pointSet.contains(pt)) { // shared vertex, remove it
+                    pointSet.remove(pt);
+                } else {
+                    pointSet.add(pt);
+                }
+            }
+        }
+
+        // X first sort
+        List<Point2D> pointsSortX = new ArrayList<>(pointSet);
+        pointsSortX.sort(X_FIRST_POINT_COMPARATOR);
+        // Y first sort
+        List<Point2D> pointsSortY = new ArrayList<>(pointSet);
+        pointsSortY.sort(Y_FIRST_POINT_COMPARATOR);
+
+        int i = 0;
+        while (i < pointSet.size()) {
+            float currY = (float) pointsSortY.get(i).getY();
+            while (i < pointSet.size() && DoubleComparisons.feq(pointsSortY.get(i).getY(), currY)) {
+                edgesH.put(pointsSortY.get(i), pointsSortY.get(i + 1));
+                edgesH.put(pointsSortY.get(i + 1), pointsSortY.get(i));
+                i += 2;
+            }
+        }
+
+        i = 0;
+        while (i < pointSet.size()) {
+            float currX = (float) pointsSortX.get(i).getX();
+            while (i < pointSet.size() && DoubleComparisons.feq(pointsSortX.get(i).getX(), currX)) {
+                edgesV.put(pointsSortX.get(i), pointsSortX.get(i + 1));
+                edgesV.put(pointsSortX.get(i + 1), pointsSortX.get(i));
+                i += 2;
+            }
+        }
+
+        // Get all the polygons
+        List<List<PolygonVertex>> polygons = new ArrayList<>();
+        Point2D nextVertex;
+        while (!edgesH.isEmpty()) {
+            ArrayList<PolygonVertex> polygon = new ArrayList<>();
+            Point2D first = edgesH.keySet()
+                    .iterator().next();
+            polygon.add(new PolygonVertex(first, Direction.HORIZONTAL));
+            edgesH.remove(first);
+
+            while (true) {
+                PolygonVertex curr = polygon.get(polygon.size() - 1);
+                PolygonVertex lastAddedVertex;
+                if (curr.direction == Direction.HORIZONTAL) {
+                    nextVertex = edgesV.get(curr.point);
+                    edgesV.remove(curr.point);
+                    lastAddedVertex = new PolygonVertex(nextVertex, Direction.VERTICAL);
+                } else {
+                    nextVertex = edgesH.get(curr.point);
+                    edgesH.remove(curr.point);
+                    lastAddedVertex = new PolygonVertex(nextVertex, Direction.HORIZONTAL);
+                }
+                polygon.add(lastAddedVertex);
+
+                if (lastAddedVertex.equals(polygon.get(0))) {
+                    // closed polygon
+                    polygon.remove(polygon.size() - 1);
+                    break;
+                }
+            }
+
+            for (PolygonVertex vertex : polygon) {
+                edgesH.remove(vertex.point);
+                edgesV.remove(vertex.point);
+            }
+            polygons.add(polygon);
+        }
+
+        // calculate grid-aligned minimum area rectangles for each found polygon
+        for (List<PolygonVertex> poly : polygons) {
+            float top = Float.MAX_VALUE;
+            float left = Float.MAX_VALUE;
+            float bottom = Float.MIN_VALUE;
+            float right = Float.MIN_VALUE;
+            for (PolygonVertex pt : poly) {
+                top = (float) Math.min(top, pt.point.getY());
+                left = (float) Math.min(left, pt.point.getX());
+                bottom = (float) Math.max(bottom, pt.point.getY());
+                right = (float) Math.max(right, pt.point.getX());
+            }
+
+            // do not add polygons with too many outer points as they are unlikely to be tables
+            if (poly.size() <= MAX_TABLE_OUTER_POINT_TOLERANCE) {
+                rectangles.add(new Rectangle(top - SPREADSHEET_AREA_TOLERANCE,
+                                             left - SPREADSHEET_AREA_TOLERANCE,
+                                             right - left + 2 * SPREADSHEET_AREA_TOLERANCE,
+                                             bottom - top + 2 * SPREADSHEET_AREA_TOLERANCE));
+            }
+        }
+
+        return rectangles;
+    }
+
+
+    private enum Direction {
+        HORIZONTAL,
+        VERTICAL
+    }
+
+    static class PolygonVertex {
+
+        Point2D point;
+        Direction direction;
+
+
+        PolygonVertex(Point2D point, Direction direction) {
+
+            this.direction = direction;
+            this.point = point;
+        }
+
+
+        @Override
+        public boolean equals(Object other) {
+
+            if (this == other) {
+                return true;
+            }
+            if (!(other instanceof PolygonVertex)) {
+                return false;
+            }
+            return this.point.equals(((PolygonVertex) other).point);
+        }
+
+
+        @Override
+        public int hashCode() {
+
+            return this.point.hashCode();
+        }
+
+
+        @Override
+        public String toString() {
+
+            return String.format("%s[point=%s,direction=%s]", this.getClass().getName(), this.point.toString(), this.direction.toString());
+        }
 
-        return RectangularIntersectionFinder.find(horizontalRulingLines, verticalRulingLines).stream().map(Cell::new).collect(Collectors.toList());
     }
 
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/blockification/DocstrumBlockificationService.java

@@ -2,20 +2,17 @@ package com.knecon.fforesight.service.layoutparser.processor.services.blockifica
 
 import static java.util.stream.Collectors.toSet;
 
-import java.awt.geom.Point2D;
 import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.List;
 import java.util.ListIterator;
-import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 
 import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage;
 import com.knecon.fforesight.service.layoutparser.processor.model.FloatFrequencyCounter;
-import com.knecon.fforesight.service.layoutparser.processor.model.table.Cell;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.Ruling;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.TablePageBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.StringFrequencyCounter;
@@ -35,24 +32,13 @@ public class DocstrumBlockificationService {
 
     private final DocstrumSegmentationService docstrumSegmentationService;
 
-    static final float THRESHOLD = 1f;
+    static final float THRESHOLD = 2f;
 
 
-    public ClassificationPage blockify(List<TextPositionSequence> textPositions, List<Cell> cells, boolean xyOder) {
-
-        // Underlined or strikethrough are also in rulings but we dont want to split blocks with them so we use cells.
-        List<Ruling> usedHorizonalRulings = new ArrayList<>();
-        List<Ruling> usedVerticalRulings = new ArrayList<>();
-
-        cells.forEach(cell -> {
-            usedHorizonalRulings.add(new Ruling(new Point2D.Float(cell.x, cell.y), new Point2D.Float(cell.x + cell.width, cell.y)));
-            usedHorizonalRulings.add(new Ruling(new Point2D.Float(cell.x, cell.y + cell.height), new Point2D.Float(cell.x + cell.width, cell.y + cell.height)));
-            usedVerticalRulings.add(new Ruling(new Point2D.Float(cell.x, cell.y), new Point2D.Float(cell.x, cell.y + cell.height)));
-            usedVerticalRulings.add(new Ruling(new Point2D.Float(cell.x + cell.width, cell.y), new Point2D.Float(cell.x + cell.width, cell.y + cell.height)));
-        });
+    public ClassificationPage blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines, boolean columnWise) {
 
         List<AbstractPageBlock> abstractPageBlocks = new ArrayList<>();
-        var zones = docstrumSegmentationService.segmentPage(textPositions, xyOder);
+        var zones = docstrumSegmentationService.segmentPage(textPositions, columnWise);
         zones.forEach(zone -> {
 
             List<TextPositionSequence> textPositionSequences = new ArrayList<>();
@@ -62,7 +48,7 @@ public class DocstrumBlockificationService {
                 });
             });
 
-            abstractPageBlocks.addAll(splitZonesAtRulings(textPositionSequences, usedHorizonalRulings, usedVerticalRulings));
+            abstractPageBlocks.addAll(splitZonesAtRulings(textPositionSequences, horizontalRulingLines, verticalRulingLines));
 //            abstractPageBlocks.add(buildTextBlock(textPositionSequences, 0));
         });
 
@@ -85,113 +71,42 @@ public class DocstrumBlockificationService {
 
             if (previous != null && !previous.getSequences().isEmpty()) {
 
-                if (current.getDir() == previous.getDir() //
-                        && previous.getNumberOfLines() >= 2 && current.getNumberOfLines() >= 2 //
-                        && previous.intersectsY(current) //
-                        && !hasBetween(current, previous, page.getTextBlocks()) //
-                        && numberOfYIntersections(current, previous, page.getTextBlocks()) == 0) {
-
+                if (current.getDir() == previous.getDir() && (Math.abs(previous.getMaxY() - current.getMaxY()) < THRESHOLD || Math.abs(previous.getMinY() - current.getMinY()) < THRESHOLD) && (previous.getNumberOfLines() >= 2 && current.getNumberOfLines() >= 2 /* && current.getNumberOfLines() <= 10 */ && previous.getNumberOfLines() <= current.getNumberOfLines())) {
                     previous.getSequences().addAll(current.getSequences());
                     previous = buildTextBlock(previous.getSequences(), 0);
-                    previous.setToDuplicate(true);
                     itty.remove();
-                    itty.previous();
-                    itty.set(previous);
-                    itty.next();
+
+                    // Might be a left/right mapping add one sorted as well
+                    var sortedDublicate = buildTextBlock(previous.getSequences().stream().sorted(new TextPositionSequenceComparator()).collect(Collectors.toList()), 0);
+                    itty.add(sortedDublicate);
                     continue;
                 }
 
-                if (current.getDir() == previous.getDir() && (previous.almostIntersects(current, 0, 0))) {
-
+                if (current.getDir() == previous.getDir() && (Math.abs(previous.getMaxY() - current.getMaxY()) < THRESHOLD || Math.abs(previous.getMinY() - current.getMinY()) < THRESHOLD) && (previous.getNumberOfLines() == 1 && current.getNumberOfLines() >= 1  /* && current.getNumberOfLines() <= 10 */ || previous.getNumberOfLines() == 2 && current.getNumberOfLines() == 1)) {
                     previous.getSequences().addAll(current.getSequences());
-                    boolean toDuplicate = previous.isToDuplicate();
                     previous = buildTextBlock(previous.getSequences(), 0);
-                    previous.setToDuplicate(toDuplicate);
                     itty.remove();
-                    itty.previous();
-                    itty.set(previous);
-                    itty.next();
                     continue;
                 }
 
-                if (current.getDir() == previous.getDir() //
-                        && (Math.abs(previous.getMaxY() - current.getMaxY()) < THRESHOLD || Math.abs(previous.getMinY() - current.getMinY()) < THRESHOLD) //
-                        && (previous.getNumberOfLines() == 1 && current.getNumberOfLines() >= 1 || previous.getNumberOfLines() == 2 && current.getNumberOfLines() == 1) //
-                        && !hasBetween(current, previous, page.getTextBlocks()) && numberOfYIntersections(current, previous, page.getTextBlocks()) <= 4) {
-
+                if (current.getDir() == previous.getDir() && previous.containsBlock(current, THRESHOLD)) {
                     previous.getSequences().addAll(current.getSequences());
+                    QuickSort.sort(previous.getSequences(), new TextPositionSequenceComparator());
                     previous = buildTextBlock(previous.getSequences(), 0);
                     itty.remove();
-                    itty.previous();
-                    itty.set(previous);
-                    itty.next();
-                    continue;
-                }
-
-                if (current.getDir() == previous.getDir() //
-                        && current.intersectsY(previous) //
-                        && (previous.getNumberOfLines() == 1 && current.getNumberOfLines() >= 1 || previous.getNumberOfLines() == 2 && current.getNumberOfLines() == 1) //
-                        && !hasBetween(current, previous, page.getTextBlocks()) //
-                        && numberOfYIntersections(current, previous, page.getTextBlocks()) <= 0) {
-                    previous.getSequences().addAll(current.getSequences());
-                    previous = buildTextBlock(previous.getSequences(), 0);
-                    itty.remove();
-                    itty.previous();
-                    itty.set(previous);
-                    itty.next();
                     continue;
                 }
 
             }
             previous = current;
         }
-
-        mergeZones(page.getTextBlocks());
-    }
-
-
-    private boolean hasBetween(TextPageBlock block, TextPageBlock other, List<AbstractPageBlock> allBlocks) {
-
-        for (AbstractPageBlock current : allBlocks) {
-
-            if (current == other || current == block) {
-                continue;
-            }
-
-            if (other.intersectsY(current) && other.getMaxX() <= current.getMinX() && current.getMaxX() <= block.getMinX()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-
-    private int numberOfYIntersections(TextPageBlock block, TextPageBlock other, List<AbstractPageBlock> allBlocks) {
-
-        double minY = Math.min(block.getMinY(), other.getMinY());
-        double maxY = Math.min(block.getMaxY(), other.getMaxY());
-
-        int numberOfYIntersections = 0;
-        for (AbstractPageBlock current : allBlocks) {
-
-            if (current == other || current == block) {
-                continue;
-            }
-
-            if (minY <= current.getMaxY() && maxY >= current.getMinY()) {
-                numberOfYIntersections++;
-            }
-        }
-
-        return numberOfYIntersections;
     }
 
 
     private void mergeZones(List<AbstractPageBlock> zones) {
 
         ListIterator<AbstractPageBlock> itty = zones.listIterator();
-        Set<AbstractPageBlock> toRemove = new HashSet<>();
+
         while (itty.hasNext()) {
             AbstractPageBlock block = itty.next();
             if (block instanceof TablePageBlock) {
@@ -200,39 +115,25 @@ public class DocstrumBlockificationService {
 
             TextPageBlock current = (TextPageBlock) block;
 
-            if (current.isToDuplicate()) {
-                continue;
-            }
-
-            for (int i = 0; i < zones.size(); i++) {
-
-                if (toRemove.contains(zones.get(i))) {
+            List<AbstractPageBlock> toBeRemoved = new ArrayList<>();
+            for (AbstractPageBlock innerZone : zones) {
+                if (innerZone == current) {
                     continue;
                 }
-                if (zones.get(i) == current) {
-                    continue;
-                }
-                if (zones.get(i) instanceof TablePageBlock) {
+                if (innerZone instanceof TablePageBlock) {
                     continue;
                 }
 
-                TextPageBlock inner = (TextPageBlock) zones.get(i);
-
-                if (inner.isToDuplicate()) {
-                    continue;
-                }
+                TextPageBlock inner = (TextPageBlock) innerZone;
 
                 if (current.getDir() == inner.getDir() && current.almostIntersects(inner, 0, 0)) {
 
                     current.getSequences().addAll(inner.getSequences());
-                    QuickSort.sort(current.getSequences(), new TextPositionSequenceComparator());
-                    current = buildTextBlock(current.getSequences(), 0);
-                    toRemove.add(inner);
-                    itty.set(current);
+                    current = buildTextBlock(inner.getSequences().stream().sorted(new TextPositionSequenceComparator()).collect(Collectors.toList()), 0);
                 }
             }
+            zones.removeAll(toBeRemoved);
         }
-        zones.removeAll(toRemove);
     }
 
 
@@ -245,6 +146,7 @@ public class DocstrumBlockificationService {
         float minX = 1000, maxX = 0, minY = 1000, maxY = 0;
         TextPositionSequence prev = null;
 
+        Float splitX1 = null;
         for (TextPositionSequence word : textPositions) {
 
             boolean isSplitByRuling = isSplitByRuling(minX, minY, maxX, maxY, word, horizontalRulingLines, verticalRulingLines);

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/DocstrumSegmentationService.java

@@ -29,7 +29,7 @@ public class DocstrumSegmentationService {
     private final ReadingOrderService readingOrderService;
 
 
-    public List<Zone> segmentPage(List<TextPositionSequence> textPositions, boolean xyOder) {
+    public List<Zone> segmentPage(List<TextPositionSequence> textPositions, boolean columnWise) {
 
         List<Zone> zones = new ArrayList<>();
         zones.addAll(computeZones(textPositions, TextDirection.ZERO));
@@ -37,7 +37,7 @@ public class DocstrumSegmentationService {
         zones.addAll(computeZones(textPositions, TextDirection.HALF_CIRCLE));
         zones.addAll(computeZones(textPositions, TextDirection.THREE_QUARTER_CIRCLE));
 
-        return readingOrderService.resolve(zones, xyOder);
+        return readingOrderService.resolve(zones, columnWise);
     }
 
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/AngleFilter.java

@@ -7,9 +7,16 @@ public class AngleFilter {
 
 
     public AngleFilter(double lowerAngle, double upperAngle) {
-        
-        this.lowerAngle = lowerAngle < -Math.PI / 2 ? lowerAngle + Math.PI : lowerAngle;
-        this.upperAngle = upperAngle >= Math.PI / 2 ? upperAngle - Math.PI : upperAngle;
+
+        if (lowerAngle < -Math.PI / 2) {
+            lowerAngle += Math.PI;
+        }
+        if (upperAngle >= Math.PI / 2) {
+            upperAngle -= Math.PI;
+        }
+
+        this.lowerAngle = lowerAngle;
+        this.upperAngle = upperAngle;
     }
 
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/BoundingBox.java

@@ -2,6 +2,8 @@ package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.m
 
 import java.awt.geom.Rectangle2D;
 
+import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
+
 import lombok.Data;
 
 @Data
@@ -45,4 +47,10 @@ public abstract class BoundingBox {
         return bBox.getX() <= contained.getX() + tolerance && bBox.getY() <= contained.getY() + tolerance && bBox.getX() + bBox.getWidth() >= contained.getX() + contained.getWidth() - tolerance && bBox.getY() + bBox.getHeight() >= contained.getY() + contained.getHeight() - tolerance;
     }
 
+
+    public boolean intersectsY(BoundingBox other) {
+
+        return this.getBBox().getMinY() <= other.getBBox().getMaxY() && this.getBBox().getMaxY() >= other.getBBox().getMinY();
+    }
+
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Character.java

@@ -55,8 +55,7 @@ public class Character {
     public double overlappingDistance(Character other) {
 
         double[] xs = new double[4];
-        double s = Math.sin(-0);
-        double c = Math.cos(-0);
+        double s = Math.sin(-0), c = Math.cos(-0);
         xs[0] = c * x - s * y;
         xs[1] = c * (x + textPosition.getWidthDirAdj()) - s * (y + textPosition.getHeightDir());
         xs[2] = c * other.x - s * other.y;

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/DisjointSets.java

@@ -23,7 +23,7 @@ public class DisjointSets<E> implements Iterable<Set<E>> {
 
     public boolean areTogether(E e1, E e2) {
 
-        return map.get(e1).findRepresentative().equals(map.get(e2).findRepresentative());
+        return map.get(e1).findRepresentative() == map.get(e2).findRepresentative();
     }
 
 
@@ -31,7 +31,7 @@ public class DisjointSets<E> implements Iterable<Set<E>> {
 
         Entry<E> r1 = map.get(e1).findRepresentative();
         Entry<E> r2 = map.get(e2).findRepresentative();
-        if (!r1.equals(r2)) {
+        if (r1 != r2) {
             if (r1.size <= r2.size) {
                 r2.mergeWith(r1);
             } else {
@@ -100,7 +100,7 @@ public class DisjointSets<E> implements Iterable<Set<E>> {
         private int size = 1;
         private final E value;
         private Entry<E> parent = this;
-        private Entry<E> next;
+        private Entry<E> next = null;
         private Entry<E> last = this;
 
 
@@ -122,10 +122,10 @@ public class DisjointSets<E> implements Iterable<Set<E>> {
         Entry<E> findRepresentative() {
 
             Entry<E> representative = parent;
-            while (!representative.parent.equals(representative)) {
+            while (representative.parent != representative) {
                 representative = representative.parent;
             }
-            for (Entry<E> entry = this; !entry.equals(representative); ) {
+            for (Entry<E> entry = this; entry != representative; ) {
                 Entry<E> nextEntry = entry.parent;
                 entry.parent = representative;
                 entry = nextEntry;
@@ -136,7 +136,7 @@ public class DisjointSets<E> implements Iterable<Set<E>> {
 
         boolean isRepresentative() {
 
-            return parent.equals(this);
+            return parent == this;
         }
 
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Histogram.java

@@ -36,11 +36,12 @@ public class Histogram {
     public double[] createGaussianKernel(double length, double stdDeviation) {
 
         int r = (int) Math.round(length / resolution) / 2;
+        stdDeviation /= resolution;
 
         int size = 2 * r + 1;
         double[] kernel = new double[size];
         double sum = 0;
-        double b = 2 * (stdDeviation / resolution) * (stdDeviation / resolution);
+        double b = 2 * stdDeviation * stdDeviation;
         double a = 1 / Math.sqrt(Math.PI * b);
         for (int i = 0; i < size; i++) {
             kernel[i] = a * Math.exp(-(i - r) * (i - r) / b);

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Line.java

@@ -32,10 +32,7 @@ public class Line extends BoundingBox {
 
         if (characters.size() >= 2) {
             // linear regression
-            double sx = 0.0;
-            double sxx = 0.0;
-            double sxy = 0.0;
-            double sy = 0.0;
+            double sx = 0.0, sxx = 0.0, sxy = 0.0, sy = 0.0;
             for (Character character : characters) {
                 sx += character.getX();
                 sxx += character.getX() * character.getX();

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/model/Zone.java

@@ -11,8 +11,8 @@ public class Zone extends BoundingBox {
 
     private List<Line> lines;
 
+    private int readingOrder = -1;
 
-    @SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
     public Zone(List<Line> lines) {
 
         lines.sort(Comparator.comparingDouble(Line::getY));

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/readingorder/IntervalRelations.java

@@ -0,0 +1,59 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.readingorder;
+
+public enum IntervalRelations {
+    // Unknown interval relations.
+    UNKNOWN,
+
+    // X takes place before Y.
+    // |____X____|......................
+    // ......................|____Y____|
+    PRECEDES,
+
+    // X meets Y.
+    // |____X____|.................
+    // ................|____Y____|
+    MEETS,
+
+    // X overlaps with Y.
+    // |______X______|.................
+    // ................|______Y______|
+    OVERLAPS,
+
+    // X starts Y.
+    // |____X____|.................
+    // |_____Y_____|..............
+    STARTS,
+
+    // X during Y.
+    // ........|____X____|.........
+    // .....|______Y______|.....
+    DURING,
+
+    // X finishes Y.
+    // .................|____X____|
+    // ..............|_____Y_____|
+    FINISHES,
+
+    // Inverse precedes.
+    PRECEDES_INVERSE,
+
+    // Inverse meets.
+    MEETS_INVERSE,
+
+    // Inverse overlaps.
+    OVERLAPS_INVERSE,
+
+    // Inverse Starts.
+    STARTS_INVERSE,
+
+    // Inverse during.
+    DURING_INVERSE,
+
+    // Inverse finishes.
+    FINISHES_INVERSE,
+
+    // X is equal to Y.
+    // ..........|____X____|............
+    // ..........|____Y____|............
+    EQUALS
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/readingorder/ReadingOrderDetector.java

@@ -0,0 +1,11 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.readingorder;
+
+import java.util.Collection;
+
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone;
+
+public interface ReadingOrderDetector {
+
+    Collection<Zone> get(Collection<Zone> zones);
+
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/readingorder/SpatialReasoningRules.java

@@ -0,0 +1,10 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.readingorder;
+
+public enum SpatialReasoningRules {
+    // In western culture the reading order is from left to right and from top to bottom.
+    BASIC,
+    // The diagonal direction 'left-bottom to top-right' cannot be present among the Basic relations allowed.
+    ROW_WISE,
+    // The diagonal direction 'right-top to bottom-left' cannot be present among the Basic relations allowed.
+    COLUMN_WISE;
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/readingorder/UnsupervisedReadingOrderDetector.java

@@ -0,0 +1,261 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.readingorder;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone;
+
+import lombok.Getter;
+
+public class UnsupervisedReadingOrderDetector {
+
+    private boolean useRenderingOrder = true;
+    @Getter
+    private SpatialReasoningRules spatialReasoningRule = SpatialReasoningRules.COLUMN_WISE;
+    private double tolerance = 5;
+    private ZoneComparator zoneComparator;
+
+
+    public boolean useRenderingOrder() {
+
+        return useRenderingOrder;
+    }
+
+
+    public UnsupervisedReadingOrderDetector() {
+
+        configureComparator();
+    }
+
+
+    public UnsupervisedReadingOrderDetector(double tolerance, SpatialReasoningRules spatialReasoningRule, boolean useRenderingOrder) {
+
+        this.tolerance = tolerance;
+        this.spatialReasoningRule = spatialReasoningRule;
+        this.useRenderingOrder = useRenderingOrder;
+
+        configureComparator();
+
+    }
+
+
+    public void configureComparator() {
+
+        switch (spatialReasoningRule) {
+            case COLUMN_WISE:
+                if (useRenderingOrder) {
+                    zoneComparator = (Zone z1, Zone z2, double t) -> getBeforeInReadingColumnWise(z1, z2, t) || getBeforeInRendering(z1, z2);
+                } else {
+                    zoneComparator = this::getBeforeInReadingColumnWise;
+                }
+                break;
+
+            case ROW_WISE:
+                if (useRenderingOrder) {
+                    zoneComparator = (Zone z1, Zone z2, double t) -> getBeforeInReadingRowWise(z1, z2, t) || getBeforeInRendering(z1, z2);
+                } else {
+                    zoneComparator = this::getBeforeInReadingRowWise;
+                }
+                break;
+
+            case BASIC:
+            default:
+                if (useRenderingOrder) {
+                    zoneComparator = (Zone z1, Zone z2, double t) -> getBeforeInReading(z1, z2, t) || getBeforeInRendering(z1, z2);
+                } else {
+                    zoneComparator = this::getBeforeInReading;
+                }
+                break;
+        }
+    }
+
+
+    public List<Zone> get(List<Zone> zones) {
+
+        int readingOrder = 0;
+        Map<Integer, List<Integer>> graph = buildGraph(zones);
+
+        List<Zone> orderedZones = new ArrayList<>();
+
+        while (!graph.isEmpty()) {
+            int maxCount = graph.values()
+                    .stream()
+                    .mapToInt(List::size)
+                    .max()
+                    .orElse(0);
+
+            Map.Entry<Integer, List<Integer>> current = graph.entrySet()
+                    .stream()
+                    .filter(entry -> entry.getValue().size() == maxCount)
+                    .findFirst()
+                    .orElse(null);
+
+            if (current != null) {
+                int index = current.getKey();
+                graph.remove(index);
+
+                for (List<Integer> valueList : graph.values()) {
+                    valueList.remove(Integer.valueOf(index));
+                }
+
+                Zone zone = zones.get(index);
+                zone.setReadingOrder(readingOrder++);
+                orderedZones.add(zone);
+            }
+        }
+
+        return orderedZones;
+    }
+
+
+    private Map<Integer, List<Integer>> buildGraph(List<Zone> zones) {
+
+        Map<Integer, List<Integer>> graph = new HashMap<>();
+
+        for (int i = 0; i < zones.size(); i++) {
+            graph.put(i, new ArrayList<>());
+        }
+
+        for (int i = 0; i < zones.size(); i++) {
+            Zone zone1 = zones.get(i);
+            for (int j = 0; j < zones.size(); j++) {
+                if (i == j) {
+                    continue;
+                }
+                Zone zone2 = zones.get(j);
+
+                if (zoneComparator.isBefore(zone1, zone2, tolerance)) {
+                    graph.get(i).add(j);
+                }
+            }
+        }
+
+        return graph;
+    }
+
+
+    private boolean getBeforeInRendering(Zone z1, Zone z2) {
+
+        double avgTextSequenceZ1 = z1.getLines()
+                .stream()
+                .flatMap(line -> line.getCharacters()
+                        .stream())
+                .map(character -> character.getTextPosition().getTextSequence())
+                .collect(Collectors.averagingDouble(Integer::intValue));
+
+        double avgTextSequenceZ2 = z2.getLines()
+                .stream()
+                .flatMap(line -> line.getCharacters()
+                        .stream())
+                .map(character -> character.getTextPosition().getTextSequence())
+                .collect(Collectors.averagingDouble(Integer::intValue));
+
+        return avgTextSequenceZ1 < avgTextSequenceZ2;
+    }
+
+
+    private boolean getBeforeInReading(Zone z1, Zone z2, double tolerance) {
+
+        IntervalRelations xRelation = getIntervalRelationX(z1, z2, tolerance).get(0);
+        IntervalRelations yRelation = getIntervalRelationY(z1, z2, tolerance).get(0);
+
+        return xRelation == IntervalRelations.PRECEDES
+               || yRelation == IntervalRelations.PRECEDES
+               || xRelation == IntervalRelations.MEETS
+               || yRelation == IntervalRelations.MEETS
+               || xRelation == IntervalRelations.OVERLAPS
+               || yRelation == IntervalRelations.OVERLAPS;
+    }
+
+
+    private boolean getBeforeInReadingColumnWise(Zone z1, Zone z2, double tolerance) {
+
+        IntervalRelations xRelation = getIntervalRelationX(z1, z2, tolerance).get(0);
+        IntervalRelations yRelation = getIntervalRelationY(z1, z2, tolerance).get(0);
+
+        return getIntervalRelations(xRelation, yRelation);
+    }
+
+    private static boolean getIntervalRelations(IntervalRelations relation1, IntervalRelations relation2) {
+
+        return relation1 == IntervalRelations.PRECEDES //
+               || relation1 == IntervalRelations.MEETS //
+               || relation1 == IntervalRelations.OVERLAPS && //
+                  (relation2 == IntervalRelations.PRECEDES //
+                   || relation2 == IntervalRelations.MEETS //
+                   || relation2 == IntervalRelations.OVERLAPS) //
+               || ((relation2 == IntervalRelations.PRECEDES || relation2 == IntervalRelations.MEETS || relation2 == IntervalRelations.OVERLAPS) && //
+                   (relation1 == IntervalRelations.STARTS //
+                    || relation1 == IntervalRelations.FINISHES_INVERSE //
+                    || relation1 == IntervalRelations.EQUALS //
+                    || relation1 == IntervalRelations.DURING //
+                    || relation1 == IntervalRelations.DURING_INVERSE //
+                    || relation1 == IntervalRelations.FINISHES //
+                    || relation1 == IntervalRelations.STARTS_INVERSE //
+                    || relation1 == IntervalRelations.OVERLAPS_INVERSE));
+    }
+
+
+
+    private boolean getBeforeInReadingRowWise(Zone z1, Zone z2, double tolerance) {
+
+        IntervalRelations xRelations = getIntervalRelationX(z1, z2, tolerance).get(0);
+        IntervalRelations yRelations = getIntervalRelationY(z1, z2, tolerance).get(0);
+
+        return getIntervalRelations(yRelations, xRelations);
+    }
+
+
+    private static List<IntervalRelations> getIntervalRelationX(Zone z1, Zone z2, double t) {
+
+        return getIntervalRelation(new ImmutablePair<>(z1.getX(), z1.getX() + z1.getWidth()), new ImmutablePair<>(z2.getX(), z2.getX() + z2.getWidth()), t);
+    }
+
+
+    private static List<IntervalRelations> getIntervalRelationY(Zone z1, Zone z2, double t) {
+
+        return getIntervalRelation(new ImmutablePair<>(z1.getY(), z1.getY() + z1.getHeight()), new ImmutablePair<>(z2.getY(), z2.getY() + z2.getHeight()), t);
+
+    }
+
+
+    private static List<IntervalRelations> getIntervalRelation(Pair<Double, Double> a, Pair<Double, Double> b, double t) {
+
+        var intervalRelations = getIntervalRelation(a, b, t, false);
+        intervalRelations.addAll(getIntervalRelation(b, a, t, true));
+        if ((b.getLeft() - t <= a.getLeft() && a.getLeft() <= b.getLeft() + t) && (b.getRight() - t <= a.getRight() && a.getRight() <= b.getRight() + t)) {
+            intervalRelations.add(IntervalRelations.EQUALS);
+        }
+        return intervalRelations;
+
+
+    }
+
+
+    private static List<IntervalRelations> getIntervalRelation(Pair<Double, Double> a, Pair<Double, Double> b, double t, boolean inverse) {
+
+        List<IntervalRelations> intervalRelations = new ArrayList<>();
+        if (a.getRight() < b.getLeft() - t) {
+            intervalRelations.add(inverse ? IntervalRelations.PRECEDES_INVERSE : IntervalRelations.PRECEDES);
+        }  if (b.getLeft() - t <= a.getRight() && a.getRight() <= b.getLeft() + t) {
+            intervalRelations.add(inverse ? IntervalRelations.MEETS_INVERSE : IntervalRelations.MEETS);
+        }  if (a.getLeft() < b.getLeft() - t && (b.getLeft() + t < a.getRight() && a.getRight() < b.getRight() - t)) {
+            intervalRelations.add(inverse ? IntervalRelations.OVERLAPS_INVERSE : IntervalRelations.OVERLAPS);
+        }  if ((b.getLeft() - t <= a.getLeft() && a.getLeft() <= b.getLeft() + t) && a.getRight() < b.getRight() - t) {
+            intervalRelations.add(inverse ? IntervalRelations.STARTS_INVERSE : IntervalRelations.STARTS);
+        }  if (a.getLeft() > b.getLeft() + t && a.getRight() < b.getRight() + t) {
+            intervalRelations.add(inverse ? IntervalRelations.DURING_INVERSE : IntervalRelations.DURING);
+        }  if (a.getLeft() > b.getLeft() + t && (b.getRight() - t <= a.getRight() && a.getRight() <= b.getRight() + t)) {
+            intervalRelations.add(inverse ? IntervalRelations.FINISHES_INVERSE : IntervalRelations.FINISHES);
+        }
+        return intervalRelations;
+    }
+
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/readingorder/ZoneComparator.java

@@ -0,0 +1,8 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.readingorder;
+
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone;
+
+@FunctionalInterface
+public interface ZoneComparator {
+    boolean isBefore(Zone zone1, Zone zone2, double tolerance);
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/LineBuilderService.java

@@ -41,6 +41,7 @@ public class LineBuilderService {
         List<Line> lines = new ArrayList<>();
         sets.forEach(group -> {
             List<Character> lineCharacters = new ArrayList<>(group);
+//            QuickSort.sort(lineCharacters, new CharacterComparator());
             lineCharacters.sort(Comparator.comparingDouble(Character::getX));
             lines.add(new Line(lineCharacters, characterSpacing));
         });

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/ReadingOrderService.java

@@ -2,31 +2,64 @@ package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.s
 
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 
 import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.BoundingBox;
 import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.readingorder.SpatialReasoningRules;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.readingorder.UnsupervisedReadingOrderDetector;
 import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.utils.DoubleUtils;
 
 @Service
 public class ReadingOrderService {
 
-    private static final double THRESHOLD = 5;
+    private static final double THRESHOLD = 1;
 
 
-    public List<Zone> resolve(List<Zone> zones, boolean xyOrder) {
+    public List<Zone> resolveNew(List<Zone> zones, boolean columnWise) {
 
         if (zones.isEmpty() || zones.size() == 1) {
             return zones;
         }
 
-        if (xyOrder) {
-//            QuickSort.sort(zones, new ZoneComparator());
+        SpatialReasoningRules spatialReasoningRules = columnWise ? SpatialReasoningRules.COLUMN_WISE : SpatialReasoningRules.ROW_WISE;
+
+        var unsupervisedReadingOrderDetector = new UnsupervisedReadingOrderDetector(1, spatialReasoningRules, false);
+
+        return unsupervisedReadingOrderDetector.get(zones);
+    }
+
+
+    public List<Zone> resolve(List<Zone> zones, boolean columnWise) {
+
+        if (zones.isEmpty() || zones.size() == 1) {
+            return zones;
+        }
+
+        Map<Long, Integer> histogram = new HashMap<>();
+
+        for (Zone zone : zones) {
+            long minY = Math.round(zone.getBBox().getMinY());
+            long maxY = Math.round(zone.getBBox().getMaxY());
+            for (long i = minY; i <= maxY; i++) {
+                histogram.put(i, histogram.getOrDefault(i, 0) + 1);
+            }
+        }
+
+        columnWise = histogram.values()
+                             .stream()
+                             .mapToInt(Integer::intValue).average()
+                             .orElse(1) > 1.5;
+
+        if (!columnWise) {
             zones.sort(Comparator.comparing(BoundingBox::getY, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD))
-                    .thenComparing(BoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, 0)));
+                               .thenComparing(BoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD)));
             return zones;
         }
 
@@ -66,14 +99,48 @@ public class ReadingOrderService {
             }
         }
 
+        List<Zone> leftNotIntersecting = new ArrayList<>();
+        for (Zone leftZone : leftOf) {
+            boolean intersects = false;
+            for (Zone rightZone : rightOf) {
+                if (leftZone.intersectsY(rightZone)) {
+                    intersects = true;
+                    break;
+                }
+            }
+            if (!intersects) {
+                leftNotIntersecting.add(leftZone);
+            }
+        }
+
+        List<Zone> rightNotIntersecting = new ArrayList<>();
+        for (Zone rightZone : rightOf) {
+            boolean intersects = false;
+            for (Zone leftZone : leftOf) {
+                if (rightZone.intersectsY(leftZone)) {
+                    intersects = true;
+                    break;
+                }
+            }
+            if (!intersects) {
+                rightNotIntersecting.add(rightZone);
+            }
+        }
+
+        leftOf.removeAll(leftNotIntersecting);
+        rightOf.removeAll(rightNotIntersecting);
+
+        middle.addAll(leftNotIntersecting);
+        middle.addAll(rightNotIntersecting);
+
         leftOf.sort(Comparator.comparing(BoundingBox::getY, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD))
-                .thenComparing(BoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD)));
+                            .thenComparing(BoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD)));
 
         rightOf.sort(Comparator.comparing(BoundingBox::getY, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD))
-                .thenComparing(BoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD)));
+                             .thenComparing(BoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD)));
 
         middle.sort(Comparator.comparing(BoundingBox::getY, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD))
-                .thenComparing(BoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD)));
+                            .thenComparing(BoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD)));
 
         List<Zone> sortedZones = new ArrayList<>();
         sortedZones.addAll(leftOf);

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/service/ZoneBuilderService.java

@@ -3,6 +3,7 @@ package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.s
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Set;
 
 import org.springframework.stereotype.Service;
@@ -67,14 +68,43 @@ public class ZoneBuilderService {
             zones.add(new Zone(new ArrayList<>(group)));
         });
 
-        if (zones.size() > MAX_ZONES) {
+//        List<Zone> mergedZones = mergeZones(zones);
+
+        List<Zone> finalZones = zones;
+
+        if (finalZones.size() > MAX_ZONES) {
             List<Line> oneZoneLines = new ArrayList<>();
-            for (Zone zone : zones) {
+            for (Zone zone : finalZones) {
                 oneZoneLines.addAll(zone.getLines());
             }
             return List.of(mergeLinesInZone(oneZoneLines, characterSpacing, lineSpacing));
         }
 
+        return finalZones;
+    }
+
+
+    private List<Zone> mergeZones(List<Zone> zones) {
+
+        ListIterator<Zone> itty = zones.listIterator();
+
+        while (itty.hasNext()) {
+
+            Zone current = itty.next();
+
+            for (Zone inner : zones) {
+                if (inner == current) {
+                    continue;
+                }
+                if (current.getBBox().intersects(inner.getBBox())) {
+                    inner.getLines().addAll(current.getLines());
+                    inner.buildBBox();
+                    itty.remove();
+                    break;
+                }
+            }
+        }
+
         return zones;
     }
 
@@ -93,6 +123,16 @@ public class ZoneBuilderService {
     }
 
 
+    private List<Zone> mergeLinesInZones(List<Zone> zones, double characterSpacing, double lineSpacing) {
+
+        List<Zone> merged = new ArrayList<>();
+        for (Zone zone : zones) {
+            merged.add(mergeLinesInZone(zone.getLines(), characterSpacing, lineSpacing));
+        }
+        return merged;
+    }
+
+
     private Zone mergeLinesInZone(List<Line> lines, double characterSpacing, double lineSpacing) {
 
         double maxHorizontalDistance = 0;

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/utils/CharacterComparator.java

@@ -0,0 +1,40 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.utils;
+
+import java.util.Comparator;
+
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Character;
+
+public class CharacterComparator implements Comparator<Character> {
+
+    @Override
+    public int compare(Character pos1, Character pos2) {
+        // only compare text that is in the same direction
+        int cmp1 = Float.compare(pos1.getTextPosition().getDir(), pos2.getTextPosition().getDir());
+        if (cmp1 != 0) {
+            return cmp1;
+        }
+
+        // get the text direction adjusted coordinates
+        float x1 = pos1.getTextPosition().getXDirAdj();
+        float x2 = pos2.getTextPosition().getXDirAdj();
+
+        float pos1YBottom = pos1.getTextPosition().getYDirAdj();
+        float pos2YBottom = pos2.getTextPosition().getYDirAdj();
+
+        // note that the coordinates have been adjusted so 0,0 is in upper left
+        float pos1YTop = pos1YBottom - pos1.getTextPosition().getHeightDir();
+        float pos2YTop = pos2YBottom - pos2.getTextPosition().getHeightDir();
+
+        float yDifference = Math.abs(pos1YBottom - pos2YBottom);
+
+        // we will do a simple tolerance comparison
+        if (yDifference < .1 || pos2YBottom >= pos1YTop && pos2YBottom <= pos1YBottom || pos1YBottom >= pos2YTop && pos1YBottom <= pos2YBottom) {
+            return Float.compare(x1, x2);
+        } else if (pos1YBottom < pos2YBottom) {
+            return -1;
+        } else {
+            return 1;
+        }
+    }
+
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/utils/DoubleUtils.java

@@ -7,8 +7,11 @@ public class DoubleUtils {
         if (Double.isNaN(d1) || Double.isNaN(d2)) {
             return Double.compare(d1, d2);
         }
-        long i1 = Math.round(d1 / (precision == 0 ? 1 : precision));
-        long i2 = Math.round(d2 / (precision == 0 ? 1 : precision));
+        if (precision == 0) {
+            precision = 1;
+        }
+        long i1 = Math.round(d1 / precision);
+        long i2 = Math.round(d2 / precision);
         return Long.compare(i1, i2);
     }
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/docstrum/utils/ReadingOrderHelper.java

@@ -0,0 +1,39 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.utils;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
+
+public class ReadingOrderHelper {
+
+    public static List<TextPositionSequence> orderByReadingOrder(List<TextPositionSequence> words) {
+        if (words.size() <= 1) {
+            return words;
+        }
+
+        int textOrientation = words.get(0).getRotation();
+
+        switch (textOrientation) {
+            case 0:
+                return words.stream()
+                        .sorted(Comparator.comparingDouble(w -> w.getRectangle().getTopLeft().getX()))
+                        .collect(Collectors.toList());
+            case 90:
+                return words.stream()
+                        .sorted((w1, w2) -> -Double.compare(w1.getRectangle().getTopLeft().getY(), w2.getRectangle().getTopLeft().getY()))
+                        .collect(Collectors.toList());
+            case 180:
+                return words.stream()
+                        .sorted((w1, w2) -> -Double.compare(w1.getRectangle().getTopLeft().getX(), w2.getRectangle().getTopLeft().getX()))
+                        .collect(Collectors.toList());
+            case 270:
+                return words.stream()
+                        .sorted(Comparator.comparingDouble(w -> w.getRectangle().getTopLeft().getY()))
+                        .collect(Collectors.toList());
+            default:
+                throw new IllegalArgumentException("Not sure what to do with this text rotation...");
+        }
+    }
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/DocumentGraphFactory.java

@@ -7,23 +7,21 @@ import static java.util.stream.Collectors.toList;
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
-import java.util.stream.Collectors;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationDocument;
 import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationFooter;
 import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationHeader;
 import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage;
+import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.DuplicatedParagraph;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Footer;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.GenericSemanticNode;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Header;
@@ -33,8 +31,6 @@ import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Pa
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Paragraph;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Section;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock;
-import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage;
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
 import com.knecon.fforesight.service.layoutparser.processor.utils.IdBuilder;
 import com.knecon.fforesight.service.layoutparser.processor.utils.TextPositionOperations;
 
@@ -79,8 +75,6 @@ public class DocumentGraphFactory {
         GenericSemanticNode node;
         if (originalTextBlock.isHeadline()) {
             node = Headline.builder().documentTree(context.getDocumentTree()).build();
-        } else if (originalTextBlock.isToDuplicate()) {
-            node = DuplicatedParagraph.builder().documentTree(context.getDocumentTree()).build();
         } else {
             node = Paragraph.builder().documentTree(context.getDocumentTree()).build();
         }
@@ -91,14 +85,6 @@ public class DocumentGraphFactory {
         textBlocks.add(originalTextBlock);
         textBlocks.addAll(textBlocksToMerge);
         AtomicTextBlock textBlock = context.textBlockFactory.buildAtomicTextBlock(TextPositionOperations.mergeAndSortTextPositionSequenceByYThenX(textBlocks), node, context, page);
-
-        if (node instanceof DuplicatedParagraph duplicatedParagraph) {
-            AtomicTextBlock unsortedTextBlock = context.textBlockFactory.buildAtomicTextBlock(textBlocks.stream()
-                    .flatMap(tb -> tb.getSequences().stream())
-                    .collect(Collectors.toList()), node, context, page);
-            duplicatedParagraph.setUnsortedLeafTextBlock(unsortedTextBlock);
-        }
-
         List<Integer> treeId = context.documentTree.createNewChildEntryAndReturnId(parentNode, node);
         node.setLeafTextBlock(textBlock);
         node.setTreeId(treeId);
@@ -109,21 +95,18 @@ public class DocumentGraphFactory {
 
         Rectangle2D position = image.getPosition();
         Page page = context.getPage(image.getPage());
-        var imageBuilder = Image.builder()
+        Image imageNode = Image.builder()
                 .id(IdBuilder.buildId(Set.of(page), List.of(position)))
                 .imageType(image.getImageType())
                 .position(position)
                 .transparent(image.isHasTransparency())
                 .page(page)
-                .documentTree(context.getDocumentTree());
-        if (image.isSourceByAi()) {
-            imageBuilder.engines(new HashSet<>(Set.of(LayoutEngine.AI)));
-        }
-        Image imageNode = imageBuilder.build();
+                .documentTree(context.getDocumentTree())
+                .build();
         page.getMainBody().add(imageNode);
 
-        List<Integer> treeId = context.getDocumentTree().createNewChildEntryAndReturnId(section, imageNode);
-        imageNode.setTreeId(treeId);
+        List<Integer> tocId = context.getDocumentTree().createNewChildEntryAndReturnId(section, imageNode);
+        imageNode.setTreeId(tocId);
     }
 
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/SectionNodeFactory.java

@@ -11,12 +11,12 @@ import java.util.Map;
 import java.util.Set;
 
 import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.GenericSemanticNode;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Section;
 import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.TablePageBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.GenericSemanticNode;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Section;
 import com.knecon.fforesight.service.layoutparser.processor.utils.TableMergingUtility;
 
 import lombok.experimental.UtilityClass;
@@ -171,7 +171,6 @@ public class SectionNodeFactory {
                 .filter(abstractTextContainer -> abstractTextContainer.intersectsY(atc))
                 .map(abstractTextContainer -> (TextPageBlock) abstractTextContainer)
                 .filter(abstractTextContainer -> abstractTextContainer.getDir() == atc.getDir())
-                .filter(abstractTextContainer -> !abstractTextContainer.isToDuplicate())
                 .toList();
     }
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/DocumentDataMapper.java

@@ -2,7 +2,6 @@ package com.knecon.fforesight.service.layoutparser.processor.services.mapper;
 
 import java.awt.geom.Rectangle2D;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -13,10 +12,8 @@ import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.Do
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPositionData;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructure;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentTextData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.DuplicatedParagraph;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Image;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table;
@@ -76,24 +73,17 @@ public class DocumentDataMapper {
             case TABLE -> PropertiesMapper.buildTableProperties((Table) entry.getNode());
             case TABLE_CELL -> PropertiesMapper.buildTableCellProperties((TableCell) entry.getNode());
             case IMAGE -> PropertiesMapper.buildImageProperties((Image) entry.getNode());
-            case PARAGRAPH ->
-                    entry.getNode() instanceof DuplicatedParagraph duplicatedParagraph ? PropertiesMapper.buildDuplicateParagraphProperties(duplicatedParagraph) : new HashMap<>();
             default -> new HashMap<>();
         };
 
-        DocumentStructure.EntryData.EntryDataBuilder documentBuilder = DocumentStructure.EntryData.builder()
+        return DocumentStructure.EntryData.builder()
                 .treeId(toPrimitiveIntArray(entry.getTreeId()))
                 .children(entry.getChildren().stream().map(DocumentDataMapper::toEntryData).toList())
                 .type(entry.getType())
                 .atomicBlockIds(atomicTextBlocks)
                 .pageNumbers(entry.getNode().getPages().stream().map(Page::getNumber).map(Integer::longValue).toArray(Long[]::new))
-                .properties(properties);
-        if (entry.getNode() != null) {
-            documentBuilder.engines(entry.getNode().getEngines());
-        } else {
-            documentBuilder.engines(new HashSet<>(Set.of(LayoutEngine.ALGORITHM)));
-        }
-        return documentBuilder.build();
+                .properties(properties)
+                .build();
     }
 
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/DocumentGraphMapper.java

@@ -7,14 +7,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPage;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPositionData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructure;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentTextData;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentData;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructure;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPage;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.DuplicatedParagraph;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Footer;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Header;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Headline;
@@ -62,7 +61,7 @@ public class DocumentGraphMapper {
 
             SemanticNode node = switch (entryData.getType()) {
                 case SECTION -> buildSection(context);
-                case PARAGRAPH -> buildParagraph(context, entryData.getProperties());
+                case PARAGRAPH -> buildParagraph(context);
                 case HEADLINE -> buildHeadline(context);
                 case HEADER -> buildHeader(context);
                 case FOOTER -> buildFooter(context);
@@ -141,17 +140,7 @@ public class DocumentGraphMapper {
     }
 
 
-    private Paragraph buildParagraph(Context context, Map<String, String> properties) {
-
-        if (PropertiesMapper.isDuplicateParagraph(properties)) {
-
-            DuplicatedParagraph duplicatedParagraph = DuplicatedParagraph.builder().documentTree(context.documentTree).build();
-
-            Long[] unsortedTextblockIds = PropertiesMapper.getUnsortedTextblockIds(properties);
-            duplicatedParagraph.setUnsortedLeafTextBlock(toTextBlock(unsortedTextblockIds, context, duplicatedParagraph));
-            return duplicatedParagraph;
-
-        }
+    private Paragraph buildParagraph(Context context) {
 
         return Paragraph.builder().documentTree(context.documentTree).build();
     }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/PropertiesMapper.java

@@ -1,19 +1,17 @@
 package com.knecon.fforesight.service.layoutparser.processor.services.mapper;
 
 import java.awt.geom.Rectangle2D;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructure;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.DuplicatedParagraph;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Image;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.ImageType;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.TableCell;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
 
 public class PropertiesMapper {
 
@@ -78,32 +76,6 @@ public class PropertiesMapper {
     }
 
 
-    public static Map<String, String> buildDuplicateParagraphProperties(DuplicatedParagraph duplicatedParagraph) {
-
-        Map<String, String> properties = new HashMap<>();
-        properties.put(DocumentStructure.DuplicateParagraphProperties.UNSORTED_TEXTBLOCK_ID, Arrays.toString(toAtomicTextBlockIds(duplicatedParagraph.getUnsortedLeafTextBlock())));
-        return properties;
-    }
-
-
-    public static boolean isDuplicateParagraph(Map<String, String> properties) {
-
-        return properties.containsKey(DocumentStructure.DuplicateParagraphProperties.UNSORTED_TEXTBLOCK_ID);
-    }
-
-
-    public static Long[] getUnsortedTextblockIds(Map<String, String> properties) {
-
-        return toLongArray(properties.get(DocumentStructure.DuplicateParagraphProperties.UNSORTED_TEXTBLOCK_ID));
-    }
-
-
-    public static Long[] toLongArray(String ids) {
-
-        return Arrays.stream(ids.substring(1, ids.length() - 1).trim().split(",")).map(Long::valueOf).toArray(Long[]::new);
-    }
-
-
     private static ImageType parseImageType(String imageType) {
 
         return switch (imageType) {
@@ -129,10 +101,4 @@ public class PropertiesMapper {
                 rectangle2D.getHeight());
     }
 
-
-    private static Long[] toAtomicTextBlockIds(TextBlock textBlock) {
-
-        return textBlock.getAtomicTextBlocks().stream().map(AtomicTextBlock::getId).toArray(Long[]::new);
-    }
-
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/parsing/PDFLinesTextStripper.java

@@ -257,7 +257,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
 
             if (textPositions.get(i).getDir() != direction && startIndex != i) {
                 List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                textPositionSequences.add(new TextPositionSequence(sublist, pageNumber, i == textPositions.size() - 1 && isParagraphStart));
+                textPositionSequences.add(new TextPositionSequence(sublist, pageNumber, i == textPositions.size() - 1 && isParagraphStart, textPositionSequences.size()));
                 startIndex = i;
                 direction = textPositions.get(i).getDir();
             }
@@ -266,7 +266,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
             if (checkIfCurrentPositionIsToTheRightOfPreviousPosition(i, textPositions)) {
                 List<TextPosition> sublist = textPositions.subList(startIndex, i);
                 if (checkIfSequenceContainsOnlyWhitespaces(sublist)) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber, i == textPositions.size() - 1 && isParagraphStart));
+                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber, i == textPositions.size() - 1 && isParagraphStart, textPositionSequences.size()));
                 }
                 startIndex = i;
             }
@@ -274,7 +274,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
             if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
                 List<TextPosition> sublist = textPositions.subList(startIndex, i);
                 if (checkIfSequenceContainsOnlyWhitespaces(sublist)) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber, i == textPositions.size() - 1 && isParagraphStart));
+                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber, i == textPositions.size() - 1 && isParagraphStart, textPositionSequences.size()));
                 }
                 startIndex = i;
             }
@@ -288,10 +288,10 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                     // Remove false sequence ends (whitespaces)
                     if (checkIfGapSizeBetweenCharactersSmallerThanMaximum(previous, sublist, 0.01f)) {
                         for (TextPosition t : sublist) {
-                            textPositionSequences.get(textPositionSequences.size() - 1).add(t);
+                            textPositionSequences.get(textPositionSequences.size() - 1).add(t, textPositionSequences.size());
                         }
                     } else {
-                        textPositionSequences.add(new TextPositionSequence(sublist, pageNumber, i == textPositions.size() - 1 && isParagraphStart));
+                        textPositionSequences.add(new TextPositionSequence(sublist, pageNumber, i == textPositions.size() - 1 && isParagraphStart, textPositionSequences.size()));
                     }
                 }
                 startIndex = i + 1;
@@ -311,10 +311,10 @@ public class PDFLinesTextStripper extends PDFTextStripper {
             if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
                     .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
                 for (TextPosition t : sublist) {
-                    textPositionSequences.get(textPositionSequences.size() - 1).add(t);
+                    textPositionSequences.get(textPositionSequences.size() - 1).add(t, textPositionSequences.size());
                 }
             } else {
-                textPositionSequences.add(new TextPositionSequence(sublist, pageNumber, isParagraphStart));
+                textPositionSequences.add(new TextPositionSequence(sublist, pageNumber, isParagraphStart, textPositionSequences.size()));
             }
         }
         super.writeString(text);

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/visualization/LayoutGridService.java

@@ -17,10 +17,8 @@ import java.util.stream.Stream;
 
 import org.springframework.stereotype.Service;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.DuplicatedParagraph;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table;
@@ -54,8 +52,6 @@ public class LayoutGridService {
 
     static Color INNER_LINES_COLOR = new Color(255, 175, 175);
     static Color PARAGRAPH_COLOR = new Color(70, 130, 180);
-
-    static Color DUPLICATE_PARAGRAPH_COLOR = new Color(70, 180, 101);
     static Color TABLE_COLOR = new Color(102, 205, 170);
     static Color SECTION_COLOR = new Color(50, 50, 50);
     static Color HEADLINE_COLOR = new Color(162, 56, 56);
@@ -67,58 +63,43 @@ public class LayoutGridService {
     @Observed(name = "ViewerDocumentService", contextualName = "create-viewer-document")
     public void addLayoutGrid(File originFile, Document document, File destinationFile, boolean layerVisibilityDefaultValue) {
 
-        Visualizations layoutGrid = this.addLayoutGrid(document, layerVisibilityDefaultValue, false);
-        Visualizations visualLayoutGrid = this.addLayoutGrid(document, layerVisibilityDefaultValue, true);
+        LayoutGrid layoutGrid = createLayoutGrid(document);
 
-        viewerDocumentService.addVisualizationsOnPage(originFile, destinationFile, List.of(layoutGrid, visualLayoutGrid));
+        viewerDocumentService.addVisualizationsOnPage(originFile,
+                destinationFile,
+                Visualizations.builder()
+                        .layer(ContentStreams.KNECON_LAYOUT)
+                        .visualizationsOnPages(layoutGrid.getVisualizationsPerPages())
+                        .layerVisibilityDefaultValue(layerVisibilityDefaultValue)
+                        .build());
     }
 
 
-    @SneakyThrows
-    @Observed(name = "ViewerDocumentService", contextualName = "create-viewer-document")
-    public Visualizations addLayoutGrid(Document document, boolean layerVisibilityDefaultValue, boolean visualParsingGrid) {
-
-        LayoutGrid layoutGrid = createLayoutGrid(document, visualParsingGrid);
-
-        return Visualizations.builder()
-                .layer(visualParsingGrid ? ContentStreams.KNECON_VISUAL_PARSING : ContentStreams.KNECON_LAYOUT)
-                .visualizationsOnPages(layoutGrid.getVisualizationsPerPages())
-                .layerVisibilityDefaultValue(layerVisibilityDefaultValue)
-                .build();
-    }
-
-
-    private LayoutGrid createLayoutGrid(Document document, boolean visualParsingGrid) {
+    private LayoutGrid createLayoutGrid(Document document) {
 
         LayoutGrid layoutGrid = new LayoutGrid(document.getNumberOfPages());
-        document.streamAllSubNodes()
-                .filter(node -> (node.getEngines().contains(LayoutEngine.AI) && visualParsingGrid) || (node.getEngines().contains(LayoutEngine.ALGORITHM) && !visualParsingGrid))
-                .forEach(semanticNode -> {
-                    Color color = switch (semanticNode.getType()) {
-                        case PARAGRAPH -> PARAGRAPH_COLOR;
-                        case TABLE -> TABLE_COLOR;
-                        case SECTION -> SECTION_COLOR;
-                        case HEADLINE -> HEADLINE_COLOR;
-                        case HEADER, FOOTER -> HEADER_COLOR;
-                        case IMAGE -> IMAGE_COLOR;
-                        default -> null;
-                    };
+        document.streamAllSubNodes().forEach(semanticNode -> {
+            Color color = switch (semanticNode.getType()) {
+                case PARAGRAPH -> PARAGRAPH_COLOR;
+                case TABLE -> TABLE_COLOR;
+                case SECTION -> SECTION_COLOR;
+                case HEADLINE -> HEADLINE_COLOR;
+                case HEADER, FOOTER -> HEADER_COLOR;
+                case IMAGE -> IMAGE_COLOR;
+                default -> null;
+            };
+            if (isNotSectionOrTableCellOrDocument(semanticNode)) {
+                addAsRectangle(semanticNode, layoutGrid, color);
+            }
+            if (semanticNode.getType().equals(NodeType.SECTION)) {
+                addSection(semanticNode, layoutGrid, color);
+            }
+            if (semanticNode.getType().equals(NodeType.TABLE)) {
+                Table table = (Table) semanticNode;
+                addInnerTableLines(table, layoutGrid);
+            }
+        });
 
-                    if (semanticNode instanceof DuplicatedParagraph) {
-                        color = DUPLICATE_PARAGRAPH_COLOR;
-                    }
-
-                    if (isNotSectionOrTableCellOrDocument(semanticNode)) {
-                        addAsRectangle(semanticNode, layoutGrid, color);
-                    }
-                    if (semanticNode.getType().equals(NodeType.SECTION)) {
-                        addSection(semanticNode, layoutGrid, color);
-                    }
-                    if (semanticNode.getType().equals(NodeType.TABLE)) {
-                        Table table = (Table) semanticNode;
-                        addInnerTableLines(table, layoutGrid);
-                    }
-                });
         return layoutGrid;
     }
 
@@ -207,33 +188,14 @@ public class LayoutGridService {
     @SneakyThrows
     private void addPlacedText(Page page, Rectangle2D textBBox, String s, LayoutGrid layoutGrid) {
 
-        // translates text, such that its right edge is a bit to the left of the drawn box
-        float translationAmount = ((FONT.getStringWidth(s) / 1000) * FONT_SIZE + (2 * LINE_WIDTH) + 4);
-
-        Point2D upperLeftCorner;
-        Point2D translationVector;
-        switch (page.getRotation()) {
-            case 90 -> {
-                upperLeftCorner = new Point2D.Double(textBBox.getMinX(), textBBox.getMinY());
-                translationVector = new Point2D.Double(FONT_SIZE, -translationAmount);
-            }
-            case 180 -> {
-                upperLeftCorner = new Point2D.Double(textBBox.getMaxX(), textBBox.getMinY());
-                translationVector = new Point2D.Double(translationAmount, FONT_SIZE);
-            }
-            case 270 -> {
-                upperLeftCorner = new Point2D.Double(textBBox.getMaxX(), textBBox.getMaxY());
-                translationVector = new Point2D.Double(-FONT_SIZE, translationAmount);
-            }
-            default -> {
-                upperLeftCorner = new Point2D.Double(textBBox.getMinX(), textBBox.getMaxY());
-                translationVector = new Point2D.Double(-translationAmount, -FONT_SIZE);
-            }
-        }
-
-        upperLeftCorner = add(upperLeftCorner, translationVector);
-
+        Point2D.Float upperLeftCorner = switch (page.getRotation()) {
+            case 90 -> new Point2D.Float((float) (textBBox.getMinX()), (float) textBBox.getMinY());
+            case 180 -> new Point2D.Float((float) (textBBox.getMaxX()), (float) textBBox.getMinY());
+            case 270 -> new Point2D.Float((float) (textBBox.getMaxX()), (float) textBBox.getMaxY());
+            default -> new Point2D.Float((float) (textBBox.getMinX()), (float) textBBox.getMaxY());
+        };
         var placedTexts = layoutGrid.getVisualizationsPerPages().get(page.getNumber() - 1).getPlacedTexts();
+        upperLeftCorner.setLocation(upperLeftCorner.getX() - ((FONT.getStringWidth(s) / 1000) * FONT_SIZE + (2 * LINE_WIDTH) + 4), upperLeftCorner.getY() - FONT_SIZE);
         placedTexts.add(PlacedText.textFacingUp(s, upperLeftCorner, FONT_SIZE, Color.BLACK, FONT));
     }
 
@@ -355,10 +317,4 @@ public class LayoutGridService {
                         .add(new ColoredRectangle(textBBox, color, LINE_WIDTH)));
     }
 
-
-    private Point2D add(Point2D a, Point2D b) {
-
-        return new Point2D.Double(a.getX() + b.getX(), a.getY() + b.getY());
-    }
-
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/DrawingOptions.java

@@ -1,28 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.utils;
-
-import java.awt.Color;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@Builder
-@AllArgsConstructor
-@Getter
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class DrawingOptions {
-
-    boolean stroke;
-    @Builder.Default
-    Color strokeColor = Color.BLACK;
-    @Builder.Default
-    float strokeWidth = 1f;
-
-    boolean fill;
-    @Builder.Default
-    Color fillColor = Color.BLACK;
-
-}
-

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/GeometricComparators.java

@@ -1,88 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.utils;
-
-import java.awt.geom.Point2D;
-import java.util.Comparator;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.table.Cell;
-import com.knecon.fforesight.service.layoutparser.processor.model.table.Rectangle;
-import com.knecon.fforesight.service.layoutparser.processor.model.table.Ruling;
-
-public class GeometricComparators {
-
-    private static final int COMPARATOR_ROUNDING = 2;
-
-    public static final Comparator<Point2D> X_FIRST_POINT_COMPARATOR = (point1, point2) -> {
-
-        int rv = 0;
-        float point1X = DoubleComparisons.round(point1.getX(), COMPARATOR_ROUNDING);
-        float point1Y = DoubleComparisons.round(point1.getY(), COMPARATOR_ROUNDING);
-        float point2X = DoubleComparisons.round(point2.getX(), COMPARATOR_ROUNDING);
-        float point2Y = DoubleComparisons.round(point2.getY(), COMPARATOR_ROUNDING);
-
-        if (point1X > point2X) {
-            rv = 1;
-        } else if (point1X < point2X) {
-            rv = -1;
-        } else if (point1Y > point2Y) {
-            rv = 1;
-        } else if (point1Y < point2Y) {
-            rv = -1;
-        }
-        return rv;
-    };
-
-    public static final Comparator<Point2D> Y_FIRST_POINT_COMPARATOR = (point1, point2) -> {
-
-        int rv = 0;
-        float point1X = DoubleComparisons.round(point1.getX(), COMPARATOR_ROUNDING);
-        float point1Y = DoubleComparisons.round(point1.getY(), COMPARATOR_ROUNDING);
-        float point2X = DoubleComparisons.round(point2.getX(), COMPARATOR_ROUNDING);
-        float point2Y = DoubleComparisons.round(point2.getY(), COMPARATOR_ROUNDING);
-
-        if (point1Y > point2Y) {
-            rv = 1;
-        } else if (point1Y < point2Y) {
-            rv = -1;
-        } else if (point1X > point2X) {
-            rv = 1;
-        } else if (point1X < point2X) {
-            rv = -1;
-        }
-        return rv;
-    };
-
-    public static final Comparator<Cell> CELL_SIZE_COMPARATOR = (cell1, cell2) -> {
-
-        Double cell1Size = cell1.getHeight() * cell1.getWidth();
-        Double cell2Size = cell2.getHeight() * cell2.getWidth();
-        return cell1Size.compareTo(cell2Size);
-    };
-
-    public static final Comparator<Rectangle> RECTANGLE_SIZE_COMPARATOR = (rect1, rect2) -> {
-
-        Double rect1Size = rect1.getHeight() * rect1.getWidth();
-        Double rect2Size = rect2.getHeight() * rect2.getWidth();
-        return rect1Size.compareTo(rect2Size);
-    };
-
-    public static final Comparator<Ruling> X_FIRST_RULING_COMPARATOR = (ruling1, ruling2) -> {
-
-        int rv = 0;
-        float point1X = DoubleComparisons.round(Math.min(ruling1.getLeft(), ruling1.getRight()), COMPARATOR_ROUNDING);
-        float point1Y = DoubleComparisons.round(Math.min(ruling1.getTop(), ruling1.getBottom()), COMPARATOR_ROUNDING);
-        float point2X = DoubleComparisons.round(Math.min(ruling2.getLeft(), ruling2.getRight()), COMPARATOR_ROUNDING);
-        float point2Y = DoubleComparisons.round(Math.min(ruling2.getTop(), ruling2.getBottom()), COMPARATOR_ROUNDING);
-
-        if (point1X > point2X) {
-            rv = 1;
-        } else if (point1X < point2X) {
-            rv = -1;
-        } else if (point1Y > point2Y) {
-            rv = 1;
-        } else if (point1Y < point2Y) {
-            rv = -1;
-        }
-        return rv;
-    };
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/MarkedContentUtils.java

@@ -43,7 +43,7 @@ public class MarkedContentUtils {
 
         return markedContentByYPosition.values().stream()
                 .map(textPositions -> new TextPositionSequence(textPositions.stream()
-                        .toList(), 0, true)
+                        .toList(), 0, true, 0)
                         .getRectangle())
                 .map(t -> new Rectangle2D.Float(t.getTopLeft().getX(), t.getTopLeft().getY() - Math.abs(t.getHeight()), t.getWidth(), Math.abs(t.getHeight()))).collect(Collectors.toList());
     }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/PdfVisualisationUtility.java

@@ -21,7 +21,11 @@ import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Pa
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
 
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
 import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
@@ -37,20 +41,20 @@ public class PdfVisualisationUtility {
 
     public void drawNode(PDDocument document, DocumentTree.Entry entry) {
 
-        DrawingOptions options = buildStandardOptionsForNodes(entry);
+        Options options = buildStandardOptionsForNodes(entry);
 
         drawBBoxAndLabelAndNumberOnPage(document, entry, options);
 
     }
 
 
-    public void drawTextBlock(PDDocument document, TextBlock textBlock, DrawingOptions options) {
+    public void drawTextBlock(PDDocument document, TextBlock textBlock, Options options) {
 
         textBlock.getAtomicTextBlocks().forEach(atb -> drawAtomicTextBlock(document, atb, options));
     }
 
 
-    public void drawAtomicTextBlock(PDDocument document, AtomicTextBlock atomicTextBlock, DrawingOptions options) {
+    public void drawAtomicTextBlock(PDDocument document, AtomicTextBlock atomicTextBlock, Options options) {
 
         drawRectangle2DList(document, atomicTextBlock.getPage().getNumber(), atomicTextBlock.getPositions().stream().toList(), options);
 
@@ -58,7 +62,7 @@ public class PdfVisualisationUtility {
 
 
     @SneakyThrows
-    public void drawText(String string, PDDocument document, Point2D location, Integer pageNumber, DrawingOptions options) {
+    public void drawText(String string, PDDocument document, Point2D location, Integer pageNumber, Options options) {
 
         var pdPage = document.getPage(pageNumber - 1);
         var contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
@@ -76,14 +80,14 @@ public class PdfVisualisationUtility {
 
 
     @SneakyThrows
-    public void drawRectangle2DList(PDDocument document, int pageNumber, List<Rectangle2D> rectCollection, DrawingOptions options) {
+    public void drawRectangle2DList(PDDocument document, int pageNumber, List<Rectangle2D> rectCollection, Options options) {
 
         var pdPage = document.getPage(pageNumber - 1);
         drawRectangle2DList(document, rectCollection, options, pdPage);
     }
 
 
-    private void drawRectangle2DList(PDDocument document, List<Rectangle2D> rectCollection, DrawingOptions options, PDPage pdPage) throws IOException {
+    private void drawRectangle2DList(PDDocument document, List<Rectangle2D> rectCollection, Options options, PDPage pdPage) throws IOException {
 
         var contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
 
@@ -106,9 +110,9 @@ public class PdfVisualisationUtility {
     }
 
 
-    private DrawingOptions buildStandardOptionsForNodes(DocumentTree.Entry entry) {
+    private Options buildStandardOptionsForNodes(DocumentTree.Entry entry) {
 
-        return DrawingOptions.builder().stroke(true).strokeColor(switch (entry.getType()) {
+        return Options.builder().stroke(true).strokeColor(switch (entry.getType()) {
             case DOCUMENT -> Color.LIGHT_GRAY;
             case HEADER, FOOTER -> Color.GREEN;
             case PARAGRAPH -> Color.BLUE;
@@ -121,7 +125,7 @@ public class PdfVisualisationUtility {
     }
 
 
-    private void drawBBoxAndLabelAndNumberOnPage(PDDocument document, DocumentTree.Entry entry, DrawingOptions options) {
+    private void drawBBoxAndLabelAndNumberOnPage(PDDocument document, DocumentTree.Entry entry, Options options) {
 
         Map<Page, Rectangle2D> rectanglesPerPage = entry.getNode().getBBox();
         rectanglesPerPage.forEach((page, rectangle2D) -> {
@@ -148,7 +152,7 @@ public class PdfVisualisationUtility {
 
 
     @SneakyThrows
-    public static void drawLine2DList(PDDocument pdDocument, int pageNumber, List<? extends Line2D> line2DS, DrawingOptions options) {
+    public static void drawLine2DList(PDDocument pdDocument, int pageNumber, List<? extends Line2D> line2DS, Options options) {
 
         var pdPage = pdDocument.getPage(pageNumber - 1);
         var contentStream = new PDPageContentStream(pdDocument, pdPage, PDPageContentStream.AppendMode.APPEND, true);
@@ -172,4 +176,21 @@ public class PdfVisualisationUtility {
         contentStream.close();
     }
 
+
+    @Builder
+    @Getter
+    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+    public static class Options {
+
+        boolean fill;
+        boolean stroke;
+        @Builder.Default
+        Color strokeColor = Color.BLACK;
+        @Builder.Default
+        float strokeWidth = 1f;
+        @Builder.Default
+        Color fillColor = Color.BLACK;
+
+    }
+
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/RectangleTransformations.java

@@ -2,7 +2,6 @@ package com.knecon.fforesight.service.layoutparser.processor.utils;
 
 import static java.lang.String.format;
 
-import java.awt.geom.Area;
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RectangularShape;
 import java.util.Collections;
@@ -38,28 +37,15 @@ public class RectangleTransformations {
     }
 
 
-    public static double calculateIntersectedArea(Rectangle2D r1, Rectangle2D r2) {
-
-        Area a1 = new Area(r1);
-        Area a2 = new Area(r2);
-        a1.intersect(a2);
-        Rectangle2D intersection = a1.getBounds2D();
-        return intersection.getWidth() * intersection.getHeight();
-    }
-
-
     public static Rectangle2D bBoxUnionAtomicTextBlock(List<AtomicTextBlock> atomicTextBlocks) {
 
         return atomicTextBlocks.stream().flatMap(atomicTextBlock -> atomicTextBlock.getPositions().stream()).collect(new Rectangle2DBBoxCollector());
     }
-
-
     public static Collector<Rectangle2D, Rectangle2DBBoxCollector.BBox, Rectangle2D> collectBBox() {
 
         return new Rectangle2DBBoxCollector();
     }
 
-
     public static PDRectangle toPDRectangleBBox(List<Rectangle> rectangles) {
 
         Rectangle2D rectangle2D = RectangleTransformations.rectangleBBox(rectangles);
@@ -84,7 +70,6 @@ public class RectangleTransformations {
         return format("%f,%f,%f,%f", rectangle2D.getX(), rectangle2D.getY(), rectangle2D.getWidth(), rectangle2D.getHeight());
     }
 
-
     public static Rectangle2D rectangleBBox(List<Rectangle> rectangles) {
 
         return rectangles.stream().map(RectangleTransformations::toRectangle2D).collect(new Rectangle2DBBoxCollector());
@@ -99,7 +84,6 @@ public class RectangleTransformations {
                 -redactionLogRectangle.getHeight());
     }
 
-
     public static Rectangle2D toRectangle2D(PDRectangle rectangle) {
 
         return new Rectangle2D.Double(rectangle.getLowerLeftX(), rectangle.getLowerLeftY(), rectangle.getWidth(), rectangle.getHeight());

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/RectangularIntersectionFinder.java

@@ -1,77 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.utils;
-
-import static com.knecon.fforesight.service.layoutparser.processor.utils.GeometricComparators.Y_FIRST_POINT_COMPARATOR;
-
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.table.Ruling;
-
-public class RectangularIntersectionFinder {
-
-    public static List<Rectangle2D> find(List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {
-
-        // Fix for 211.pdf
-        for (Ruling r : horizontalRulingLines) {
-            if (r.getX2() < r.getX1()) {
-                double a = r.getX2();
-                r.x2 = (float) r.getX1();
-                r.x1 = (float) a;
-            }
-        }
-
-        List<Rectangle2D> foundRectangles = new ArrayList<>();
-        Map<Point2D, Ruling[]> intersectionPoints = Ruling.findIntersections(horizontalRulingLines, verticalRulingLines);
-        List<Point2D> intersectionPointsList = new ArrayList<>(intersectionPoints.keySet());
-        intersectionPointsList.sort(Y_FIRST_POINT_COMPARATOR);
-
-        for (int i = 0; i < intersectionPointsList.size(); i++) {
-            Point2D topLeft = intersectionPointsList.get(i);
-            Ruling[] hv = intersectionPoints.get(topLeft);
-
-            // CrossingPointsDirectlyBelow( topLeft );
-            List<Point2D> xPoints = new ArrayList<>();
-            // CrossingPointsDirectlyToTheRight( topLeft );
-            List<Point2D> yPoints = new ArrayList<>();
-
-            for (Point2D p : intersectionPointsList.subList(i, intersectionPointsList.size())) {
-                if (p.getX() == topLeft.getX() && p.getY() > topLeft.getY()) {
-                    xPoints.add(p);
-                }
-                if (p.getY() == topLeft.getY() && p.getX() > topLeft.getX()) {
-                    yPoints.add(p);
-                }
-            }
-            outer:
-            for (Point2D xPoint : xPoints) {
-                // is there a vertical edge b/w topLeft and xPoint?
-                if (!hv[1].equals(intersectionPoints.get(xPoint)[1])) {
-                    continue;
-                }
-                for (Point2D yPoint : yPoints) {
-                    // is there a horizontal edge b/w topLeft and yPoint ?
-                    if (!hv[0].equals(intersectionPoints.get(yPoint)[0])) {
-                        continue;
-                    }
-                    Point2D btmRight = new Point2D.Float((float) yPoint.getX(), (float) xPoint.getY());
-                    if (intersectionPoints.containsKey(btmRight)
-                        && intersectionPoints.get(btmRight)[0].equals(intersectionPoints.get(xPoint)[0])
-                        && intersectionPoints.get(btmRight)[1].equals(intersectionPoints.get(yPoint)[1])) {
-                        foundRectangles.add(new Rectangle2D.Double(topLeft.getX(), topLeft.getY(), btmRight.getX() - topLeft.getX(), btmRight.getY() - topLeft.getY()));
-                        break outer;
-                    }
-                }
-            }
-        }
-
-        // TODO create cells for vertical ruling lines with aligned endpoints at the top/bottom of a grid
-        // that aren't connected with an horizontal ruler?
-        // see: https://github.com/jazzido/tabula-extractor/issues/78#issuecomment-41481207
-
-        return foundRectangles;
-    }
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/SpreadsheetFinder.java

@@ -1,172 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.utils;
-
-import static com.knecon.fforesight.service.layoutparser.processor.utils.GeometricComparators.X_FIRST_POINT_COMPARATOR;
-import static com.knecon.fforesight.service.layoutparser.processor.utils.GeometricComparators.Y_FIRST_POINT_COMPARATOR;
-
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.table.Rectangle;
-
-public class SpreadsheetFinder {
-
-    private static final int MAX_OUTER_POINT_TOLERANCE = 10;
-    private static final float AREA_TOLERANCE = 0.001f;
-
-
-    public static List<Rectangle> findSpreadsheetsFromCells(List<? extends Rectangle> cells) {
-        // via: http://stackoverflow.com/questions/13746284/merging-multiple-adjacent-rectangles-into-one-polygon
-        List<Rectangle> rectangles = new ArrayList<>();
-        Set<Point2D> pointSet = new HashSet<>();
-        Map<Point2D, Point2D> edgesH = new HashMap<>();
-        Map<Point2D, Point2D> edgesV = new HashMap<>();
-
-        for (Rectangle cell : cells) {
-            for (Point2D pt : cell.getPoints()) {
-                if (pointSet.contains(pt)) { // shared vertex, remove it
-                    pointSet.remove(pt);
-                } else {
-                    pointSet.add(pt);
-                }
-            }
-        }
-
-        // X first sort
-        List<Point2D> pointsSortX = new ArrayList<>(pointSet);
-        pointsSortX.sort(X_FIRST_POINT_COMPARATOR);
-        // Y first sort
-        List<Point2D> pointsSortY = new ArrayList<>(pointSet);
-        pointsSortY.sort(Y_FIRST_POINT_COMPARATOR);
-
-        int i = 0;
-        while (i < pointSet.size()) {
-            float currY = (float) pointsSortY.get(i).getY();
-            while (i < pointSet.size() && DoubleComparisons.feq(pointsSortY.get(i).getY(), currY)) {
-                edgesH.put(pointsSortY.get(i), pointsSortY.get(i + 1));
-                edgesH.put(pointsSortY.get(i + 1), pointsSortY.get(i));
-                i += 2;
-            }
-        }
-
-        i = 0;
-        while (i < pointSet.size()) {
-            float currX = (float) pointsSortX.get(i).getX();
-            while (i < pointSet.size() && DoubleComparisons.feq(pointsSortX.get(i).getX(), currX)) {
-                edgesV.put(pointsSortX.get(i), pointsSortX.get(i + 1));
-                edgesV.put(pointsSortX.get(i + 1), pointsSortX.get(i));
-                i += 2;
-            }
-        }
-
-        // Get all the polygons
-        List<List<PolygonVertex>> polygons = new ArrayList<>();
-        Point2D nextVertex;
-        while (!edgesH.isEmpty()) {
-            ArrayList<PolygonVertex> polygon = new ArrayList<>();
-            Point2D first = edgesH.keySet()
-                    .iterator().next();
-            polygon.add(new PolygonVertex(first, Direction.HORIZONTAL));
-            edgesH.remove(first);
-
-            while (true) {
-                PolygonVertex curr = polygon.get(polygon.size() - 1);
-                PolygonVertex lastAddedVertex;
-                if (curr.direction == Direction.HORIZONTAL) {
-                    nextVertex = edgesV.get(curr.point);
-                    edgesV.remove(curr.point);
-                    lastAddedVertex = new PolygonVertex(nextVertex, Direction.VERTICAL);
-                } else {
-                    nextVertex = edgesH.get(curr.point);
-                    edgesH.remove(curr.point);
-                    lastAddedVertex = new PolygonVertex(nextVertex, Direction.HORIZONTAL);
-                }
-                polygon.add(lastAddedVertex);
-
-                if (lastAddedVertex.equals(polygon.get(0))) {
-                    // closed polygon
-                    polygon.remove(polygon.size() - 1);
-                    break;
-                }
-            }
-
-            for (PolygonVertex vertex : polygon) {
-                edgesH.remove(vertex.point);
-                edgesV.remove(vertex.point);
-            }
-            polygons.add(polygon);
-        }
-
-        // calculate grid-aligned minimum area rectangles for each found polygon
-        for (List<PolygonVertex> poly : polygons) {
-            float top = Float.MAX_VALUE;
-            float left = Float.MAX_VALUE;
-            float bottom = Float.MIN_VALUE;
-            float right = Float.MIN_VALUE;
-            for (PolygonVertex pt : poly) {
-                top = (float) Math.min(top, pt.point.getY());
-                left = (float) Math.min(left, pt.point.getX());
-                bottom = (float) Math.max(bottom, pt.point.getY());
-                right = (float) Math.max(right, pt.point.getX());
-            }
-
-            // do not add polygons with too many outer points as they are unlikely to be tables
-            if (poly.size() <= MAX_OUTER_POINT_TOLERANCE) {
-                rectangles.add(new Rectangle(top - AREA_TOLERANCE, left - AREA_TOLERANCE, right - left + 2 * AREA_TOLERANCE, bottom - top + 2 * AREA_TOLERANCE));
-            }
-        }
-        return rectangles;
-    }
-
-
-    private enum Direction {
-        HORIZONTAL,
-        VERTICAL
-    }
-
-    static class PolygonVertex {
-
-        Point2D point;
-        Direction direction;
-
-
-        PolygonVertex(Point2D point, Direction direction) {
-
-            this.direction = direction;
-            this.point = point;
-        }
-
-
-        @Override
-        public boolean equals(Object other) {
-
-            if (this == other) {
-                return true;
-            }
-            if (!(other instanceof PolygonVertex)) {
-                return false;
-            }
-            return this.point.equals(((PolygonVertex) other).point);
-        }
-
-
-        @Override
-        public int hashCode() {
-
-            return this.point.hashCode();
-        }
-
-
-        @Override
-        public String toString() {
-
-            return String.format("%s[point=%s,direction=%s]", this.getClass().getName(), this.point.toString(), this.direction.toString());
-        }
-
-    }
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/TextPositionOperations.java

@@ -3,6 +3,7 @@ package com.knecon.fforesight.service.layoutparser.processor.utils;
 import java.util.List;
 import java.util.stream.Collectors;
 
+
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/UnionFind.java

@@ -1,44 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-// simple implementation of a disjoint-set data structure
-// https://en.wikipedia.org/wiki/Disjoint-set_data_structure
-public class UnionFind<T> {
-
-    Map<T, T> parents = new HashMap<>();
-    Map<T, Integer> numberOfObjects = new HashMap<>();
-
-
-    public T find(T node) {
-
-        if (!parents.containsKey(node)) {
-            parents.put(node, node);
-            numberOfObjects.put(node, 1);
-        }
-        if (!node.equals(parents.get(node))) {
-            parents.put(node, find(parents.get(node)));
-        }
-        return parents.get(node);
-    }
-
-
-    public void union(T node1, T node2) {
-
-        T root1 = find(node1);
-        T root2 = find(node2);
-
-        if (!root1.equals(root2)) {
-            if (numberOfObjects.getOrDefault(root1, 1) < numberOfObjects.getOrDefault(root2, 1)) {
-                parents.put(root1, root2);
-                numberOfObjects.put(root2, numberOfObjects.get(root2) + numberOfObjects.get(root1));
-            } else {
-                parents.put(root2, root1);
-                numberOfObjects.put(root1, numberOfObjects.get(root1) + numberOfObjects.get(root2));
-            }
-        }
-    }
-
-}
-

layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/BdrJsonBuildTest.java

@@ -30,7 +30,6 @@ import com.knecon.fforesight.service.layoutparser.processor.python_api.model.tab
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.VisualLayoutParsingResponse;
 import com.knecon.fforesight.service.layoutparser.processor.services.factory.DocumentGraphFactory;
 import com.knecon.fforesight.service.layoutparser.processor.services.mapper.TaasDocumentDataMapper;
-import com.knecon.fforesight.service.layoutparser.processor.utils.DrawingOptions;
 import com.knecon.fforesight.service.layoutparser.server.utils.AbstractTest;
 import com.knecon.fforesight.service.layoutparser.server.utils.visualizations.PdfDraw;
 
@@ -114,7 +113,7 @@ public class BdrJsonBuildTest extends AbstractTest {
 
         try (PDDocument pdDocument = Loader.loadPDF(file); var outputStream = new FileOutputStream(resultingFileName)) {
             PdfDraw.drawDocumentGraph(pdDocument, document);
-            PdfDraw.drawTextBlock(pdDocument, textBlock, DrawingOptions.builder().stroke(true).strokeWidth(0.1f).strokeColor(Color.YELLOW).build());
+            PdfDraw.drawTextBlock(pdDocument, textBlock, PdfDraw.Options.builder().stroke(true).strokeWidth(0.1f).strokeColor(Color.YELLOW).build());
             pdDocument.save(outputStream);
         }
     }

layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentGraphVisualizationTest.java

@@ -13,7 +13,6 @@ import org.springframework.core.io.ClassPathResource;
 
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
-import com.knecon.fforesight.service.layoutparser.processor.utils.DrawingOptions;
 import com.knecon.fforesight.service.layoutparser.server.utils.BuildDocumentTest;
 import com.knecon.fforesight.service.layoutparser.server.utils.visualizations.PdfDraw;
 
@@ -71,7 +70,7 @@ public class DocumentGraphVisualizationTest extends BuildDocumentTest {
         try (PDDocument pdDocument = Loader.loadPDF(fileResource.getFile())) {
             log.info("drawing document");
             PdfDraw.drawDocumentGraph(pdDocument, documentGraph);
-            PdfDraw.drawTextBlock(pdDocument, textBlock, DrawingOptions.builder().stroke(true).strokeWidth(0.1f).strokeColor(Color.YELLOW).build());
+            PdfDraw.drawTextBlock(pdDocument, textBlock, PdfDraw.Options.builder().stroke(true).strokeWidth(0.1f).strokeColor(Color.YELLOW).build());
             log.info("saving document");
             pdDocument.save(tmpFile);
             log.info("saved document");

layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/ViewerDocumentTest.java

@@ -26,14 +26,14 @@ public class ViewerDocumentTest extends BuildDocumentTest {
     @SneakyThrows
     public void testViewerDocument() {
 
-        String fileName = "files/new/270 rotated text on non rotated pages.pdf";
+        String fileName = "files/Plenarprotokoll 1 (keine Druchsache!) (1).pdf";
         String tmpFileName = "/tmp/" + Path.of(fileName).getFileName() + "_VIEWER.pdf";
 
         var documentFile = new ClassPathResource(fileName).getFile();
         ViewerDocumentService viewerDocumentService = new ViewerDocumentService(null);
         LayoutGridService layoutGridService = new LayoutGridService(viewerDocumentService);
 
-        Document document = buildGraph(fileName, LayoutParsingType.DOCSTRUM_XY);
+        Document document = buildGraph(fileName, LayoutParsingType.DOCSTRUM);
         long start = System.currentTimeMillis();
         layoutGridService.addLayoutGrid(documentFile, document, new File(tmpFileName), true);
         System.out.printf("Total time: %.2fs%n", ((float) (System.currentTimeMillis() - start)) / 1000);

layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/segmentation/PdfSegmentationServiceTest.java

@@ -683,7 +683,7 @@ public class PdfSegmentationServiceTest extends AbstractTest {
         validateTableSize(document, 4);
 
         validateTable(document, 0, 3, 3, 0, 0);
-        validateTable(document, 1, 3, 6, 2, 0);
+        validateTable(document, 1, 3, 5, 2, 0);
         validateTable(document, 2, 3, 3, 1, 0);
         validateTable(document, 3, 3, 3, 0, 0);
 
@@ -744,12 +744,13 @@ public class PdfSegmentationServiceTest extends AbstractTest {
 
         ClassificationDocument document = buildClassificationDocument(pdfFileResource.getFile());
 
-        validateTableSize(document, 5);
+        validateTableSize(document, 6);
         validateTable(document, 0, 1, 1, 0, 0);
         validateTable(document, 1, 1, 1, 0, 0);
         validateTable(document, 2, 1, 1, 0, 0);
         validateTable(document, 3, 1, 1, 0, 0);
         validateTable(document, 4, 1, 1, 0, 0);
+        validateTable(document, 5, 1, 1, 0, 0);
 
     }
 

layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/services/RulingCleaningServiceTest.java

@@ -1,17 +1,13 @@
 package com.knecon.fforesight.service.layoutparser.server.services;
 
-import java.awt.Color;
-import java.awt.geom.Rectangle2D;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;
 
@@ -31,8 +27,6 @@ import com.knecon.fforesight.service.layoutparser.processor.services.RulingClean
 import com.knecon.fforesight.service.layoutparser.processor.services.factory.DocumentGraphFactory;
 import com.knecon.fforesight.service.layoutparser.processor.services.mapper.DocumentDataMapper;
 import com.knecon.fforesight.service.layoutparser.processor.services.mapper.PropertiesMapper;
-import com.knecon.fforesight.service.layoutparser.processor.utils.DrawingOptions;
-import com.knecon.fforesight.service.layoutparser.processor.utils.RectangularIntersectionFinder;
 import com.knecon.fforesight.service.layoutparser.server.utils.BuildDocumentTest;
 import com.knecon.fforesight.service.layoutparser.server.utils.visualizations.PdfDraw;
 
@@ -41,40 +35,19 @@ import lombok.SneakyThrows;
 public class RulingCleaningServiceTest extends BuildDocumentTest {
 
     @Test
-    @Disabled
-    @SneakyThrows
-    public void textRectanglesFromRulingsExtraction() {
-
-        String fileName = "files/SinglePages/T5 VV-640252-Page16.pdf";
-        String lineFileName = "/tmp/" + Path.of(fileName).getFileName().toString() + "_CELLS.pdf";
-        List<PageContents> pageContents = PageContentExtractor.getSortedPageContents(fileName);
-        RulingCleaningService rulingCleaningService = new RulingCleaningService();
-        List<List<Rectangle2D>> rectanglesPerPage = new LinkedList<>();
-        for (PageContents pageContent : pageContents) {
-            CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(Collections.emptyList(), pageContent.getRulings());
-            List<Rectangle2D> rects = RectangularIntersectionFinder.find(cleanRulings.getHorizontal(), cleanRulings.getVertical());
-            rectanglesPerPage.add(rects);
-        }
-
-        PdfDraw.drawRectanglesPerPage(fileName, rectanglesPerPage, lineFileName, DrawingOptions.builder().stroke(true).strokeColor(Color.RED).build());
-    }
-
-
-    @Test
-    @Disabled
+//    @Disabled
     @SneakyThrows
     public void textRulingExtraction() {
 
-        String fileName = "files/SinglePages/19 Chlorothalonil RAR 08 Volume 3CA B 6b metabolites Oct 2017_Page35.pdf";
+        String fileName = "files/211.pdf";
         String lineFileName = "/tmp/" + Path.of(fileName).getFileName().toString() + "_LINES.pdf";
         List<PageContents> pageContents = PageContentExtractor.getSortedPageContents(fileName);
         RulingCleaningService rulingCleaningService = new RulingCleaningService();
+        PdfDraw.drawLinesPerPage(fileName, pageContents.stream().map(PageContents::getRulings).toList(), lineFileName);
         List<CleanRulings> cleanRulingsPerPage = new LinkedList<>();
         for (PageContents pageContent : pageContents) {
             cleanRulingsPerPage.add(rulingCleaningService.getCleanRulings(Collections.emptyList(), pageContent.getRulings()));
         }
-        var cleanRulings = cleanRulingsPerPage.stream().map(CleanRulings::getVertical).collect(Collectors.toList());
-        PdfDraw.drawLinesPerPage(fileName,  cleanRulings, lineFileName);
 
     }
 

layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/BuildDocumentTest.java

@@ -26,12 +26,7 @@ public abstract class BuildDocumentTest extends AbstractTest {
 
         File fileResource = new ClassPathResource(filename).getFile();
         prepareStorage(filename);
-        return layoutParsingPipeline.parseLayout(layoutParsingType,
-                fileResource,
-                layoutParsingStorageService.getImagesFile(IMAGE_FILE_ID),
-                new TableServiceResponse(),
-                new VisualLayoutParsingResponse(),
-                filename);
+        return layoutParsingPipeline.parseLayout(layoutParsingType, fileResource, layoutParsingStorageService.getImagesFile(IMAGE_FILE_ID), new TableServiceResponse(), new VisualLayoutParsingResponse(),filename);
     }
 
 

layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/visualizations/PdfDraw.java

@@ -24,31 +24,20 @@ import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Pa
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.Ruling;
-import com.knecon.fforesight.service.layoutparser.processor.utils.DrawingOptions;
 import com.knecon.fforesight.service.layoutparser.processor.utils.PdfVisualisationUtility;
 import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
 
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
 import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
 import lombok.experimental.UtilityClass;
 
 @UtilityClass
 public class PdfDraw {
 
-    public static void drawRectanglesPerPage(String filename, List<List<Rectangle2D>> rectanglesPerPage, String tmpFileName, DrawingOptions options) throws IOException {
-
-        ClassPathResource pdfResource = new ClassPathResource(filename);
-        try (PDDocument pdDocument = Loader.loadPDF(pdfResource.getFile()); var out = new FileOutputStream(tmpFileName)) {
-            for (int pageNumber = 1; pageNumber < pdDocument.getNumberOfPages() + 1; pageNumber++) {
-                PdfVisualisationUtility.drawRectangle2DList(pdDocument,
-                        pageNumber,
-                        rectanglesPerPage.get(pageNumber - 1),
-                        options);
-            }
-            pdDocument.save(out);
-        }
-
-    }
-
     public static void drawRectanglesPerPage(String filename, List<List<Rectangle2D>> rectanglesPerPage, String tmpFileName) throws IOException {
 
         ClassPathResource pdfResource = new ClassPathResource(filename);
@@ -57,7 +46,7 @@ public class PdfDraw {
                 PdfVisualisationUtility.drawRectangle2DList(pdDocument,
                         pageNumber,
                         rectanglesPerPage.get(pageNumber - 1),
-                        DrawingOptions.builder().stroke(true).build());
+                        PdfVisualisationUtility.Options.builder().stroke(true).build());
             }
             pdDocument.save(out);
         }
@@ -73,13 +62,13 @@ public class PdfDraw {
                 var rectanglesOnPage = rectanglesPerPage.get(pageNumber - 1);
                 for (int lineNumber = 0; lineNumber < rectanglesOnPage.size(); lineNumber++) {
                     var rectanglesInLine = rectanglesOnPage.get(lineNumber);
-                    PdfVisualisationUtility.drawRectangle2DList(pdDocument, pageNumber, rectanglesInLine, DrawingOptions.builder().stroke(true).build());
+                    PdfVisualisationUtility.drawRectangle2DList(pdDocument, pageNumber, rectanglesInLine, PdfVisualisationUtility.Options.builder().stroke(true).build());
                     double y = Math.min(rectanglesInLine.get(0).getMinY(), rectanglesInLine.get(0).getMaxY());
                     PdfVisualisationUtility.drawText(String.format("%d", lineNumber),
                             pdDocument,
                             new Point2D.Double(rectanglesInLine.get(0).getX() - (5 + (5 * countNumberOfDigits(lineNumber))), y + 2),
                             pageNumber,
-                            DrawingOptions.builder().stroke(true).build());
+                            PdfVisualisationUtility.Options.builder().stroke(true).build());
                 }
             }
             pdDocument.save(out);
@@ -110,20 +99,20 @@ public class PdfDraw {
 
     public static void drawNode(PDDocument document, DocumentTree.Entry entry) {
 
-        DrawingOptions options = buildStandardOptionsForNodes(entry);
+        Options options = buildStandardOptionsForNodes(entry);
 
         drawBBoxAndLabelAndNumberOnPage(document, entry, options);
 
     }
 
 
-    public static void drawTextBlock(PDDocument document, TextBlock textBlock, DrawingOptions options) {
+    public static void drawTextBlock(PDDocument document, TextBlock textBlock, Options options) {
 
         textBlock.getAtomicTextBlocks().forEach(atb -> drawAtomicTextBlock(document, atb, options));
     }
 
 
-    public static void drawAtomicTextBlock(PDDocument document, AtomicTextBlock atomicTextBlock, DrawingOptions options) {
+    public static void drawAtomicTextBlock(PDDocument document, AtomicTextBlock atomicTextBlock, Options options) {
 
         drawRectangle2DList(document, atomicTextBlock.getPage().getNumber(), atomicTextBlock.getPositions().stream().toList(), options);
 
@@ -131,7 +120,7 @@ public class PdfDraw {
 
 
     @SneakyThrows
-    private static void drawText(String string, PDDocument document, Point2D location, Integer pageNumber, DrawingOptions options, boolean rotate) {
+    private static void drawText(String string, PDDocument document, Point2D location, Integer pageNumber, Options options, boolean rotate) {
 
         var pdPage = document.getPage(pageNumber - 1);
         var contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
@@ -153,14 +142,14 @@ public class PdfDraw {
 
 
     @SneakyThrows
-    public static void drawRectangle2DList(PDDocument document, int pageNumber, List<Rectangle2D> rectCollection, DrawingOptions options) {
+    public static void drawRectangle2DList(PDDocument document, int pageNumber, List<Rectangle2D> rectCollection, Options options) {
 
         var pdPage = document.getPage(pageNumber - 1);
         drawRectangle2DList(document, rectCollection, options, pdPage);
     }
 
 
-    private static void drawRectangle2DList(PDDocument document, List<Rectangle2D> rectCollection, DrawingOptions options, PDPage pdPage) throws IOException {
+    private static void drawRectangle2DList(PDDocument document, List<Rectangle2D> rectCollection, Options options, PDPage pdPage) throws IOException {
 
         var contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
 
@@ -192,12 +181,12 @@ public class PdfDraw {
 //                PdfVisualisationUtility.drawLine2DList(pdDocument,
 //                        pageNumber,
 //                        list.get(pageNumber - 1),
-//                        PdfVisualisationUtility.DrawingOptions.builder().stroke(true).build());
+//                        PdfVisualisationUtility.Options.builder().stroke(true).build());
                 PdfVisualisationUtility.drawRectangle2DList(pdDocument,
                         pageNumber,
                         rectanglesPerPage.get(pageNumber - 1),
-                        DrawingOptions.builder().stroke(true).build());
-                PdfVisualisationUtility.drawRectangle2DList(pdDocument, pageNumber, list.get(pageNumber - 1), DrawingOptions.builder().stroke(true).build());
+                        PdfVisualisationUtility.Options.builder().stroke(true).build());
+                PdfVisualisationUtility.drawRectangle2DList(pdDocument, pageNumber, list.get(pageNumber - 1), PdfVisualisationUtility.Options.builder().stroke(true).build());
             }
             pdDocument.save(out);
         }
@@ -213,18 +202,35 @@ public class PdfDraw {
                 PdfVisualisationUtility.drawLine2DList(pdDocument,
                         pageNumber,
                         linesPerPage.get(pageNumber - 1),
-                        DrawingOptions.builder().strokeColor(Color.RED).stroke(true).build());
+                        PdfVisualisationUtility.Options.builder().strokeColor(Color.RED).stroke(true).build());
             }
             pdDocument.save(out);
         }
     }
 
 
+    @Builder
+    @AllArgsConstructor
+    @Getter
+    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+    public static class Options {
+
+        boolean stroke;
+        @Builder.Default
+        Color strokeColor = Color.BLACK;
+        @Builder.Default
+        float strokeWidth = 1f;
+
+        boolean fill;
+        @Builder.Default
+        Color fillColor = Color.BLACK;
+
+    }
 
 
-    private static DrawingOptions buildStandardOptionsForNodes(DocumentTree.Entry entry) {
+    private static Options buildStandardOptionsForNodes(DocumentTree.Entry entry) {
 
-        return DrawingOptions.builder().stroke(true).strokeColor(switch (entry.getType()) {
+        return Options.builder().stroke(true).strokeColor(switch (entry.getType()) {
             case DOCUMENT -> Color.LIGHT_GRAY;
             case HEADER, FOOTER -> Color.GREEN;
             case PARAGRAPH -> Color.BLUE;
@@ -237,7 +243,7 @@ public class PdfDraw {
     }
 
 
-    private static void drawBBoxAndLabelAndNumberOnPage(PDDocument document, DocumentTree.Entry entry, DrawingOptions options) {
+    private static void drawBBoxAndLabelAndNumberOnPage(PDDocument document, DocumentTree.Entry entry, Options options) {
 
         Map<Page, Rectangle2D> rectanglesPerPage = entry.getNode().getBBox();
         for (Page page : rectanglesPerPage.keySet()) {

layoutparser-service/viewer-doc-processor/src/main/java/com/knecon/fforesight/service/viewerdoc/ContentStreams.java

@@ -12,8 +12,6 @@ public class ContentStreams {
 
     public static Identifier KNECON_LAYOUT = new Identifier("Layout grid", COSName.getPDFName("KNECON_LAYOUT"), true);
 
-    public static Identifier KNECON_VISUAL_PARSING = new Identifier("Layout grid - visual", COSName.getPDFName("KNECON_VISUAL_PARSING"), true);
-
     public static Identifier KNECON_OCR = new Identifier("OCR", COSName.getPDFName("KNECON_OCR"), false);
 
     public static Identifier KNECON_OCR_TEXT_DEBUG = new Identifier("OCR Text", COSName.getPDFName("KNECON_OCR_TEXT_DEBUG"), true);
@@ -26,14 +24,7 @@ public class ContentStreams {
 
     public static Identifier ESCAPE_END = new Identifier("escape start", COSName.getPDFName("ESCAPE_END"), false);
 
-    public static List<Identifier> allContentStreams = List.of(KNECON_LAYOUT,
-                                                               KNECON_VISUAL_PARSING,
-                                                               KNECON_OCR,
-                                                               KNECON_OCR_BBOX_DEBUG,
-                                                               KNECON_OCR_TEXT_DEBUG,
-                                                               OTHER,
-                                                               ESCAPE_START,
-                                                               ESCAPE_END);
+    public static List<Identifier> allContentStreams = List.of(KNECON_LAYOUT, KNECON_OCR, KNECON_OCR_BBOX_DEBUG, KNECON_OCR_TEXT_DEBUG, OTHER, ESCAPE_START, ESCAPE_END);
 
     public record Identifier(String name, COSName cosName, boolean optionalContent) {