RED-8666

More
2024-03-04 15:18:13 +01:00 · 2024-02-16 14:51:26 +01:00 · 2024-02-16 14:50:31 +01:00 · 2024-02-16 14:08:59 +01:00 · 2024-02-16 13:48:03 +01:00 · 2024-02-16 11:15:44 +01:00
103 changed files with 2034 additions and 2342 deletions
@@ -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
@@ -1,6 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
-
-public enum LayoutEngine {
-    ALGORITHM,
-    AI
-}
@@ -18,15 +18,11 @@ public record LayoutParsingRequest(

        @Schema(description = "Path to the original PDF file.")//
        @NonNull String originFileStorageId,//
-
-
        @Schema(description = "Optional Path to the table extraction file.")//
        Optional<String> tablesFileStorageId,//
        @Schema(description = "Optional Path to the image classification file.")//
        Optional<String> imagesFileStorageId,//

-        @Schema(description = "Optional Path to the the visual layout parsing service file") Optional<String> visualLayoutParsingFileId,//
-
        @Schema(description = "Path where the Document Structure File will be stored.")//
        @NonNull String structureFileStorageId,//
        @Schema(description = "Path where the Research Data File will be stored.")//
@@ -1,10 +1,7 @@
 package com.knecon.fforesight.service.layoutparser.internal.api.queue;

 public enum LayoutParsingType {
-    REDACT_MANAGER_OLD,
+    REDACT_MANAGER,
    TAAS,
-    DOCUMINE,
-
-    DOCSTRUM,
-    REDACT_MANAGER
+    DOCUMINE
 }
@@ -10,6 +10,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;

 import org.apache.pdfbox.Loader;
@@ -26,31 +27,29 @@ 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;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.adapter.CvTableParsingAdapter;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.adapter.ImageServiceResponseAdapter;
-import com.knecon.fforesight.service.layoutparser.processor.python_api.adapter.VisualLayoutParsingAdapter;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableCells;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse;
-import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.VisualLayoutParsingResponse;
 import com.knecon.fforesight.service.layoutparser.processor.services.BodyTextFrameService;
 import com.knecon.fforesight.service.layoutparser.processor.services.RulingCleaningService;
 import com.knecon.fforesight.service.layoutparser.processor.services.SectionsBuilderService;
 import com.knecon.fforesight.service.layoutparser.processor.services.SimplifiedSectionTextService;
 import com.knecon.fforesight.service.layoutparser.processor.services.TableExtractionService;
-import com.knecon.fforesight.service.layoutparser.processor.services.blockification.DocstrumBlockificationService;
 import com.knecon.fforesight.service.layoutparser.processor.services.blockification.DocuMineBlockificationService;
 import com.knecon.fforesight.service.layoutparser.processor.services.blockification.RedactManagerBlockificationService;
 import com.knecon.fforesight.service.layoutparser.processor.services.blockification.TaasBlockificationService;
 import com.knecon.fforesight.service.layoutparser.processor.services.classification.DocuMineClassificationService;
 import com.knecon.fforesight.service.layoutparser.processor.services.classification.RedactManagerClassificationService;
 import com.knecon.fforesight.service.layoutparser.processor.services.classification.TaasClassificationService;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.DocstrumSegmentationService;
 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.TaasDocumentDataMapper;
@@ -88,10 +87,9 @@ public class LayoutParsingPipeline {
    TaasBlockificationService taasBlockificationService;
    DocuMineBlockificationService docuMineBlockificationService;
    RedactManagerBlockificationService redactManagerBlockificationService;
-    DocstrumBlockificationService docstrumBlockificationService;
    LayoutGridService layoutGridService;
    ObservationRegistry observationRegistry;
-    VisualLayoutParsingAdapter visualLayoutParsingAdapter;
+    DocstrumSegmentationService docstrumSegmentationService;


    public LayoutParsingFinishedEvent parseLayoutAndSaveFilesToStorage(LayoutParsingRequest layoutParsingRequest) throws IOException {
@@ -102,11 +100,6 @@ public class LayoutParsingPipeline {
        File originFile = layoutParsingStorageService.getOriginFile(layoutParsingRequest.originFileStorageId());
        File viewerDocumentFile = layoutParsingStorageService.getViewerDocFile(layoutParsingRequest.viewerDocumentStorageId()).orElse(originFile);

-        VisualLayoutParsingResponse visualLayoutParsingResponse = new VisualLayoutParsingResponse();
-        if (layoutParsingRequest.visualLayoutParsingFileId().isPresent()) {
-            visualLayoutParsingResponse = layoutParsingStorageService.getVisualLayoutParsingFile(layoutParsingRequest.visualLayoutParsingFileId().get());
-        }
-
        ImageServiceResponse imageServiceResponse = new ImageServiceResponse();
        if (layoutParsingRequest.imagesFileStorageId().isPresent()) {
            imageServiceResponse = layoutParsingStorageService.getImagesFile(layoutParsingRequest.imagesFileStorageId().get());
@@ -121,7 +114,6 @@ public class LayoutParsingPipeline {
                originFile,
                imageServiceResponse,
                tableServiceResponse,
-                visualLayoutParsingResponse,
                layoutParsingRequest.identifier().toString());

        log.info("Building document graph for {}", layoutParsingRequest.identifier());
@@ -182,9 +174,9 @@ public class LayoutParsingPipeline {

        AtomicReference<Document> documentReference = new AtomicReference<>();

-        Observation.createNotStarted("LayoutParsingPipeline", observationRegistry)
-                .contextualName("build-document-graph")
-                .observe(() -> documentReference.set(DocumentGraphFactory.buildDocumentGraph(classificationDocument)));
+        Observation.createNotStarted("LayoutParsingPipeline", observationRegistry).contextualName("build-document-graph").observe(() -> {
+            documentReference.set(DocumentGraphFactory.buildDocumentGraph(classificationDocument));
+        });

        return documentReference.get();
    }
@@ -210,14 +202,13 @@ public class LayoutParsingPipeline {
                                              File originFile,
                                              ImageServiceResponse imageServiceResponse,
                                              TableServiceResponse tableServiceResponse,
-                                              VisualLayoutParsingResponse visualLayoutParsingResponse,
                                              String identifier) {

        PDDocument originDocument = openDocument(originFile);
        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);
+
        ClassificationDocument classificationDocument = new ClassificationDocument();
        List<ClassificationPage> classificationPages = new ArrayList<>();

@@ -256,16 +247,37 @@ 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());
+            // Docstrum
+            AtomicInteger num = new AtomicInteger(pageNumber);
+            var zones = docstrumSegmentationService.segmentPage(stripper.getTextPositionSequences());
+
+            List<AbstractPageBlock> pageBlocks = new ArrayList<>();
+            AtomicInteger numOnPage = new AtomicInteger(1);
+//            List<TextPositionSequence> textPositionSequences = new ArrayList<>();
+            zones.forEach(zone -> {
+
+                List<TextPositionSequence> textPositionSequences = new ArrayList<>();
+                zone.getLines().forEach(line -> {
+                    line.getWords().forEach(word -> {
+                        textPositionSequences.add(new TextPositionSequence(word.getTextPositions(), num.get()));
+                    });
+                });
+
+                var cps = redactManagerBlockificationService.blockify(textPositionSequences, cleanRulings.getHorizontal(), cleanRulings.getVertical());
+
+                cps.getTextBlocks().forEach(cp -> {
+                    pageBlocks.add(redactManagerBlockificationService.buildTextBlock(((TextPageBlock) cp).getSequences(), numOnPage.getAndIncrement()));
+                });
+            });
+
+//            ClassificationPage classificationPage = switch (layoutParsingType) {
+//                case REDACT_MANAGER -> redactManagerBlockificationService.blockify(textPositionSequences, cleanRulings.getHorizontal(), cleanRulings.getVertical());
+//                case TAAS -> taasBlockificationService.blockify(textPositionSequences, cleanRulings.getHorizontal(), cleanRulings.getVertical());
+//                case DOCUMINE -> docuMineBlockificationService.blockify(textPositionSequences, cleanRulings.getHorizontal(), cleanRulings.getVertical());
+//            };
+
+            ClassificationPage classificationPage = new ClassificationPage(pageBlocks);

-            ClassificationPage classificationPage = switch (layoutParsingType) {
-                case REDACT_MANAGER_OLD ->
-                        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 REDACT_MANAGER -> docstrumBlockificationService.blockify(stripper.getTextPositionSequences(), emptyTableCells, true);
-            };
            classificationPage.setCleanRulings(cleanRulings);
            classificationPage.setRotation(rotation);
            classificationPage.setLandscape(isLandscape);
@@ -282,19 +294,7 @@ public class LayoutParsingPipeline {
                imageServiceResponseAdapter.findOcr(classificationPage);
            }

-            if (signatures.containsKey(pageNumber)) {
-                if (classificationPage.getImages() == null || classificationPage.getImages().size() == 0) {
-                    classificationPage.setImages(signatures.get(pageNumber));
-                } else {
-                    classificationPage.getImages().addAll(signatures.get(pageNumber));
-                }
-            }
-
-            tableExtractionService.extractTables(emptyTableCells, classificationPage);
-
-            if (layoutParsingType == LayoutParsingType.DOCSTRUM || layoutParsingType == LayoutParsingType.REDACT_MANAGER) {
-                docstrumBlockificationService.combineBlocks(classificationPage);
-            }
+            tableExtractionService.extractTables(cleanRulings, classificationPage);

            buildPageStatistics(classificationPage);
            increaseDocumentStatistics(classificationPage, classificationDocument);
@@ -310,28 +310,22 @@ public class LayoutParsingPipeline {
        switch (layoutParsingType) {
            case TAAS -> taasClassificationService.classifyDocument(classificationDocument);
            case DOCUMINE -> docuMineClassificationService.classifyDocument(classificationDocument);
-            case REDACT_MANAGER_OLD -> redactManagerClassificationService.classifyDocument(classificationDocument);
            case REDACT_MANAGER -> redactManagerClassificationService.classifyDocument(classificationDocument);
-            case DOCSTRUM -> redactManagerClassificationService.classifyDocument(classificationDocument);
        }

-        log.info("Building Sections for {}", identifier);
+        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);

-//        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);
-//        }
+        log.info("Building Sections for {}", identifier);
+//        sectionsBuilderService.buildSections(classificationDocument);
+//        sectionsBuilderService.addImagesToSections(classificationDocument);
        return classificationDocument;
    }

@@ -365,7 +359,9 @@ public class LayoutParsingPipeline {

    private void increaseDocumentStatistics(ClassificationPage classificationPage, ClassificationDocument document) {

-        document.getFontSizeCounter().addAll(classificationPage.getFontSizeCounter().getCountPerValue());
+        if (!classificationPage.isLandscape()) {
+            document.getFontSizeCounter().addAll(classificationPage.getFontSizeCounter().getCountPerValue());
+        }
        document.getFontCounter().addAll(classificationPage.getFontCounter().getCountPerValue());
        document.getTextHeightCounter().addAll(classificationPage.getTextHeightCounter().getCountPerValue());
        document.getFontStyleCounter().addAll(classificationPage.getFontStyleCounter().getCountPerValue());
@@ -10,6 +10,8 @@ import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.util.Optional;

+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.stereotype.Service;

 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -20,7 +22,6 @@ import com.knecon.fforesight.service.layoutparser.internal.api.data.taas.Researc
 import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingRequest;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse;
-import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.VisualLayoutParsingResponse;
 import com.knecon.fforesight.tenantcommons.TenantContext;

 import io.micrometer.observation.annotation.Observed;
@@ -78,14 +79,6 @@ public class LayoutParsingStorageService {
        }
    }

-    public VisualLayoutParsingResponse getVisualLayoutParsingFile(String storageId) throws IOException {
-
-        try (InputStream inputStream = getObject(storageId)) {
-            VisualLayoutParsingResponse visualLayoutParsingResponse = objectMapper.readValue(inputStream, VisualLayoutParsingResponse.class);
-            return visualLayoutParsingResponse;
-        }
-    }
-

    @Observed(name = "LayoutParsingStorageService", contextualName = "store-document-data")
    public void storeDocumentData(LayoutParsingRequest layoutParsingRequest, DocumentData documentData) {
@@ -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;
@@ -96,7 +94,7 @@ public abstract class AbstractPageBlock extends Rectangle {

        return this.minX - threshold <= apb.getMaxX() && this.maxX + threshold >= apb.getMinX();
    }
-    
+

    public abstract boolean isEmpty();

@@ -12,15 +12,16 @@ import com.knecon.fforesight.service.layoutparser.processor.model.table.CleanRul
 import com.knecon.fforesight.service.layoutparser.processor.model.text.StringFrequencyCounter;

 import lombok.Data;
+import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
-import org.apache.pdfbox.pdmodel.documentinterchange.markedcontent.PDMarkedContent;

@Data
@RequiredArgsConstructor
 public class ClassificationPage {

    @NonNull
+    @Getter
    private List<AbstractPageBlock> textBlocks;

    private List<ClassifiedImage> images = new ArrayList<>();
@@ -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);
    }


@@ -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();
-    }
-
-}
@@ -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;

@@ -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;

@@ -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;

@@ -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());
    }


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

@@ -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;

@@ -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;
    }
@@ -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() {
@@ -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;
    }
-
 }
@@ -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();
    }

 }
@@ -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;
@@ -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);
@@ -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)) {
@@ -1,18 +1,18 @@
 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.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.stream.Collectors;

 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,8 +21,7 @@ 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 TreeMap<CellPosition, Cell> cells = new TreeMap<>();

    private final int rotation;
    @Getter
@@ -31,14 +30,10 @@ public class TablePageBlock extends AbstractPageBlock {
    private int unrotatedRowCount;
    private int unrotatedColCount;
    private List<List<Cell>> rows;
-    @Getter
-    @Setter
-    private List<Cell> cells;


    public TablePageBlock(List<Cell> cells, Rectangle area, int rotation) {

-        this.cells = cells;
        addCells(cells);
        minX = area.getLeft();
        minY = area.getBottom();
@@ -55,7 +50,6 @@ public class TablePageBlock extends AbstractPageBlock {
        return getColCount() == 0 || getRowCount() == 0;
    }

-
    public List<List<Cell>> getRows() {

        if (rows == null) {
@@ -86,17 +80,14 @@ public class TablePageBlock extends AbstractPageBlock {

    public int getColCount() {

-        return getRows().stream()
-                .mapToInt(List::size)
-                .max()
-                .orElse(0);
+        return getRows().stream().mapToInt(List::size).max().orElse(0);

    }


    /**
     * 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 +95,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);
@@ -129,8 +120,7 @@ public class TablePageBlock extends AbstractPageBlock {
                List<Cell> cellsToTheTop = new ArrayList<>();
                for (int i = 0; i < rowIndex; i++) {
                    try {
-                        cellsToTheTop.add(rows.get(i)
-                                                  .get(colIndex));
+                        cellsToTheTop.add(rows.get(i).get(colIndex));
                    } catch (IndexOutOfBoundsException e) {
                        log.debug("No cell {} in row {}, ignoring.", colIndex, rowIndex);
                    }
@@ -145,8 +135,7 @@ public class TablePageBlock extends AbstractPageBlock {
                if (lastHeaderCell != null) {
                    cell.getHeaderCells().add(lastHeaderCell);
                }
-                if (!cell.getTextBlocks().isEmpty() && cell.getTextBlocks()
-                        .get(0).getMostPopularWordStyle().equals("bold")) {
+                if (!cell.getTextBlocks().isEmpty() && cell.getTextBlocks().get(0).getMostPopularWordStyle().equals("bold")) {
                    cell.setHeaderCell(true);
                }
            }
@@ -162,7 +151,7 @@ public class TablePageBlock extends AbstractPageBlock {
            for (int i = 0; i < unrotatedColCount; i++) { // rows
                List<Cell> lastRow = new ArrayList<>();
                for (int j = unrotatedRowCount - 1; j >= 0; j--) { // cols
-                    Cell cell = cellTreeMap.get(new CellPosition(j, i));
+                    Cell cell = cells.get(new CellPosition(j, i));
                    if (cell != null) {
                        lastRow.add(cell);
                    }
@@ -173,7 +162,7 @@ public class TablePageBlock extends AbstractPageBlock {
            for (int i = unrotatedColCount - 1; i >= 0; i--) { // rows
                List<Cell> lastRow = new ArrayList<>();
                for (int j = 0; j < unrotatedRowCount; j++) { // cols
-                    Cell cell = cellTreeMap.get(new CellPosition(j, i));
+                    Cell cell = cells.get(new CellPosition(j, i));
                    if (cell != null) {
                        lastRow.add(cell);
                    }
@@ -184,7 +173,7 @@ public class TablePageBlock extends AbstractPageBlock {
            for (int i = 0; i < unrotatedRowCount; i++) {
                List<Cell> lastRow = new ArrayList<>();
                for (int j = 0; j < unrotatedColCount; j++) {
-                    Cell cell = cellTreeMap.get(new CellPosition(i, j)); // JAVA_8 use getOrDefault()
+                    Cell cell = cells.get(new CellPosition(i, j)); // JAVA_8 use getOrDefault()
                    if (cell != null) {
                        lastRow.add(cell);
                    }
@@ -198,6 +187,17 @@ public class TablePageBlock extends AbstractPageBlock {
    }


+    private void add(Cell chunk, int row, int col) {
+
+        unrotatedRowCount = Math.max(unrotatedRowCount, row + 1);
+        unrotatedColCount = Math.max(unrotatedColCount, col + 1);
+
+        CellPosition cp = new CellPosition(row, col);
+        cells.put(cp, chunk);
+
+    }
+
+
    private void addCells(List<Cell> cells) {

        if (cells.isEmpty()) {
@@ -206,12 +206,11 @@ public class TablePageBlock extends AbstractPageBlock {

        cells.removeIf(cell -> cell.getWidth() < 1.1 || cell.getHeight() < 1.1);

-        List<List<Cell>> rowsOfCellsMatrix = calculateTableStructure(cells);
+        List<List<Cell>> rowsOfCells = calculateStructure(cells);

-        for (int i = 0; i < rowsOfCellsMatrix.size(); i++) {
-            for (int j = 0; j < rowsOfCellsMatrix.get(i).size(); j++) {
-                addCellToRowAndCol(rowsOfCellsMatrix.get(i)
-                                           .get(j), i, j);
+        for (int i = 0; i < rowsOfCells.size(); i++) {
+            for (int j = 0; j < rowsOfCells.get(i).size(); j++) {
+                add(rowsOfCells.get(i).get(j), i, j);
            }
        }

@@ -222,36 +221,29 @@ public class TablePageBlock extends AbstractPageBlock {
     * Calculates the structure of the table. For spanning rows and columns multiple cells with the same values will be inserted.
     *
     * @param cells The found cells
-     * @return TablePageBlock Structure as a rows of cells matrix
+     * @return TablePageBlock Structure
     */
-    private List<List<Cell>> calculateTableStructure(List<Cell> cells) {
+    private List<List<Cell>> calculateStructure(List<Cell> cells) {
+
+        List<List<Cell>> matrix = new ArrayList<>();

        if (cells.isEmpty()) {
-            return new ArrayList<>();
+            return matrix;
        }

        Set<Float> uniqueX = new HashSet<>();
        Set<Float> uniqueY = new HashSet<>();
-        cells.stream()
-                .filter(c -> !c.getTextBlocks().isEmpty() || c.getHeight() > 3 && c.getWidth() > 3)
-                .forEach(c -> {
-                    uniqueX.add(c.getLeft());
-                    uniqueX.add(c.getRight());
-                    uniqueY.add(c.getBottom());
-                    uniqueY.add(c.getTop());
-                });
+        cells.stream().filter(c -> !c.getTextBlocks().isEmpty() || c.getHeight() > 3 && c.getWidth() > 3).forEach(c -> {
+            uniqueX.add(c.getLeft());
+            uniqueX.add(c.getRight());
+            uniqueY.add(c.getBottom());
+            uniqueY.add(c.getTop());
+        });

-        var sortedUniqueX = uniqueX.stream()
-                .sorted()
-                .toList();
-        var sortedUniqueY = uniqueY.stream()
-                .sorted()
-                .toList();
-
-        List<List<Cell>> rowsOfCells = new ArrayList<>();
+        var sortedUniqueX = uniqueX.stream().sorted().toList();
+        var sortedUniqueY = uniqueY.stream().sorted().toList();

        Float prevY = null;
-
        for (Float y : sortedUniqueY) {

            List<Cell> row = new ArrayList<>();
@@ -260,88 +252,45 @@ 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()) {
+                    var intersectionCell = cells.stream().filter(c -> intersects(cell, c)).findFirst();

-                        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()));
-
-                        row.add(cellFromGridStructure);
+                    intersectionCell.ifPresent(value -> cell.getTextBlocks().addAll(value.getTextBlocks()));
+                    if (cell.hasMinimumSize()) {
+                        row.add(cell);
                    }
                }
                prevX = x;
            }

-            // exclude empty rows and rows where all text blocks are empty
-            if (prevY != null && prevX != null && !row.isEmpty() && !row.stream()
-                    .allMatch(cell -> cell.getTextBlocks().isEmpty())) {
-
-                rowsOfCells.add(row);
+            if (prevY != null && prevX != null && !row.isEmpty()) {
+                matrix.add(row);
            }
            prevY = y;
        }

-        Collections.reverse(rowsOfCells);
+        Collections.reverse(matrix);

-        // now cells are removed which are part of a column without any text blocks
-        // this is done by first computing the inverse matrix which contains call columns of cells
-        // then the column indices that have to be removed are determined
-        List<List<Cell>> columnsOfCells = new ArrayList<>();
-        int maxRowLength = rowsOfCells.stream()
-                .map(List::size)
-                .max(java.util.Comparator.naturalOrder())
-                .orElse(0);
-        for (int i = 0; i < maxRowLength; i++) {
-            columnsOfCells.add(new ArrayList<>());
-        }
-
-        for (List<Cell> row : rowsOfCells) {
-            for (int j = 0; j < row.size(); j++) {
-                columnsOfCells.get(j).add(row.get(j));
-            }
-        }
-
-        List<Integer> columnIndicesToRemove = new ArrayList<>();
-        int columnIndex = 0;
-        for (List<Cell> col : columnsOfCells) {
-            if (col.stream()
-                    .allMatch(cell -> cell.getTextBlocks().isEmpty())) {
-                columnIndicesToRemove.add(columnIndex);
-            }
-            columnIndex++;
-        }
-        columnIndicesToRemove.sort(Collections.reverseOrder());
-
-        // update all rows so that the values of the empty columns get removed
-        var rowsOfCellsBefore = new ArrayList<>(rowsOfCells);
-        rowsOfCells = new ArrayList<>();
-        for (List<Cell> row : rowsOfCellsBefore) {
-            var updatedRow = new ArrayList<>(row);
-            columnIndicesToRemove.forEach(idxToRemove -> updatedRow.remove(updatedRow.get(idxToRemove)));
-            rowsOfCells.add(updatedRow);
-        }
-
-        return rowsOfCells;
+        return matrix;
    }


-    private void addCellToRowAndCol(Cell cell, int row, int col) {
-
-        unrotatedRowCount = Math.max(unrotatedRowCount, row + 1);
-        unrotatedColCount = Math.max(unrotatedColCount, col + 1);
-
-        CellPosition cp = new CellPosition(row, col);
-        cellTreeMap.put(cp, cell);

+    public boolean intersects(Cell cell1, Cell cell2) {
+        if (cell1.getHeight() <= 0 || cell2.getHeight() <= 0) {
+            return false;
+        }
+        double x0 = cell1.getX() + 2;
+        double y0 = cell1.getY() + 2;
+        return (cell2.x + cell2.width > x0 &&
+                cell2.y + cell2.height > y0 &&
+                cell2.x < x0 + cell1.getWidth() -2 &&
+                cell2.y < y0 + cell1.getHeight() -2);
    }


+
    @Override
    public String getText() {

@@ -365,7 +314,7 @@ public class TablePageBlock extends AbstractPageBlock {
                            if (!first) {
                                sb.append("\n");
                            }
-                            sb.append('\"').append(textBlock.getText().replaceAll("\"", "\"")).append('\"');
+                            sb.append('\"').append(textBlock.getText().replaceAll("\"", "\\\"")).append('\"');
                            first = false;
                        }
                    }
@@ -379,6 +328,8 @@ public class TablePageBlock extends AbstractPageBlock {
    }


+
+
    public String getTextAsHtml() {

        StringBuilder sb = new StringBuilder();
@@ -412,9 +363,4 @@ public class TablePageBlock extends AbstractPageBlock {
        return sb.toString();
    }

-
-    record CellWithIntersection(Cell originalCell, double intersectedArea) {
-
-    }
-
 }
@@ -45,6 +45,9 @@ public class RedTextPosition {
    @JsonIgnore
    private String fontName;

+    @JsonIgnore
+    private RedTextPosition parent;
+

    @SneakyThrows
    public static RedTextPosition fromTextPosition(TextPosition textPosition) {
@@ -17,6 +17,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import lombok.NoArgsConstructor;

@EqualsAndHashCode(callSuper = true)
@@ -27,6 +28,7 @@ import lombok.NoArgsConstructor;
 public class TextPageBlock extends AbstractPageBlock {

    @Builder.Default
+    @Getter
    private List<TextPositionSequence> sequences = new ArrayList<>();

    @JsonIgnore
@@ -53,9 +55,6 @@ public class TextPageBlock extends AbstractPageBlock {
    @JsonIgnore
    private PageBlockType classification;

-    @JsonIgnore
-    private boolean toDuplicate;
-

    @JsonIgnore
    public TextDirection getDir() {
@@ -365,22 +364,7 @@ public class TextPageBlock extends AbstractPageBlock {
        }

        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString());
-    }

-
-    public int getNumberOfLines() {
-
-        int numberOfLines = 1;
-        TextPositionSequence previous = null;
-        for (TextPositionSequence word : sequences) {
-            if (previous != null) {
-                if (word.getMaxYDirAdj() - previous.getMaxYDirAdj() > word.getTextHeight()) {
-                    numberOfLines++;
-                }
-            }
-            previous = word;
-        }
-        return numberOfLines;
    }


@@ -63,6 +63,7 @@ public class TextPositionSequence implements CharSequence {
        this.rotation = textPositions.get(0).getRotation();
        this.pageHeight = textPositions.get(0).getPageHeight();
        this.pageWidth = textPositions.get(0).getPageWidth();
+        this.isParagraphStart = false;
    }


@@ -1,92 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.python_api.adapter;
-
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.ImageType;
-import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage;
-import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.VisualLayoutParsingBox;
-import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.VisualLayoutParsingResponse;
-import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.VisualLayoutParsingResult;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class VisualLayoutParsingAdapter {
-
-    private static String SIGNATURES = "signature";
-
-
-    public Map<Integer, List<VisualLayoutParsingResult>> buildExtractedTablesPerPage(VisualLayoutParsingResponse visualLayoutParsingResponse) {
-
-        Map<Integer, List<VisualLayoutParsingResult>> tableCells = new HashMap<>();
-        visualLayoutParsingResponse.getData()
-                .forEach(tableData -> tableCells.computeIfAbsent(tableData.getPage_idx(), tableCell -> new ArrayList<>()).addAll(convertTableCells(tableData.getBoxes())));
-
-        return tableCells;
-
-    }
-
-
-    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;
-
-    }
-
-
-    public List<VisualLayoutParsingResult> convertTableCells(List<VisualLayoutParsingBox> tableObjects) {
-
-        List<VisualLayoutParsingResult> parsedTableCells = new ArrayList<>();
-
-        tableObjects.stream().forEach(t -> {
-            VisualLayoutParsingResult result = new VisualLayoutParsingResult();
-            result.setX0(t.getBox().getX1());
-            result.setX1(t.getBox().getX2());
-            result.setY0(t.getBox().getY1());
-            result.setY1(t.getBox().getY2());
-            result.setWidth(result.getX1() - result.getX0());
-            result.setHeight(result.getY1() - result.getY0());
-            result.setLabel(t.getLabel());
-            parsedTableCells.add(result);
-        });
-
-        return parsedTableCells;
-
-    }
-
-
-    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);
-
-                signatures.add(signature);
-            }
-        });
-
-        return signatures;
-
-    }
-
-}
@@ -1,18 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.python_api.model.table;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class VisualLayoutParsingBox {
-
-    private VisualLayoutParsingBoxValue box;
-    private String label;
-    private float probability;
-
-}
@@ -1,19 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.python_api.model.table;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class VisualLayoutParsingBoxValue {
-
-    private float x1;
-    private float y1;
-    private float x2;
-    private float y2;
-
-}
@@ -1,21 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.python_api.model.table;
-
-import java.util.List;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class VisualLayoutParsingData {
-
-    private int page_idx;
-
-    private List<VisualLayoutParsingBox> boxes;
-
-}
@@ -1,23 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.python_api.model.table;
-
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class VisualLayoutParsingResponse {
-
-    private String dossierId;
-    private String fileId;
-    private String targetFileExtension;
-    private String responseFileExtension;
-    private String X_TENANT_ID;
-    private List<VisualLayoutParsingData> data;
-
-}
@@ -1,22 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.python_api.model.table;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class VisualLayoutParsingResult {
-
-    private float x0;
-    private float y0;
-    private float x1;
-    private float y1;
-    private float width;
-    private float height;
-    private String label;
-
-}
@@ -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,25 @@ 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 = 6;


    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 +51,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) {
+                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) {
+                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 +151,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 +189,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;
    }

 }
@@ -1,33 +1,79 @@
 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.Iterator;
 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_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 Comparator<Point2D> X_FIRST_POINT_COMPARATOR = (arg0, arg1) -> {
+
+        int rv = 0;
+        float arg0X = DoubleComparisons.round(arg0.getX(), 2);
+        float arg0Y = DoubleComparisons.round(arg0.getY(), 2);
+        float arg1X = DoubleComparisons.round(arg1.getX(), 2);
+        float arg1Y = DoubleComparisons.round(arg1.getY(), 2);
+
+        if (arg0X > arg1X) {
+            rv = 1;
+        } else if (arg0X < arg1X) {
+            rv = -1;
+        } else if (arg0Y > arg1Y) {
+            rv = 1;
+        } else if (arg0Y < arg1Y) {
+            rv = -1;
+        }
+        return rv;
+    };
+    private static final Comparator<Point2D> POINT_COMPARATOR = (arg0, arg1) -> {
+
+        int rv = 0;
+        float arg0X = DoubleComparisons.round(arg0.getX(), 2);
+        float arg0Y = DoubleComparisons.round(arg0.getY(), 2);
+        float arg1X = DoubleComparisons.round(arg1.getX(), 2);
+        float arg1Y = DoubleComparisons.round(arg1.getY(), 2);
+
+        if (arg0Y > arg1Y) {
+            rv = 1;
+        } else if (arg0Y < arg1Y) {
+            rv = -1;
+        } else if (arg0X > arg1X) {
+            rv = 1;
+        } else if (arg0X < arg1X) {
+            rv = -1;
+        }
+        return rv;
+    };
+
+
+    public boolean contains(Cell cell, double x, double y, double w, double h) {
+
+        if (cell.isEmpty() || w <= 0 || h <= 0) {
+            return false;
+        }
+        double x0 = cell.getX();
+        double y0 = cell.getY();
+        return (x >= x0 - 2 && y >= y0 - 2 && (x + w) <= x0 + cell.getWidth() + 2 && (y + h) <= y0 + cell.getHeight() + 2);
+    }


    /**
@@ -40,104 +86,272 @@ 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(CleanRulings cleanRulings, ClassificationPage page) {

-    public void extractTables(List<Cell> emptyCells, 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);
+        List<TextPageBlock> toBeRemoved = new ArrayList<>();

        for (AbstractPageBlock abstractPageBlock : page.getTextBlocks()) {
            TextPageBlock textBlock = (TextPageBlock) abstractPageBlock;
-            for (Cell cell : emptyCells) {
-                if (cell.hasMinimumSize() && doesCellContainTextBlock(cell, textBlock)) {
+            for (Cell cell : cells) {
+                if (cell.hasMinimumSize() && contains(cell,
+                        textBlock.getPdfMinX(),
+                        textBlock.getPdfMinY(),
+                        textBlock.getPdfMaxX() - textBlock.getPdfMinX(),
+                        textBlock.getPdfMaxY() - textBlock.getPdfMinY())) {
                    cell.addTextBlock(textBlock);
+                    toBeRemoved.add(textBlock);
                    break;
                }
            }
        }

-        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);
-        // 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);
+        List<Rectangle> spreadsheetAreas = findSpreadsheetsFromCells(cells);

        List<TablePageBlock> tables = new ArrayList<>();
        for (Rectangle area : spreadsheetAreas) {

-            List<Cell> containedCells = new ArrayList<>();
+            List<Cell> overlappingCells = new ArrayList<>();
            for (Cell c : cells) {
-                if (c.hasMinimumSize() && area.contains(c)) {
-                    containedCells.add(c);
+                if (c.hasMinimumSize() && c.intersects(area)) {
+                    overlappingCells.add(c);
                }
            }
-
-            var containedCellsWithText = containedCells.stream().filter(cell -> !cell.getTextBlocks().isEmpty()).toList();
-
-            // verify if table would contain fewer cells with text than the threshold allows
-            if (containedCellsWithText.size() >= MAX_TABLE_CONTAINED_CELLS_WITH_TEXT && checkIfTableCellsAreUniform(containedCells)) {
-                tables.add(new TablePageBlock(containedCells, area, page.getRotation()));
-                cells.removeAll(containedCells);
-            }
+            tables.add(new TablePageBlock(overlappingCells, area, page.getRotation()));
        }

        for (TablePageBlock table : tables) {
            int position = -1;

-            for (AbstractPageBlock pageBlock : page.getTextBlocks()) {
-                if (pageBlock instanceof TextPageBlock ? table.containsBlock((TextPageBlock) pageBlock) : table.contains(pageBlock) && position == -1) {
-                    position = page.getTextBlocks().indexOf(pageBlock);
+            Iterator<AbstractPageBlock> itty = page.getTextBlocks().iterator();
+            while (itty.hasNext()) {
+                AbstractPageBlock textBlock = itty.next();
+                if (textBlock instanceof TextPageBlock ? table.containsBlock((TextPageBlock) textBlock) : table.contains(textBlock) && position == -1) {
+                    position = page.getTextBlocks().indexOf(textBlock);
                }
            }
            if (position != -1) {
                page.getTextBlocks().add(position, table);
-
-                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);
            }
        }
+
+        page.getTextBlocks().removeAll(toBeRemoved);
    }


-    private boolean checkIfTableCellsAreUniform(List<Cell> containedCells) {
+    public List<Cell> findCells(List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {

-        if (containedCells.size() <= 2) {
-            return true;
+        // 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;
+            }
        }

-        Map<Long, List<Long>> cellsGroupedByRoundedWidth = containedCells.stream()
-                .map(Rectangle::getWidth)
-                .map(size -> Math.round(size / 10.0) * 10)
-                .collect(Collectors.groupingBy(Long::longValue));
+        List<Cell> cellsFound = new ArrayList<>();
+        Map<Point2D, Ruling[]> intersectionPoints = Ruling.findIntersections(horizontalRulingLines, verticalRulingLines);
+        List<Point2D> intersectionPointsList = new ArrayList<>(intersectionPoints.keySet());
+        intersectionPointsList.sort(POINT_COMPARATOR);

-        return (double) cellsGroupedByRoundedWidth.size() / containedCells.size() <= TABLE_UNIFORMITY_THRESHOLD;
-    }
+        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<>();

-    private boolean doesCellContainTextBlock(Cell cell, TextPageBlock textBlock) {
-
-        double x = textBlock.getPdfMinX();
-        double y = textBlock.getPdfMinY();
-        double w = textBlock.getPdfMaxX() - textBlock.getPdfMinX();
-        double h = textBlock.getPdfMaxY() - textBlock.getPdfMinY();
-        if (cell.isEmpty() || w <= 0 || h <= 0) {
-            return false;
+            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 an 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;
+                    }
+                }
+            }
        }
-        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);
+
+        // 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;
    }


-    public static List<Cell> findCells(List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {
+    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<>();
+        int i = 0;
+
+        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(POINT_COMPARATOR);
+
+        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());
+            }
+            rectangles.add(new Rectangle(top, left, right - left, bottom - top));
+        }
+
+        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());
    }

 }
@@ -1,408 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.services.blockification;
-
-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 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;
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
-import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.DocstrumSegmentationService;
-import com.knecon.fforesight.service.layoutparser.processor.utils.QuickSort;
-import com.knecon.fforesight.service.layoutparser.processor.utils.RulingTextDirAdjustUtil;
-import com.knecon.fforesight.service.layoutparser.processor.utils.TextPositionSequenceComparator;
-
-import lombok.RequiredArgsConstructor;
-
-@SuppressWarnings("all")
-@Service
-@RequiredArgsConstructor
-public class DocstrumBlockificationService {
-
-    private final DocstrumSegmentationService docstrumSegmentationService;
-
-    static final float THRESHOLD = 1f;
-
-
-    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)));
-        });
-
-        List<AbstractPageBlock> abstractPageBlocks = new ArrayList<>();
-        var zones = docstrumSegmentationService.segmentPage(textPositions, xyOder);
-        zones.forEach(zone -> {
-
-            List<TextPositionSequence> textPositionSequences = new ArrayList<>();
-            zone.getLines().forEach(line -> {
-                line.getWords().forEach(word -> {
-                    textPositionSequences.add(new TextPositionSequence(word.getTextPositions(), word.getPage()));
-                });
-            });
-
-            abstractPageBlocks.addAll(splitZonesAtRulings(textPositionSequences, usedHorizonalRulings, usedVerticalRulings));
-//            abstractPageBlocks.add(buildTextBlock(textPositionSequences, 0));
-        });
-
-        return new ClassificationPage(abstractPageBlocks);
-    }
-
-
-    public void combineBlocks(ClassificationPage page) {
-
-        mergeZones(page.getTextBlocks());
-
-        TextPageBlock previous = new TextPageBlock();
-        ListIterator<AbstractPageBlock> itty = page.getTextBlocks().listIterator();
-        while (itty.hasNext()) {
-            AbstractPageBlock block = itty.next();
-            if (block instanceof TablePageBlock) {
-                continue;
-            }
-            TextPageBlock current = (TextPageBlock) block;
-
-            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) {
-
-                    previous.getSequences().addAll(current.getSequences());
-                    previous = buildTextBlock(previous.getSequences(), 0);
-                    previous.setToDuplicate(true);
-                    itty.remove();
-                    itty.previous();
-                    itty.set(previous);
-                    itty.next();
-                    continue;
-                }
-
-                if (current.getDir() == previous.getDir() && (previous.almostIntersects(current, 0, 0))) {
-
-                    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) {
-
-                    previous.getSequences().addAll(current.getSequences());
-                    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) {
-                continue;
-            }
-
-            TextPageBlock current = (TextPageBlock) block;
-
-            if (current.isToDuplicate()) {
-                continue;
-            }
-
-            for (int i = 0; i < zones.size(); i++) {
-
-                if (toRemove.contains(zones.get(i))) {
-                    continue;
-                }
-                if (zones.get(i) == current) {
-                    continue;
-                }
-                if (zones.get(i) instanceof TablePageBlock) {
-                    continue;
-                }
-
-                TextPageBlock inner = (TextPageBlock) zones.get(i);
-
-                if (inner.isToDuplicate()) {
-                    continue;
-                }
-
-                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);
-                }
-            }
-        }
-        zones.removeAll(toRemove);
-    }
-
-
-    public List<AbstractPageBlock> splitZonesAtRulings(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {
-
-        int indexOnPage = 0;
-        List<TextPositionSequence> chunkWords = new ArrayList<>();
-        List<AbstractPageBlock> chunkBlockList = new ArrayList<>();
-
-        float minX = 1000, maxX = 0, minY = 1000, maxY = 0;
-        TextPositionSequence prev = null;
-
-        for (TextPositionSequence word : textPositions) {
-
-            boolean isSplitByRuling = isSplitByRuling(minX, minY, maxX, maxY, word, horizontalRulingLines, verticalRulingLines);
-            boolean splitByDir = prev != null && !prev.getDir().equals(word.getDir());
-
-            if (prev != null && (splitByDir || isSplitByRuling)) {
-
-                TextPageBlock cb1 = buildTextBlock(chunkWords, indexOnPage);
-                indexOnPage++;
-
-                chunkBlockList.add(cb1);
-                chunkWords = new ArrayList<>();
-
-                minX = 1000;
-                maxX = 0;
-                minY = 1000;
-                maxY = 0;
-                prev = null;
-            }
-
-            chunkWords.add(word);
-
-            prev = word;
-            if (word.getMinXDirAdj() < minX) {
-                minX = word.getMinXDirAdj();
-            }
-            if (word.getMaxXDirAdj() > maxX) {
-                maxX = word.getMaxXDirAdj();
-            }
-            if (word.getMinYDirAdj() < minY) {
-                minY = word.getMinYDirAdj();
-            }
-            if (word.getMaxYDirAdj() > maxY) {
-                maxY = word.getMaxYDirAdj();
-            }
-        }
-
-        TextPageBlock cb1 = buildTextBlock(chunkWords, indexOnPage);
-        if (cb1 != null) {
-            chunkBlockList.add(cb1);
-        }
-
-        return chunkBlockList;
-    }
-
-
-    private boolean equalsWithThreshold(float f1, float f2) {
-
-        return Math.abs(f1 - f2) < THRESHOLD;
-    }
-
-
-    private TextPageBlock buildTextBlock(List<TextPositionSequence> wordBlockList, int indexOnPage) {
-
-        TextPageBlock textBlock = null;
-
-        FloatFrequencyCounter lineHeightFrequencyCounter = new FloatFrequencyCounter();
-        FloatFrequencyCounter fontSizeFrequencyCounter = new FloatFrequencyCounter();
-        FloatFrequencyCounter spaceFrequencyCounter = new FloatFrequencyCounter();
-        StringFrequencyCounter fontFrequencyCounter = new StringFrequencyCounter();
-        StringFrequencyCounter styleFrequencyCounter = new StringFrequencyCounter();
-
-        for (TextPositionSequence wordBlock : wordBlockList) {
-
-            lineHeightFrequencyCounter.add(wordBlock.getTextHeight());
-            fontSizeFrequencyCounter.add(wordBlock.getFontSize());
-            spaceFrequencyCounter.add(wordBlock.getSpaceWidth());
-            fontFrequencyCounter.add(wordBlock.getFont());
-            styleFrequencyCounter.add(wordBlock.getFontStyle());
-
-            if (textBlock == null) {
-                textBlock = new TextPageBlock(wordBlock.getMinXDirAdj(),
-                        wordBlock.getMaxXDirAdj(),
-                        wordBlock.getMinYDirAdj(),
-                        wordBlock.getMaxYDirAdj(),
-                        wordBlockList,
-                        wordBlock.getRotation());
-            } else {
-                TextPageBlock spatialEntity = textBlock.union(wordBlock);
-                textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity.getHeight());
-            }
-        }
-
-        if (textBlock != null) {
-            textBlock.setMostPopularWordFont(fontFrequencyCounter.getMostPopular());
-            textBlock.setMostPopularWordStyle(styleFrequencyCounter.getMostPopular());
-            textBlock.setMostPopularWordFontSize(fontSizeFrequencyCounter.getMostPopular());
-            textBlock.setMostPopularWordHeight(lineHeightFrequencyCounter.getMostPopular());
-            textBlock.setMostPopularWordSpaceWidth(spaceFrequencyCounter.getMostPopular());
-            textBlock.setHighestFontSize(fontSizeFrequencyCounter.getHighest());
-        }
-
-        if (textBlock != null && textBlock.getSequences() != null && textBlock.getSequences().stream().map(t -> round(t.getMinYDirAdj(), 3)).collect(toSet()).size() == 1) {
-            textBlock.getSequences().sort(Comparator.comparing(TextPositionSequence::getMinXDirAdj));
-        }
-        return textBlock;
-    }
-
-
-    private boolean isSplitByRuling(float minX,
-                                    float minY,
-                                    float maxX,
-                                    float maxY,
-                                    TextPositionSequence word,
-                                    List<Ruling> horizontalRulingLines,
-                                    List<Ruling> verticalRulingLines) {
-
-        return isSplitByRuling(maxX,
-                minY,
-                word.getMinXDirAdj(),
-                word.getMinYDirAdj(),
-                verticalRulingLines,
-                word.getDir().getDegrees(),
-                word.getPageWidth(),
-                word.getPageHeight()) //
-                || isSplitByRuling(minX,
-                minY,
-                word.getMinXDirAdj(),
-                word.getMaxYDirAdj(),
-                horizontalRulingLines,
-                word.getDir().getDegrees(),
-                word.getPageWidth(),
-                word.getPageHeight()) //
-                || isSplitByRuling(maxX,
-                minY,
-                word.getMinXDirAdj(),
-                word.getMinYDirAdj(),
-                horizontalRulingLines,
-                word.getDir().getDegrees(),
-                word.getPageWidth(),
-                word.getPageHeight()) //
-                || isSplitByRuling(minX,
-                minY,
-                word.getMinXDirAdj(),
-                word.getMaxYDirAdj(),
-                verticalRulingLines,
-                word.getDir().getDegrees(),
-                word.getPageWidth(),
-                word.getPageHeight());
-    }
-
-
-    private boolean isSplitByRuling(float previousX2, float previousY1, float currentX1, float currentY1, List<Ruling> rulingLines, float dir, float pageWidth, float pageHeight) {
-
-        for (Ruling ruling : rulingLines) {
-            var line = RulingTextDirAdjustUtil.convertToDirAdj(ruling, dir, pageWidth, pageHeight);
-            if (line.intersectsLine(previousX2, previousY1, currentX1, currentY1)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    private double round(float value, int decimalPoints) {
-
-        var d = Math.pow(10, decimalPoints);
-        return Math.round(value * d) / d;
-    }
-
-}
@@ -57,7 +57,7 @@ public class RedactManagerBlockificationService {
            boolean isSplitByRuling = isSplitByRuling(minX, minY, maxX, maxY, word, horizontalRulingLines, verticalRulingLines);
            boolean splitByDir = prev != null && !prev.getDir().equals(word.getDir());

-            if (prev != null && (lineSeparation || startFromTop || splitByX || splitByDir || isSplitByRuling)) {
+            if (prev != null && (splitByDir || isSplitByRuling)) {

                Orientation prevOrientation = null;
                if (!chunkBlockList.isEmpty()) {
@@ -167,7 +167,7 @@ public class RedactManagerBlockificationService {
    }


-    private TextPageBlock buildTextBlock(List<TextPositionSequence> wordBlockList, int indexOnPage) {
+    public TextPageBlock buildTextBlock(List<TextPositionSequence> wordBlockList, int indexOnPage) {

        TextPageBlock textBlock = null;

@@ -1,12 +1,10 @@
 package com.knecon.fforesight.service.layoutparser.processor.services.docstrum;

-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;

 import org.springframework.stereotype.Service;

-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextDirection;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
 import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Character;
 import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone;
@@ -29,31 +27,22 @@ public class DocstrumSegmentationService {
    private final ReadingOrderService readingOrderService;


-    public List<Zone> segmentPage(List<TextPositionSequence> textPositions, boolean xyOder) {
+    public List<Zone> segmentPage(List<TextPositionSequence> textPositions) {

-        List<Zone> zones = new ArrayList<>();
-        zones.addAll(computeZones(textPositions, TextDirection.ZERO));
-        zones.addAll(computeZones(textPositions, TextDirection.QUARTER_CIRCLE));
-        zones.addAll(computeZones(textPositions, TextDirection.HALF_CIRCLE));
-        zones.addAll(computeZones(textPositions, TextDirection.THREE_QUARTER_CIRCLE));
-
-        return readingOrderService.resolve(zones, xyOder);
-    }
-
-
-    private List<Zone> computeZones(List<TextPositionSequence> textPositions, TextDirection direction) {
-
-        var positions = textPositions.stream().filter(t -> t.getDir() == direction).map(TextPositionSequence::getTextPositions).flatMap(List::stream).toList();
+        var positions = textPositions.stream().map(TextPositionSequence::getTextPositions).flatMap(List::stream).toList();

        var characters = positions.stream().map(Character::new).collect(Collectors.toList());

        nearestNeighbourService.findNearestNeighbors(characters);

        var characterSpacing = spacingService.computeCharacterSpacing(characters);
-        var lineSpacing = Math.min(spacingService.computeLineSpacing(characters), 20);
+        var lineSpacing = spacingService.computeLineSpacing(characters);

        var lines = lineBuilderService.buildLines(characters, characterSpacing, lineSpacing);
-        return zoneBuilderService.buildZones(lines, characterSpacing, lineSpacing);
+
+        var zones = zoneBuilderService.buildZones(lines, characterSpacing, lineSpacing);
+
+        return readingOrderService.resolve(zones);
    }

 }
@@ -1,25 +1,90 @@
 package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model;

-public class AngleFilter {
+/**
+ * Filter class for neighbor objects that checks if the angle of the
+ * neighbor is within specified range.
+ */
+public abstract class AngleFilter {

-    protected double lowerAngle;
-    protected double upperAngle;
+    private final double lowerAngle;
+    private final double upperAngle;


-    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;
+    private AngleFilter(double lowerAngle, double upperAngle) {
+
+        this.lowerAngle = lowerAngle;
+        this.upperAngle = upperAngle;
    }


-    public boolean matches(Neighbor neighbor) {
+    /**
+     * Constructs new angle filter.
+     *
+     * @param lowerAngle minimum angle in range [-3*pi/2, pi/2)
+     * @param upperAngle maximum angle in range [-pi/2, 3*pi/2)
+     * @return newly constructed angle filter
+     */
+    public static AngleFilter newInstance(double lowerAngle, double upperAngle) {

+        if (lowerAngle < -Math.PI / 2) {
+            lowerAngle += Math.PI;
+        }
+        if (upperAngle >= Math.PI / 2) {
+            upperAngle -= Math.PI;
+        }
        if (lowerAngle <= upperAngle) {
-            return lowerAngle <= neighbor.getAngle() && neighbor.getAngle() < upperAngle;
+            return new AndFilter(lowerAngle, upperAngle);
        } else {
-            return lowerAngle <= neighbor.getAngle() || neighbor.getAngle() < upperAngle;
+            return new OrFilter(lowerAngle, upperAngle);
        }
    }

+
+    public double getLowerAngle() {
+
+        return lowerAngle;
+    }
+
+
+    public double getUpperAngle() {
+
+        return upperAngle;
+    }
+
+
+    public abstract boolean matches(Neighbor neighbor);
+
+
+    public static final class AndFilter extends AngleFilter {
+
+        private AndFilter(double lowerAngle, double upperAngle) {
+
+            super(lowerAngle, upperAngle);
+        }
+
+
+        @Override
+        public boolean matches(Neighbor neighbor) {
+
+            return getLowerAngle() <= neighbor.getAngle() && neighbor.getAngle() < getUpperAngle();
+        }
+
+    }
+
+    public static final class OrFilter extends AngleFilter {
+
+        private OrFilter(double lowerAngle, double upperAngle) {
+
+            super(lowerAngle, upperAngle);
+        }
+
+
+        @Override
+        public boolean matches(Neighbor neighbor) {
+
+            return getLowerAngle() <= neighbor.getAngle() || neighbor.getAngle() < getUpperAngle();
+        }
+
+    }
+
 }
@@ -1,7 +1,6 @@
 package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model;

 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;

 import com.knecon.fforesight.service.layoutparser.processor.model.text.RedTextPosition;
@@ -52,21 +51,6 @@ public class Character {
    }


-    public double overlappingDistance(Character other) {
-
-        double[] xs = new double[4];
-        double s = Math.sin(-0);
-        double 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;
-        xs[3] = c * (other.x + other.textPosition.getWidthDirAdj()) - s * (other.y + other.textPosition.getHeightDir());
-        boolean overlapping = xs[1] >= xs[2] && xs[3] >= xs[0];
-        Arrays.sort(xs);
-        return Math.abs(xs[2] - xs[1]) * (overlapping ? 1 : -1);
-    }
-
-
    public void setNeighbors(List<Neighbor> neighbors) {

        this.neighbors = neighbors;
@@ -10,28 +10,46 @@ import java.util.Set;

 public class DisjointSets<E> implements Iterable<Set<E>> {

-    private final Map<E, Entry<E>> map = new HashMap<>();
+    private final Map<E, Entry<E>> map = new HashMap<E, Entry<E>>();


-    public DisjointSets(Collection<? extends E> collection) {
+    /**
+     * Constructs a new set of singletons.
+     *
+     * @param c elements of singleton sets
+     */
+    public DisjointSets(Collection<? extends E> c) {

-        for (E element : collection) {
+        for (E element : c) {
            map.put(element, new Entry<E>(element));
        }
    }


+    /**
+     * Checks if elements are in the same subsets.
+     *
+     * @param e1 element from a subset
+     * @param e2 element from a subset
+     * @return true if elements are in the same subset; false otherwise
+     */
    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();
    }


+    /**
+     * Merges subsets which elements e1 and e2 belong to.
+     *
+     * @param e1 element from a subset
+     * @param e2 element from a subset
+     */
    public void union(E e1, E e2) {

        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 {
@@ -44,7 +62,7 @@ public class DisjointSets<E> implements Iterable<Set<E>> {
    @Override
    public Iterator<Set<E>> iterator() {

-        return new Iterator<>() {
+        return new Iterator<Set<E>>() {

            private final Iterator<Entry<E>> iterator = map.values().iterator();
            private Entry<E> nextRepresentative;
@@ -100,7 +118,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 +140,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 +154,7 @@ public class DisjointSets<E> implements Iterable<Set<E>> {

        boolean isRepresentative() {

-            return parent.equals(this);
+            return parent == this;
        }


@@ -1,19 +1,33 @@
 package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model;

-public class Histogram {
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+public class Histogram implements Iterable<Histogram.Bin> {

    private static final double EPSILON = 1.0e-6;
+
    private final double min;
+    private final double delta;
    private final double resolution;
+
    private double[] frequencies;


+    /**
+     * Constructs a new histogram for values in range [minValue, maxValue] with
+     * given resolution.
+     *
+     * @param minValue   - minimum allowed value
+     * @param maxValue   - maximum allowed value
+     * @param resolution - histogram's resolution
+     */
    public Histogram(double minValue, double maxValue, double resolution) {

        this.min = minValue - EPSILON;
-        double delta = maxValue - minValue + 2 * EPSILON;
+        this.delta = maxValue - minValue + 2 * EPSILON;
        int size = Math.max(1, (int) Math.round((maxValue - minValue) / resolution));
-        this.resolution = delta / size;
+        this.resolution = this.delta / size;
        this.frequencies = new double[size];
    }

@@ -33,14 +47,34 @@ public class Histogram {
    }


+    public void circularKernelSmooth(double[] kernel) {
+
+        double[] newFrequencies = new double[frequencies.length];
+        int shift = (kernel.length - 1) / 2;
+        for (int i = 0; i < frequencies.length; i++) {
+            for (int d = 0; d < kernel.length; d++) {
+                int j = i + d - shift;
+                if (j < 0) {
+                    j += frequencies.length;
+                } else if (j >= frequencies.length) {
+                    j -= frequencies.length;
+                }
+                newFrequencies[i] += kernel[d] * frequencies[j];
+            }
+        }
+        frequencies = newFrequencies;
+    }
+
+
    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);
@@ -53,24 +87,45 @@ public class Histogram {
    }


+    public void circularGaussianSmooth(double windowLength, double stdDeviation) {
+
+        circularKernelSmooth(createGaussianKernel(windowLength, stdDeviation));
+    }
+
+
    public void gaussianSmooth(double windowLength, double stdDeviation) {

        kernelSmooth(createGaussianKernel(windowLength, stdDeviation));
    }


+    /**
+     * Adds single occurrence of given value to the histogram.
+     *
+     * @param value inserted values
+     */
    public void add(double value) {

        frequencies[(int) ((value - min) / resolution)] += 1.0;
    }


+    /**
+     * Returns histogram's number of bins.
+     *
+     * @return number of bins
+     */
    public int getSize() {

        return frequencies.length;
    }


+    /**
+     * Finds the histogram's peak value.
+     *
+     * @return peak value
+     */
    public double getPeakValue() {

        int peakIndex = 0;
@@ -87,4 +142,58 @@ public class Histogram {
        return ((double) peakIndex + peakEndIndex) / 2 * resolution + min;
    }

+
+    @Override
+    public Iterator<Bin> iterator() {
+
+        return new Iterator() {
+
+            private int index = 0;
+
+
+            @Override
+            public boolean hasNext() {
+
+                return index < frequencies.length;
+            }
+
+
+            @Override
+            public Object next() {
+
+                if (index >= frequencies.length) {
+                    throw new NoSuchElementException();
+                }
+                return new Bin(index++);
+            }
+
+
+            @Override
+            public void remove() {
+
+                throw new UnsupportedOperationException("Not supported yet.");
+            }
+
+        };
+    }
+
+
+    public final class Bin {
+
+        private final int index;
+
+
+        private Bin(int index) {
+
+            this.index = index;
+        }
+
+
+        public double getValue() {
+
+            return (index + 0.5) * resolution + min;
+        }
+
+    }
+
 }
@@ -31,16 +31,13 @@ public class Line extends BoundingBox {
        this.characters = characters;

        if (characters.size() >= 2) {
-            // linear regression
-            double sx = 0.0;
-            double sxx = 0.0;
-            double sxy = 0.0;
-            double sy = 0.0;
-            for (Character character : characters) {
-                sx += character.getX();
-                sxx += character.getX() * character.getX();
-                sxy += character.getX() * character.getY();
-                sy += character.getY();
+            // Simple linear regression
+            double sx = 0.0, sxx = 0.0, sxy = 0.0, sy = 0.0;
+            for (Character component : characters) {
+                sx += component.getX();
+                sxx += component.getX() * component.getX();
+                sxy += component.getX() * component.getY();
+                sy += component.getY();
            }
            double b = (characters.size() * sxy - sx * sy) / (characters.size() * sxx - sx * sx);
            double a = (sy - b * sx) / characters.size();
@@ -49,18 +46,20 @@ public class Line extends BoundingBox {
            this.y0 = a + b * this.x0;
            this.x1 = characters.get(characters.size() - 1).getX();
            this.y1 = a + b * this.x1;
-        } else {
-            Character character = characters.get(0);
-            double dx = character.getTextPosition().getWidthDirAdj() / 3;
+        } else if (!characters.isEmpty()) {
+            Character component = characters.get(0);
+            double dx = component.getTextPosition().getWidthDirAdj() / 3;
            double dy = dx * Math.tan(0);
-            this.x0 = character.getX() - dx;
-            this.x1 = character.getX() + dx;
-            this.y0 = character.getY() - dy;
-            this.y1 = character.getY() + dy;
+            this.x0 = component.getX() - dx;
+            this.x1 = component.getX() + dx;
+            this.y0 = component.getY() - dy;
+            this.y1 = component.getY() + dy;
+        } else {
+            throw new IllegalArgumentException("Component list must not be empty");
        }
        height = computeHeight();
        computeWords(wordSpacing * WORD_DISTANCE_MULTIPLIER);
-        buildBBox();
+        buildBox();
    }


@@ -137,7 +136,7 @@ public class Line extends BoundingBox {
    }


-    private void buildBBox() {
+    private void buildBox() {

        double minX = Double.POSITIVE_INFINITY;
        double minY = Double.POSITIVE_INFINITY;
@@ -12,16 +12,15 @@ public class Zone extends BoundingBox {
    private List<Line> lines;


-    @SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
    public Zone(List<Line> lines) {

        lines.sort(Comparator.comparingDouble(Line::getY));
        this.lines = lines;
-        buildBBox();
+        buildBox();
    }


-    public void buildBBox() {
+    public void buildBox() {

        double minX = Double.POSITIVE_INFINITY;
        double minY = Double.POSITIVE_INFINITY;
@@ -0,0 +1,64 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.readingorder;
+
+import java.awt.geom.Rectangle2D;
+
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.BoundingBox;
+
+public class BoundingBoxZoneGroup extends BoundingBox {
+
+    private BoundingBox leftChild;
+    private BoundingBox rightChild;
+
+
+    public BoundingBoxZoneGroup(BoundingBox child1, BoundingBox child2) {
+
+        this.leftChild = child1;
+        this.rightChild = child2;
+        setBounds(Math.min(child1.getX(), child2.getX()),
+                Math.min(child1.getY(), child2.getY()),
+                Math.max(child1.getX() + child1.getWidth(), child2.getX() + child2.getWidth()),
+                Math.max(child1.getY() + child1.getHeight(), child2.getY() + child2.getHeight()));
+    }
+
+
+    public void setbBox(Rectangle2D bBox) {
+
+        super.setBBox(bBox);
+    }
+
+
+    public BoundingBox getLeftChild() {
+
+        return leftChild;
+    }
+
+
+    public BoundingBox getRightChild() {
+
+        return rightChild;
+    }
+
+
+    public BoundingBoxZoneGroup setLeftChild(BoundingBox obj) {
+
+        this.leftChild = obj;
+        return this;
+    }
+
+
+    public BoundingBoxZoneGroup setRightChild(BoundingBox obj) {
+
+        this.rightChild = obj;
+        return this;
+    }
+
+
+    public BoundingBoxZoneGroup setBounds(double x0, double y0, double x1, double y1) {
+
+        assert x1 >= x0;
+        assert y1 >= y0;
+        this.setBBox(new Rectangle2D.Double(x0, y0, x1 - x0, y1 - y0));
+        return this;
+    }
+
+}
@@ -0,0 +1,115 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.readingorder;
+
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.utils.DoubleUtils;
+
+public class DistElem<E> implements Comparable<DistElem<E>> {
+
+    @Override
+    public int hashCode() {
+
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + (c ? 1231 : 1237);
+        long temp;
+        temp = Double.doubleToLongBits(dist);
+        result = prime * result + (int) (temp ^ (temp >>> 32));
+        result = prime * result + ((obj1 == null) ? 0 : obj1.hashCode());
+        result = prime * result + ((obj2 == null) ? 0 : obj2.hashCode());
+        return result;
+    }
+
+
+    @Override
+    public boolean equals(Object obj) {
+
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        DistElem other = (DistElem) obj;
+        if (c != other.c) {
+            return false;
+        }
+        if (Double.doubleToLongBits(dist) != Double.doubleToLongBits(other.dist)) {
+            return false;
+        }
+        if (obj1 == null) {
+            if (other.obj1 != null) {
+                return false;
+            }
+        } else if (!obj1.equals(other.obj1)) {
+            return false;
+        }
+        if (obj2 == null) {
+            if (other.obj2 != null) {
+                return false;
+            }
+        } else if (!obj2.equals(other.obj2)) {
+            return false;
+        }
+        return true;
+    }
+
+
+    boolean c;
+    double dist;
+    E obj1;
+    E obj2;
+
+
+    public boolean isC() {
+
+        return c;
+    }
+
+
+    public void setC(boolean c) {
+
+        this.c = c;
+    }
+
+
+    public double getDist() {
+
+        return dist;
+    }
+
+
+    public E getObj1() {
+
+        return obj1;
+    }
+
+
+    public E getObj2() {
+
+        return obj2;
+    }
+
+
+    public DistElem(boolean c, double dist, E obj1, E obj2) {
+
+        this.c = c;
+        this.dist = dist;
+        this.obj1 = obj1;
+        this.obj2 = obj2;
+    }
+
+
+    @Override
+    public int compareTo(DistElem<E> compareObject) {
+
+        double eps = 1E-3;
+        if (c == compareObject.c) {
+            return DoubleUtils.compareDouble(dist, compareObject.dist, eps);
+        } else {
+            return c ? -1 : 1;
+        }
+    }
+
+}
@@ -0,0 +1,258 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.readingorder;
+
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.BoundingBox;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone;
+
+/**
+ * A set-like data structure for objects placed on a plane. Can efficiently find objects in a certain rectangular area.
+ * It maintains two parallel lists of objects, each of which is sorted by its x or y coordinate.
+ *
+ * @author Pawel Szostek
+ */
+public class DocumentPlane {
+
+    /**
+     * List of objects on the plane. Stored in a random order
+     */
+    private final List<BoundingBox> objs;
+    /**
+     * Size of a grid square. If gridSize=50, then the plane is divided into squares of size 50. Each square contains
+     * objects placed in a 50x50 area
+     */
+    private final int gridSize;
+    /**
+     * Redundant dictionary of objects on the plane. Allows efficient 2D space search. Keys are X-Y coordinates of a
+     * grid square. Single object can be stored under several keys (depending on its physical size). Grid squares are
+     * lazy-initialized.
+     */
+    private final Map<GridXY, List<BoundingBox>> grid;
+
+    /**
+     * Representation of XY coordinates
+     */
+    private static class GridXY {
+
+        public int x;
+        public int y;
+
+
+        public GridXY(int x, int y) {
+
+            this.x = x;
+            this.y = y;
+        }
+
+
+        @Override
+        public int hashCode() {
+
+            return x * y;
+        }
+
+
+        @Override
+        public boolean equals(Object obj) {
+
+            if (obj == null || getClass() != obj.getClass()) {
+                return false;
+            }
+            GridXY comparedObj = (GridXY) obj;
+            return x == comparedObj.x && y == comparedObj.y;
+        }
+
+
+        @Override
+        public String toString() {
+
+            return "(" + x + "," + y + ")";
+        }
+
+    }
+
+
+    public List<BoundingBox> getObjects() {
+
+        return objs;
+    }
+
+
+    public DocumentPlane(List<Zone> objectList, int gridSize) {
+
+        this.grid = new HashMap<GridXY, List<BoundingBox>>();
+        this.objs = new ArrayList<BoundingBox>();
+        this.gridSize = gridSize;
+        for (Zone obj : objectList) {
+            add(obj);
+        }
+    }
+
+
+    /**
+     * Looks for objects placed between obj1 and obj2 excluding them
+     *
+     * @param obj1 object
+     * @param obj2 object
+     * @return object list
+     */
+    public List<BoundingBox> findObjectsBetween(BoundingBox obj1, BoundingBox obj2) {
+
+        double x0 = Math.min(obj1.getX(), obj2.getX());
+        double y0 = Math.min(obj1.getY(), obj2.getY());
+        double x1 = Math.max(obj1.getX() + obj1.getWidth(), obj2.getX() + obj2.getWidth());
+        double y1 = Math.max(obj1.getY() + obj1.getHeight(), obj2.getY() + obj2.getHeight());
+        assert x1 >= x0 && y1 >= y0;
+        Rectangle2D searchBounds = new Rectangle2D.Double(x0, y0, x1 - x0, y1 - y0);
+        List<BoundingBox> objsBetween = find(searchBounds);
+        /*
+         * the rectangle area must contain at least obj1 and obj2
+         */
+        objsBetween.remove(obj1);
+        objsBetween.remove(obj2);
+        return objsBetween;
+    }
+
+
+    /**
+     * Checks if there is any object placed between obj1 and obj2
+     *
+     * @param obj1 object
+     * @param obj2 object
+     * @return true if anything is placed between, false otherwise
+     */
+    public boolean anyObjectsBetween(BoundingBox obj1, BoundingBox obj2) {
+
+        List<BoundingBox> lObjs = findObjectsBetween(obj1, obj2);
+        return !(lObjs.isEmpty());
+    }
+
+
+    /**
+     * Adds object to the plane
+     *
+     * @param obj object
+     * @return document plane
+     */
+    public DocumentPlane add(BoundingBox obj) {
+
+        int objsBefore = this.objs.size();
+        /*
+         * iterate over grid squares
+         */
+        for (int y = ((int) obj.getY()) / gridSize; y <= ((int) (obj.getY() + obj.getHeight() + gridSize - 1)) / gridSize; ++y) {
+            for (int x = ((int) obj.getX()) / gridSize; x <= ((int) (obj.getX() + obj.getWidth() + gridSize - 1)) / gridSize; ++x) {
+                GridXY xy = new GridXY(x, y);
+                if (!grid.keySet().contains(xy)) {
+                    /*
+                     * add the non-existing key
+                     */
+                    grid.put(xy, new ArrayList<BoundingBox>());
+                    grid.get(xy).add(obj);
+                    assert grid.get(xy).size() == 1;
+                } else {
+                    grid.get(xy).add(obj);
+                }
+            }
+        }
+        objs.add(obj);
+        /*
+         * size of the object list should be incremented
+         */
+        assert objsBefore + 1 == objs.size();
+        /*
+         * object list must contain the same number of objects as object dictionary
+         */
+        assert objs.size() == elementsInGrid();
+        return this;
+    }
+
+
+    public DocumentPlane remove(BoundingBox obj) {
+        /*
+         * iterate over grid squares
+         */
+        for (int y = ((int) obj.getY()) / gridSize; y <= ((int) (obj.getY() + obj.getHeight() + gridSize - 1)) / gridSize; ++y) {
+            for (int x = ((int) obj.getX()) / gridSize; x <= ((int) (obj.getX() + obj.getWidth() + gridSize - 1)) / gridSize; ++x) {
+                GridXY xy = new GridXY(x, y);
+                if (grid.get(xy).contains(obj)) {
+                    grid.get(xy).remove(obj);
+                }
+            }
+        }
+        objs.remove(obj);
+        assert objs.size() == elementsInGrid();
+        return this;
+    }
+
+
+    /**
+     * Find objects within search bounds
+     *
+     * @param searchBounds is a search rectangle
+     * @return list of objects in!side search rectangle
+     */
+    public List<BoundingBox> find(Rectangle2D searchBounds) {
+
+        List<BoundingBox> done = new ArrayList<BoundingBox>(); //contains already considered objects (wrt. optimization)
+        List<BoundingBox> ret = new ArrayList<BoundingBox>();
+        double x0 = searchBounds.getX();
+        double y0 = searchBounds.getY();
+        double y1 = searchBounds.getY() + searchBounds.getHeight();
+        double x1 = searchBounds.getX() + searchBounds.getWidth();
+        /*
+         * iterate over grid squares
+         */
+        for (int y = (int) y0 / gridSize; y < ((int) (y1 + gridSize - 1)) / gridSize; ++y) {
+            for (int x = (int) x0 / gridSize; x < ((int) (x1 + gridSize - 1)) / gridSize; ++x) {
+                GridXY xy = new GridXY(x, y);
+                if (!grid.containsKey(xy)) {
+                    continue;
+                }
+                for (BoundingBox obj : grid.get(xy)) {
+                    if (done.contains(obj)) /*
+                     * omit if already checked
+                     */ {
+                        continue;
+                    }
+                    /*
+                     * add to the checked objects
+                     */
+                    done.add(obj);
+                    /*
+                     * check if two objects overlap
+                     */
+                    if (obj.getX() + obj.getWidth() <= x0 || x1 <= obj.getX() || obj.getY() + obj.getHeight() <= y0 || y1 <= obj.getY()) {
+                        continue;
+                    }
+                    ret.add(obj);
+                }
+            }
+        }
+        return ret;
+    }
+
+
+    /**
+     * Count objects stored in objects dictionary
+     *
+     * @return number of elements
+     */
+    protected int elementsInGrid() {
+
+        List<BoundingBox> objs_ = new ArrayList<BoundingBox>();
+        for (GridXY coord : grid.keySet()) {
+            for (BoundingBox obj : grid.get(coord)) {
+                if (!objs_.contains(obj)) {
+                    objs_.add(obj);
+                }
+            }
+        }
+        return objs_.size();
+    }
+
+}
@@ -0,0 +1,29 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.readingorder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone;
+
+public class TreeToListConverter {
+
+    public List<Zone> convertToList(BoundingBoxZoneGroup obj) {
+
+        List<Zone> ret = new ArrayList<>();
+        if (obj.getLeftChild() instanceof Zone) {
+            Zone zone = (Zone) obj.getLeftChild();
+            ret.add(zone);
+        } else { // obj.getLeftChild() instanceof BxZoneGroup
+            ret.addAll(convertToList((BoundingBoxZoneGroup) obj.getLeftChild()));
+        }
+
+        if (obj.getRightChild() instanceof Zone) {
+            Zone zone = (Zone) obj.getRightChild();
+            ret.add(zone);
+        } else { // obj.getRightChild() instanceof BxZoneGroup
+            ret.addAll(convertToList((BoundingBoxZoneGroup) obj.getRightChild()));
+        }
+        return ret;
+    }
+
+}
@@ -25,14 +25,13 @@ public class LineBuilderService {
        double maxVerticalDistance = lineSpacing * MAX_VERTICAL_CHARACTER_DISTANCE;

        DisjointSets<Character> sets = new DisjointSets<>(characters);
-        AngleFilter filter = new AngleFilter(-ANGLE_TOLERANCE, ANGLE_TOLERANCE);
+        AngleFilter filter = AngleFilter.newInstance(-ANGLE_TOLERANCE, ANGLE_TOLERANCE);

        characters.forEach(character -> {
            character.getNeighbors().forEach(neighbor -> {
                double x = neighbor.getHorizontalDistance() / maxHorizontalDistance;
                double y = neighbor.getVerticalDistance() / maxVerticalDistance;
-                if (character.getTextPosition().getDir() == neighbor.getCharacter().getTextPosition().getDir() && filter.matches(neighbor) && Math.pow(x, 2) + Math.pow(y,
-                        2) <= 1) {
+                if (filter.matches(neighbor) && Math.pow(x, 2) + Math.pow(y, 2) <= 1) {
                    sets.union(character, neighbor.getCharacter());
                }
            });
@@ -40,9 +39,9 @@ public class LineBuilderService {

        List<Line> lines = new ArrayList<>();
        sets.forEach(group -> {
-            List<Character> lineCharacters = new ArrayList<>(group);
-            lineCharacters.sort(Comparator.comparingDouble(Character::getX));
-            lines.add(new Line(lineCharacters, characterSpacing));
+            List<Character> lineComponents = new ArrayList<>(group);
+            lineComponents.sort(Comparator.comparingDouble(Character::getX));
+            lines.add(new Line(lineComponents, characterSpacing));
        });

        return lines;
@@ -18,7 +18,7 @@ public class NearestNeighbourService {

    public void findNearestNeighbors(List<Character> characters) {

-        if (characters.isEmpty() || characters.size() == 1) {
+        if (characters.isEmpty()) {
            return;
        }

@@ -1,100 +1,286 @@
 package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service;

 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.ListIterator;

 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.BoundingBoxZoneGroup;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.readingorder.DistElem;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.readingorder.DocumentPlane;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.readingorder.TreeToListConverter;
 import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.utils.DoubleUtils;

@Service
 public class ReadingOrderService {

-    private static final double THRESHOLD = 5;
+    static final int GRIDSIZE = 50;
+    static final double EPS = 0.01;
+    static final int MAX_ZONES = 1000;
+    static final Comparator<BoundingBox> Y_ASCENDING_ORDER = new Comparator<BoundingBox>() {

+        @Override
+        public int compare(BoundingBox o1, BoundingBox o2) {

-    public List<Zone> resolve(List<Zone> zones, boolean xyOrder) {
-
-        if (zones.isEmpty() || zones.size() == 1) {
-            return zones;
+            return DoubleUtils.compareDouble(o1.getY(), o2.getY(), EPS);
        }
+    };

-        if (xyOrder) {
-//            QuickSort.sort(zones, new ZoneComparator());
-            zones.sort(Comparator.comparing(BoundingBox::getY, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD))
-                    .thenComparing(BoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, 0)));
-            return zones;
+    static final Comparator<BoundingBox> X_ASCENDING_ORDER = new Comparator<BoundingBox>() {
+
+        @Override
+        public int compare(BoundingBox o1, BoundingBox o2) {
+
+            return DoubleUtils.compareDouble(o1.getX(), o2.getX(), EPS);
        }
+    };

-        return resolveMultiColumnReadingOder(zones);
+    static final Comparator<BoundingBox> YX_ASCENDING_ORDER = new Comparator<BoundingBox>() {
+
+        @Override
+        public int compare(BoundingBox o1, BoundingBox o2) {
+
+            int yCompare = Y_ASCENDING_ORDER.compare(o1, o2);
+            return yCompare == 0 ? X_ASCENDING_ORDER.compare(o1, o2) : yCompare;
+        }
+    };
+
+
+    public List<Zone> resolve(List<Zone> zones) {
+
+        List<Zone> orderedZones;
+        if (zones.size() > MAX_ZONES) {
+            orderedZones = new ArrayList<>(zones);
+            Collections.sort(orderedZones, YX_ASCENDING_ORDER);
+        } else {
+            orderedZones = reorderZones(zones);
+        }
+        return orderedZones;
    }


-    private List<Zone> resolveMultiColumnReadingOder(List<Zone> zones) {
+    private List<Zone> reorderZones(List<Zone> unorderedZones) {

-        // Simple reading order resolver for multi column page layout as described here : https://pub.towardsai.net/advanced-rag-02-unveiling-pdf-parsing-b84ae866344e
-        // TODO implement a more fancy reading order resolver see https://github.com/BobLd/DocumentLayoutAnalysis/blob/master/README.md#reading-order
+        if (unorderedZones.isEmpty()) {
+            return new ArrayList<>();
+        } else if (unorderedZones.size() == 1) {
+            List<Zone> ret = new ArrayList<>(1);
+            ret.add(unorderedZones.get(0));
+            return ret;
+        } else {
+            BoundingBoxZoneGroup bxZonesTree = groupZonesHierarchically(unorderedZones);
+            sortGroupedZones(bxZonesTree);
+            TreeToListConverter treeConverter = new TreeToListConverter();
+            List<Zone> orderedZones = treeConverter.convertToList(bxZonesTree);
+            assert unorderedZones.size() == orderedZones.size();
+            return orderedZones;
+        }
+    }

-        double minX = Double.POSITIVE_INFINITY;
-        double maxX = Double.NEGATIVE_INFINITY;

-        for (Zone zone : zones) {
-            if (zone.getX() < minX) {
-                minX = zone.getX();
-            }
-            if (zone.getX() + zone.getWidth() > maxX) {
-                maxX = zone.getX() + zone.getWidth();
+    /**
+     * Builds a binary tree of zones and groups of zones from a list of unordered zones. This is done in hierarchical
+     * clustering by joining two least distant nodes. Distance is calculated in the distance() method.
+     *
+     * @param zones is a list of unordered zones
+     * @return root of the zones clustered in a tree
+     */
+    private BoundingBoxZoneGroup groupZonesHierarchically(List<Zone> zones) {
+        /*
+         * Distance tuples are stored sorted by ascending distance value
+         */
+        List<DistElem<BoundingBox>> dists = new ArrayList<DistElem<BoundingBox>>(zones.size() * zones.size() / 2);
+        for (int idx1 = 0; idx1 < zones.size(); ++idx1) {
+            for (int idx2 = idx1 + 1; idx2 < zones.size(); ++idx2) {
+                Zone zone1 = zones.get(idx1);
+                Zone zone2 = zones.get(idx2);
+                dists.add(new DistElem<BoundingBox>(false, distance(zone1, zone2), zone1, zone2));
            }
        }
-
-        double midLineXCoordinate = (minX + maxX) / 2;
-
-        List<Zone> leftOf = new ArrayList<>();
-        List<Zone> rightOf = new ArrayList<>();
-        List<Zone> middle = new ArrayList<>();
-        for (Zone zone : zones) {
-            if (zone.getX() < midLineXCoordinate && zone.getX() + zone.getWidth() < midLineXCoordinate) {
-                leftOf.add(zone);
-            } else if (zone.getX() > midLineXCoordinate && zone.getX() + zone.getWidth() > midLineXCoordinate) {
-                rightOf.add(zone);
-            } else {
-                middle.add(zone);
+        Collections.sort(dists);
+        DocumentPlane plane = new DocumentPlane(zones, GRIDSIZE);
+        while (!dists.isEmpty()) {
+            DistElem<BoundingBox> distElem = dists.get(0);
+            dists.remove(0);
+            if (!distElem.isC() && plane.anyObjectsBetween(distElem.getObj1(), distElem.getObj2())) {
+                dists.add(new DistElem<BoundingBox>(true, distElem.getDist(), distElem.getObj1(), distElem.getObj2()));
+                continue;
            }
+            BoundingBoxZoneGroup newGroup = new BoundingBoxZoneGroup(distElem.getObj1(), distElem.getObj2());
+            plane.remove(distElem.getObj1()).remove(distElem.getObj2());
+            dists = removeDistElementsContainingObject(dists, distElem.getObj1());
+            dists = removeDistElementsContainingObject(dists, distElem.getObj2());
+            for (BoundingBox other : plane.getObjects()) {
+                dists.add(new DistElem<BoundingBox>(false, distance(other, newGroup), newGroup, other));
+            }
+            Collections.sort(dists);
+            plane.add(newGroup);
        }

-        leftOf.sort(Comparator.comparing(BoundingBox::getY, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD))
-                .thenComparing(BoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD)));
+        assert plane.getObjects().size() == 1 : "There should be one object left at the plane after grouping";
+        return (BoundingBoxZoneGroup) plane.getObjects().get(0);
+    }

-        rightOf.sort(Comparator.comparing(BoundingBox::getY, (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)));
+    /**
+     * Removes all distance tuples containing obj
+     */
+    private List<DistElem<BoundingBox>> removeDistElementsContainingObject(Collection<DistElem<BoundingBox>> list, BoundingBox obj) {

-        List<Zone> sortedZones = new ArrayList<>();
-        sortedZones.addAll(leftOf);
-        sortedZones.addAll(rightOf);
-
-        ListIterator<Zone> itty = middle.listIterator();
-
-        while (itty.hasNext()) {
-            Zone current = itty.next();
-            for (int i = 0; i < sortedZones.size(); i++) {
-                if (current.getY() < sortedZones.get(i).getY()) {
-                    sortedZones.add(i, current);
-                    itty.remove();
-                    break;
-                }
+        List<DistElem<BoundingBox>> ret = new ArrayList<DistElem<BoundingBox>>();
+        for (DistElem<BoundingBox> distElem : list) {
+            if (distElem.getObj1() != obj && distElem.getObj2() != obj) {
+                ret.add(distElem);
            }
        }
+        return ret;
+    }

-        sortedZones.addAll(middle);

-        return sortedZones;
+    /**
+     * Swaps children of BxZoneGroup if necessary. A group with smaller sort factor is placed to the left (leftChild).
+     * An object with greater sort factor is placed on the right (rightChild). This plays an important role when
+     * traversing the tree in conversion to a one dimensional list.
+     *
+     * @param group
+     */
+    private void sortGroupedZones(BoundingBoxZoneGroup group) {
+
+        BoundingBox leftChild = group.getLeftChild();
+        BoundingBox rightChild = group.getRightChild();
+        if (shouldBeSwapped(leftChild, rightChild)) {
+            // swap
+            group.setLeftChild(rightChild);
+            group.setRightChild(leftChild);
+        }
+
+        if (leftChild instanceof BoundingBoxZoneGroup) // if the child is a tree node, then recurse
+        {
+            sortGroupedZones((BoundingBoxZoneGroup) leftChild);
+        }
+        if (rightChild instanceof BoundingBoxZoneGroup) // as above - recurse
+        {
+            sortGroupedZones((BoundingBoxZoneGroup) rightChild);
+        }
+    }
+
+
+    private boolean shouldBeSwapped(BoundingBox first, BoundingBox second) {
+
+        double cx, cy, cw, ch, ox, oy, ow, oh;
+        cx = first.getBBox().getX();
+        cy = first.getBBox().getY();
+        cw = first.getBBox().getWidth();
+        ch = first.getBBox().getHeight();
+
+        ox = second.getBBox().getX();
+        oy = second.getBBox().getY();
+        ow = second.getBBox().getWidth();
+        oh = second.getBBox().getHeight();
+
+        // Determine Octant
+        //
+        // 0 | 1 | 2
+        // __|___|__
+        // 7 | 9 | 3   First is placed in 9th square
+        // __|___|__
+        // 6 | 5 | 4
+
+        if (cx + cw <= ox) { //2,3,4
+            return false;
+        } else if (ox + ow <= cx) { //0,6,7
+            return true; //6
+        } else if (cy + ch <= oy) {
+            return false; //5
+        } else if (oy + oh <= cy) {
+            return true; //1
+        } else { //two zones
+            double xdiff = ox + ow / 2 - cx - cw / 2;
+            double ydiff = oy + oh / 2 - cy - ch / 2;
+            return xdiff + ydiff < 0;
+        }
+    }
+
+
+    /**
+     * A distance function between two TextBoxes.
+     * <p>
+     * Consider the bounding rectangle for obj1 and obj2. Return its area minus the areas of obj1 and obj2, shown as
+     * 'www' below. This value may be negative. (x0,y0) +------+..........+ | obj1 |wwwwwwwwww: +------+www+------+
+     * :wwwwwwwwww| obj2 | +..........+------+ (x1,y1)
+     *
+     * @return distance value based on objects' coordinates and physical size on a plane
+     */
+    private double distance(BoundingBox obj1, BoundingBox obj2) {
+
+        double x0 = Math.min(obj1.getX(), obj2.getX());
+        double y0 = Math.min(obj1.getY(), obj2.getY());
+        double x1 = Math.max(obj1.getX() + obj1.getWidth(), obj2.getX() + obj2.getWidth());
+        double y1 = Math.max(obj1.getY() + obj1.getHeight(), obj2.getY() + obj2.getHeight());
+        double dist = ((x1 - x0) * (y1 - y0) - obj1.getArea() - obj2.getArea());
+
+        double factor = ((x1 - x0)/x1) / ((y1 - y0)/y1);
+
+        double obj1X = obj1.getX();
+        double obj1Y_2 = obj1.getBBox().getMaxY();
+        double obj1X_2 = obj1.getBBox().getMaxX();
+        double obj1CenterX = obj1.getBBox().getCenterX();
+        double obj1CenterY = obj1.getBBox().getCenterY();
+        double obj2X = obj2.getX();
+        double obj2Y_2 = obj2.getBBox().getMaxY();
+        double obj2X_2 = obj2.getBBox().getMaxX();
+        double obj2CenterX = obj2.getBBox().getCenterX();
+        double obj2CenterY = obj2.getBBox().getCenterY();
+
+        double obj1obj2VectorCosineAbsLeft = Math.abs((obj2X - obj1X) / Math.sqrt((obj2X - obj1X) * (obj2X - obj1X) + (obj2CenterY - obj1CenterY) * (obj2CenterY - obj1CenterY)));
+        double obj1obj2VectorCosineAbsRight = Math.abs((obj2X_2 - obj1X_2) / Math.sqrt((obj2X_2 - obj1X_2) * (obj2X_2 - obj1X_2) + (obj2CenterY - obj1CenterY) * (obj2CenterY - obj1CenterY)));
+        double obj1obj2VectorCosineAbsCenter = Math.abs((obj2CenterX - obj1CenterX) / Math.sqrt((obj2CenterX - obj1CenterX) * (obj2CenterX - obj1CenterX) + (obj2CenterY - obj1CenterY) * (obj2CenterY - obj1CenterY)));
+
+        double cosine = Math.min(obj1obj2VectorCosineAbsLeft, Math.min(obj1obj2VectorCosineAbsRight, obj1obj2VectorCosineAbsCenter));
+
+        final double MAGIC_COEFF = 0.85;
+        //return dist * (MAGIC_COEFF + cosine);
+
+        return Math.sqrt(Math.pow((obj1X - obj2X), 2) + Math.pow((obj1Y_2 - obj2Y_2) * MAGIC_COEFF, 2));
+
+
+        /**if (Math.abs(obj1CenterX - obj2CenterX) >= Math.abs(obj1CenterY - obj2CenterY)) {
+            return dist * 2;
+        } else {
+            return dist;
+        }**/
+
+
+    }
+
+
+    private double distanceNew(BoundingBox obj1, BoundingBox obj2) {
+
+        if(obj1.getBBox().intersects(obj2.getBBox()))
+            return -1;
+
+        double minX0 = Math.min(obj1.getX(), obj2.getX());
+        double maxX0 = Math.max(obj1.getX(), obj2.getX());
+        double minY0 = Math.min(obj1.getY(), obj2.getY());
+        double maxY0 = Math.max(obj1.getY(), obj2.getY());
+        double minX1 = Math.min(obj1.getX() + obj1.getWidth(), obj2.getX() + obj2.getWidth());
+        double maxX1 = Math.max(obj1.getX() + obj1.getWidth(), obj2.getX() + obj2.getWidth());
+        double minY1 = Math.min(obj1.getY() + obj1.getHeight(), obj2.getY() + obj2.getHeight());
+        double maxY1 = Math.max(obj1.getY() + obj1.getHeight(), obj2.getY() + obj2.getHeight());
+        List<Double> xValues = new ArrayList<>(List.of(minX0, maxX0, minX1, maxX1));
+        Collections.sort(xValues);
+        List<Double> yValues = new ArrayList<>(List.of(minY0, maxY0, minY1, maxY1));
+        Collections.sort(yValues);
+
+        double yArea = (xValues.get(2) - xValues.get(1)) * (yValues.get(3) - yValues.get(0));
+        double xArea = (yValues.get(2) - yValues.get(1)) * (xValues.get(3) - xValues.get(0));
+
+        return Math.min(10*yArea, xArea);
    }

 }
@@ -18,32 +18,32 @@ public class SpacingService {
    private static final double ANGLE_TOLERANCE = Math.PI / 6;


-    public double computeCharacterSpacing(List<Character> characters) {
+    public double computeCharacterSpacing(List<Character> components) {

-        return computeSpacing(characters, 0);
+        return computeSpacing(components, 0);
    }


-    public double computeLineSpacing(List<Character> characters) {
+    public double computeLineSpacing(List<Character> components) {

-        return computeSpacing(characters, Math.PI / 2);
+        return computeSpacing(components, Math.PI / 2);
    }


-    private double computeSpacing(List<Character> characters, double angle) {
+    private double computeSpacing(List<Character> components, double angle) {

        double maxDistance = Double.NEGATIVE_INFINITY;

-        for (Character character : characters) {
-            for (Neighbor neighbor : character.getNeighbors()) {
+        for (Character component : components) {
+            for (Neighbor neighbor : component.getNeighbors()) {
                maxDistance = Math.max(maxDistance, neighbor.getDistance());
            }
        }
        Histogram histogram = new Histogram(0, maxDistance, SPACING_HISTOGRAM_RESOLUTION);
-        AngleFilter angleFilter = new AngleFilter(angle - ANGLE_TOLERANCE, angle + ANGLE_TOLERANCE);
-        for (Character character : characters) {
-            for (Neighbor neighbor : character.getNeighbors()) {
-                if (angleFilter.matches(neighbor)) {
+        AngleFilter filter = AngleFilter.newInstance(angle - ANGLE_TOLERANCE, angle + ANGLE_TOLERANCE);
+        for (Character component : components) {
+            for (Neighbor neighbor : component.getNeighbors()) {
+                if (filter.matches(neighbor)) {
                    histogram.add(neighbor.getDistance());
                }
            }
@@ -1,13 +1,10 @@
 package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service;

 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
-import java.util.Set;

 import org.springframework.stereotype.Service;

-import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Character;
 import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.DisjointSets;
 import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Line;
 import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone;
@@ -28,9 +25,7 @@ public class ZoneBuilderService {

    private static final double ANGLE_TOLERANCE = Math.PI / 6;

-    private static final int MAX_ZONES = 300;
-
-    private static final double MAX_VERTICAL_MERGE_DISTANCE = 0.5;
+    public static final int MAX_ZONES = 300;


    public List<Zone> buildZones(List<Line> lines, double characterSpacing, double lineSpacing) {
@@ -46,7 +41,6 @@ public class ZoneBuilderService {

        lines.forEach(outerLine -> //
                lines.forEach(innerLine -> {
-
                    double scale = Math.min(outerLine.getHeight(), innerLine.getHeight()) / meanHeight;
                    scale = Math.max(MIN_LINE_SIZE_SCALE, Math.min(scale, MAX_LINE_SIZE_SCALE));

@@ -55,8 +49,13 @@ public class ZoneBuilderService {
                        double horizontalDistance = outerLine.horizontalDistance(innerLine) / scale;
                        double verticalDistance = outerLine.verticalDistance(innerLine) / scale;

-                        if (minHorizontalDistance <= horizontalDistance && verticalDistance <= maxVerticalDistance //
-                                || minHorizontalMergeDistance <= horizontalDistance && verticalDistance <= maxVerticalMergeDistance) {
+                        // Line over or above
+                        if (minHorizontalDistance <= horizontalDistance && verticalDistance <= maxVerticalDistance) {
+                            sets.union(outerLine, innerLine);
+                        }
+
+                        // Split line that needs later merging
+                        else if (minHorizontalMergeDistance <= horizontalDistance && verticalDistance <= maxVerticalMergeDistance) {
                            sets.union(outerLine, innerLine);
                        }
                    }
@@ -72,7 +71,7 @@ public class ZoneBuilderService {
            for (Zone zone : zones) {
                oneZoneLines.addAll(zone.getLines());
            }
-            return List.of(mergeLinesInZone(oneZoneLines, characterSpacing, lineSpacing));
+            return List.of(new Zone(oneZoneLines));
        }

        return zones;
@@ -92,59 +91,4 @@ public class ZoneBuilderService {
        return meanHeight;
    }

-
-    private Zone mergeLinesInZone(List<Line> lines, double characterSpacing, double lineSpacing) {
-
-        double maxHorizontalDistance = 0;
-        double minVerticalDistance = 0;
-        double maxVerticalDistance = lineSpacing * MAX_VERTICAL_MERGE_DISTANCE;
-
-        DisjointSets<Line> sets = new DisjointSets<>(lines);
-
-        lines.forEach(outer -> {
-
-            lines.forEach(inner -> {
-                if (inner != outer) {
-
-                    double horizontalDistance = outer.horizontalDistance(inner);
-                    double verticalDistance = outer.verticalDistance(inner);
-
-                    if (horizontalDistance <= maxHorizontalDistance && minVerticalDistance <= verticalDistance && verticalDistance <= maxVerticalDistance) {
-                        sets.union(outer, inner);
-                    } else if (minVerticalDistance <= verticalDistance && verticalDistance <= maxVerticalDistance && Math.abs(horizontalDistance - Math.min(outer.getLength(),
-                            inner.getLength())) < 0.1) {
-                        boolean characterOverlap = false;
-                        int overlappingCount = 0;
-                        for (Character outerCharacter : outer.getCharacters()) {
-                            for (Character innerCharacter : inner.getCharacters()) {
-                                double characterOverlapDistance = outerCharacter.overlappingDistance(innerCharacter);
-                                if (characterOverlapDistance > 2) {
-                                    characterOverlap = true;
-                                }
-                                if (characterOverlapDistance > 0) {
-                                    overlappingCount++;
-                                }
-                            }
-                        }
-                        if (!characterOverlap && overlappingCount <= 2) {
-                            sets.union(outer, inner);
-                        }
-                    }
-                }
-            });
-        });
-
-        List<Line> outputZone = new ArrayList<>();
-        for (Set<Line> group : sets) {
-            List<Character> components = new ArrayList<>();
-            for (Line line : group) {
-                components.addAll(line.getCharacters());
-            }
-            components.sort(Comparator.comparingDouble(Character::getX));
-
-            outputZone.add(new Line(components, characterSpacing));
-        }
-        return new Zone(outputZone);
-    }
-
 }
@@ -7,9 +7,12 @@ 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));
-        return Long.compare(i1, i2);
+        if (precision == 0) {
+            precision = 1;
+        }
+        long i1 = Math.round(d1 / precision);
+        long i2 = Math.round(d2 / precision);
+        return Long.valueOf(i1).compareTo(i2);
    }

 }
@@ -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);
    }


@@ -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();
    }

@@ -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();
    }


@@ -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();
    }
@@ -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);
-    }
-
 }
@@ -237,13 +237,8 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        int startIndex = 0;
        RedTextPosition previous = null;

-        float direction = -1;
        for (int i = 0; i <= textPositions.size() - 1; i++) {

-            if (direction == -1) {
-                direction = textPositions.get(i).getDir();
-            }
-
            if (!textPositionSequences.isEmpty()) {
                previous = textPositionSequences.get(textPositionSequences.size() - 1)
                        .getTextPositions()
@@ -255,13 +250,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                continue;
            }

-            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));
-                startIndex = i;
-                direction = textPositions.get(i).getDir();
-            }
-
            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
            if (checkIfCurrentPositionIsToTheRightOfPreviousPosition(i, textPositions)) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
@@ -341,7 +329,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < maximumGapSize;
    }

-
    @Override
    public String getText(PDDocument doc) throws IOException {

@@ -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());
-    }
-
 }
@@ -0,0 +1,270 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.visualization;
+
+import java.awt.Color;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
+import org.apache.pdfbox.util.Matrix;
+import org.springframework.core.io.ClassPathResource;
+
+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.nodes.Document;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page;
+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.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) 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),
+                        PdfVisualisationUtility.Options.builder().stroke(true).build());
+            }
+            pdDocument.save(out);
+        }
+
+    }
+
+
+    public static void drawRectanglesPerPageNumberedByLine(String filename, List<List<List<Rectangle2D>>> rectanglesPerPage, String tmpFileName) 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++) {
+                var rectanglesOnPage = rectanglesPerPage.get(pageNumber - 1);
+                for (int lineNumber = 0; lineNumber < rectanglesOnPage.size(); lineNumber++) {
+                    var rectanglesInLine = rectanglesOnPage.get(lineNumber);
+                    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,
+                            PdfVisualisationUtility.Options.builder().stroke(true).build());
+                }
+            }
+            pdDocument.save(out);
+        }
+
+    }
+
+
+    private static int countNumberOfDigits(int num) {
+
+        int final_num = num;
+        if (final_num == 0) {
+            return 1;
+        }
+        int count = 0;
+        for (; final_num != 0; final_num /= 10) {
+            count++;
+        }
+        return count;
+    }
+
+
+    public static void drawDocumentGraph(PDDocument document, Document documentGraph) {
+
+        documentGraph.getDocumentTree().allEntriesInOrder().forEach(entry -> drawNode(document, entry));
+    }
+
+
+    public static void drawNode(PDDocument document, DocumentTree.Entry entry) {
+
+        Options options = buildStandardOptionsForNodes(entry);
+
+        drawBBoxAndLabelAndNumberOnPage(document, entry, 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, Options options) {
+
+        drawRectangle2DList(document, atomicTextBlock.getPage().getNumber(), atomicTextBlock.getPositions().stream().toList(), options);
+
+    }
+
+
+    @SneakyThrows
+    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);
+
+        contentStream.setNonStrokingColor(options.getStrokeColor());
+        contentStream.setLineWidth(options.getStrokeWidth());
+
+        contentStream.beginText();
+        if (rotate) {
+            contentStream.setTextMatrix(Matrix.getRotateInstance(Math.toRadians(15), (float) location.getX(), (float) location.getY()));
+        } else {
+            contentStream.newLineAtOffset((float) location.getX(), (float) location.getY());
+        }
+        contentStream.setFont(new PDType1Font(Standard14Fonts.FontName.HELVETICA), 10);
+        contentStream.showText(string);
+        contentStream.endText();
+        contentStream.close();
+    }
+
+
+    @SneakyThrows
+    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, Options options, PDPage pdPage) throws IOException {
+
+        var contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
+
+        contentStream.setStrokingColor(options.getStrokeColor());
+        contentStream.setNonStrokingColor(options.getFillColor());
+        contentStream.setLineWidth(options.getStrokeWidth());
+
+        for (var r : rectCollection) {
+            contentStream.addRect((float) r.getMinX(), (float) r.getMinY(), (float) r.getWidth(), (float) r.getHeight());
+
+            if (options.isStroke() && options.isFill()) {
+                contentStream.fillAndStroke();
+            } else if (options.isStroke()) {
+                contentStream.stroke();
+            } else if (options.isFill()) {
+                contentStream.fill();
+            }
+        }
+        contentStream.close();
+    }
+
+
+    @SneakyThrows
+    public static void drawRectanglesAndLinesPerPage(String filename, List<List<Rectangle2D>> list, List<List<Rectangle2D>> rectanglesPerPage, String tmpFileName) {
+
+        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.drawLine2DList(pdDocument,
+//                        pageNumber,
+//                        list.get(pageNumber - 1),
+//                        PdfVisualisationUtility.Options.builder().stroke(true).build());
+                PdfVisualisationUtility.drawRectangle2DList(pdDocument,
+                        pageNumber,
+                        rectanglesPerPage.get(pageNumber - 1),
+                        PdfVisualisationUtility.Options.builder().stroke(true).build());
+                PdfVisualisationUtility.drawRectangle2DList(pdDocument, pageNumber, list.get(pageNumber - 1), PdfVisualisationUtility.Options.builder().stroke(true).build());
+            }
+            pdDocument.save(out);
+        }
+    }
+
+
+    @SneakyThrows
+    public static void drawLinesPerPage(String filename, List<List<Ruling>> linesPerPage, String tmpFileName) {
+
+        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.drawLine2DList(pdDocument,
+                        pageNumber,
+                        linesPerPage.get(pageNumber - 1),
+                        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 Options buildStandardOptionsForNodes(DocumentTree.Entry entry) {
+
+        return Options.builder().stroke(true).strokeColor(switch (entry.getType()) {
+            case DOCUMENT -> Color.LIGHT_GRAY;
+            case HEADER, FOOTER -> Color.GREEN;
+            case PARAGRAPH -> Color.BLUE;
+            case HEADLINE -> Color.RED;
+            case SECTION -> Color.BLACK;
+            case TABLE -> Color.ORANGE;
+            case TABLE_CELL -> Color.GRAY;
+            case IMAGE -> Color.MAGENTA;
+        }).build();
+    }
+
+
+    private static void drawBBoxAndLabelAndNumberOnPage(PDDocument document, DocumentTree.Entry entry, Options options) {
+
+        Map<Page, Rectangle2D> rectanglesPerPage = entry.getNode().getBBox();
+        for (Page page : rectanglesPerPage.keySet()) {
+            Rectangle2D rectangle2D = rectanglesPerPage.get(page);
+            if (entry.getType() == NodeType.SECTION) {
+                rectangle2D = RectangleTransformations.pad(rectangle2D, 10, 10);
+            }
+            drawRectangle2DList(document, page.getNumber(), List.of(rectangle2D), options);
+            drawText(buildString(entry),
+                    document,
+                    new Point2D.Double(rectangle2D.getMinX(), rectangle2D.getMaxY() + 2),
+                    page.getNumber(),
+                    options,
+                    entry.getType() == NodeType.TABLE_CELL);
+        }
+    }
+
+
+    private static String buildString(DocumentTree.Entry entry) {
+
+        return entry.getNode().getNumberOnPage() + ": " + entry.getTreeId() + ": " + entry.getType();
+    }
+
+}
@@ -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;
-
-}
-
@@ -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;
-    };
-
-}
@@ -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;
+
+    }
+
 }
@@ -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());
@@ -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;
-    }
-
-}
@@ -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());
-        }
-
-    }
-
-}
@@ -30,6 +30,8 @@ public class TableMergingUtility {
            if (consecutiveTable.getColCount() == originalTablePageBlock.getColCount() && !hasTableHeader(consecutiveTable) && outerBoundaryAlignsX(originalTablePageBlock,
                    consecutiveTable)) {
                consecutiveTablesWithSameColCountAndHeaders.add(consecutiveTable);
+            } else {
+                break;
            }
        }
        return Stream.concat(Stream.of(originalTablePageBlock), consecutiveTablesWithSameColCountAndHeaders.stream()).toList();
@@ -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;

@@ -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));
-            }
-        }
-    }
-
-}
-
@@ -27,10 +27,8 @@ import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Do
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse;
-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;

@@ -52,7 +50,6 @@ public class BdrJsonBuildTest extends AbstractTest {
                file,
                new ImageServiceResponse(),
                new TableServiceResponse(),
-                new VisualLayoutParsingResponse(),
                file.toString()));
    }

@@ -114,7 +111,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);
        }
    }
@@ -33,7 +33,6 @@ import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Do
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse;
-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.tenantcommons.TenantsClient;

@@ -95,11 +94,10 @@ public class HeadlinesGoldStandardIntegrationTest {
        goldStandardLog.getRedactionLogEntry().removeIf(r -> !r.isRedacted() || r.getChanges().get(r.getChanges().size() - 1).getType().equals(ChangeType.REMOVED));
        goldStandardLog.getRedactionLogEntry().forEach(e -> goldStandardHeadlines.add(new Headline(e.getPositions().get(0).getPage(), e.getValue())));

-        Document documentGraph = DocumentGraphFactory.buildDocumentGraph(layoutParsingPipeline.parseLayout(LayoutParsingType.REDACT_MANAGER_OLD,
+        Document documentGraph = DocumentGraphFactory.buildDocumentGraph(layoutParsingPipeline.parseLayout(LayoutParsingType.REDACT_MANAGER,
                pdfFileResource.getFile(),
                new ImageServiceResponse(),
                new TableServiceResponse(),
-                new VisualLayoutParsingResponse(),
                filePath));

        var foundHeadlines = documentGraph.streamAllSubNodes()
@@ -25,8 +25,10 @@ public class LayoutparserEnd2EndTest extends AbstractTest {
    @SneakyThrows
    public void testLayoutParserEndToEnd() {

-        prepareStorage("files/bdr/Wie weiter bei Kristeneinrichtungen.pdf");
-        LayoutParsingRequest layoutParsingRequest = buildDefaultLayoutParsingRequest(LayoutParsingType.REDACT_MANAGER_OLD);
+        String s = "（";
+        String s1 = "）";
+        prepareStorage("files/Minimal Examples/WrongOrderPage1.pdf");
+        LayoutParsingRequest layoutParsingRequest = buildDefaultLayoutParsingRequest(LayoutParsingType.REDACT_MANAGER);
        LayoutParsingFinishedEvent finishedEvent = layoutParsingPipeline.parseLayoutAndSaveFilesToStorage(layoutParsingRequest);
        Arrays.stream(finishedEvent.message().split("\n")).forEach(log::info);
    }
@@ -16,7 +16,6 @@ import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsi
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse;
-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.DocumentDataMapper;
 import com.knecon.fforesight.service.layoutparser.server.utils.BuildDocumentTest;
@@ -55,11 +54,10 @@ public class DocumentGraphJsonWritingTest extends BuildDocumentTest {
    @SneakyThrows
    private void writeJsons(Path filename) {

-        Document documentGraph = DocumentGraphFactory.buildDocumentGraph(layoutParsingPipeline.parseLayout(LayoutParsingType.REDACT_MANAGER_OLD,
+        Document documentGraph = DocumentGraphFactory.buildDocumentGraph(layoutParsingPipeline.parseLayout(LayoutParsingType.REDACT_MANAGER,
                filename.toFile(),
                new ImageServiceResponse(),
                new TableServiceResponse(),
-                new VisualLayoutParsingResponse(),
                filename.toFile().toString()));

        DocumentData documentData = DocumentDataMapper.toDocumentData(documentGraph);
@@ -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");
@@ -12,7 +12,6 @@ import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsi
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse;
-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.visualization.LayoutGridService;
 import com.knecon.fforesight.service.layoutparser.server.utils.BuildDocumentTest;
@@ -26,7 +25,7 @@ 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();
@@ -57,7 +56,6 @@ public class ViewerDocumentTest extends BuildDocumentTest {
                documentFile,
                new ImageServiceResponse(),
                tableResponse,
-                new VisualLayoutParsingResponse(),
                Path.of(fileName).getFileName().toFile().toString());
        ViewerDocumentService viewerDocumentService = new ViewerDocumentService(null);
        LayoutGridService layoutGridService = new LayoutGridService(viewerDocumentService);
@@ -67,4 +65,3 @@ public class ViewerDocumentTest extends BuildDocumentTest {
    }

 }
-
@@ -29,9 +29,10 @@ import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Im
 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.TablePageBlock;
+import com.knecon.fforesight.service.layoutparser.processor.python_api.adapter.CvTableParsingAdapter;
+import com.knecon.fforesight.service.layoutparser.processor.python_api.adapter.ImageServiceResponseAdapter;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse;
-import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.VisualLayoutParsingResponse;
 import com.knecon.fforesight.service.layoutparser.processor.services.SectionsBuilderService;
 import com.knecon.fforesight.service.layoutparser.processor.services.classification.RedactManagerClassificationService;
 import com.knecon.fforesight.service.layoutparser.server.utils.AbstractTest;
@@ -49,6 +50,12 @@ public class PdfSegmentationServiceTest extends AbstractTest {
    @Autowired
    private RedactManagerClassificationService redactManagerClassificationService;

+    @Autowired
+    private CvTableParsingAdapter cvTableParsingAdapter;
+
+    @Autowired
+    private ImageServiceResponseAdapter imageServiceResponseAdapter;
+
    @Autowired
    private SectionsBuilderService sectionsBuilderService;

@@ -56,11 +63,10 @@ public class PdfSegmentationServiceTest extends AbstractTest {
    @SneakyThrows
    public ClassificationDocument buildClassificationDocument(File originDocument, TableServiceResponse tableServiceResponse) {

-        ClassificationDocument classificationDocument = layoutParsingPipeline.parseLayout(LayoutParsingType.REDACT_MANAGER_OLD,
+        ClassificationDocument classificationDocument = layoutParsingPipeline.parseLayout(LayoutParsingType.REDACT_MANAGER,
                originDocument,
                new ImageServiceResponse(),
                tableServiceResponse,
-                new VisualLayoutParsingResponse(),
                "document");

        redactManagerClassificationService.classifyDocument(classificationDocument);
@@ -81,11 +87,11 @@ public class PdfSegmentationServiceTest extends AbstractTest {
    @Test
    public void tablesToHtmlDebugger() throws IOException {

-        ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/T5 VV-640252-Page16.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/A20622A izRMS (CZ) fRR Part B9_Page185.pdf");

        ClassificationDocument document = buildClassificationDocument(pdfFileResource.getFile());

-        toHtml(document, "/tmp/T5.html");
+        toHtml(document, "/tmp/A20622A izRMS (CZ) fRR Part B9_Page185.html");

    }

@@ -103,7 +109,6 @@ public class PdfSegmentationServiceTest extends AbstractTest {
    }


-    @Disabled
    @Test
    public void testScanRotationBorderIsIgnored() throws IOException {

@@ -153,7 +158,7 @@ public class PdfSegmentationServiceTest extends AbstractTest {

        ClassificationDocument document = buildClassificationDocument(pdfFileResource.getFile());
        assertThat(document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList())).isNotEmpty();
-        TablePageBlock table = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).toList().get(0);
+        TablePageBlock table = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList()).get(0);
        assertThat(table.getColCount()).isEqualTo(6);
        assertThat(table.getRowCount()).isEqualTo(13);
        assertThat(table.getRows().stream().mapToInt(List::size).sum()).isEqualTo(6 * 13);
@@ -167,10 +172,10 @@ public class PdfSegmentationServiceTest extends AbstractTest {

        ClassificationDocument document = buildClassificationDocument(pdfFileResource.getFile());
        assertThat(document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList())).isNotEmpty();
-        TablePageBlock firstTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).toList().get(0);
+        TablePageBlock firstTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList()).get(0);
        assertThat(firstTable.getColCount()).isEqualTo(8);
        assertThat(firstTable.getRowCount()).isEqualTo(1);
-        TablePageBlock secondTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).toList().get(1);
+        TablePageBlock secondTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList()).get(1);
        assertThat(secondTable.getColCount()).isEqualTo(8);
        assertThat(secondTable.getRowCount()).isEqualTo(2);
        List<List<Cell>> firstTableHeaderCells = firstTable.getRows().get(0).stream().map(Collections::singletonList).collect(Collectors.toList());
@@ -185,10 +190,10 @@ public class PdfSegmentationServiceTest extends AbstractTest {

        ClassificationDocument document = buildClassificationDocument(pdfFileResource.getFile());
        assertThat(document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList())).isNotEmpty();
-        TablePageBlock firstTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).toList().get(0);
+        TablePageBlock firstTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList()).get(0);
        assertThat(firstTable.getColCount()).isEqualTo(9);
        assertThat(firstTable.getRowCount()).isEqualTo(5);
-        TablePageBlock secondTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).toList().get(1);
+        TablePageBlock secondTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList()).get(1);
        assertThat(secondTable.getColCount()).isEqualTo(9);
        assertThat(secondTable.getRowCount()).isEqualTo(6);
        List<List<Cell>> firstTableHeaderCells = firstTable.getRows().get(firstTable.getRowCount() - 1).stream().map(Cell::getHeaderCells).collect(Collectors.toList());
@@ -203,10 +208,10 @@ public class PdfSegmentationServiceTest extends AbstractTest {

        ClassificationDocument document = buildClassificationDocument(pdfFileResource.getFile());
        assertThat(document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList())).isNotEmpty();
-        TablePageBlock firstTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).toList().get(0);
+        TablePageBlock firstTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList()).get(0);
        assertThat(firstTable.getColCount()).isEqualTo(8);
        assertThat(firstTable.getRowCount()).isEqualTo(1);
-        TablePageBlock secondTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).toList().get(1);
+        TablePageBlock secondTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList()).get(1);
        assertThat(secondTable.getColCount()).isEqualTo(8);
        assertThat(secondTable.getRowCount()).isEqualTo(6);
        List<List<Cell>> firstTableHeaderCells = firstTable.getRows().get(0).stream().map(Collections::singletonList).collect(Collectors.toList());
@@ -214,7 +219,7 @@ public class PdfSegmentationServiceTest extends AbstractTest {
    }


-    @Test
+    @Test // Non-sense test
    public void testDoc56Page170() throws IOException {

        ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/56 Fludioxonil_RAR_12_Volume_3CA_B-7_2018-02-21_Page170.pdf");
@@ -225,8 +230,8 @@ public class PdfSegmentationServiceTest extends AbstractTest {

        validateTable(document, 0, 1, 1, 0, 0);
        validateTable(document, 1, 2, 2, 0, 0);
-        validateTable(document, 2, 4, 19, 12, 0);
-        validateTable(document, 3, 2, 12, 0, 0);
+        validateTable(document, 2, 6, 20, 0, 0);
+        validateTable(document, 3, 7, 31, 0, 0);

    }

@@ -574,100 +579,6 @@ public class PdfSegmentationServiceTest extends AbstractTest {
    }


-    @Test
-    public void testT0() throws IOException {
-
-        ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/T0 TableWithMergedCells.pdf");
-
-        ClassificationDocument document = buildClassificationDocument(pdfFileResource.getFile());
-
-        validateTableSize(document, 1);
-
-        validateTable(document, 0, 6, 8, 0, 0);
-    }
-
-
-    @Test
-    public void testT1() throws IOException {
-
-        ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/T1 MultipleNestedTable.pdf");
-
-        ClassificationDocument document = buildClassificationDocument(pdfFileResource.getFile());
-
-        validateTableSize(document, 4);
-
-        validateTable(document, 0, 3, 3, 0, 0);
-        validateTable(document, 1, 3, 6, 2, 0);
-        validateTable(document, 2, 3, 3, 1, 0);
-        validateTable(document, 3, 3, 3, 0, 0);
-
-    }
-
-
-    @Test
-    public void testT2() throws IOException {
-
-        ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/T2 MultipleTables.pdf");
-
-        ClassificationDocument document = buildClassificationDocument(pdfFileResource.getFile());
-
-        validateTableSize(document, 6);
-
-        validateTable(document, 0, 5, 5, 0, 0);
-        validateTable(document, 1, 5, 6, 0, 0);
-        validateTable(document, 2, 5, 5, 0, 0);
-        validateTable(document, 3, 5, 5, 0, 0);
-        validateTable(document, 4, 5, 5, 0, 0);
-        validateTable(document, 5, 5, 5, 0, 0);
-
-    }
-
-
-    @Test
-    public void testT3() throws IOException {
-
-        ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/T3 S-Meto_Page29.pdf");
-
-        ClassificationDocument document = buildClassificationDocument(pdfFileResource.getFile());
-
-        validateTableSize(document, 1);
-
-        validateTable(document, 0, 6, 5, 0, 0);
-
-    }
-
-
-    @Test
-    public void testT4() throws IOException {
-
-        ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/T4 138 IDD0000261736_Page16.pdf");
-
-        ClassificationDocument document = buildClassificationDocument(pdfFileResource.getFile());
-
-        validateTableSize(document, 1);
-
-        validateTable(document, 0, 5, 8, 1, 0);
-
-    }
-
-
-    @Test
-    public void testT5() throws IOException {
-
-        ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/T5 VV-640252-Page16.pdf");
-
-        ClassificationDocument document = buildClassificationDocument(pdfFileResource.getFile());
-
-        validateTableSize(document, 5);
-        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);
-
-    }
-
-
    @SneakyThrows
    private void toHtml(ClassificationDocument document, String filename) {

@@ -694,7 +605,7 @@ public class PdfSegmentationServiceTest extends AbstractTest {

        TablePageBlock table = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).toList().get(tableIndex);
        List<List<Cell>> rows = table.getRows();
-        int emptyCellsFoundFound = rows.stream().flatMap(List::stream).toList().stream().filter(f -> f.toString().isEmpty()).toList().size();
+        int emptyCellsFoundFound = rows.stream().flatMap(List::stream).toList().stream().filter(f -> f.toString().equals("")).toList().size();

        for (List<Cell> row : table.getRows()) {
            row.forEach(r -> System.out.println(r.toString()));
@@ -48,7 +48,7 @@ class GapAcrossLinesDetectionServiceTest {


    @Test
-    @Disabled
+    //@Disabled
    @SneakyThrows
    public void testColumnDetection() {

@@ -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;

@@ -25,56 +21,34 @@ import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Ta
 import com.knecon.fforesight.service.layoutparser.processor.model.table.CleanRulings;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse;
-import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.VisualLayoutParsingResponse;
 import com.knecon.fforesight.service.layoutparser.processor.services.PageContentExtractor;
 import com.knecon.fforesight.service.layoutparser.processor.services.RulingCleaningService;
 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.processor.services.visualization.LayoutGridService;
 import com.knecon.fforesight.service.layoutparser.server.utils.BuildDocumentTest;
 import com.knecon.fforesight.service.layoutparser.server.utils.visualizations.PdfDraw;
+import com.knecon.fforesight.service.viewerdoc.service.ViewerDocumentService;

 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);

    }

@@ -83,6 +57,9 @@ public class RulingCleaningServiceTest extends BuildDocumentTest {
    @SneakyThrows
    public void testTableExtraction() {

+        ViewerDocumentService viewerDocumentService = new ViewerDocumentService(null);
+        LayoutGridService layoutGridService = new LayoutGridService(viewerDocumentService);
+
        ClassPathResource resource = new ClassPathResource("files");
        List<String> pdfFileNames = Files.walk(resource.getFile().toPath())
                .filter(path -> path.getFileName().toString().endsWith(".pdf"))
@@ -90,8 +67,8 @@ public class RulingCleaningServiceTest extends BuildDocumentTest {
                .map(Path::toString)
                .toList();

-        for (String pdfFileName : pdfFileNames) {
-            writeJsons(Path.of(pdfFileName));
+        for (int i = 0; i < pdfFileNames.size(); i++) {
+            writeJsons(Path.of(pdfFileNames.get(i)));
        }
    }

@@ -99,27 +76,25 @@ public class RulingCleaningServiceTest extends BuildDocumentTest {
    @SneakyThrows
    private void writeJsons(Path filename) {

-        Document documentGraphBefore = DocumentGraphFactory.buildDocumentGraph(layoutParsingPipeline.parseLayout(LayoutParsingType.REDACT_MANAGER_OLD,
+        Document documentGraphBefore = DocumentGraphFactory.buildDocumentGraph(layoutParsingPipeline.parseLayout(LayoutParsingType.REDACT_MANAGER,
                filename.toFile(),
                new ImageServiceResponse(),
                new TableServiceResponse(),
-                new VisualLayoutParsingResponse(),
                filename.toFile().toString()));
-        Document documentGraphAfter = DocumentGraphFactory.buildDocumentGraph(layoutParsingPipeline.parseLayout(LayoutParsingType.REDACT_MANAGER_OLD,
+        Document documentGraphAfter = DocumentGraphFactory.buildDocumentGraph(layoutParsingPipeline.parseLayout(LayoutParsingType.REDACT_MANAGER,
                filename.toFile(),
                new ImageServiceResponse(),
                new TableServiceResponse(),
-                new VisualLayoutParsingResponse(),
                filename.toFile().toString()));
        DocumentData documentDataBefore = DocumentDataMapper.toDocumentData(documentGraphBefore);
        DocumentData documentDataAfter = DocumentDataMapper.toDocumentData(documentGraphAfter);
-        if (!compareStructures(documentDataBefore.getDocumentStructure(), documentDataAfter.getDocumentStructure())) {
-            String tmpFileNameBefore = "/tmp/before." + filename.getFileName().toString();
+        if (!compareStructures(documentDataBefore.getDocumentStructure(), documentDataAfter.getDocumentStructure(), filename.getFileName().toString())) {
+            String tmpFileNameBefore = "C:/Users/YANNIK~1/AppData/Local/Temp/before." + filename.getFileName().toString();
            try (PDDocument pdDocument = Loader.loadPDF(filename.toFile())) {
                PdfDraw.drawDocumentGraph(pdDocument, documentGraphBefore);
                pdDocument.save(tmpFileNameBefore);
            }
-            String tmpFileNameAfter = "/tmp/after." + filename.getFileName().toString();
+            String tmpFileNameAfter = "C:/Users/YANNIK~1/AppData/Local/Temp/after." + filename.getFileName().toString();
            try (PDDocument pdDocument = Loader.loadPDF(filename.toFile())) {
                PdfDraw.drawDocumentGraph(pdDocument, documentGraphAfter);
                pdDocument.save(tmpFileNameAfter);
@@ -130,9 +105,9 @@ public class RulingCleaningServiceTest extends BuildDocumentTest {


    @SneakyThrows
-    private boolean compareStructures(DocumentStructure structure1, DocumentStructure structure2) {
+    private boolean compareStructures(DocumentStructure structure1, DocumentStructure structure2, String pdfName) {

-        List<Table> listStructure1 = structure1.streamAllEntries()
+        List listStructure1 = structure1.streamAllEntries()
                .filter(entryData -> entryData.getType().equals(NodeType.TABLE))
                .map(DocumentStructure.EntryData::getProperties)
                .map(properties -> {
@@ -142,7 +117,7 @@ public class RulingCleaningServiceTest extends BuildDocumentTest {
                })
                .toList();

-        List<Table> listStructure2 = structure2.streamAllEntries()
+        List listStructure2 = structure2.streamAllEntries()
                .filter(entryData -> entryData.getType().equals(NodeType.TABLE))
                .map(DocumentStructure.EntryData::getProperties)
                .map(properties -> {
@@ -153,8 +128,8 @@ public class RulingCleaningServiceTest extends BuildDocumentTest {
                .toList();

        for (int i = 0; i < listStructure1.size(); i++) {
-            Table tableNode1 = listStructure1.get(i);
-            Table tableNode2 = listStructure2.get(i);
+            Table tableNode1 = (Table) listStructure1.get(i);
+            Table tableNode2 = (Table) listStructure2.get(i);
            if (tableNode1.getNumberOfRows() != tableNode2.getNumberOfRows() || tableNode1.getNumberOfCols() != tableNode2.getNumberOfCols()) {
                return false;
            }
@@ -51,8 +51,6 @@ public abstract class AbstractTest {
    private RabbitTemplate rabbitTemplate;

    protected final static String ORIGIN_FILE_ID = "origin";
-
-    protected final static String VISUAL_LAYOUT_FILE = "visual";
    protected final static String TABLE_FILE_ID = "table";
    protected final static String IMAGE_FILE_ID = "image";
    protected final static String STRUCTURE_FILE_ID = "structure";
@@ -67,7 +65,7 @@ public abstract class AbstractTest {
    protected LayoutParsingRequest buildStandardLayoutParsingRequest() {

        return LayoutParsingRequest.builder()
-                .layoutParsingType(LayoutParsingType.REDACT_MANAGER_OLD)
+                .layoutParsingType(LayoutParsingType.REDACT_MANAGER)
                .originFileStorageId(ORIGIN_FILE_ID)
                .tablesFileStorageId(Optional.of(TABLE_FILE_ID))
                .imagesFileStorageId(Optional.of(IMAGE_FILE_ID))
@@ -98,7 +96,7 @@ public abstract class AbstractTest {
    @SneakyThrows
    protected LayoutParsingRequest prepareStorage(String file) {

-        return prepareStorage(file, "cv_table_parsing_response/empty.json", "image_service_response/empty.json", "visual_layout_parsing_response/empty.json");
+        return prepareStorage(file, "cv_table_parsing_response/empty.json", "image_service_response/empty.json");
    }


@@ -106,7 +104,7 @@ public abstract class AbstractTest {
    protected LayoutParsingRequest prepareStorage(InputStream fileInputStream) {

        storageService.storeObject(TenantContext.getTenantId(), ORIGIN_FILE_ID, fileInputStream);
-        return buildDefaultLayoutParsingRequest(LayoutParsingType.REDACT_MANAGER_OLD);
+        return buildDefaultLayoutParsingRequest(LayoutParsingType.REDACT_MANAGER);
    }


@@ -118,7 +116,6 @@ public abstract class AbstractTest {
                .originFileStorageId(ORIGIN_FILE_ID)
                .tablesFileStorageId(Optional.of(TABLE_FILE_ID))
                .imagesFileStorageId(Optional.of(IMAGE_FILE_ID))
-                .visualLayoutParsingFileId(Optional.of(VISUAL_LAYOUT_FILE))
                .structureFileStorageId(STRUCTURE_FILE_ID)
                .textBlockFileStorageId(TEXT_FILE_ID)
                .positionBlockFileStorageId(POSITION_FILE_ID)
@@ -140,21 +137,6 @@ public abstract class AbstractTest {
    }


-    @SneakyThrows
-    protected LayoutParsingRequest prepareStorage(String file, String cvServiceResponseFile, String imageInfoFile, String visualLayoutParsingResponseFile) {
-
-        ClassPathResource pdfFileResource = new ClassPathResource(file);
-        ClassPathResource cvServiceResponseFileResource = new ClassPathResource(cvServiceResponseFile);
-        ClassPathResource imageInfoFileResource = new ClassPathResource(imageInfoFile);
-        ClassPathResource visualLayoutParsingResponseResource = new ClassPathResource(visualLayoutParsingResponseFile);
-
-        return prepareStorage(pdfFileResource.getInputStream(),
-                cvServiceResponseFileResource.getInputStream(),
-                imageInfoFileResource.getInputStream(),
-                visualLayoutParsingResponseResource.getInputStream());
-    }
-
-
    @SneakyThrows
    protected LayoutParsingRequest prepareStorage(InputStream fileStream, InputStream cvServiceResponseFileStream, InputStream imageInfoStream) {

@@ -162,22 +144,7 @@ public abstract class AbstractTest {
        storageService.storeObject(TenantContext.getTenantId(), TABLE_FILE_ID, cvServiceResponseFileStream);
        storageService.storeObject(TenantContext.getTenantId(), ORIGIN_FILE_ID, fileStream);

-        return buildDefaultLayoutParsingRequest(LayoutParsingType.REDACT_MANAGER_OLD);
-    }
-
-
-    @SneakyThrows
-    protected LayoutParsingRequest prepareStorage(InputStream fileStream,
-                                                  InputStream cvServiceResponseFileStream,
-                                                  InputStream imageInfoStream,
-                                                  InputStream visualLayoutParsingResponseFileStream) {
-
-        storageService.storeObject(TenantContext.getTenantId(), IMAGE_FILE_ID, imageInfoStream);
-        storageService.storeObject(TenantContext.getTenantId(), TABLE_FILE_ID, cvServiceResponseFileStream);
-        storageService.storeObject(TenantContext.getTenantId(), ORIGIN_FILE_ID, fileStream);
-        storageService.storeObject(TenantContext.getTenantId(), VISUAL_LAYOUT_FILE, visualLayoutParsingResponseFileStream);
-
-        return buildDefaultLayoutParsingRequest(LayoutParsingType.REDACT_MANAGER_OLD);
+        return buildDefaultLayoutParsingRequest(LayoutParsingType.REDACT_MANAGER);
    }


@@ -10,7 +10,6 @@ import com.knecon.fforesight.service.layoutparser.processor.LayoutParsingPipelin
 import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationDocument;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse;
-import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.VisualLayoutParsingResponse;
 import com.knecon.fforesight.service.layoutparser.processor.services.factory.DocumentGraphFactory;

 import lombok.SneakyThrows;
@@ -26,19 +25,14 @@ 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(), filename);
    }


    @SneakyThrows
    protected Document buildGraph(String filename) {

-        return buildGraph(filename, LayoutParsingType.REDACT_MANAGER_OLD);
+        return buildGraph(filename, LayoutParsingType.REDACT_MANAGER);
    }


@@ -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()) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
maverickstuder	f90cb20156	RED-8666	2024-03-04 15:18:13 +01:00
Dominique Eifländer	72202f63dc	More	2024-02-16 14:51:26 +01:00
Dominique Eifländer	e14d953b04	More	2024-02-16 14:50:31 +01:00
Dominique Eifländer	9e5778d4b2	More	2024-02-16 14:08:59 +01:00
Dominique Eifländer	e394f2fa7c	More refactoring	2024-02-16 13:48:03 +01:00
Dominique Eifländer	b2fb6829cb	More refactoring	2024-02-16 11:15:44 +01:00
Dominique Eifländer	4871e55f2d	More refactoring	2024-02-15 16:54:07 +01:00
Dominique Eifländer	4de6c12aec	REmove more	2024-02-15 10:29:39 +01:00
Dominique Eifländer	4afa8daafa	First working docstrum	2024-02-14 13:39:27 +01:00