RED-8670: fix bug in LineBuilderService, change constant in line classification

* some 'slight' refactoring

.gitlab-ci.yml

@@ -21,5 +21,6 @@ deploy:
       dotenv: version.env
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH 
+    - if: $CI_COMMIT_BRANCH =~ /^feature/ && $CI_COMMIT_TAG == ""
     - if: $CI_COMMIT_BRANCH =~ /^release/
     - if: $CI_COMMIT_TAG

buildSrc/src/main/kotlin/com.knecon.fforesight.java-conventions.gradle.kts

@@ -8,6 +8,8 @@ plugins {
 
 group = "com.knecon.fforesight"
 
+val documentVersion by rootProject.extra { "4.433.0" }
+
 java.sourceCompatibility = JavaVersion.VERSION_17
 java.targetCompatibility = JavaVersion.VERSION_17
 
@@ -51,6 +53,10 @@ allprojects {
         }
     }
 
+    pmd {
+        setConsoleOutput(true)
+    }
+
     publishing {
         publications {
             create<MavenPublication>(name) {

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

@@ -1,28 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
-
-import java.io.Serializable;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-@Schema(description = "Object containing the complete document layout parsing information. It is split into 4 categories, structure, text, positions and pages: " + "The document tree structure of SemanticNodes such as Section, Paragraph, Headline, etc. " + "The text, which is stored as separate blocks of data. " + "The text positions, which are also stored as separate blocks. The Blocks are equal to the text blocks in length and order. " + "The page information.")
-public class DocumentData implements Serializable {
-
-    @Schema(description = "Contains information about the document's pages.")
-    DocumentPage[] documentPages;
-    @Schema(description = "Contains information about the document's text.")
-    DocumentTextData[] documentTextData;
-    @Schema(description = "Contains information about the document's text positions.")
-    DocumentPositionData[] documentPositions;
-    @Schema(description = "Contains information about the document's semantic structure.")
-    DocumentStructure documentStructure;
-
-}

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

@@ -1,30 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
-
-import java.io.Serializable;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Schema(description = "Object containing information about the document's pages.")
-public class DocumentPage implements Serializable {
-
-    @Schema(description = "The page number, starting with 1.")
-    int number;
-    @Schema(description = "The page height in PDF user units.", example = "792")
-    int height;
-    @Schema(description = "The page width in PDF user units.", example = "694")
-    int width;
-    @Schema(description = "The page rotation as specified by the PDF.", example = "90", allowableValues = {"0", "90", "180", "270"})
-    int rotation;
-
-}

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

@@ -1,28 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
-
-import java.io.Serializable;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Schema(description = "Object containing text positional information of a specific text block. A document is split into multiple text blocks, which are supposed to be read in order. Every text block can only occur on a single page.")
-public class DocumentPositionData implements Serializable {
-
-    @Schema(description = "Identifier of the text block.")
-    Long id;
-    @Schema(description = "For each string coordinate in the search text of the text block, the array contains an entry relating the string coordinate to the position coordinate. This is required due to the text and position coordinates not being equal.")
-    int[] stringIdxToPositionIdx;
-    @Schema(description = "The bounding box for each glyph as a rectangle. This matrix is of size (n,4), where n is the number of glyphs in the text block. The second dimension specifies the rectangle with the value x, y, width, height, with x, y specifying the lower left corner. In order to access this information, the stringIdxToPositionIdx array must be used to transform the coordinates.")
-    float[][] positions;
-
-}

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

@@ -1,172 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
-
-import java.awt.geom.Rectangle2D;
-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;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Schema(description = "Object containing information about the parsed tree structure of the SemanticNodes, such as Section, Paragraph, Headline etc inside of the document.")
-public class DocumentStructure implements Serializable {
-
-    @Schema(description = "The root EntryData represents the Document.")
-    EntryData root;
-
-    @Schema(description = "Object containing the extra field names, a table has in its properties field.")
-    public static class TableProperties implements Serializable {
-
-        public static final String NUMBER_OF_ROWS = "numberOfRows";
-        public static final String NUMBER_OF_COLS = "numberOfCols";
-
-    }
-
-    @Schema(description = "Object containing the extra field names, an Image has in its properties field.")
-    public static class ImageProperties implements Serializable {
-
-        public static final String TRANSPARENT = "transparent";
-        public static final String IMAGE_TYPE = "imageType";
-        public static final String POSITION = "position";
-        public static final String ID = "id";
-
-        public static final String REPRESENTATION_HASH = "representationHash";
-
-    }
-
-    @Schema(description = "Object containing the extra field names, a table cell has in its properties field.")
-    public static class TableCellProperties implements Serializable {
-
-        public static final String B_BOX = "bBox";
-        public static final String ROW = "row";
-        public static final String COL = "col";
-        public static final String HEADER = "header";
-
-    }
-
-    @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 = ";";
-
-
-    public static Rectangle2D parseRectangle2D(String bBox) {
-
-        List<Float> floats = Arrays.stream(bBox.split(RECTANGLE_DELIMITER))
-                .map(Float::parseFloat)
-                .toList();
-        return new Rectangle2D.Float(floats.get(0), floats.get(1), floats.get(2), floats.get(3));
-    }
-
-
-    public static double[] parseRepresentationVector(String representationHash) {
-
-        String[] stringArray = representationHash.split("[,\\s]+");
-        double[] doubleArray = new double[stringArray.length];
-        for (int i = 0; i < stringArray.length; i++) {
-            doubleArray[i] = Double.parseDouble(stringArray[i]);
-        }
-
-        return doubleArray;
-    }
-
-
-    public EntryData get(List<Integer> tocId) {
-
-        if (tocId.isEmpty()) {
-            return root;
-        }
-        EntryData entry = root.children.get(tocId.get(0));
-        for (int id : tocId.subList(1, tocId.size())) {
-            entry = entry.children.get(id);
-        }
-        return entry;
-    }
-
-
-    public Stream<EntryData> streamAllEntries() {
-
-        return Stream.concat(Stream.of(root), root.children.stream())
-                .flatMap(DocumentStructure::flatten);
-    }
-
-
-    public String toString() {
-
-        return String.join("\n",
-                           streamAllEntries().map(EntryData::toString)
-                                   .toList());
-    }
-
-
-    private static Stream<EntryData> flatten(EntryData entry) {
-
-        return Stream.concat(Stream.of(entry),
-                             entry.children.stream()
-                                     .flatMap(DocumentStructure::flatten));
-    }
-
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @FieldDefaults(level = AccessLevel.PRIVATE)
-    @Schema(description = "Object containing information of a SemanticNode and also structuring the layout with children.")
-    public static class EntryData implements Serializable {
-
-        @Schema(description = "Type of the semantic node.", allowableValues = {"DOCUMENT", "SECTION", "PARAGRAPH", "HEADLINE", "TABLE", "TABLE_CELL", "HEADER", "FOOTER", "IMAGE"})
-        NodeType type;
-        @Schema(description = "Specifies the position in the parsed tree structure.", example = "[1, 0, 2]")
-        int[] treeId;
-        @Schema(description = "Specifies the text block IDs associated with this semantic node. The value should be joined with the DocumentTextData/DocumentPositionData. Is empty, if no text block is directly associated with this semantic node. Only Paragraph, Headline, Header or Footer is directly associated with a text block.", example = "[1]")
-        Long[] atomicBlockIds;
-        @Schema(description = "Specifies the pages this semantic node appears on. The value should be joined with the PageData.", example = "[1, 2, 3]")
-        Long[] pageNumbers;
-        @Schema(description = "Some semantic nodes have additional information, this information is stored in this Map. The extra fields are specified by the Properties subclasses.", example = "For a Table: {\"numberOfRows\": 3, \"numberOfCols\": 4}")
-        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
-        public String toString() {
-
-            StringBuilder sb = new StringBuilder();
-            sb.append("[");
-            for (int i : treeId) {
-                sb.append(i);
-                sb.append(",");
-            }
-            sb.delete(sb.length() - 1, sb.length());
-            sb.append("]: ");
-
-            sb.append(type);
-            sb.append(" atbs = ");
-            sb.append(atomicBlockIds.length);
-
-            return sb.toString();
-        }
-
-    }
-
-}

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

@@ -1,36 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
-
-import java.io.Serializable;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Schema(description = "Object containing text information of a specific text block. A document is split into multiple text blocks, which are supposed to be read in order. Every text block can only occur on a single page.")
-public class DocumentTextData implements Serializable {
-
-    @Schema(description = "Identifier of the text block.")
-    Long id;
-    @Schema(description = "The page the text block occurs on.")
-    Long page;
-    @Schema(description = "The text the text block.")
-    String searchText;
-    @Schema(description = "Each text block is assigned a number on a page, starting from 0.")
-    int numberOnPage;
-    @Schema(description = "The text blocks are ordered, this number represents the start of the text block as a string offset.")
-    int start;
-    @Schema(description = "The text blocks are ordered, this number represents the end of the text block as a string offset.")
-    int end;
-    @Schema(description = "The line breaks in the text of this semantic node in string offsets. They are exclusive end. At the end of each semantic node there is an implicit linebreak.", example = "[5, 10]")
-    int[] lineBreaks;
-
-}

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

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

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

@@ -1,23 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
-
-import java.io.Serializable;
-import java.util.Locale;
-
-public enum NodeType implements Serializable {
-    DOCUMENT,
-    SECTION,
-    SUPER_SECTION,
-    HEADLINE,
-    PARAGRAPH,
-    TABLE,
-    TABLE_CELL,
-    IMAGE,
-    HEADER,
-    FOOTER;
-
-
-    public String toString() {
-
-        return this.name().charAt(0) + this.name().substring(1).toLowerCase(Locale.ROOT);
-    }
-}

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

@@ -21,5 +21,14 @@ public class SimplifiedText {
     @Schema(description = "A List of simplified Sections, which contains almost exclusively text.")
     @Builder.Default
     private List<SimplifiedSectionText> sectionTexts = new ArrayList<>();
+    @Schema(description = "A list of the main section numbers ")
+    @Builder.Default
+    private List<String> mainSectionNumbers = new ArrayList<>();
+    @Schema(description = "A list of the header section numbers ")
+    @Builder.Default
+    private List<String> headerSectionNumbers = new ArrayList<>();
+    @Schema(description = "A list of the footer section numbers ")
+    @Builder.Default
+    private List<String> footerSectionNumbers = new ArrayList<>();
 
 }

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

@@ -8,13 +8,20 @@ import lombok.Builder;
 @Builder
 @Schema(description = "Object containing information about the layout parsing.")
 public record LayoutParsingFinishedEvent(
-        @Schema(description = "General purpose identifier. It is returned exactly the same way it is inserted with the LayoutParsingRequest.")
-        Map<String, String> identifier,//
-        @Schema(description = "The duration of a single layout parsing in ms.")
-        long duration,//
-        @Schema(description = "The number of pages of the parsed document.")
-        int numberOfPages,//
-        @Schema(description = "A general message. It contains some information useful for a developer, like the paths where the files are stored. Not meant to be machine readable.")
-        String message) {
+        @Schema(description = "General purpose identifier. It is returned exactly the same way it is inserted with the LayoutParsingRequest.") //
+        Map<String, String> identifier,
+
+        @Schema(description = "The duration of a single layout parsing in ms.") //
+        long duration,
+
+        @Schema(description = "The number of pages of the parsed document.") //
+        int numberOfPages,
+
+        @Schema(description = "A general message. It contains some information useful for a developer, like the paths where the files are stored. Not meant to be machine readable.") //
+        String message,
+
+        @Schema(description = "The app version of the layout parser.") //
+        String layoutParserVersion
+) {
 
 }

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

@@ -2,6 +2,9 @@ package com.knecon.fforesight.service.layoutparser.internal.api.queue;
 
 public class LayoutParsingQueueNames {
 
-    public static final String LAYOUT_PARSING_REQUEST_QUEUE = "layout_parsing_request_queue";
-    public static final String LAYOUT_PARSING_FINISHED_EVENT_QUEUE = "layout_parsing_response_queue";
+    public static final String LAYOUT_PARSING_REQUEST_QUEUE_PREFIX = "layout_parsing_request";
+    public static final String LAYOUT_PARSING_REQUEST_EXCHANGE = "layout_parsing_request_exchange";
+    public static final String LAYOUT_PARSING_RESPONSE_QUEUE_PREFIX = "layout_parsing_response";
+    public static final String LAYOUT_PARSING_RESPONSE_EXCHANGE = "layout_parsing_response_exchange";
+    public static final String LAYOUT_PARSING_DLQ = "layout_parsing_error";
 }

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

@@ -10,38 +10,23 @@ import lombok.NonNull;
 @Builder
 @Schema(description = "Object containing all storage paths the service needs to know.")
 public record LayoutParsingRequest(
-        @Schema(description = "Enum specifying the type of layout parsing to be performed.", allowableValues = "{RedactManager, DocuMine, TAAS}")//
-        @NonNull LayoutParsingType layoutParsingType,
+        @Schema(description = "Enum specifying the type of layout parsing to be performed.", allowableValues = "{RedactManager, DocuMine, TAAS}") @NonNull LayoutParsingType layoutParsingType,
+        @Schema(description = "General purpose identifiers. They are not changed by the service at all and are returned as is in the response queue.") Map<String, String> identifier,
+        @Schema(description = "Path to the original PDF file.") @NonNull String originFileStorageId,
 
-        @Schema(description = "General purpose identifiers. They are not changed by the service at all and are returned as is in the response queue.")//
-        Map<String, String> identifier,
+        @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 = "Path where the IDP Result File is stored.") Optional<String> idpResultStorageId,
+        @Schema(description = "Optional Path to the the visual layout parsing service file") Optional<String> visualLayoutParsingFileId,
 
-        @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.")//
-        String researchDocumentStorageId,//
-        @Schema(description = "Path where the Document Text File will be stored.")//
-        @NonNull String textBlockFileStorageId,//
-        @Schema(description = "Path where the Document Positions File will be stored.")//
-        @NonNull String positionBlockFileStorageId,//
-        @Schema(description = "Path where the Document Pages File will be stored.")//
-        @NonNull String pageFileStorageId,//
-        @Schema(description = "Path where the Document Markdown File will be stored.")//
-        Optional<String> documentMarkdownFileStorageId,//
-        @Schema(description = "Path where the Simplified Text File will be stored.")//
-        @NonNull String simplifiedTextStorageId,//
-        @Schema(description = "Path where the Viewer Document PDF will be stored.")//
-        @NonNull String viewerDocumentStorageId
+        @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.") String researchDocumentStorageId,
+        @Schema(description = "Path where the Document Text File will be stored.") @NonNull String textBlockFileStorageId,
+        @Schema(description = "Path where the Document Positions File will be stored.") @NonNull String positionBlockFileStorageId,
+        @Schema(description = "Path where the Document Pages File will be stored.") @NonNull String pageFileStorageId,
+        @Schema(description = "Path where the Document Markdown File will be stored.") Optional<String> documentMarkdownFileStorageId,
+        @Schema(description = "Path where the Simplified Text File will be stored.") @NonNull String simplifiedTextStorageId,
+        @Schema(description = "Path where the Viewer Document PDF will be stored.") @NonNull String viewerDocumentStorageId
 ) {
 
 }

layoutparser-service/layoutparser-service-processor/build.gradle.kts

@@ -8,16 +8,22 @@ description = "layoutparser-service-processor"
 val jacksonVersion = "2.15.2"
 val pdfBoxVersion = "3.0.0"
 
+
 dependencies {
     implementation(project(":layoutparser-service-internal-api"))
     implementation(project(":viewer-doc-processor"))
 
-    implementation("com.iqser.red.service:persistence-service-shared-api-v1:2.144.0") {
+    implementation("com.knecon.fforesight:document:${rootProject.extra.get("documentVersion")}")
+    implementation("com.iqser.red.service:persistence-service-shared-api-v1:2.564.0-RED9010.0") {
         exclude("org.springframework.boot", "spring-boot-starter-security")
         exclude("org.springframework.boot", "spring-boot-starter-validation")
     }
-    implementation("com.knecon.fforesight:tenant-commons:0.21.0")
-    implementation("com.iqser.red.commons:storage-commons:2.45.0")
+    implementation("com.knecon.fforesight:tenant-commons:0.30.0") {
+        exclude("com.iqser.red.commons", "storage-commons")
+    }
+    implementation("com.iqser.red.commons:storage-commons:2.50.0")
+
+    api("com.knecon.fforesight:azure-ocr-service-api:0.25.0")
 
     implementation("org.apache.pdfbox:pdfbox:${pdfBoxVersion}")
     implementation("org.apache.pdfbox:pdfbox-tools:${pdfBoxVersion}")
@@ -25,9 +31,12 @@ dependencies {
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}")
     implementation("org.springframework.boot:spring-boot-starter-web:3.1.3")
     implementation("org.jgrapht:jgrapht-core:1.5.2")
+    implementation("org.apache.pdfbox:jbig2-imageio:3.0.4")
+    implementation("com.github.jai-imageio:jai-imageio-core:1.4.0")
+    implementation("com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0")
     implementation("org.tinspin:tinspin-indexes:2.1.3")
     implementation("org.commonmark:commonmark:0.22.0")
     implementation("org.commonmark:commonmark-ext-gfm-tables:0.22.0")
     implementation("com.pdftron:PDFNet:10.11.0")
-
+    implementation("org.apache.commons:commons-text:1.12.0")
 }

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

@@ -13,9 +13,10 @@ import lombok.experimental.FieldDefaults;
 @Configuration
 @ConfigurationProperties("layoutparser")
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class LayoutparserSettings {
+public class LayoutParserSettings {
 
     boolean debug;
     LayoutParsingType layoutParsingTypeOverride;
     String pdftronLicense;
+    int extractionThreads = 1;
 }

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

@@ -2,45 +2,53 @@ package com.knecon.fforesight.service.layoutparser.processor;
 
 import static java.lang.String.format;
 
-import java.awt.geom.Point2D;
+import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.documentinterchange.markedcontent.PDMarkedContent;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
+import com.iqser.red.service.redaction.v1.server.mapper.DocumentDataMapper;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.NodeType;
 import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingFinishedEvent;
 import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingRequest;
 import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType;
-import com.knecon.fforesight.service.layoutparser.processor.markdown.MarkdownMapper;
+import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Character;
+import com.knecon.fforesight.service.layoutparser.processor.docstrum.service.ReadingOrderService;
 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.graph.nodes.Document;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.ImageType;
+import com.knecon.fforesight.service.layoutparser.processor.model.DocumentWithVisualization;
+import com.knecon.fforesight.service.layoutparser.processor.model.PageContents;
 import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage;
 import com.knecon.fforesight.service.layoutparser.processor.model.outline.OutlineExtractorService;
-import com.knecon.fforesight.service.layoutparser.processor.model.outline.OutlineObject;
-import com.knecon.fforesight.service.layoutparser.processor.model.outline.OutlineValidationService;
-import com.knecon.fforesight.service.layoutparser.processor.model.outline.TOCEnrichmentService;
-import com.knecon.fforesight.service.layoutparser.processor.model.outline.TableOfContents;
+import com.knecon.fforesight.service.layoutparser.processor.model.outline.SectionTree;
+import com.knecon.fforesight.service.layoutparser.processor.model.outline.SectionTreeBuilderService;
+import com.knecon.fforesight.service.layoutparser.processor.model.outline.SectionTreeEnhancementService;
 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.Ruling;
+import com.knecon.fforesight.service.layoutparser.processor.model.table.TablePageBlock;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.RedTextPosition;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.TextDirection;
 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.model.text.Word;
 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;
@@ -48,29 +56,26 @@ import com.knecon.fforesight.service.layoutparser.processor.python_api.model.ima
 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.PageContentExtractor;
 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.tables.TableExtractionService;
 import com.knecon.fforesight.service.layoutparser.processor.services.TextRulingsClassifier;
 import com.knecon.fforesight.service.layoutparser.processor.services.blockification.BlockificationPostprocessingService;
-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.classification.ClarifyndClassificationService;
-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.blockification.BlockificationService;
+import com.knecon.fforesight.service.layoutparser.processor.services.classification.ClassificationService;
 import com.knecon.fforesight.service.layoutparser.processor.services.factory.DocumentGraphFactory;
-import com.knecon.fforesight.service.layoutparser.processor.services.graphics.Box;
 import com.knecon.fforesight.service.layoutparser.processor.services.graphics.GraphicExtractorService;
-import com.knecon.fforesight.service.layoutparser.processor.services.mapper.DocumentDataMapper;
+import com.knecon.fforesight.service.layoutparser.processor.services.mapper.MarkdownMapper;
 import com.knecon.fforesight.service.layoutparser.processor.services.mapper.TaasDocumentDataMapper;
 import com.knecon.fforesight.service.layoutparser.processor.services.parsing.PDFLinesTextStripper;
 import com.knecon.fforesight.service.layoutparser.processor.services.visualization.LayoutGridService;
 import com.knecon.fforesight.service.layoutparser.processor.utils.MarkedContentUtils;
-import com.knecon.fforesight.service.layoutparser.processor.utils.PageInformation;
+import com.knecon.fforesight.service.layoutparser.processor.model.PageInformation;
 import com.knecon.fforesight.service.layoutparser.processor.utils.TextPositionOperations;
+import com.knecon.fforesight.service.ocr.v1.api.model.IdpResult;
+import com.knecon.fforesight.service.ocr.v1.api.model.Table;
 
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
@@ -85,32 +90,31 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+@FieldDefaults(level = AccessLevel.PRIVATE)
 public class LayoutParsingPipeline {
 
-    ImageServiceResponseAdapter imageServiceResponseAdapter;
-    CvTableParsingAdapter cvTableParsingAdapter;
-    LayoutParsingStorageService layoutParsingStorageService;
-    SectionsBuilderService sectionsBuilderService;
-    RedactManagerClassificationService redactManagerClassificationService;
-    DocuMineClassificationService docuMineClassificationService;
-    SimplifiedSectionTextService simplifiedSectionTextService;
-    BodyTextFrameService bodyTextFrameService;
-    RulingCleaningService rulingCleaningService;
-    TableExtractionService tableExtractionService;
-    DocuMineBlockificationService docuMineBlockificationService;
-    RedactManagerBlockificationService redactManagerBlockificationService;
-    BlockificationPostprocessingService blockificationPostprocessingService;
-    DocstrumBlockificationService docstrumBlockificationService;
-    LayoutGridService layoutGridService;
-    ObservationRegistry observationRegistry;
-    VisualLayoutParsingAdapter visualLayoutParsingAdapter;
-    ClarifyndClassificationService clarifyndClassificationService;
-    GraphicExtractorService graphicExtractorService;
-    OutlineExtractorService outlineExtractorService;
-    OutlineValidationService outlineValidationService;
-    TOCEnrichmentService tocEnrichmentService;
-    LayoutparserSettings settings;
+    final ImageServiceResponseAdapter imageServiceResponseAdapter;
+    final CvTableParsingAdapter cvTableParsingAdapter;
+    final LayoutParsingStorageService layoutParsingStorageService;
+    final SectionsBuilderService sectionsBuilderService;
+    final SimplifiedSectionTextService simplifiedSectionTextService;
+    final RulingCleaningService rulingCleaningService;
+    final TableExtractionService tableExtractionService;
+    final BlockificationService blockificationService;
+    final BlockificationPostprocessingService blockificationPostprocessingService;
+    final LayoutGridService layoutGridService;
+    final ObservationRegistry observationRegistry;
+    final VisualLayoutParsingAdapter visualLayoutParsingAdapter;
+    final GraphicExtractorService graphicExtractorService;
+    final OutlineExtractorService outlineExtractorService;
+    final SectionTreeBuilderService sectionTreeBuilderService;
+    final SectionTreeEnhancementService sectionTreeEnhancementService;
+    final LayoutParserSettings settings;
+    final ClassificationService classificationService;
+    final ReadingOrderService readingOrderService;
+
+    @Value("${LAYOUT_PARSER_VERSION:}")
+    private String layoutParserVersion;
 
 
     public LayoutParsingFinishedEvent parseLayoutAndSaveFilesToStorage(LayoutParsingRequest layoutParsingRequest) throws IOException {
@@ -127,76 +131,69 @@ public class LayoutParsingPipeline {
                 .map(layoutParsingStorageService::getImagesFile).orElse(new ImageServiceResponse());
         TableServiceResponse tableServiceResponse = layoutParsingRequest.tablesFileStorageId()
                 .map(layoutParsingStorageService::getTablesFile).orElse(new TableServiceResponse());
+        IdpResult idpResult = layoutParsingRequest.idpResultStorageId()
+                .map(layoutParsingStorageService::getIdpResultFile).orElse(IdpResult.empty());
 
-        ClassificationDocument classificationDocument = parseLayout(settings.getLayoutParsingTypeOverride() == null //
-                                                                            ? layoutParsingRequest.layoutParsingType() : settings.getLayoutParsingTypeOverride(),
+        LayoutParsingType layoutParsingType = settings.getLayoutParsingTypeOverride() == null ? layoutParsingRequest.layoutParsingType() : settings.getLayoutParsingTypeOverride();
+
+        ClassificationDocument classificationDocument = parseLayout(layoutParsingType,
                                                                     originFile,
                                                                     imageServiceResponse,
                                                                     tableServiceResponse,
+                                                                    idpResult,
                                                                     visualLayoutParsingResponse,
                                                                     layoutParsingRequest.identifier());
 
         log.info("Building document graph for {}", layoutParsingRequest.identifier());
 
-        Document documentGraph = observeBuildDocumentGraph(settings.getLayoutParsingTypeOverride() == null //
-                                                                   ? layoutParsingRequest.layoutParsingType() : settings.getLayoutParsingTypeOverride(), classificationDocument);
+        DocumentWithVisualization documentWithVisualization = observeBuildDocumentGraph(layoutParsingType, classificationDocument);
 
         log.info("Creating viewer document for {}", layoutParsingRequest.identifier());
 
-        layoutGridService.addLayoutGrid(viewerDocumentFile, documentGraph, viewerDocumentFile, false, layoutParsingRequest.visualLayoutParsingFileId().isPresent());
+        layoutGridService.addLayoutGrid(viewerDocumentFile, documentWithVisualization, viewerDocumentFile, layoutParsingType, layoutParserVersion, false);
 
         log.info("Storing resulting files for {}", layoutParsingRequest.identifier());
 
-        layoutParsingStorageService.storeDocumentData(layoutParsingRequest, DocumentDataMapper.toDocumentData(documentGraph));
+        layoutParsingStorageService.storeDocumentData(layoutParsingRequest, DocumentDataMapper.toDocumentData(documentWithVisualization.document()));
         if (layoutParsingRequest.documentMarkdownFileStorageId().isPresent()) {
-            layoutParsingStorageService.storeMarkdownFile(layoutParsingRequest.documentMarkdownFileStorageId().get(), new MarkdownMapper().toMarkdownContent(documentGraph));
+            layoutParsingStorageService.storeMarkdownFile(layoutParsingRequest.documentMarkdownFileStorageId().get(),
+                                                          new MarkdownMapper().toMarkdownContent(documentWithVisualization.document()));
         }
-        layoutParsingStorageService.storeSimplifiedText(layoutParsingRequest, simplifiedSectionTextService.toSimplifiedText(documentGraph));
+        layoutParsingStorageService.storeSimplifiedText(layoutParsingRequest, simplifiedSectionTextService.toSimplifiedText(documentWithVisualization.document()));
         layoutParsingStorageService.storeViewerDocument(layoutParsingRequest, viewerDocumentFile);
 
         if (layoutParsingRequest.researchDocumentStorageId() != null) {
             log.info("Building research document data for {}", layoutParsingRequest.identifier());
-            var researchDocumentData = TaasDocumentDataMapper.fromDocument(documentGraph);
+            var researchDocumentData = TaasDocumentDataMapper.fromDocument(documentWithVisualization.document());
             layoutParsingStorageService.storeResearchDocumentData(layoutParsingRequest, researchDocumentData);
         }
 
         if (!viewerDocumentFile.equals(originFile)) {
-            viewerDocumentFile.delete();
+            assert !viewerDocumentFile.exists() || viewerDocumentFile.delete();
         }
-        originFile.delete();
+        assert !originFile.exists() || originFile.delete();
 
         return LayoutParsingFinishedEvent.builder()
                 .identifier(layoutParsingRequest.identifier())
-                .numberOfPages(documentGraph.getNumberOfPages())
+                .numberOfPages(documentWithVisualization.document().getNumberOfPages())
                 .duration(System.currentTimeMillis() - start)
                 .message(format("""
                                         Layout parsing has finished in %.02f s.
                                         identifiers: %s
                                         %s
-                                        Files have been saved with Ids:
-                                        Structure: %s
-                                        Text: %s
-                                        Positions: %s
-                                        PageData: %s
-                                        Simplified Text: %s
-                                        Viewer Doc: %s""",
+                                        """,
                                 ((float) (System.currentTimeMillis() - start)) / 1000,
                                 layoutParsingRequest.identifier(),
-                                buildSemanticNodeCountMessage(documentGraph.getNumberOfPages(), documentGraph.buildSemanticNodeCounts()),
-                                layoutParsingRequest.structureFileStorageId(),
-                                layoutParsingRequest.textBlockFileStorageId(),
-                                layoutParsingRequest.positionBlockFileStorageId(),
-                                layoutParsingRequest.pageFileStorageId(),
-                                layoutParsingRequest.simplifiedTextStorageId(),
-                                layoutParsingRequest.viewerDocumentStorageId()))
+                                buildSemanticNodeCountMessage(documentWithVisualization.document().getNumberOfPages(), documentWithVisualization.buildSemanticNodeCounts())))
+                .layoutParserVersion(layoutParserVersion)
                 .build();
 
     }
 
 
-    private Document observeBuildDocumentGraph(LayoutParsingType layoutParsingType, ClassificationDocument classificationDocument) {
+    private DocumentWithVisualization observeBuildDocumentGraph(LayoutParsingType layoutParsingType, ClassificationDocument classificationDocument) {
 
-        AtomicReference<Document> documentReference = new AtomicReference<>();
+        AtomicReference<DocumentWithVisualization> documentReference = new AtomicReference<>();
 
         Observation.createNotStarted("LayoutParsingPipeline", observationRegistry)
                 .contextualName("build-document-graph")
@@ -226,15 +223,22 @@ public class LayoutParsingPipeline {
                                               File originFile,
                                               ImageServiceResponse imageServiceResponse,
                                               TableServiceResponse tableServiceResponse,
+                                              IdpResult idpResult,
                                               VisualLayoutParsingResponse visualLayoutParsingResponse,
                                               Map<String, String> identifier) {
 
-        PDDocument originDocument = openDocument(originFile);
-        addNumberOfPagesToTrace(originDocument.getNumberOfPages(), Files.size(originFile.toPath()));
+        PageContentExtractor extractor = new PageContentExtractor(originFile, settings.getExtractionThreads());
+        extractor.startAsync();
+        int pageCount = extractor.getPageCount();
+        addNumberOfPagesToTrace(pageCount, Files.size(originFile.toPath()));
 
         Map<Integer, List<TableCells>> pdfTableCells = cvTableParsingAdapter.buildCvParsedTablesPerPage(tableServiceResponse);
-        Map<Integer, List<ClassifiedImage>> pdfImages = imageServiceResponseAdapter.buildClassifiedImagesPerPage(imageServiceResponse);
+        Map<Integer, List<ClassifiedImage>> pdfImages = imageServiceResponseAdapter.buildClassifiedImagesPerPage(imageServiceResponse, idpResult);
         Map<Integer, List<ClassifiedImage>> signatures = visualLayoutParsingAdapter.buildExtractedSignaturesPerPage(visualLayoutParsingResponse);
+        Function<Table, Integer> pageNumberExtractor = table -> table.bboxes().get(0).pageNumber();
+        Map<Integer, List<Table>> idpTablesPerPage = idpResult.tables()
+                .stream()
+                .collect(Collectors.groupingBy(pageNumberExtractor));
 
         ClassificationDocument classificationDocument = new ClassificationDocument();
 
@@ -243,100 +247,50 @@ public class LayoutParsingPipeline {
         }
 
         List<ClassificationPage> classificationPages = new ArrayList<>();
-        OutlineObject lastProcessedOutlineObject = null;
 
-        // parsing the structure elements could be useful as well
-        if (layoutParsingType != LayoutParsingType.REDACT_MANAGER_OLD && layoutParsingType != LayoutParsingType.DOCUMINE_OLD) {
-            classificationDocument.setOutlineObjectTree(outlineExtractorService.getOutlineObjectTree(originDocument));
-        }
-
-        long pageCount = originDocument.getNumberOfPages();
+        classificationDocument.setOutlineObjectTree(outlineExtractorService.getOutlineObjectTree(originFile));
 
         for (int pageNumber = 1; pageNumber <= pageCount; pageNumber++) {
-
-            if (pageNumber % 100 == 0) {
-                // re-open document every once in a while to save on RAM. This has no significant performance impact.
-                // This is due to PDFBox caching all images and some other stuff with Soft References. This dereferences them and forces the freeing of memory.
-                originDocument.close();
-                originDocument = openDocument(originFile);
-            }
-
+            PageContents pageContents = extractor.awaitPageContents(pageNumber);
             if (pageNumber % 100 == 0 || pageNumber == pageCount || pageNumber == 1) {
-                log.info("Extracting text on Page {} for {}", pageNumber, identifier);
+                log.info("Processing text on Page {} for {}", pageNumber, identifier);
             }
 
             classificationDocument.setPages(classificationPages);
             PDFLinesTextStripper stripper = new PDFLinesTextStripper();
-            PDPage pdPage = originDocument.getPage(pageNumber - 1);
-            stripper.setPageNumber(pageNumber);
-            stripper.setStartPage(pageNumber);
-            stripper.setEndPage(pageNumber);
-            stripper.setPdpage(pdPage);
-            stripper.getText(originDocument);
-            List<TextPositionSequence> words = stripper.getTextPositionSequences();
+
+            List<Word> words = pageContents.getWords();
+            List<Ruling> rulings = pageContents.getRulings();
+            PageInformation pageInformation = pageContents.getPageInformation();
+
+//            rotateDirAdjExactly(words, pdPage); // works really well for many highly rotated documents (e.g. VV-331340.pdf), but it decreases the headline performance by 1.3%, so I am leaving it out for now
+
             if (layoutParsingType.equals(LayoutParsingType.DOCUMINE_OLD)) {
                 var lines = TextPositionOperations.groupByLine(new HashSet<>(words));
                 classificationDocument.getLayoutDebugLayer().addLineVisualizationsFromNestedTextPosition(lines, pageNumber);
-                words = TextPositionOperations.sortLines(lines);
+                words = TextPositionOperations.sortWords(lines);
             }
             classificationDocument.getLayoutDebugLayer().addTextVisualizations(words, pageNumber);
 
-            PDRectangle pdr = pdPage.getMediaBox();
+            classificationDocument.getLayoutDebugLayer().addRulingVisualization(rulings, pageNumber);
+            CleanRulings cleanRulings = rulingCleaningService.deduplicateAndStraightenRulings(pdfTableCells.get(pageNumber), rulings);
 
-            int rotation = pdPage.getRotation();
-            boolean isLandscape = pdr.getWidth() > pdr.getHeight() && (rotation == 0 || rotation == 180) || pdr.getHeight() > pdr.getWidth() && (rotation == 90 || rotation == 270);
-
-            PDRectangle cropbox = pdPage.getCropBox();
-            classificationDocument.getLayoutDebugLayer().addRulingVisualization(stripper.getRulings(), pageNumber);
-            CleanRulings cleanRulings = rulingCleaningService.deduplicateAndStraightenRulings(pdfTableCells.get(pageNumber), stripper.getRulings());
-
-            PageInformation pageInformation = PageInformation.fromPDPage(pageNumber, pdPage);
             List<Cell> emptyTableCells = TableExtractionService.findCells(cleanRulings.getHorizontals(), cleanRulings.getVerticals(), pageInformation);
-            classificationDocument.getLayoutDebugLayer().addCellVisualizations(emptyTableCells, pageNumber);
-
+            classificationDocument.getLayoutDebugLayer().addCellVisualizations(emptyTableCells, pageNumber, null);
             TextRulingsClassifier.classifyUnderlinedAndStrikethroughText(words, cleanRulings);
 
-            List<Box> graphics = graphicExtractorService.extractPathElementGraphics(originDocument, pdPage, pageNumber, cleanRulings, stripper.getTextPositionSequences(), false);
+            List<TablePageBlock> tables = tableExtractionService.extractTables(emptyTableCells, words, pageInformation, idpTablesPerPage.get(pageNumber), layoutParsingType);
 
-            pdfImages.computeIfAbsent(pageNumber, x -> new ArrayList<>())
-                    .addAll(graphics.stream()
-                                    .map(g -> new ClassifiedImage(new Rectangle2D.Double(g.x1, g.y1, g.width(), g.height()),
-                                                                  ImageType.GRAPHIC,
-                                                                  false,
-                                                                  stripper.getPageNumber(),
-                                                                  ""))
-                                    .toList());
+            List<ClassifiedImage> graphics = graphicExtractorService.extractPathElementGraphics(pageContents.getGraphicBBoxes(), pageNumber, cleanRulings);
+            pdfImages.computeIfAbsent(pageNumber, x -> new ArrayList<>()).addAll(graphics);
 
-            ClassificationPage classificationPage = switch (layoutParsingType) {
-                case REDACT_MANAGER_OLD ->
-                        redactManagerBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings, classificationDocument.getLayoutDebugLayer());
-                case DOCUMINE_OLD -> docuMineBlockificationService.blockify(words, cleanRulings);
-                case DOCUMINE, REDACT_MANAGER, REDACT_MANAGER_PARAGRAPH_DEBUG, REDACT_MANAGER_WITHOUT_DUPLICATE_PARAGRAPH ->
-                        docstrumBlockificationService.blockify(words, cleanRulings, true, classificationDocument.getLayoutDebugLayer(), layoutParsingType);
-                case CLARIFYND, CLARIFYND_PARAGRAPH_DEBUG ->
-                        docstrumBlockificationService.blockify(words, cleanRulings, false, classificationDocument.getLayoutDebugLayer(), layoutParsingType);
-            };
+            List<TextPageBlock> textBlocks = blockificationService.blockify(layoutParsingType, words, cleanRulings, classificationDocument.getLayoutDebugLayer());
 
-            classificationPage.setCleanRulings(cleanRulings);
-            classificationPage.setRotation(rotation);
-            classificationPage.setLandscape(isLandscape);
-            classificationPage.setPageNumber(pageNumber);
-            classificationPage.setPageWidth(cropbox.getWidth());
-            classificationPage.setPageHeight(cropbox.getHeight());
+            List<AbstractPageBlock> blocks = readingOrderService.resolve(textBlocks, tables);
 
-            if (layoutParsingType != LayoutParsingType.REDACT_MANAGER_OLD && layoutParsingType != LayoutParsingType.DOCUMINE_OLD) {
-                List<OutlineObject> outlineObjects = classificationDocument.getOutlineObjectTree().getOutlineObjectsPerPage().getOrDefault(pageNumber - 1, new ArrayList<>());
+            ClassificationPage classificationPage = new ClassificationPage(blocks, pageInformation, cleanRulings);
 
-                OutlineObject notFoundOutlineObject = null;
-                if (lastProcessedOutlineObject != null && !lastProcessedOutlineObject.isFound()) {
-                    lastProcessedOutlineObject.setPoint(new Point2D.Float(0, cropbox.getHeight()));
-                    notFoundOutlineObject = lastProcessedOutlineObject;
-                }
-                if (!outlineObjects.isEmpty()) {
-                    classificationPage.setOutlineObjects(outlineObjects);
-                    lastProcessedOutlineObject = blockificationPostprocessingService.sanitizeOutlineBlocks(classificationPage, notFoundOutlineObject);
-                }
-            }
+            blockificationPostprocessingService.findHeadlinesFromOutline(classificationDocument, pageNumber, classificationPage, pageInformation);
 
             classificationDocument.getLayoutDebugLayer().addMarkedContentVisualizations(stripper.getMarkedContents(), pageNumber);
             // MarkedContent needs to be converted at this point, otherwise it leads to GC Problems in Pdfbox.
@@ -356,50 +310,54 @@ public class LayoutParsingPipeline {
                 }
             }
 
-            tableExtractionService.extractTables(emptyTableCells, classificationPage);
-
             buildPageStatistics(classificationPage);
             increaseDocumentStatistics(classificationPage, classificationDocument);
 
             classificationPages.add(classificationPage);
         }
 
-        originDocument.close();
+        classificationService.classify(classificationDocument, layoutParsingType, identifier);
 
-        log.info("Calculating BodyTextFrame for {}", identifier);
-        bodyTextFrameService.setBodyTextFrames(classificationDocument, layoutParsingType);
-        for (ClassificationPage page : classificationDocument.getPages()) {
-            classificationDocument.getLayoutDebugLayer().addCleanRulingVisualization(page.getCleanRulings(), page.getPageNumber());
-        }
-        log.info("Classify TextBlocks for {}", identifier);
-        switch (layoutParsingType) {
-            case REDACT_MANAGER, REDACT_MANAGER_PARAGRAPH_DEBUG, REDACT_MANAGER_OLD, CLARIFYND_PARAGRAPH_DEBUG, REDACT_MANAGER_WITHOUT_DUPLICATE_PARAGRAPH ->
-                    redactManagerClassificationService.classifyDocument(classificationDocument);
-            case DOCUMINE_OLD, DOCUMINE -> docuMineClassificationService.classifyDocument(classificationDocument);
-            case CLARIFYND -> clarifyndClassificationService.classifyDocument(classificationDocument);
-        }
-
-        List<TextPageBlock> headlines = classificationDocument.getPages()
-                .stream()
-                .flatMap(classificationPage -> classificationPage.getTextBlocks()
-                        .stream()
-                        .filter(tb -> tb instanceof TextPageBlock && tb.getClassification() != null && tb.getClassification().isHeadline())
-                        .map(tb -> (TextPageBlock) tb))
-                .toList();
-        TableOfContents tableOfContents = outlineValidationService.createToC(headlines);
-        classificationDocument.setTableOfContents(tableOfContents);
+        SectionTree sectionTree = sectionTreeBuilderService.createSectionTree(classificationDocument);
+        classificationDocument.setSectionTree(sectionTree);
 
         log.info("Building Sections for {}", identifier);
 
         switch (layoutParsingType) {
             case CLARIFYND_PARAGRAPH_DEBUG, REDACT_MANAGER_PARAGRAPH_DEBUG -> sectionsBuilderService.buildParagraphDebugSections(classificationDocument);
-            default -> tocEnrichmentService.assignSectionBlocksAndImages(classificationDocument);
+            default -> sectionTreeEnhancementService.assignSectionBlocksAndImages(classificationDocument);
         }
 
         return classificationDocument;
     }
 
 
+    private static void rotateDirAdjExactly(List<Word> words, PDPage pdPage) {
+
+        for (TextDirection dir : TextDirection.values()) {
+            double averageRotation = words.stream()
+                    .map(Word::getCharacters)
+                    .flatMap(Collection::stream)
+                    .map(Character::getTextPosition)
+                    .filter(pos -> pos.getDir().equals(dir))
+                    .mapToDouble(RedTextPosition::getExactDir).average().orElse(0);
+
+            if (averageRotation == 0) {
+                continue;
+            }
+
+            AffineTransform rotateInstance = AffineTransform.getRotateInstance(averageRotation, pdPage.getMediaBox().getWidth() / 2, pdPage.getMediaBox().getHeight() / 2);
+
+            for (Word word : words) {
+                if (!dir.equals(word.getDir())) {
+                    continue;
+                }
+                word.transform(rotateInstance);
+            }
+        }
+    }
+
+
     private void addNumberOfPagesToTrace(int numberOfPages, long size) {
 
         if (observationRegistry.getCurrentObservation() != null) {
@@ -441,10 +399,10 @@ public class LayoutParsingPipeline {
         // Collect all statistics for the classificationPage, except from blocks inside tables, as tables will always be added to BodyTextFrame.
         for (AbstractPageBlock textBlock : classificationPage.getTextBlocks()) {
             if (textBlock instanceof TextPageBlock) {
-                if (((TextPageBlock) textBlock).getSequences() == null) {
+                if (((TextPageBlock) textBlock).getWords() == null) {
                     continue;
                 }
-                for (TextPositionSequence word : ((TextPageBlock) textBlock).getSequences()) {
+                for (Word word : ((TextPageBlock) textBlock).getWords()) {
                     classificationPage.getTextHeightCounter().add(word.getTextHeight());
                     classificationPage.getFontCounter().add(word.getFont());
                     classificationPage.getFontSizeCounter().add(word.getFontSize());

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

@@ -11,18 +11,21 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 
+import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.redaction.v1.server.data.DocumentData;
 import com.iqser.red.storage.commons.service.StorageService;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentData;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.SimplifiedText;
 import com.knecon.fforesight.service.layoutparser.internal.api.data.taas.ResearchDocumentData;
 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.service.ocr.v1.api.model.IdpResult;
 import com.knecon.fforesight.service.viewerdoc.service.ViewerDocVersioningUtility;
 import com.knecon.fforesight.tenantcommons.TenantContext;
 
@@ -39,6 +42,8 @@ public class LayoutParsingStorageService {
     private final StorageService storageService;
     private final ObjectMapper objectMapper;
 
+    private final TaskExecutor taskExecutor;
+
 
     @Observed(name = "LayoutParsingStorageService", contextualName = "get-origin-file")
     public File getOriginFile(String storageId) throws IOException {
@@ -91,7 +96,23 @@ public class LayoutParsingStorageService {
     }
 
 
-@SneakyThrows
+
+    @SneakyThrows
+    public IdpResult getIdpResultFile(String storageId) {
+
+        if (!storageService.objectExists(TenantContext.getTenantId(), storageId)) {
+            return IdpResult.empty();
+        }
+        try (var idpResultStream = getObject(storageId)) {
+
+            IdpResult idpResult = objectMapper.readValue(idpResultStream, IdpResult.class);
+            idpResultStream.close();
+            return idpResult;
+        }
+    }
+
+
+    @SneakyThrows
     public VisualLayoutParsingResponse getVisualLayoutParsingFile(String storageId) {
 
         try (InputStream inputStream = getObject(storageId)) {
@@ -100,13 +121,35 @@ public class LayoutParsingStorageService {
     }
 
 
+    @SneakyThrows
     @Observed(name = "LayoutParsingStorageService", contextualName = "store-document-data")
     public void storeDocumentData(LayoutParsingRequest layoutParsingRequest, DocumentData documentData) {
 
-        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.structureFileStorageId(), documentData.getDocumentStructure());
-        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.textBlockFileStorageId(), documentData.getDocumentTextData());
-        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.positionBlockFileStorageId(), documentData.getDocumentPositions());
-        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.pageFileStorageId(), documentData.getDocumentPages());
+        Runnable storeDocumentStructureRunnable = () -> storageService.storeProtoObject(TenantContext.getTenantId(),
+                                                                                       layoutParsingRequest.structureFileStorageId(),
+                                                                                       documentData.getDocumentStructure());
+
+        CompletableFuture<Void> storeDocumentStructureFuture = CompletableFuture.runAsync(storeDocumentStructureRunnable, taskExecutor);
+
+        Runnable storeDocumentTextDataRunnable = () -> storageService.storeProtoObject(TenantContext.getTenantId(),
+                                                                                      layoutParsingRequest.textBlockFileStorageId(),
+                                                                                      documentData.getDocumentTextData());
+
+        CompletableFuture<Void> storeDocumentTextDataFuture = CompletableFuture.runAsync(storeDocumentTextDataRunnable, taskExecutor);
+
+        Runnable storeDocumentPositionsRunnable = () -> storageService.storeProtoObject(TenantContext.getTenantId(),
+                                                                                       layoutParsingRequest.positionBlockFileStorageId(),
+                                                                                       documentData.getDocumentPositionData());
+
+        CompletableFuture<Void> storeDocumentPositionsFuture = CompletableFuture.runAsync(storeDocumentPositionsRunnable, taskExecutor);
+
+        Runnable storeDocumentPagesRunnable = () -> storageService.storeProtoObject(TenantContext.getTenantId(),
+                                                                                   layoutParsingRequest.pageFileStorageId(),
+                                                                                   documentData.getDocumentPages());
+
+        CompletableFuture<Void> storeDocumentPagesFuture = CompletableFuture.runAsync(storeDocumentPagesRunnable, taskExecutor);
+
+        CompletableFuture.allOf(storeDocumentStructureFuture, storeDocumentTextDataFuture, storeDocumentPositionsFuture, storeDocumentPagesFuture).join();
     }
 
 

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

@@ -1,9 +1,7 @@
 package com.knecon.fforesight.service.layoutparser.processor.docstrum;
 
 import java.util.ArrayList;
-import java.util.EnumMap;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 
@@ -16,10 +14,8 @@ import com.knecon.fforesight.service.layoutparser.processor.docstrum.service.Rea
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.service.SpacingService;
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.service.ZoneBuilderService;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.CleanRulings;
-import com.knecon.fforesight.service.layoutparser.processor.model.text.RedTextPosition;
 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.visualization.LayoutDebugLayer;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.Word;
 
 import lombok.RequiredArgsConstructor;
 
@@ -27,7 +23,6 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class DocstrumSegmentationService {
 
-    public static final double SAME_DIRECTION_THRESHOLD = 0.9;
     private final NearestNeighbourService nearestNeighbourService;
     private final SpacingService spacingService;
     private final LineBuilderService lineBuilderService;
@@ -35,61 +30,32 @@ public class DocstrumSegmentationService {
     private final ReadingOrderService readingOrderService;
 
 
-    public List<Zone> segmentPage(List<TextPositionSequence> textPositions, boolean xyOrder, CleanRulings usedRulings, LayoutDebugLayer visualizations) {
+    public List<Zone> segmentPage(List<Word> words, boolean xyOrder, CleanRulings usedRulings) {
 
-        EnumMap<TextDirection, Integer> directionCounts = new EnumMap<>(TextDirection.class);
-
-        List<Zone> newZones = computeZones(textPositions, usedRulings, visualizations, TextDirection.ZERO);
-        directionCounts.put(TextDirection.ZERO, newZones.size());
+        List<Zone> newZones = computeZones(words, usedRulings, TextDirection.ZERO);
         List<Zone> zones = new ArrayList<>(newZones);
 
-        newZones = computeZones(textPositions, usedRulings, visualizations, TextDirection.QUARTER_CIRCLE);
-        directionCounts.put(TextDirection.QUARTER_CIRCLE, newZones.size());
+        newZones = computeZones(words, usedRulings, TextDirection.QUARTER_CIRCLE);
         zones.addAll(newZones);
 
-        newZones = computeZones(textPositions, usedRulings, visualizations, TextDirection.HALF_CIRCLE);
-        directionCounts.put(TextDirection.HALF_CIRCLE, newZones.size());
+        newZones = computeZones(words, usedRulings, TextDirection.HALF_CIRCLE);
         zones.addAll(newZones);
 
-        newZones = computeZones(textPositions, usedRulings, visualizations, TextDirection.THREE_QUARTER_CIRCLE);
-        directionCounts.put(TextDirection.THREE_QUARTER_CIRCLE, newZones.size());
+        newZones = computeZones(words, usedRulings, TextDirection.THREE_QUARTER_CIRCLE);
         zones.addAll(newZones);
 
-        return readingOrderService.resolve(zones, xyOrder, mostSameDirection(directionCounts));
+        return readingOrderService.resolve(zones, xyOrder);
     }
 
 
-    private boolean mostSameDirection(EnumMap<TextDirection, Integer> directionCounts) {
+    private List<Zone> computeZones(List<Word> words, CleanRulings rulings, TextDirection direction) {
 
-        int total = directionCounts.values()
-                .stream()
-                .mapToInt(i -> i).sum();
-
-        if ((double) directionCounts.get(TextDirection.ZERO) / total > SAME_DIRECTION_THRESHOLD) {
-            return true;
-        } else if ((double) directionCounts.get(TextDirection.QUARTER_CIRCLE) / total > SAME_DIRECTION_THRESHOLD) {
-            return true;
-        } else if ((double) directionCounts.get(TextDirection.HALF_CIRCLE) / total > SAME_DIRECTION_THRESHOLD) {
-            return true;
-        } else if ((double) directionCounts.get(TextDirection.THREE_QUARTER_CIRCLE) / total > SAME_DIRECTION_THRESHOLD) {
-            return true;
-        }
-        return false;
-    }
-
-
-    private List<Zone> computeZones(List<TextPositionSequence> textPositions, CleanRulings rulings, LayoutDebugLayer visualizations, TextDirection direction) {
-
-        List<RedTextPosition> positions = textPositions.stream()
+        List<Character> characters = words.stream()
                 .filter(t -> t.getDir() == direction)
-                .map(TextPositionSequence::getTextPositions)
+                .map(Word::getCharacters)
                 .flatMap(List::stream)
                 .toList();
 
-        List<Character> characters = positions.stream()
-                .map(Character::new)
-                .collect(Collectors.toList());
-
         nearestNeighbourService.findNearestNeighbors(characters);
 
         double characterSpacing = spacingService.computeCharacterSpacing(characters);

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

@@ -1,7 +1,6 @@
 package com.knecon.fforesight.service.layoutparser.processor.docstrum.model;
 
 import java.awt.geom.Rectangle2D;
-import java.util.Comparator;
 import java.util.List;
 
 import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
@@ -25,8 +24,6 @@ public abstract class BoundingBox {
     // Also, these are definitely correct and should be used whenever possible.
     protected Rectangle2D bBoxPdf;
 
-    protected static final float VERTICAL_COMPARISON_THRESHOLD = 0.4f;
-
 
     public double getX() {
 
@@ -133,7 +130,7 @@ public abstract class BoundingBox {
     }
 
 
-    private boolean intersectsX(BoundingBox other, float threshold) {
+    public boolean intersectsX(BoundingBox other, float threshold) {
 
         return this.getX() - threshold <= other.getMaxX() && this.getMaxX() + threshold >= other.getX();
     }
@@ -204,54 +201,51 @@ public abstract class BoundingBox {
     }
 
 
-    public double verticalOverlap(BoundingBox other) {
+    public double verticalOverlapPdf(BoundingBox other) {
 
         return Math.max(0, Math.min(this.getPdfMaxY(), other.getPdfMaxY()) - Math.max(this.getPdfMinY(), other.getPdfMinY()));
     }
 
 
-    public static final Comparator<BoundingBox> ILL_DEFINED_ORDER = (o1, o2) -> {
+    public double verticalOverlap(BoundingBox other) {
 
-        if (o1.equals(o2)) {
-            return 0;
-        }
-        if (o1.verticalOverlap(o2) > VERTICAL_COMPARISON_THRESHOLD * ((o1.getHeight() + o2.getHeight()) / 2)) {
-            return Double.compare(o1.getPdfMinX(), o2.getPdfMinX());
-        } else {
-            return Double.compare(o1.getPdfMaxY(), o2.getPdfMaxY());
-        }
-    };
+        return Math.max(0, Math.min(this.getMaxY(), other.getMaxY()) - Math.max(this.getMinY(), other.getMinY()));
+    }
+
+
+    public double horizontalOverlap(BoundingBox other) {
+
+        return Math.max(0, Math.min(this.getMaxX(), other.getMaxX()) - Math.max(this.getMinX(), other.getMinX()));
+    }
 
 
     public double horizontalDistance(BoundingBox other) {
 
-        Rectangle2D left;
-        Rectangle2D right;
-        if (this.leftOf(other)) {
-            left = this.getBBox();
-            right = other.getBBox();
-        } else {
-            left = other.getBBox();
-            right = this.getBBox();
-        }
+        double rect1Right = getMaxX();
+        double rect1Left = getMinX();
+        double rect2Right = other.getMaxX();
+        double rect2Left = other.getMinX();
 
-        return Math.max(0, right.getMinX() - left.getMaxX());
+        if (rect1Left > rect2Right || rect2Left > rect1Right) {
+            return Math.max(rect2Left - rect1Right, rect1Left - rect2Right);
+        } else {
+            return 0;
+        }
     }
 
 
     public double verticalDistance(BoundingBox other) {
 
-        Rectangle2D bottom;
-        Rectangle2D top;
-        if (this.isAbove(other)) {
-            top = this.getBBox();
-            bottom = other.getBBox();
-        } else {
-            bottom = this.getBBox();
-            top = other.getBBox();
-        }
+        double rect1Top = getMaxY();
+        double rect1Bottom = getMinY();
+        double rect2Top = other.getMaxY();
+        double rect2Bottom = other.getMinY();
 
-        return Math.max(0, bottom.getMinY() - top.getMaxY());
+        if (rect1Bottom > rect2Top || rect2Bottom > rect1Top) {
+            return Math.max(rect2Bottom - rect1Top, rect1Bottom - rect2Top);
+        } else {
+            return 0;
+        }
     }
 
 
@@ -278,4 +272,13 @@ public abstract class BoundingBox {
         return this.intersectsX(other) && this.getMinY() >= other.getMaxY();
     }
 
+
+    public double intersectedArea(BoundingBox r2) {
+
+        double xOverlap = horizontalOverlap(r2);
+        double yOverlap = verticalOverlap(r2);
+
+        return xOverlap * yOverlap;
+    }
+
 }

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

@@ -1,9 +1,9 @@
 package com.knecon.fforesight.service.layoutparser.processor.docstrum.model;
 
-import static com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence.BOLD;
-import static com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence.BOLD_ITALIC;
-import static com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence.ITALIC;
-import static com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence.STANDARD;
+import static com.knecon.fforesight.service.layoutparser.processor.model.text.Word.BOLD;
+import static com.knecon.fforesight.service.layoutparser.processor.model.text.Word.BOLD_ITALIC;
+import static com.knecon.fforesight.service.layoutparser.processor.model.text.Word.ITALIC;
+import static com.knecon.fforesight.service.layoutparser.processor.model.text.Word.STANDARD;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -14,7 +14,7 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.utils.FastAtan2;
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.Word;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.FontStyle;
 
 import lombok.Data;
@@ -24,7 +24,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = false)
 public class Line extends TextBoundingBox {
 
-    private static final double WORD_DISTANCE_MULTIPLIER = 0.18;
+    private static final double WORD_DISTANCE_MULTIPLIER = 0.17;
 
     @EqualsAndHashCode.Include
     private final double x0;
@@ -36,18 +36,13 @@ public class Line extends TextBoundingBox {
     @EqualsAndHashCode.Include
     private final double y1;
 
-    private final double height;
-
     private FontStyle fontStyle;
 
-    private final List<Character> characters;
-    private final List<TextPositionSequence> words = new ArrayList<>();
+    private final List<Word> words;
 
 
     public Line(List<Character> characters, double wordSpacing) {
 
-        this.characters = characters;
-
         if (characters.size() >= 2) {
             // linear regression
             double sx = 0.0;
@@ -76,20 +71,32 @@ public class Line extends TextBoundingBox {
             this.y0 = character.getY() - dy;
             this.y1 = character.getY() + dy;
         }
-        height = computeHeight();
-        computeWords(wordSpacing * WORD_DISTANCE_MULTIPLIER);
+        this.words = new ArrayList<>();
+        computeWords(characters, wordSpacing * WORD_DISTANCE_MULTIPLIER);
         buildBBox();
         computeFontStyle();
     }
 
 
+    public Line(List<Word> words) {
+
+        this.words = words;
+        buildBBox();
+        x0 = getMinX();
+        y0 = getMinY();
+        x1 = getMaxX();
+        y1 = getMaxY();
+        computeFontStyle();
+    }
+
+
     private void computeFontStyle() {
 
         EnumMap<FontStyle, AtomicInteger> fontStyleCounter = new EnumMap<>(FontStyle.class);
         for (FontStyle fontStyle : FontStyle.values()) {
             fontStyleCounter.put(fontStyle, new AtomicInteger(0));
         }
-        for (TextPositionSequence word : words) {
+        for (Word word : words) {
             switch (word.getFontStyle()) {
                 case STANDARD -> fontStyleCounter.get(FontStyle.REGULAR).getAndIncrement();
                 case BOLD -> fontStyleCounter.get(FontStyle.BOLD).getAndIncrement();
@@ -100,8 +107,7 @@ public class Line extends TextBoundingBox {
         fontStyle = fontStyleCounter.entrySet()
                 .stream()
                 .max(Comparator.comparing(entry -> entry.getValue().get()))
-                .map(Map.Entry::getKey)
-                .orElse(FontStyle.REGULAR);
+                .map(Map.Entry::getKey).orElse(FontStyle.REGULAR);
     }
 
 
@@ -117,14 +123,6 @@ public class Line extends TextBoundingBox {
     }
 
 
-    private double computeHeight() {
-
-        return characters.stream()
-                       .map(Character::getHeight)
-                       .reduce(0d, Double::sum) / characters.size();
-    }
-
-
     public double angularDifference(Line j) {
 
         double diff = Math.abs(getAngle() - j.getAngle());
@@ -157,19 +155,22 @@ public class Line extends TextBoundingBox {
     }
 
 
-    private void computeWords(double wordSpacing) {
+    private void computeWords(List<Character> characters, double wordSpacing) {
 
-        TextPositionSequence word = new TextPositionSequence();
+        // Imo, the width of space should be scaled with the font size, but it only depends on the median distance between horizontal neighbours.
+        // If there are large differences in fontsize on a page, this might lead to missing spaces for the smaller fonts and too many for larger fonts.
+        // I've just now changed the scaling factor. If you come across this comment with missing whitespaces again, try scaling the fontsize instead of simply changing the factor again.
+        Word word = new Word();
         Character previous = null;
         for (Character current : characters) {
             if (previous != null) {
                 double dist = current.getTextPosition().getXDirAdj() - previous.getTextPosition().getXDirAdj() - previous.getTextPosition().getWidthDirAdj();
                 if (dist > wordSpacing) {
                     words.add(word);
-                    word = new TextPositionSequence();
+                    word = new Word();
                 }
             }
-            word.getTextPositions().add(current.getTextPosition());
+            word.add(current);
             previous = current;
         }
         words.add(word);
@@ -178,9 +179,7 @@ public class Line extends TextBoundingBox {
 
     private void buildBBox() {
 
-        this.setToBBoxOfComponents(characters.stream()
-                                           .map(Character::getTextPosition)
-                                           .toList());
+        this.setToBBoxOfComponents(words);
     }
 
 

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

@@ -2,7 +2,9 @@ package com.knecon.fforesight.service.layoutparser.processor.docstrum.model;
 
 import java.awt.geom.Rectangle2D;
 import java.util.List;
-import java.util.Set;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextDirection;
@@ -36,19 +38,16 @@ public abstract class TextBoundingBox extends BoundingBox {
                 .map(TextBoundingBox::getBBoxDirAdj)
                 .collect(RectangleTransformations.collectBBox());
 
-        Set<TextDirection> textDirections = components.stream()
+        Optional<TextDirection> mostCommonDir = components.stream()
                 .filter(c -> c instanceof TextBoundingBox)
                 .map(c -> (TextBoundingBox) c)
                 .map(TextBoundingBox::getDir)
-                .collect(Collectors.toSet());
+                .collect(Collectors.groupingBy(Function.identity(), Collectors.counting())).entrySet()
+                .stream()
+                .max(Map.Entry.comparingByValue())
+                .map(Map.Entry::getKey);
 
-        if (textDirections.isEmpty()) {
-            dir = TextDirection.ZERO;
-        } else if (textDirections.size() > 1) {
-            throw new IllegalArgumentException("More than one text direction found");
-        } else {
-            dir = textDirections.iterator().next();
-        }
+        dir = mostCommonDir.orElse(TextDirection.ZERO);
     }
 
 
@@ -99,4 +98,82 @@ public abstract class TextBoundingBox extends BoundingBox {
         return this.bBoxDirAdj.getCenterX();
     }
 
+
+    public double horizontalDistanceDirAdj(TextBoundingBox other) {
+
+        double rect1Right = getMaxXDirAdj();
+        double rect1Left = getXDirAdj();
+        double rect2Right = other.getMaxXDirAdj();
+        double rect2Left = other.getXDirAdj();
+
+        if (rect1Left > rect2Right || rect2Left > rect1Right) {
+            return Math.max(rect2Left - rect1Right, rect1Left - rect2Right);
+        } else {
+            return 0;
+        }
+    }
+
+
+    public double verticalDistanceDirAdj(TextBoundingBox other) {
+
+        double rect1Top = getMaxYDirAdj();
+        double rect1Bottom = getYDirAdj();
+        double rect2Top = other.getMaxYDirAdj();
+        double rect2Bottom = other.getYDirAdj();
+
+        if (rect1Bottom > rect2Top || rect2Bottom > rect1Top) {
+            return Math.max(rect2Bottom - rect1Top, rect1Bottom - rect2Top);
+        } else {
+            return 0;
+        }
+    }
+
+
+    public boolean intersectsDirAdj(TextBoundingBox other) {
+
+        return this.intersectsXDirAdj(other) && this.intersectsYDirAdj(other);
+    }
+
+
+    public boolean intersectsDirAdj(TextBoundingBox other, float yThreshold, float xThreshold) {
+
+        return this.intersectsXDirAdj(other, xThreshold) && this.intersectsYDirAdj(other, yThreshold);
+    }
+
+
+    public boolean intersectsXDirAdj(TextBoundingBox other, float threshold) {
+
+        return this.getXDirAdj() - threshold <= other.getMaxXDirAdj() && this.getMaxXDirAdj() + threshold >= other.getXDirAdj();
+    }
+
+
+    public boolean intersectsXDirAdj(TextBoundingBox other) {
+
+        return this.getXDirAdj() <= other.getMaxXDirAdj() && this.getMaxXDirAdj() >= other.getXDirAdj();
+    }
+
+
+    public boolean intersectsYDirAdj(TextBoundingBox other) {
+
+        return this.getYDirAdj() <= other.getMaxYDirAdj() && this.getMaxYDirAdj() >= other.getYDirAdj();
+    }
+
+
+    public boolean intersectsYDirAdj(TextBoundingBox other, float threshold) {
+
+        return this.getYDirAdj() - threshold <= other.getMaxYDirAdj() && this.getMaxYDirAdj() + threshold >= other.getYDirAdj();
+    }
+
+
+    public boolean isAboveDirAdj(TextBoundingBox other) {
+
+        return other.isBelow(this);
+    }
+
+
+    public boolean isBelowDirAdj(TextBoundingBox other) {
+
+        return this.intersectsXDirAdj(other) && this.getYDirAdj() >= other.getMaxYDirAdj();
+    }
+
 }

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

@@ -18,7 +18,6 @@ public class Zone extends TextBoundingBox {
     @SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
     public Zone(List<Line> lines) {
 
-        lines.sort(Comparator.comparingDouble(Line::getY0));
         this.lines = lines;
         setToBBoxOfComponents(lines);
     }

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

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.AngleFilter;
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Character;
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Line;
-import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.UnionFind;
+import com.knecon.fforesight.service.layoutparser.processor.model.UnionFind;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.CleanRulings;
 
 @Service
@@ -17,7 +17,7 @@ public class LineBuilderService {
 
     private static final double CHARACTER_SPACING_DISTANCE_MULTIPLIER = 3.5;
     private static final double LINE_SPACING_THRESHOLD_MULTIPLIER = 0.67;
-    private static final double ANGLE_TOLERANCE = Math.PI / 6;
+    private static final double ANGLE_TOLERANCE = Math.toRadians(5);
 
 
     public List<Line> buildLines(List<Character> characters, double characterSpacing, double lineSpacing, CleanRulings rulings) {
@@ -32,6 +32,9 @@ public class LineBuilderService {
         characters.forEach(character -> {
             character.getNeighbors()
                     .forEach(neighbor -> {
+                        if (!characters.contains(neighbor.getCharacter())) {
+                            return;
+                        }
                         double normalizedHorizontalDistance = neighbor.getHorizontalDistance() / maxHorizontalDistance;
                         double normalizedVerticalDistance = neighbor.getVerticalDistance() / maxVerticalDistance;
 

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

@@ -3,6 +3,7 @@ package com.knecon.fforesight.service.layoutparser.processor.docstrum.service;
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.ListIterator;
@@ -12,25 +13,43 @@ import java.util.stream.Collectors;
 import org.springframework.stereotype.Service;
 
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.TextBoundingBox;
-import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Zone;
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.utils.DoubleUtils;
+import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
+import com.knecon.fforesight.service.layoutparser.processor.model.table.TablePageBlock;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.TextDirection;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
 
 @Service
 public class ReadingOrderService {
 
     private static final double THRESHOLD = 5;
     public static final double MULTI_COLUMN_DETECTION_THRESHOLD = 1.5;
+    public static final double SAME_DIRECTION_THRESHOLD = 0.9;
 
     private static final Comparator<TextBoundingBox> COMPARATOR = //
-            Comparator.comparing(TextBoundingBox::getY, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD))
-                    .thenComparing(TextBoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD));
+            Comparator.comparing(TextBoundingBox::getY,
+                                 (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD))
+                    .thenComparing(TextBoundingBox::getX,
+                                   (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD));
 
     private static final Comparator<TextBoundingBox> COMPARATOR_DIR_ADJ = //
-            Comparator.comparing(TextBoundingBox::getYDirAdj, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD))
+            Comparator.comparing(TextBoundingBox::getYDirAdj,
+                                 (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD))
                     .thenComparing(TextBoundingBox::getXDirAdj, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD));
 
 
-    public List<Zone> resolve(List<Zone> zones, boolean xyReadingOrder, boolean useDirAdjCoords) {
+    public List<AbstractPageBlock> resolve(List<TextPageBlock> textBlocks, List<TablePageBlock> tables) {
+
+        List<AbstractPageBlock> unsortedBlocks = new ArrayList<>(textBlocks.size() + tables.size());
+        unsortedBlocks.addAll(textBlocks);
+        unsortedBlocks.addAll(tables);
+        return resolve(unsortedBlocks, false);
+    }
+
+
+    public <T extends TextBoundingBox> List<T> resolve(List<T> zones, boolean xyReadingOrder) {
+
+        boolean useDirAdjCoords = mostSameDirection(zones);
 
         if (zones.isEmpty() || zones.size() == 1) {
             return zones;
@@ -41,7 +60,7 @@ public class ReadingOrderService {
         }
 
         Map<Long, Integer> histogram = new HashMap<>();
-        for (Zone zone : zones) {
+        for (TextBoundingBox zone : zones) {
             Rectangle2D bbox = useDirAdjCoords ? zone.getBBoxDirAdj() : zone.getBBox();
             long minY = Math.round(bbox.getMinY());
             long maxY = Math.round(bbox.getMaxY());
@@ -52,8 +71,7 @@ public class ReadingOrderService {
 
         if (histogram.values()
                     .stream()
-                    .mapToInt(Integer::intValue).average()
-                    .orElse(1) < MULTI_COLUMN_DETECTION_THRESHOLD) {
+                    .mapToInt(Integer::intValue).average().orElse(1) < MULTI_COLUMN_DETECTION_THRESHOLD) {
             return resolveSingleColumnReadingOrder(zones, useDirAdjCoords);
         } else {
 
@@ -63,7 +81,7 @@ public class ReadingOrderService {
     }
 
 
-    private static List<Zone> resolveSingleColumnReadingOrder(List<Zone> zones, boolean useDirAdjCoords) {
+    private static <T extends TextBoundingBox> List<T> resolveSingleColumnReadingOrder(List<T> zones, boolean useDirAdjCoords) {
 
         if (useDirAdjCoords) {
             return zones.stream()
@@ -71,7 +89,7 @@ public class ReadingOrderService {
                     .stream()
                     .flatMap(words -> words.stream()
                             .sorted(COMPARATOR_DIR_ADJ))
-                    .toList();
+                    .collect(Collectors.toList());
         }
 
         zones.sort(COMPARATOR);
@@ -79,7 +97,7 @@ public class ReadingOrderService {
     }
 
 
-    private List<Zone> resolveMultiColumnReadingOder(List<Zone> zones, boolean useDirAdjCoords) {
+    private <T extends TextBoundingBox> List<T> resolveMultiColumnReadingOder(List<T> zones, boolean useDirAdjCoords) {
 
         // 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
@@ -87,7 +105,7 @@ public class ReadingOrderService {
         double minX = Double.POSITIVE_INFINITY;
         double maxX = Double.NEGATIVE_INFINITY;
 
-        for (Zone zone : zones) {
+        for (T zone : zones) {
             Rectangle2D bbox = useDirAdjCoords ? zone.getBBoxDirAdj() : zone.getBBox();
             if (bbox.getX() < minX) {
                 minX = zone.getXDirAdj();
@@ -99,11 +117,11 @@ public class ReadingOrderService {
 
         double midLineXCoordinate = (minX + maxX) / 2;
 
-        List<Zone> leftOf = new ArrayList<>();
-        List<Zone> rightOf = new ArrayList<>();
-        List<Zone> middle = new ArrayList<>();
+        List<T> leftOf = new ArrayList<>();
+        List<T> rightOf = new ArrayList<>();
+        List<T> middle = new ArrayList<>();
 
-        for (Zone zone : zones) {
+        for (T zone : zones) {
             Rectangle2D bbox = useDirAdjCoords ? zone.getBBoxDirAdj() : zone.getBBox();
             if (bbox.getX() < midLineXCoordinate && bbox.getX() + bbox.getWidth() < midLineXCoordinate) {
                 leftOf.add(zone);
@@ -166,14 +184,14 @@ public class ReadingOrderService {
         middle.addAll(leftNotIntersecting);
         middle.addAll(rightNotIntersecting);
 */
-        List<Zone> sortedZones = new ArrayList<>();
+        List<T> sortedZones = new ArrayList<>();
         sortedZones.addAll(leftOf);
         sortedZones.addAll(rightOf);
 
-        ListIterator<Zone> itty = middle.listIterator();
+        ListIterator<T> itty = middle.listIterator();
 
         while (itty.hasNext()) {
-            Zone current = itty.next();
+            T current = itty.next();
             Rectangle2D bbox = useDirAdjCoords ? current.getBBoxDirAdj() : current.getBBox();
             for (int i = 0; i < sortedZones.size(); i++) {
                 if (bbox.getY() < sortedZones.get(i).getY()) {
@@ -189,4 +207,29 @@ public class ReadingOrderService {
         return sortedZones;
     }
 
+
+    private boolean mostSameDirection(List<? extends TextBoundingBox> zones) {
+
+        EnumMap<TextDirection, Integer> directionCounts = new EnumMap<>(TextDirection.class);
+
+        for (TextBoundingBox zone : zones) {
+            TextDirection dir = zone.getDir();
+            directionCounts.put(dir, directionCounts.getOrDefault(dir, 0) + 1);
+        }
+        int total = directionCounts.values()
+                .stream()
+                .mapToInt(i -> i).sum();
+
+        if ((double) directionCounts.getOrDefault(TextDirection.ZERO, 0) / total > SAME_DIRECTION_THRESHOLD) {
+            return true;
+        } else if ((double) directionCounts.getOrDefault(TextDirection.QUARTER_CIRCLE, 0) / total > SAME_DIRECTION_THRESHOLD) {
+            return true;
+        } else if ((double) directionCounts.getOrDefault(TextDirection.HALF_CIRCLE, 0) / total > SAME_DIRECTION_THRESHOLD) {
+            return true;
+        } else if ((double) directionCounts.getOrDefault(TextDirection.THREE_QUARTER_CIRCLE, 0) / total > SAME_DIRECTION_THRESHOLD) {
+            return true;
+        }
+        return false;
+    }
+
 }

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

@@ -1,9 +1,7 @@
 package com.knecon.fforesight.service.layoutparser.processor.docstrum.service;
 
-import static com.knecon.fforesight.service.layoutparser.processor.model.SectionIdentifier.numericalIdentifierPattern;
-
 import java.util.ArrayList;
-import java.util.Comparator;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -11,11 +9,12 @@ import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 
-import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Character;
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Line;
-import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.UnionFind;
+import com.knecon.fforesight.service.layoutparser.processor.model.UnionFind;
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Zone;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.CleanRulings;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.Word;
+import com.knecon.fforesight.service.layoutparser.processor.utils.TextPositionOperations;
 
 @Service
 public class ZoneBuilderService {
@@ -31,7 +30,7 @@ public class ZoneBuilderService {
 
     private static final double MAX_LINE_SIZE_SCALE = 2.5;
 
-    private static final double ANGLE_TOLERANCE = Math.PI / 6;
+    private static final double ANGLE_TOLERANCE = Math.toRadians(5);
 
     private static final double MAX_VERTICAL_MERGE_DISTANCE = 0.5;
 
@@ -114,64 +113,14 @@ public class ZoneBuilderService {
 
     private Zone mergeLinesInZone(List<Line> lines, double characterSpacing, double lineSpacing) {
 
-        double maxHorizontalDistance = 0;
-        double minVerticalDistance = 0;
-        double maxVerticalDistance = lineSpacing * MAX_VERTICAL_MERGE_DISTANCE;
+        Set<Word> words = lines.stream()
+                .map(Line::getWords)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toSet());
+        Collection<Set<Word>> groupedLines = TextPositionOperations.groupByLine(words);
 
-        UnionFind<Line> unionFind = new UnionFind<>(new HashSet<>(lines));
-
-        lines.forEach(outer -> {
-            lines.forEach(inner -> {
-                if (inner == outer) {
-                    return;
-                }
-
-                double horizontalDistance = outer.horizontalDistance(inner);
-                double verticalDistance = outer.verticalDistance(inner);
-
-                if (horizontalDistance <= maxHorizontalDistance && minVerticalDistance <= verticalDistance && verticalDistance <= maxVerticalDistance) {
-
-                    unionFind.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) {
-                        unionFind.union(outer, inner);
-                    }
-                }
-
-            });
-        });
-
-        List<Line> outputZone = new ArrayList<>();
-        for (Set<Line> group : unionFind.getGroups()) {
-            List<Character> characters = new ArrayList<>();
-            for (Line line : group) {
-                characters.addAll(line.getCharacters());
-            }
-            characters.sort(Comparator.comparingDouble(Character::getX));
-
-            outputZone.add(new Line(characters, characterSpacing));
-        }
-
-        return new Zone(outputZone.stream()
-                                .sorted(Comparator.comparing(Line::getY0))
-                                .collect(Collectors.toList()));
+        List<Line> sortedLines = TextPositionOperations.sortLines(groupedLines);
+        return new Zone(sortedLines);
     }
 
 }

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

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.service.layoutparser.processor.services;
+package com.knecon.fforesight.service.layoutparser.processor.experimental;
 
 import java.awt.geom.Line2D;
 import java.awt.geom.Rectangle2D;
@@ -7,7 +7,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Stream;
 
-import com.knecon.fforesight.service.layoutparser.processor.model.GapInformation;
 import com.knecon.fforesight.service.layoutparser.processor.model.PageContents;
 
 import lombok.experimental.UtilityClass;
@@ -23,13 +22,13 @@ public class DividingColumnDetectionService {
     public List<Rectangle2D> detectColumns(PageContents pageContents) {
 
 
-        if (pageContents.getSortedTextPositionSequences().size() < 2) {
-            return List.of(pageContents.getCropBox());
+        if (pageContents.getWords().size() < 2) {
+            return List.of(pageContents.getPageInformation().cropBox());
         }
 
-        GapInformation linesWithGapInformation = GapDetectionService.findGapsInLines(pageContents.getSortedTextPositionSequences(), pageContents.getCropBox());
+        GapInformation linesWithGapInformation = GapDetectionService.findGapsInLines(pageContents.getWords(), pageContents.getPageInformation().cropBox());
 
-        return detectColumnsFromLines(linesWithGapInformation.getXGaps(), pageContents.getCropBox());
+        return detectColumnsFromLines(linesWithGapInformation.getXGaps(), pageContents.getPageInformation().cropBox());
     }
 
 

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

@@ -1,11 +1,10 @@
-package com.knecon.fforesight.service.layoutparser.processor.services;
+package com.knecon.fforesight.service.layoutparser.processor.experimental;
 
 import java.awt.geom.Rectangle2D;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.knecon.fforesight.service.layoutparser.processor.model.GapInformation;
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.Word;
 
 import lombok.AllArgsConstructor;
 import lombok.experimental.UtilityClass;
@@ -18,23 +17,23 @@ public class GapDetectionService {
     private static final double NEW_LINE_FACTOR = 0.2;
 
 
-    public static GapInformation findGapsInLines(List<TextPositionSequence> sortedTextPositionSequences, Rectangle2D mainBodyTextFrame) {
+    public static GapInformation findGapsInLines(List<Word> sortedWords, Rectangle2D mainBodyTextFrame) {
 
-        if (sortedTextPositionSequences.isEmpty()) {
+        if (sortedWords.isEmpty()) {
             return new GapInformation();
         }
 
-        final double avgTextPositionHeight = getAvgTextPositionHeight(sortedTextPositionSequences);
+        final double avgTextPositionHeight = getAvgTextPositionHeight(sortedWords);
 
         XGapsContext xGapContext = XGapsContext.init(mainBodyTextFrame);
         YGapsContext yGapContext = YGapsContext.init(mainBodyTextFrame);
 
-        var previousTextPosition = sortedTextPositionSequences.get(0);
+        var previousTextPosition = sortedWords.get(0);
         Rectangle2D rectangle = toRectangle2D(previousTextPosition);
 
         xGapContext.addGapFromLeftEdgeOfMainBody(rectangle);
 
-        for (TextPositionSequence currentTextPosition : sortedTextPositionSequences.subList(1, sortedTextPositionSequences.size())) {
+        for (Word currentTextPosition : sortedWords.subList(1, sortedWords.size())) {
 
             double yDifference = Math.abs(currentTextPosition.getMaxYDirAdj() - previousTextPosition.getMaxYDirAdj());
             double xGap = Math.abs(previousTextPosition.getMaxXDirAdj() - currentTextPosition.getXDirAdj());
@@ -59,14 +58,14 @@ public class GapDetectionService {
             }
             previousTextPosition = currentTextPosition;
         }
-        xGapContext.addGapToRightEdgeOfMainBody(toRectangle2D(sortedTextPositionSequences.get(sortedTextPositionSequences.size() - 1)));
+        xGapContext.addGapToRightEdgeOfMainBody(toRectangle2D(sortedWords.get(sortedWords.size() - 1)));
         xGapContext.gapsPerLine.add(xGapContext.gapsInCurrentLine);
 
         return new GapInformation(xGapContext.gapsPerLine, yGapContext.gapsPerLine);
     }
 
 
-    private static Rectangle2D toRectangle2D(TextPositionSequence textPosition) {
+    private static Rectangle2D toRectangle2D(Word textPosition) {
 
         return mirrorY(textPosition.getBBox());
     }
@@ -87,18 +86,18 @@ public class GapDetectionService {
     }
 
 
-    private static void assertAllTextPositionsHaveSameDir(List<TextPositionSequence> textPositionSequences) {
+    private static void assertAllTextPositionsHaveSameDir(List<Word> words) {
 
-        assert textPositionSequences.stream()
-                .map(TextPositionSequence::getDir)
-                .allMatch(a -> a.equals(textPositionSequences.get(0).getDir()));
+        assert words.stream()
+                .map(Word::getDir)
+                .allMatch(a -> a.equals(words.get(0).getDir()));
     }
 
 
-    private static double getAvgTextPositionHeight(List<TextPositionSequence> textPositionSequences) {
+    private static double getAvgTextPositionHeight(List<Word> words) {
 
-        return textPositionSequences.stream()
-                .mapToDouble(TextPositionSequence::getHeight).average().orElseThrow();
+        return words.stream()
+                .mapToDouble(Word::getHeight).average().orElseThrow();
     }
 
 

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

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.service.layoutparser.processor.model;
+package com.knecon.fforesight.service.layoutparser.processor.experimental;
 
 import java.awt.geom.Rectangle2D;
 import java.util.LinkedList;

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

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.service.layoutparser.processor.services;
+package com.knecon.fforesight.service.layoutparser.processor.experimental;
 
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RectangularShape;
@@ -6,9 +6,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 import java.util.stream.Stream;
-import com.iqser.red.commons.jackson.ObjectMapperFactory;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.GapInformation;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,23 +1,21 @@
-package com.knecon.fforesight.service.layoutparser.processor.services;
+package com.knecon.fforesight.service.layoutparser.processor.experimental;
 
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RectangularShape;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.knecon.fforesight.service.layoutparser.processor.model.GapInformation;
-import com.knecon.fforesight.service.layoutparser.processor.model.LineInformation;
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.Word;
 
 import lombok.experimental.UtilityClass;
 
 @UtilityClass
 public class InvisibleTableDetectionService {
 
-    public List<List<Rectangle2D>> detectTable(List<TextPositionSequence> textPositionSequences, Rectangle2D tableBBox) {
+    public List<List<Rectangle2D>> detectTable(List<Word> words, Rectangle2D tableBBox) {
 
-        LineInformation lineInformation = LineDetectionService.calculateLineInformation(textPositionSequences);
-        GapInformation gaps = GapDetectionService.findGapsInLines(textPositionSequences, tableBBox);
+        LineInformation lineInformation = LineDetectionService.calculateLineInformation(words);
+        GapInformation gaps = GapDetectionService.findGapsInLines(words, tableBBox);
         List<Rectangle2D> gapsAcrossLines = GapsAcrossLinesService.detectXGapsAcrossLines(gaps, tableBBox);
         List<Double> columnXCoords = gapsAcrossLines.stream().map(RectangularShape::getCenterX).toList();
         int colCount = gapsAcrossLines.size();

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

@@ -1,13 +1,11 @@
-package com.knecon.fforesight.service.layoutparser.processor.services;
+package com.knecon.fforesight.service.layoutparser.processor.experimental;
 
 import java.awt.geom.Rectangle2D;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.knecon.fforesight.service.layoutparser.processor.model.GapInformation;
-import com.knecon.fforesight.service.layoutparser.processor.model.LineInformation;
 import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.Word;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -19,37 +17,37 @@ public class LineDetectionService {
     private static final double X_GAP_FACTOR = 1; // multiplied with average text height, determines the minimum distance of gaps in lines
 
 
-    public LineInformation calculateLineInformation(List<TextPositionSequence> sortedTextPositionSequences) {
+    public LineInformation calculateLineInformation(List<Word> sortedWords) {
 
-        if (sortedTextPositionSequences.isEmpty()) {
+        if (sortedWords.isEmpty()) {
             return LineFactory.init().build();
         }
 
-        return buildLineInformation(sortedTextPositionSequences);
+        return buildLineInformation(sortedWords);
     }
 
 
-    public List<List<Rectangle2D>> findLinesWithGaps(List<TextPositionSequence> sortedTextPositionSequences, Rectangle2D mainBodyTextFrame) {
+    public List<List<Rectangle2D>> findLinesWithGaps(List<Word> sortedWords, Rectangle2D mainBodyTextFrame) {
 
-        return calculateLineInformation(sortedTextPositionSequences).getBBoxWithGapsByLines();
+        return calculateLineInformation(sortedWords).getBBoxWithGapsByLines();
     }
 
 
-    public List<List<TextPositionSequence>> orderByLines(List<TextPositionSequence> sortedTextPositionSequences, Rectangle2D mainBodyTextFrame) {
+    public List<List<Word>> orderByLines(List<Word> sortedWords, Rectangle2D mainBodyTextFrame) {
 
-        return calculateLineInformation(sortedTextPositionSequences).getSequencesByLines();
+        return calculateLineInformation(sortedWords).getSequencesByLines();
     }
 
 
-    private static LineInformation buildLineInformation(List<TextPositionSequence> sortedTextPositionSequences) {
+    private static LineInformation buildLineInformation(List<Word> sortedWords) {
 
-        final double avgTextPositionHeight = getAvgTextPositionHeight(sortedTextPositionSequences);
+        final double avgTextPositionHeight = getAvgTextPositionHeight(sortedWords);
 
         LineFactory lineFactory = LineFactory.init();
 
-        var previousTextPosition = sortedTextPositionSequences.get(0);
+        var previousTextPosition = sortedWords.get(0);
         lineFactory.addToCurrentLine(previousTextPosition);
-        for (TextPositionSequence currentTextPosition : sortedTextPositionSequences.subList(1, sortedTextPositionSequences.size())) {
+        for (Word currentTextPosition : sortedWords.subList(1, sortedWords.size())) {
             if (isNewLine(currentTextPosition, previousTextPosition, avgTextPositionHeight) || isSplitByOrientation(currentTextPosition, previousTextPosition)) {
                 lineFactory.startNewLine();
             } else if (isXGap(currentTextPosition, previousTextPosition, avgTextPositionHeight)) {
@@ -63,25 +61,25 @@ public class LineDetectionService {
     }
 
 
-    private static double getAvgTextPositionHeight(List<TextPositionSequence> textPositionSequences) {
+    private static double getAvgTextPositionHeight(List<Word> words) {
 
-        return textPositionSequences.stream().mapToDouble(TextPositionSequence::getHeight).average().orElseThrow();
+        return words.stream().mapToDouble(Word::getHeight).average().orElseThrow();
     }
 
 
-    private static boolean isXGap(TextPositionSequence currentTextPosition, TextPositionSequence previousTextPosition, double avgTextPositionHeight) {
+    private static boolean isXGap(Word currentTextPosition, Word previousTextPosition, double avgTextPositionHeight) {
 
         return Math.abs(previousTextPosition.getMaxXDirAdj() - currentTextPosition.getXDirAdj()) > (avgTextPositionHeight * X_GAP_FACTOR);
     }
 
 
-    private static boolean isSplitByOrientation(TextPositionSequence currentTextPosition, TextPositionSequence previousTextPosition) {
+    private static boolean isSplitByOrientation(Word currentTextPosition, Word previousTextPosition) {
 
         return !previousTextPosition.getDir().equals(currentTextPosition.getDir());
     }
 
 
-    private static boolean isNewLine(TextPositionSequence currentTextPosition, TextPositionSequence previousTextPosition, double avgTextPositionHeight) {
+    private static boolean isNewLine(Word currentTextPosition, Word previousTextPosition, double avgTextPositionHeight) {
 
         return Math.abs(previousTextPosition.getYDirAdj() - currentTextPosition.getYDirAdj()) > avgTextPositionHeight;
     }
@@ -96,13 +94,13 @@ public class LineDetectionService {
         List<List<Rectangle2D>> bBoxWithGapsByLines;
         List<Rectangle2D> bBoxWithGapsInCurrentLine;
 
-        List<List<List<TextPositionSequence>>> sequencesWithGapsByLines;
-        List<List<TextPositionSequence>> sequencesWithGapsInCurrentLine;
+        List<List<List<Word>>> sequencesWithGapsByLines;
+        List<List<Word>> sequencesWithGapsInCurrentLine;
 
-        List<TextPositionSequence> currentSequencesWithoutGaps;
+        List<Word> currentSequencesWithoutGaps;
 
-        List<List<TextPositionSequence>> sequencesByLines;
-        List<TextPositionSequence> sequencesInCurrentLine;
+        List<List<Word>> sequencesByLines;
+        List<Word> sequencesInCurrentLine;
 
         List<List<Rectangle2D>> xGaps;
         List<List<Rectangle2D>> yGaps;
@@ -116,14 +114,14 @@ public class LineDetectionService {
             List<Rectangle2D> bBoxWithGapsInCurrentLine = new LinkedList<>();
             bBoxWithGapsByLines.add(bBoxWithGapsInCurrentLine);
 
-            List<List<List<TextPositionSequence>>> sequencesWithGapsByLines = new LinkedList<>();
-            List<List<TextPositionSequence>> sequencesWithGapsInCurrentLine = new LinkedList<>();
+            List<List<List<Word>>> sequencesWithGapsByLines = new LinkedList<>();
+            List<List<Word>> sequencesWithGapsInCurrentLine = new LinkedList<>();
             sequencesWithGapsByLines.add(sequencesWithGapsInCurrentLine);
-            List<TextPositionSequence> currentSequencesWithoutGaps = new LinkedList<>();
+            List<Word> currentSequencesWithoutGaps = new LinkedList<>();
             sequencesWithGapsInCurrentLine.add(currentSequencesWithoutGaps);
 
-            List<List<TextPositionSequence>> sequencesByLines = new LinkedList<>();
-            List<TextPositionSequence> sequencesInCurrentLine = new LinkedList<>();
+            List<List<Word>> sequencesByLines = new LinkedList<>();
+            List<Word> sequencesInCurrentLine = new LinkedList<>();
             sequencesByLines.add(sequencesInCurrentLine);
 
             return new LineFactory(lineBBox,
@@ -178,13 +176,13 @@ public class LineDetectionService {
         }
 
 
-        private Rectangle2D textPositionBBox(List<TextPositionSequence> textPositionSequences) {
+        private Rectangle2D textPositionBBox(List<Word> words) {
 
-            return RectangleTransformations.rectangle2DBBox(textPositionSequences.stream().map(TextPositionSequence::getBBox).toList());
+            return RectangleTransformations.rectangle2DBBox(words.stream().map(Word::getBBox).toList());
         }
 
 
-        public void addToCurrentLine(TextPositionSequence current) {
+        public void addToCurrentLine(Word current) {
 
             sequencesInCurrentLine.add(current);
             currentSequencesWithoutGaps.add(current);

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

@@ -1,9 +1,9 @@
-package com.knecon.fforesight.service.layoutparser.processor.model;
+package com.knecon.fforesight.service.layoutparser.processor.experimental;
 
 import java.awt.geom.Rectangle2D;
 import java.util.List;
 
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.Word;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -16,8 +16,8 @@ import lombok.experimental.FieldDefaults;
 public class LineInformation {
 
     List<Rectangle2D> lineBBox;
-    List<List<TextPositionSequence>> sequencesByLines;
+    List<List<Word>> sequencesByLines;
     List<List<Rectangle2D>> bBoxWithGapsByLines;
-    List<List<List<TextPositionSequence>>> sequencesWithGapsByLines;
+    List<List<List<Word>>> sequencesWithGapsByLines;
 
 }

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

@@ -1,12 +1,15 @@
 package com.knecon.fforesight.service.layoutparser.processor.model;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.BoundingBox;
+import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.TextBoundingBox;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.Word;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -17,18 +20,18 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public abstract class AbstractPageBlock extends BoundingBox {
+public abstract class AbstractPageBlock extends TextBoundingBox {
 
     @JsonIgnore
     protected PageBlockType classification;
 
-    Set<LayoutEngine> engines = new HashSet<>();
+    protected Set<LayoutEngine> engines = new HashSet<>();
 
     @JsonIgnore
     protected int page;
 
     @JsonIgnore
-    private Orientation orientation = Orientation.NONE;
+    protected Orientation orientation = Orientation.NONE;
 
 
     public abstract String getText();
@@ -42,4 +45,6 @@ public abstract class AbstractPageBlock extends BoundingBox {
 
     public abstract boolean isEmpty();
 
+    public abstract List<Word> getWords();
+
 }

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

@@ -4,7 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.knecon.fforesight.service.layoutparser.processor.model.outline.OutlineObjectTree;
-import com.knecon.fforesight.service.layoutparser.processor.model.outline.TableOfContents;
+import com.knecon.fforesight.service.layoutparser.processor.model.outline.SectionTree;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.ClassificationFooter;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.ClassificationHeader;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.StringFrequencyCounter;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.UnclassifiedText;
 import com.knecon.fforesight.service.layoutparser.processor.visualization.LayoutDebugLayer;
@@ -31,6 +33,6 @@ public class ClassificationDocument {
     private long rulesVersion;
 
     private OutlineObjectTree outlineObjectTree;
-    private TableOfContents tableOfContents;
+    private SectionTree sectionTree;
 
 }

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

@@ -1,5 +1,6 @@
 package com.knecon.fforesight.service.layoutparser.processor.model;
 
+import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -11,29 +12,38 @@ import com.knecon.fforesight.service.layoutparser.processor.model.image.Classifi
 import com.knecon.fforesight.service.layoutparser.processor.model.outline.OutlineObject;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.CleanRulings;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.StringFrequencyCounter;
+import com.knecon.fforesight.service.layoutparser.processor.utils.CoordinateTransforms;
 
 import lombok.Data;
 import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 
 @Data
-@RequiredArgsConstructor
-
 public class ClassificationPage {
 
+    public ClassificationPage(List<AbstractPageBlock> pageBlocks, PageInformation pageInformation, CleanRulings cleanRulings) {
+
+        this.cleanRulings = cleanRulings;
+        this.pageNumber = pageInformation.number();
+        this.textBlocks = pageBlocks;
+        var mediaBox = pageInformation.mediabox();
+        int rotation = pageInformation.rotationDegrees();
+        this.landscape = mediaBox.getWidth() > mediaBox.getHeight() && (rotation == 0 || rotation == 180) //
+                         || mediaBox.getHeight() > mediaBox.getWidth() && (rotation == 90 || rotation == 270);
+        this.pageInformation = pageInformation;
+    }
+
+
+    private PageInformation pageInformation;
     @NonNull
     private List<AbstractPageBlock> textBlocks;
 
     private List<OutlineObject> outlineObjects = new ArrayList<>();
 
-    private List<AbstractPageBlock> headlines = new ArrayList<>();
-
     private List<ClassifiedImage> images = new ArrayList<>();
 
     private Rectangle bodyTextFrame;
 
     private boolean landscape;
-    private int rotation;
 
     private int pageNumber;
 
@@ -42,11 +52,32 @@ public class ClassificationPage {
     private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
     private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
 
-    private float pageWidth;
-    private float pageHeight;
-
     private CleanRulings cleanRulings;
 
     private Map<String, List<Rectangle2D>> markedContentBboxPerType = new HashMap<>();
 
+
+    public AffineTransform getPdfToPageTransform() {
+
+        return CoordinateTransforms.calculateInitialUserSpaceCoordsToPageCoords(getPageInformation());
+    }
+
+
+    public int getRotation() {
+
+        return pageInformation.rotationDegrees();
+    }
+
+
+    public float getPageWidth() {
+
+        return (float) pageInformation.width();
+    }
+
+
+    public float getPageHeight() {
+
+        return (float) pageInformation.height();
+    }
+
 }

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

@@ -0,0 +1,19 @@
+package com.knecon.fforesight.service.layoutparser.processor.model;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.NodeType;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.knecon.fforesight.service.layoutparser.processor.visualization.LayoutDebugLayer;
+
+public record DocumentWithVisualization(Document document, LayoutDebugLayer layoutDebugLayer) {
+
+    public Map<NodeType, Long> buildSemanticNodeCounts() {
+
+        return document.streamAllSubNodes()
+                .collect(Collectors.groupingBy(SemanticNode::getType, Collectors.counting()));
+    }
+
+}

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

@@ -1,6 +1,5 @@
 package com.knecon.fforesight.service.layoutparser.processor.model;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -13,10 +12,14 @@ import lombok.Getter;
 public class FloatFrequencyCounter {
 
     Map<Double, Integer> countPerValue = new HashMap<>();
+    boolean changed;
+    Double mostPopularCache;
 
 
     public void add(double value) {
 
+        changed = true;
+
         if (!countPerValue.containsKey(value)) {
             countPerValue.put(value, 1);
         } else {
@@ -27,6 +30,8 @@ public class FloatFrequencyCounter {
 
     public void addAll(Map<Double, Integer> otherCounter) {
 
+        changed = true;
+
         for (Map.Entry<Double, Integer> entry : otherCounter.entrySet()) {
             if (countPerValue.containsKey(entry.getKey())) {
                 countPerValue.put(entry.getKey(), countPerValue.get(entry.getKey()) + entry.getValue());
@@ -39,27 +44,27 @@ public class FloatFrequencyCounter {
 
     public Double getMostPopular() {
 
-        Map.Entry<Double, Integer> mostPopular = null;
-        for (Map.Entry<Double, Integer> entry : countPerValue.entrySet()) {
-            if (mostPopular == null || entry.getValue() >= mostPopular.getValue()) {
-                mostPopular = entry;
+        if (changed || mostPopularCache == null) {
+            Map.Entry<Double, Integer> mostPopular = null;
+            for (Map.Entry<Double, Integer> entry : countPerValue.entrySet()) {
+                if (mostPopular == null || entry.getValue() >= mostPopular.getValue()) {
+                    mostPopular = entry;
+                }
             }
+            mostPopularCache = mostPopular != null ? mostPopular.getKey() : 0;
+            changed = false;
         }
-        return mostPopular != null ? mostPopular.getKey() : null;
+
+        return mostPopularCache;
     }
 
 
-    public List<Double> getHigherThanMostPopular() {
+    public List<Double> getValuesInReverseOrder() {
 
-        Double mostPopular = getMostPopular();
-        List<Double> higher = new ArrayList<>();
-        for (Double value : countPerValue.keySet()) {
-            if (value > mostPopular) {
-                higher.add(value);
-            }
-        }
-
-        return higher.stream().sorted(Collections.reverseOrder()).collect(Collectors.toList());
+        return countPerValue.keySet()
+                .stream()
+                .sorted(Collections.reverseOrder())
+                .collect(Collectors.toList());
     }
 
 

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

@@ -9,12 +9,14 @@ public enum PageBlockType {
     H6,
     HEADER,
     FOOTER,
-    TITLE,
     PARAGRAPH,
     PARAGRAPH_BOLD,
     PARAGRAPH_ITALIC,
     PARAGRAPH_UNKNOWN,
     OTHER,
+    TABLE_OF_CONTENTS_HEADLINE,
+    TABLE_OF_CONTENTS_ITEM,
+    LIST_ITEM,
     TABLE;
 
 
@@ -34,7 +36,7 @@ public enum PageBlockType {
     public static int getHeadlineNumber(PageBlockType pageBlockType) {
 
         return switch (pageBlockType) {
-            case H1 -> 1;
+            case H1, TABLE_OF_CONTENTS_HEADLINE -> 1;
             case H2 -> 2;
             case H3 -> 3;
             case H4 -> 4;
@@ -46,6 +48,6 @@ public enum PageBlockType {
 
     public boolean isHeadline() {
 
-        return this.equals(H1) || this.equals(H2) || this.equals(H3) || this.equals(H4) || this.equals(H5) || this.equals(H6);
+        return this.equals(H1) || this.equals(H2) || this.equals(H3) || this.equals(H4) || this.equals(H5) || this.equals(H6) || this.equals(TABLE_OF_CONTENTS_HEADLINE);
     }
 }

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

@@ -1,10 +1,10 @@
 package com.knecon.fforesight.service.layoutparser.processor.model;
 
-import java.awt.geom.Rectangle2D;
 import java.util.List;
 
 import com.knecon.fforesight.service.layoutparser.processor.model.table.Ruling;
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.Word;
+import com.knecon.fforesight.service.layoutparser.processor.services.graphics.Box;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -15,8 +15,9 @@ import lombok.Getter;
 @AllArgsConstructor
 public class PageContents {
 
-    List<TextPositionSequence> sortedTextPositionSequences;
-    Rectangle2D cropBox;
-    Rectangle2D mediaBox;
+    PageInformation pageInformation;
+    List<Word> words;
     List<Ruling> rulings;
+    List<Box> graphicBBoxes;
+
 }

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

@@ -2,16 +2,63 @@ package com.knecon.fforesight.service.layoutparser.processor.model;
 
 import java.awt.geom.Rectangle2D;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
 
-@Getter
-@AllArgsConstructor
-public class PageInformation {
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
 
-    PageContents pageContents;
-    LineInformation lineInformation;
-    Rectangle2D mainBodyTextFrame;
-    GapInformation gapInformation;
+public record PageInformation(Rectangle2D mediabox, Rectangle2D cropBox, int number, int rotationDegrees) {
 
-}
+    public static PageInformation fromPDPage(int pageNum, PDPage page) {
+
+        PDRectangle mediaBox = page.getMediaBox();
+        PDRectangle cropBox = page.getCropBox();
+        return new PageInformation(new Rectangle2D.Double(mediaBox.getLowerLeftX(), mediaBox.getLowerLeftY(), mediaBox.getWidth(), mediaBox.getHeight()),
+                                   new Rectangle2D.Double(cropBox.getLowerLeftX(), cropBox.getLowerLeftY(), cropBox.getWidth(), cropBox.getHeight()),
+                                   pageNum,
+                                   page.getRotation());
+    }
+
+
+    public static PageInformation fromPage(Page page) {
+
+        return new PageInformation(new Rectangle2D.Double(0, 0, page.getWidth(), page.getHeight()),
+                                   new Rectangle2D.Double(0, 0, page.getWidth(), page.getHeight()),
+                                   page.getNumber(),
+                                   page.getRotation());
+    }
+
+
+    public double height() {
+
+        return mediabox.getHeight();
+    }
+
+
+    public double heightRot() {
+
+        if (rotationDegrees == 90 || rotationDegrees == 270) {
+            return width();
+        }
+        return height();
+    }
+
+
+    public double width() {
+
+        return mediabox.getWidth();
+    }
+
+
+    public double minX() {
+
+        return mediabox.getX();
+    }
+
+
+    public double minY() {
+
+        return mediabox.getY();
+    }
+
+}

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

@@ -3,6 +3,8 @@ package com.knecon.fforesight.service.layoutparser.processor.model;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -15,11 +17,13 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
 public class SectionIdentifier {
 
-    public static Pattern numericalIdentifierPattern = Pattern.compile("^[\\s]?(\\d+)[\\s.,;]?(\\d+)?[\\s.,;]?(\\d+)?[\\s.,;]?(\\d+)?");
+    public static Pattern numericalIdentifierPattern = Pattern.compile("^[\\s]?(\\d{1,2})(?:[\\s.,;](\\d{1,2}))?(?:[\\s.,;](\\d{1,2}))?(?:[\\s.,;](\\d{1,2}))?");
+    public static Pattern alphanumericIdentifierPattern = Pattern.compile("^[\\s]?[A-Za-z][\\s.,;]?(\\d{1,2})[\\s.,;]?(\\d{1,2})?[\\s.,;]?(\\d{1,2})?[\\s.,;]?(\\d{1,2})?[\\s.,;]?");
 
     public enum Format {
         EMPTY,
         NUMERICAL,
+        ALPHANUMERIC,
         DOCUMENT
     }
 
@@ -41,6 +45,10 @@ public class SectionIdentifier {
         if (numericalIdentifierMatcher.find()) {
             return buildNumericalSectionIdentifier(headline, numericalIdentifierMatcher);
         }
+        Matcher alphanumericIdentifierMatcher = alphanumericIdentifierPattern.matcher(headline);
+        if (alphanumericIdentifierMatcher.find()) {
+            return buildAlphanumericSectionIdentifier(headline, alphanumericIdentifierMatcher);
+        }
         // more formats here
         return SectionIdentifier.empty();
     }
@@ -70,12 +78,41 @@ public class SectionIdentifier {
         List<Integer> identifiers = new LinkedList<>();
         for (int i = 1; i <= 4; i++) {
             String numericalIdentifier = numericalIdentifierMatcher.group(i);
+            if (numericalIdentifier == null || Objects.equals(numericalIdentifier, "0") || numericalIdentifier.isBlank()) {
+                break;
+            }
+            identifiers.add(Integer.parseInt(numericalIdentifier.trim()));
+        }
+        return new SectionIdentifier(Format.NUMERICAL,
+                                     identifierString,
+                                     identifiers.stream()
+                                             .toList(),
+                                     false);
+    }
+
+
+    private static SectionIdentifier buildAlphanumericSectionIdentifier(String headline, Matcher alphanumericIdentifierMatcher) {
+
+        String identifierString = headline.substring(alphanumericIdentifierMatcher.start(), alphanumericIdentifierMatcher.end());
+
+        String alphanumericIdentifier = alphanumericIdentifierMatcher.group(0).substring(0, 1).toUpperCase(Locale.ENGLISH);
+        int mappedCharacterValue = alphanumericIdentifier.charAt(0) - 'A' + 1;
+        List<Integer> identifiers = new LinkedList<>();
+        identifiers.add(mappedCharacterValue);
+
+        for (int i = 1; i <= 3; i++) {
+            String numericalIdentifier = alphanumericIdentifierMatcher.group(i);
             if (numericalIdentifier == null || numericalIdentifier.equals("0") || numericalIdentifier.isEmpty() || numericalIdentifier.isBlank()) {
                 break;
             }
             identifiers.add(Integer.parseInt(numericalIdentifier.trim()));
         }
-        return new SectionIdentifier(Format.NUMERICAL, identifierString, identifiers.stream().toList(), false);
+
+        return new SectionIdentifier(Format.ALPHANUMERIC,
+                                     identifierString,
+                                     identifiers.stream()
+                                             .toList(),
+                                     false);
     }
 
 
@@ -123,4 +160,22 @@ public class SectionIdentifier {
         return identifierString;
     }
 
+
+    public boolean isEmpty() {
+
+        return this.format.equals(Format.EMPTY);
+    }
+
+
+    public int level() {
+
+        return identifiers.size();
+    }
+
+
+    protected List<Integer> getIdentifiers() {
+
+        return identifiers;
+    }
+
 }

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

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.service.layoutparser.processor.docstrum.model;
+package com.knecon.fforesight.service.layoutparser.processor.model;
 
 import java.util.Collection;
 import java.util.LinkedHashMap;
@@ -28,4 +28,10 @@ public class UnionFind<T> extends org.jgrapht.alg.util.UnionFind<T> {
         return setRep.values();
     }
 
+
+    public Collection<T> getElements() {
+
+        return getParentMap().keySet();
+    }
+
 }

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

@@ -1,94 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
-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;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Image;
-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.nodes.SemanticNode;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SuperSection;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.TableCell;
-
-public abstract class AbstractNodeVisitor implements NodeVisitor {
-
-    @Override
-    public void visit(Document document) {
-
-        visitChildren(document);
-    }
-
-
-    @Override
-    public void visit(SuperSection superSection) {
-
-        visitChildren(superSection);
-    }
-
-
-    @Override
-    public void visit(Section section) {
-
-        visitChildren(section);
-    }
-
-
-    @Override
-    public void visit(Headline headline) {
-
-        visitChildren(headline);
-    }
-
-
-    @Override
-    public void visit(Paragraph paragraph) {
-
-        visitChildren(paragraph);
-    }
-
-
-    @Override
-    public void visit(Footer footer) {
-
-        visitChildren(footer);
-    }
-
-
-    @Override
-    public void visit(Header header) {
-
-        visitChildren(header);
-    }
-
-
-    @Override
-    public void visit(Image image) {
-
-        visitChildren(image);
-    }
-
-
-    @Override
-    public void visit(Table table) {
-
-        visitChildren(table);
-    }
-
-
-    @Override
-    public void visit(TableCell tableCell) {
-
-        visitChildren(tableCell);
-    }
-
-
-    private void visitChildren(SemanticNode semanticNode) {
-
-        semanticNode.streamChildren()
-                .forEach(node -> node.accept(this));
-
-    }
-
-}

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

@@ -1,230 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph;
-
-import static java.lang.String.format;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.stream.Stream;
-
-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.GenericSemanticNode;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode;
-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.TextBlock;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@EqualsAndHashCode
-public class DocumentTree {
-
-    private final Entry root;
-
-
-    public DocumentTree(Document document) {
-
-        root = Entry.builder().treeId(Collections.emptyList()).children(new LinkedList<>()).node(document).build();
-    }
-
-
-    public TextBlock buildTextBlock() {
-
-        return allEntriesInOrder().map(Entry::getNode)
-                .filter(SemanticNode::isLeaf)
-                .map(SemanticNode::getLeafTextBlock)
-                .collect(new TextBlockCollector());
-    }
-
-
-    public List<Integer> createNewMainEntryAndReturnId(GenericSemanticNode node) {
-
-        return createNewChildEntryAndReturnIdImpl(Collections.emptyList(), node);
-    }
-
-
-    public List<Integer> createNewChildEntryAndReturnId(GenericSemanticNode parentNode, GenericSemanticNode node) {
-
-        return createNewChildEntryAndReturnIdImpl(parentNode.getTreeId(), node);
-    }
-
-
-    public List<Integer> createNewChildEntryAndReturnId(GenericSemanticNode parentNode, Table node) {
-
-        return createNewChildEntryAndReturnIdImpl(parentNode.getTreeId(), node);
-    }
-
-
-    public List<Integer> createNewTableChildEntryAndReturnId(Table parentTable, TableCell tableCell) {
-
-        return createNewChildEntryAndReturnIdImpl(parentTable.getTreeId(), tableCell);
-    }
-
-
-    @SuppressWarnings("PMD.UnusedPrivateMethod") // PMD actually flags this wrong
-    private List<Integer> createNewChildEntryAndReturnIdImpl(List<Integer> parentId, SemanticNode node) {
-
-        if (!entryExists(parentId)) {
-            throw new IllegalArgumentException(format("parentId %s does not exist!", parentId));
-        }
-
-        Entry parent = getEntryById(parentId);
-        List<Integer> newId = new LinkedList<>(parentId);
-        newId.add(parent.children.size());
-        parent.children.add(Entry.builder().treeId(newId).node(node).build());
-
-        return newId;
-    }
-
-
-    private boolean entryExists(List<Integer> treeId) {
-
-        if (treeId.isEmpty()) {
-            return root != null;
-        }
-        Entry entry = root.children.get(treeId.get(0));
-        for (int id : treeId.subList(1, treeId.size())) {
-            if (id >= entry.children.size() || 0 > id) {
-                return false;
-            }
-            entry = entry.children.get(id);
-        }
-        return true;
-    }
-
-
-    public Entry getParentEntryById(List<Integer> treeId) {
-
-        return getEntryById(getParentId(treeId));
-    }
-
-
-    public boolean hasParentById(List<Integer> treeId) {
-
-        return !treeId.isEmpty();
-    }
-
-
-    public Stream<SemanticNode> childNodes(List<Integer> treeId) {
-
-        return getEntryById(treeId).children.stream()
-                .map(Entry::getNode);
-    }
-
-
-    public Stream<SemanticNode> childNodesOfType(List<Integer> treeId, NodeType nodeType) {
-
-        return getEntryById(treeId).children.stream()
-                .filter(entry -> entry.node.getType().equals(nodeType))
-                .map(Entry::getNode);
-    }
-
-
-    private static List<Integer> getParentId(List<Integer> treeId) {
-
-        if (treeId.isEmpty()) {
-            throw new UnsupportedOperationException("Root has no parent!");
-        }
-        if (treeId.size() < 2) {
-            return Collections.emptyList();
-        }
-        return treeId.subList(0, treeId.size() - 1);
-    }
-
-
-    public Entry getEntryById(List<Integer> treeId) {
-
-        if (treeId.isEmpty()) {
-            return root;
-        }
-        Entry entry = root;
-        for (int id : treeId) {
-            entry = entry.children.get(id);
-        }
-        return entry;
-    }
-
-
-    public Stream<Entry> mainEntries() {
-
-        return root.children.stream();
-    }
-
-
-    public Stream<Entry> allEntriesInOrder() {
-
-        return Stream.of(root)
-                .flatMap(DocumentTree::flatten);
-    }
-
-
-    public Stream<Entry> allSubEntriesInOrder(List<Integer> parentId) {
-
-        return getEntryById(parentId).children.stream()
-                .flatMap(DocumentTree::flatten);
-    }
-
-
-    @Override
-    public String toString() {
-
-        return String.join("\n",
-                           allEntriesInOrder().map(Entry::toString)
-                                   .toList());
-    }
-
-
-    private static Stream<Entry> flatten(Entry entry) {
-
-        return Stream.concat(Stream.of(entry),
-                             entry.children.stream()
-                                     .flatMap(DocumentTree::flatten));
-    }
-
-
-    public SemanticNode getHighestParentById(List<Integer> treeId) {
-
-        if (treeId.isEmpty()) {
-            return root.node;
-        }
-        return root.children.get(treeId.get(0)).node;
-    }
-
-
-    @Builder
-    @Getter
-    @AllArgsConstructor
-    @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-    public static class Entry {
-
-        List<Integer> treeId;
-        SemanticNode node;
-        @Builder.Default
-        List<Entry> children = new LinkedList<>();
-
-
-        @Override
-        public String toString() {
-
-            return node.toString();
-        }
-
-
-        public NodeType getType() {
-
-            return node.getType();
-        }
-
-    }
-
-}

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

@@ -1,45 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
-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;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Image;
-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.nodes.SuperSection;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.TableCell;
-
-public interface NodeVisitor {
-
-    void visit(Document document);
-
-
-    void visit(SuperSection superSection);
-
-
-    void visit(Section section);
-
-
-    void visit(Headline headline);
-
-
-    void visit(Paragraph paragraph);
-
-
-    void visit(Footer footer);
-
-
-    void visit(Header header);
-
-
-    void visit(Image image);
-
-
-    void visit(Table table);
-
-
-    void visit(TableCell tableCell);
-
-}

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

@@ -1,164 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph;
-
-import static java.lang.String.format;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.stream.IntStream;
-
-import lombok.EqualsAndHashCode;
-import lombok.Setter;
-
-@Setter
-@EqualsAndHashCode
-@SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName")
-public class TextRange implements Comparable<TextRange> {
-
-    private int start;
-    private int end;
-
-
-    public TextRange(int start, int end) {
-
-        if (start > end) {
-            throw new IllegalArgumentException(format("start: %d > end: %d", start, end));
-        }
-        this.start = start;
-        this.end = end;
-    }
-
-
-    public int length() {
-
-        return end - start;
-    }
-
-
-    public int start() {
-
-        return start;
-    }
-
-
-    public int end() {
-
-        return end;
-    }
-
-
-    public boolean contains(TextRange textRange) {
-
-        return start <= textRange.start() && textRange.end() <= end;
-    }
-
-
-    public boolean containedBy(TextRange textRange) {
-
-        return textRange.contains(this);
-    }
-
-
-    public boolean contains(int start, int end) {
-
-        if (start > end) {
-            throw new IllegalArgumentException(format("start: %d > end: %d", start, end));
-        }
-        return this.start <= start && end <= this.end;
-    }
-
-
-    public boolean containedBy(int start, int end) {
-
-        if (start > end) {
-            throw new IllegalArgumentException(format("start: %d > end: %d", start, end));
-        }
-        return start <= this.start && this.end <= end;
-    }
-
-
-    public boolean contains(int index) {
-
-        return start <= index && index <= end;
-    }
-
-
-    public boolean containsExclusive(int index) {
-
-        return start <= index && index < end;
-    }
-
-
-    public boolean intersects(TextRange textRange) {
-
-        return textRange.start() < this.end && this.start < textRange.end();
-    }
-
-
-    public List<TextRange> split(List<Integer> splitIndices) {
-
-        if (splitIndices.stream()
-                .anyMatch(idx -> !this.containsExclusive(idx))) {
-            throw new IndexOutOfBoundsException(format("%s splitting indices are out of range for %s",
-                                                       splitIndices.stream()
-                                                               .filter(idx -> !this.containsExclusive(idx))
-                                                               .toList(),
-                                                       this));
-        }
-        List<TextRange> splitBoundaries = new LinkedList<>();
-        int previousIndex = start;
-        for (int splitIndex : splitIndices) {
-
-            // skip split if it would produce a boundary of length 0
-            if (splitIndex == previousIndex) {
-                continue;
-            }
-            splitBoundaries.add(new TextRange(previousIndex, splitIndex));
-            previousIndex = splitIndex;
-        }
-        splitBoundaries.add(new TextRange(previousIndex, end));
-        return splitBoundaries;
-    }
-
-
-    public IntStream intStream() {
-
-        return IntStream.range(start, end);
-    }
-
-
-    public static TextRange merge(Collection<TextRange> boundaries) {
-
-        int minStart = boundaries.stream()
-                .mapToInt(TextRange::start)
-                .min()
-                .orElseThrow(IllegalArgumentException::new);
-        int maxEnd = boundaries.stream()
-                .mapToInt(TextRange::end)
-                .max()
-                .orElseThrow(IllegalArgumentException::new);
-        return new TextRange(minStart, maxEnd);
-    }
-
-
-    @Override
-    public String toString() {
-
-        return format("Boundary [%d|%d)", start, end);
-    }
-
-
-    @Override
-    public int compareTo(TextRange textRange) {
-
-        if (end < textRange.end() && start < textRange.start()) {
-            return -1;
-        }
-        if (start > textRange.start() && end > textRange.end()) {
-            return 1;
-        }
-
-        return 0;
-    }
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/entity/EntityType.java

@@ -1,8 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.entity;
-
-public enum EntityType {
-    ENTITY,
-    RECOMMENDATION,
-    FALSE_POSITIVE,
-    FALSE_RECOMMENDATION
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/entity/RedactionPosition.java

@@ -1,24 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.entity;
-
-import java.awt.geom.Rectangle2D;
-import java.util.List;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class RedactionPosition {
-
-    final String id;
-    Page page;
-    // Each entry in this list corresponds to an entry in the redaction log, this means:
-    // An entity might be represented by multiple redaction log entries
-    List<Rectangle2D> rectanglePerLine;
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/entity/TextEntity.java

@@ -1,228 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.entity;
-
-import java.awt.geom.Rectangle2D;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Deque;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.TextRange;
-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.utils.IdBuilder;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class TextEntity {
-
-    // initial values
-    @EqualsAndHashCode.Include
-    final TextRange textRange;
-    @EqualsAndHashCode.Include
-    final String type;
-    @EqualsAndHashCode.Include
-    final EntityType entityType;
-
-    // empty defaults
-    boolean redaction;
-    boolean removed;
-    boolean ignored;
-    boolean resized;
-    boolean skipRemoveEntitiesContainedInLarger;
-    boolean dictionaryEntry;
-    boolean dossierDictionaryEntry;
-    Set<Engine> engines;
-    Set<TextEntity> references;
-    @Builder.Default
-    Deque<Integer> matchedRules = new LinkedList<>();
-    String redactionReason;
-    String legalBasis;
-
-    // inferred on graph insertion
-    @EqualsAndHashCode.Include
-    String value;
-    String textBefore;
-    String textAfter;
-    @Builder.Default
-    Set<Page> pages = new HashSet<>();
-    List<RedactionPosition> redactionPositionsPerPage;
-    @Builder.Default
-    List<SemanticNode> intersectingNodes = new LinkedList<>();
-    SemanticNode deepestFullyContainingNode;
-
-
-    public static TextEntity initialEntityNode(TextRange textRange, String type, EntityType entityType) {
-
-        return TextEntity.builder().type(type).entityType(entityType).textRange(textRange).engines(new HashSet<>()).references(new HashSet<>()).build();
-    }
-
-
-    public boolean occursInNodeOfType(Class<? extends SemanticNode> clazz) {
-
-        return intersectingNodes.stream().anyMatch(clazz::isInstance);
-    }
-
-
-    public boolean occursInNode(SemanticNode semanticNode) {
-
-        return intersectingNodes.stream().anyMatch(node -> node.equals(semanticNode));
-    }
-
-
-    public boolean isType(String type) {
-
-        return this.type.equals(type);
-    }
-
-
-    public boolean isAnyType(List<String> types) {
-
-        return types.contains(type);
-    }
-
-
-    public void addIntersectingNode(SemanticNode containingNode) {
-
-        intersectingNodes.add(containingNode);
-    }
-
-
-    public void removeFromGraph() {
-
-        intersectingNodes.forEach(node -> node.getEntities().remove(this));
-        pages.forEach(page -> page.getEntities().remove(this));
-        intersectingNodes = new LinkedList<>();
-        deepestFullyContainingNode = null;
-        pages = new HashSet<>();
-        removed = true;
-        ignored = true;
-    }
-
-
-    public void addMatchedRule(int ruleNumber) {
-
-        matchedRules.add(ruleNumber);
-    }
-
-
-    public int getMatchedRule() {
-
-        if (matchedRules.isEmpty()) {
-            return 0;
-        }
-        return matchedRules.getLast();
-    }
-
-
-    public List<RedactionPosition> getRedactionPositionsPerPage() {
-
-        if (redactionPositionsPerPage == null || redactionPositionsPerPage.isEmpty()) {
-            Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = deepestFullyContainingNode.getTextBlock().getPositionsPerPage(textRange);
-
-            Page firstPage = rectanglesPerLinePerPage.keySet()
-                    .stream()
-                    .min(Comparator.comparingInt(Page::getNumber))
-                    .orElseThrow(() -> new RuntimeException("No Positions found on any page!"));
-            String id = IdBuilder.buildId(pages, rectanglesPerLinePerPage.values().stream().flatMap(Collection::stream).toList());
-            redactionPositionsPerPage = rectanglesPerLinePerPage.entrySet().stream().map(entry -> buildRedactionPosition(firstPage, id, entry)).toList();
-        }
-        return redactionPositionsPerPage;
-    }
-
-
-    private static RedactionPosition buildRedactionPosition(Page firstPage, String id, Map.Entry<Page, List<Rectangle2D>> entry) {
-
-        if (entry.getKey().equals(firstPage)) {
-            return new RedactionPosition(id, entry.getKey(), entry.getValue());
-        } else {
-            return new RedactionPosition(id + "-" + entry.getKey().getNumber(), entry.getKey(), entry.getValue());
-        }
-    }
-
-
-    public boolean containedBy(TextEntity textEntity) {
-
-        return this.textRange.containedBy(textEntity.getTextRange());
-    }
-
-
-    public boolean contains(TextEntity textEntity) {
-
-        return this.textRange.contains(textEntity.getTextRange());
-    }
-
-
-    public boolean intersects(TextEntity textEntity) {
-
-        return this.textRange.intersects(textEntity.getTextRange());
-    }
-
-
-    public void addEngine(Engine engine) {
-
-        engines.add(engine);
-    }
-
-
-    public void addEngines(Set<Engine> engines) {
-
-        this.engines.addAll(engines);
-    }
-
-
-    public void addReference(TextEntity reference) {
-
-        references.add(reference);
-    }
-
-
-    public void addReferences(List<TextEntity> references) {
-
-        this.references.addAll(references);
-    }
-
-
-    public boolean matchesAnnotationId(String manualRedactionId) {
-
-        return getRedactionPositionsPerPage().stream().anyMatch(entityPosition -> entityPosition.getId().equals(manualRedactionId));
-    }
-
-
-    @Override
-    public String toString() {
-
-        StringBuilder sb = new StringBuilder();
-        sb.append("Entity[\"");
-        sb.append(value);
-        sb.append("\", ");
-        sb.append(textRange);
-        sb.append(", pages[");
-        pages.forEach(page -> {
-            sb.append(page.getNumber());
-            sb.append(", ");
-        });
-        sb.delete(sb.length() - 2, sb.length());
-        sb.append("], type = \"");
-        sb.append(type);
-        sb.append("\", EntityType.");
-        sb.append(entityType);
-        sb.append("]");
-        return sb.toString();
-    }
-
-}

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

@@ -1,74 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import java.awt.geom.Rectangle2D;
-import java.util.HashSet;
-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.processor.model.graph.DocumentTree;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.TextEntity;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-import lombok.experimental.SuperBuilder;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public abstract class AbstractSemanticNode implements GenericSemanticNode {
-
-    @Builder.Default
-    Set<LayoutEngine> engines = new HashSet<>(Set.of(LayoutEngine.ALGORITHM));
-    List<Integer> treeId;
-
-    TextBlock textBlock;
-    @EqualsAndHashCode.Exclude
-    DocumentTree documentTree;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<TextEntity> entities = new HashSet<>();
-
-    @EqualsAndHashCode.Exclude
-    Map<Page, Rectangle2D> bBoxCache;
-
-
-    @Override
-    public TextBlock getTextBlock() {
-
-        if (textBlock == null) {
-            textBlock = GenericSemanticNode.super.getTextBlock();
-        }
-        return textBlock;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return treeId.toString() + ": " + getType() + ": " + this.getTextBlock().buildSummary();
-    }
-
-
-    @Override
-    public Map<Page, Rectangle2D> getBBox() {
-
-        if (bBoxCache == null) {
-            bBoxCache = GenericSemanticNode.super.getBBox();
-        }
-        return bBoxCache;
-    }
-
-}

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

@@ -1,173 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import java.awt.geom.Rectangle2D;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-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.NodeVisitor;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
-import com.knecon.fforesight.service.layoutparser.processor.visualization.LayoutDebugLayer;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-import lombok.experimental.SuperBuilder;
-
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class Document extends AbstractSemanticNode {
-
-    Set<Page> pages;
-    Integer numberOfPages;
-
-    LayoutDebugLayer layoutDebugLayer;
-
-
-    @Override
-    public NodeType getType() {
-
-        return NodeType.DOCUMENT;
-    }
-
-
-    /**
-     * Gets the sections of the document as a list.
-     *
-     * @return A list of all sections within the document.
-     */
-    public List<Section> getAllSections() {
-
-        return streamAllSubNodesOfType(NodeType.SECTION).map(node -> (Section) node)
-                .collect(Collectors.toList());
-    }
-
-
-    /**
-     * Gets the main sections of the document as a list.
-     *
-     * @return A list of main sections within the document
-     * @deprecated This method is marked for removal.
-     * Use {@link #streamChildrenOfType(NodeType)} instead,
-     * or {@link #getChildrenOfTypeSectionOrSuperSection()} which returns children of type SECTION as well as SUPER_SECTION.
-     */
-    @Deprecated(forRemoval = true)
-    public List<Section> getMainSections() {
-
-        return streamChildrenOfType(NodeType.SECTION).map(node -> (Section) node)
-                .collect(Collectors.toList());
-    }
-
-
-    /**
-     * Gets the direct children of type SECTION or SUPER_SECTION of the document as a list of SemanticNode objects.
-     *
-     * @return A list of all children of type SECTION or SUPER_SECTION.
-     */
-    public List<SemanticNode> getChildrenOfTypeSectionOrSuperSection() {
-
-        return streamChildren().filter(semanticNode -> semanticNode.getType().equals(NodeType.SECTION) || semanticNode.getType().equals(NodeType.SUPER_SECTION))
-                .toList();
-    }
-
-
-    public List<Header> getHeaders() {
-
-        return streamChildrenOfType(NodeType.HEADER).map(node -> (Header) node)
-                .collect(Collectors.toList());
-    }
-
-
-    public List<Footer> getFooters() {
-
-        return streamChildrenOfType(NodeType.FOOTER).map(node -> (Footer) node)
-                .collect(Collectors.toList());
-    }
-
-
-    @Override
-    public Headline getHeadline() {
-
-        return streamAllSubNodesOfType(NodeType.HEADLINE).map(node -> (Headline) node)
-                .findFirst().orElse(Headline.builder().build());
-    }
-
-
-    public Stream<TextBlock> streamTerminalTextBlocksInOrder() {
-
-        return streamAllNodes().filter(SemanticNode::isLeaf)
-                .map(SemanticNode::getTextBlock);
-    }
-
-
-    @Override
-    public List<Integer> getTreeId() {
-
-        return Collections.emptyList();
-    }
-
-
-    @Override
-    public void setTreeId(List<Integer> tocId) {
-
-        throw new UnsupportedOperationException("Document is always the root of the TablePageBlock of Contents");
-    }
-
-
-    private Stream<SemanticNode> streamAllNodes() {
-
-        return getDocumentTree().allEntriesInOrder()
-                .map(DocumentTree.Entry::getNode);
-    }
-
-
-    public Stream<Image> streamAllImages() {
-
-        return streamAllSubNodesOfType(NodeType.IMAGE).map(node -> (Image) node);
-    }
-
-
-    public Map<NodeType, Long> buildSemanticNodeCounts() {
-
-        return streamAllSubNodes().collect(Collectors.groupingBy(SemanticNode::getType, Collectors.counting()));
-    }
-
-
-    @Override
-    public String toString() {
-
-        return NodeType.DOCUMENT + ": " + this.getTextBlock().buildSummary();
-    }
-
-
-    @Override
-    public Map<Page, Rectangle2D> getBBox() {
-
-        Map<Page, Rectangle2D> bBox = new HashMap<>();
-        for (Page page : pages) {
-            bBox.put(page, new Rectangle2D.Double(0, 0, page.getWidth(), page.getHeight()));
-        }
-        return bBox;
-    }
-
-
-    @Override
-    public void accept(NodeVisitor visitor) {
-
-        visitor.visit(this);
-    }
-
-}

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

@@ -1,35 +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(super.getLeafTextBlock(), unsortedLeafTextBlock)
-                .collect(new TextBlockCollector());
-
-    }
-
-
-    @Override
-    public String toString() {
-
-        return super.toString();
-    }
-
-}

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

@@ -1,57 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-import lombok.experimental.SuperBuilder;
-
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class Footer extends AbstractSemanticNode {
-
-    TextBlock leafTextBlock;
-
-
-    @Override
-    public NodeType getType() {
-
-        return NodeType.FOOTER;
-    }
-
-
-    @Override
-    public boolean isLeaf() {
-
-        return true;
-    }
-
-
-    @Override
-    public void accept(NodeVisitor visitor) {
-        visitor.visit(this);
-    }
-
-
-    @Override
-    public TextBlock getTextBlock() {
-
-        return leafTextBlock;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return getTreeId() + ": " + NodeType.FOOTER + ": " + leafTextBlock.buildSummary();
-    }
-
-}

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

@@ -1,5 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-public interface GenericSemanticNode extends SemanticNode {
-
-}

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

@@ -1,58 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-import lombok.experimental.SuperBuilder;
-
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class Header extends AbstractSemanticNode {
-
-    TextBlock leafTextBlock;
-
-
-    @Override
-    public boolean isLeaf() {
-
-        return true;
-    }
-
-
-    @Override
-    public void accept(NodeVisitor visitor) {
-
-        visitor.visit(this);
-    }
-
-
-    @Override
-    public NodeType getType() {
-
-        return NodeType.HEADER;
-    }
-
-
-    @Override
-    public TextBlock getTextBlock() {
-
-        return leafTextBlock;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return getTreeId() + ": " + NodeType.HEADER + ": " + leafTextBlock.buildSummary();
-    }
-
-}

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

@@ -1,65 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-import lombok.experimental.SuperBuilder;
-
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class Headline extends AbstractSemanticNode {
-
-    TextBlock leafTextBlock;
-
-
-    @Override
-    public NodeType getType() {
-
-        return NodeType.HEADLINE;
-    }
-
-
-    @Override
-    public boolean isLeaf() {
-
-        return true;
-    }
-
-
-    @Override
-    public void accept(NodeVisitor visitor) {
-
-        visitor.visit(this);
-    }
-
-
-    @Override
-    public TextBlock getTextBlock() {
-
-        return leafTextBlock;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return getTreeId() + ": " + NodeType.HEADLINE + ": " + leafTextBlock.buildSummary();
-    }
-
-
-    @Override
-    public Headline getHeadline() {
-
-        return this;
-    }
-
-}

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

@@ -1,115 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import java.awt.geom.Rectangle2D;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-import lombok.experimental.SuperBuilder;
-
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class Image extends AbstractSemanticNode {
-
-    String id;
-
-    String representationHash;
-
-    ImageType imageType;
-    boolean transparent;
-    Rectangle2D position;
-
-    TextBlock leafTextBlock;
-
-    boolean redaction;
-    boolean ignored;
-    @Builder.Default
-    String redactionReason = "";
-    @Builder.Default
-    String legalBasis = "";
-    @Builder.Default
-    int matchedRule = -1;
-
-    @EqualsAndHashCode.Exclude
-    Page page;
-
-
-    @Override
-    public NodeType getType() {
-
-        return NodeType.IMAGE;
-    }
-
-
-    @Override
-    public TextBlock getTextBlock() {
-
-        return leafTextBlock;
-    }
-
-
-    @Override
-    public Set<Page> getPages() {
-
-        return Collections.singleton(page);
-    }
-
-
-    @Override
-    public String toString() {
-
-        return getTreeId() + ": " + NodeType.IMAGE + ": " + imageType.toString() + " " + position;
-    }
-
-
-    @Override
-    public Map<Page, Rectangle2D> getBBox() {
-
-        Map<Page, Rectangle2D> bBoxPerPage = new HashMap<>();
-        bBoxPerPage.put(page, position);
-        return bBoxPerPage;
-    }
-
-
-    @Override
-    public void accept(NodeVisitor visitor) {
-
-        visitor.visit(this);
-    }
-
-
-    @Override
-    public boolean isLeaf() {
-
-        return true;
-    }
-
-
-    public double getArea() {
-
-        return position.getWidth() * position.getHeight();
-    }
-
-
-    public boolean isFullPageImage() {
-
-        return imageType.equals(ImageType.OCR) || getArea() >= 0.5 * page.getArea();
-    }
-
-}

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

@@ -1,26 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import java.util.Locale;
-
-public enum ImageType {
-    LOGO,
-    FORMULA,
-    SIGNATURE,
-    SIGNATURE_VISUAL,
-    OTHER,
-    OCR,
-    GRAPHIC;
-
-
-    public static ImageType fromString(String imageType) {
-
-        return switch (imageType.toLowerCase(Locale.ROOT)) {
-            case "logo" -> ImageType.LOGO;
-            case "formula" -> ImageType.FORMULA;
-            case "signature" -> ImageType.SIGNATURE;
-            case "ocr" -> ImageType.OCR;
-            case "graphic" -> ImageType.GRAPHIC;
-            default -> ImageType.OTHER;
-        };
-    }
-}

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

@@ -1,96 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.TextEntity;
-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;
-import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.FieldDefaults;
-
-@Getter
-@Setter
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class Page {
-
-    Integer number;
-    Integer height;
-    Integer width;
-    Integer rotation;
-
-    @EqualsAndHashCode.Exclude
-    List<SemanticNode> mainBody;
-    @EqualsAndHashCode.Exclude
-    Header header;
-    @EqualsAndHashCode.Exclude
-    Footer footer;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<TextEntity> entities = new HashSet<>();
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<Image> images = new HashSet<>();
-
-
-    public static Page fromClassificationPage(ClassificationPage classificationPage) {
-
-        return Page.builder()
-                .height((int) classificationPage.getPageHeight())
-                .width((int) classificationPage.getPageWidth())
-                .number(classificationPage.getPageNumber())
-                .rotation(classificationPage.getRotation())
-                .mainBody(new LinkedList<>())
-                .build();
-    }
-
-
-    public TextBlock getMainBodyTextBlock() {
-
-        return mainBody.stream()
-                .filter(SemanticNode::isLeaf)
-                .map(SemanticNode::getLeafTextBlock)
-                .collect(new TextBlockCollector());
-    }
-
-
-    @Override
-    public String toString() {
-
-        return String.valueOf(number);
-    }
-
-
-    @Override
-    public int hashCode() {
-
-        return number;
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-
-        return o instanceof Page && o.hashCode() == this.hashCode();
-    }
-
-
-    public double getArea() {
-
-        return height * width;
-    }
-
-}

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

@@ -1,51 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-import lombok.experimental.SuperBuilder;
-
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@FieldDefaults(level = AccessLevel.PROTECTED)
-public class Paragraph extends AbstractSemanticNode {
-
-    TextBlock leafTextBlock;
-
-
-    @Override
-    public NodeType getType() {
-
-        return NodeType.PARAGRAPH;
-    }
-
-
-    @Override
-    public boolean isLeaf() {
-
-        return true;
-    }
-
-
-    @Override
-    public void accept(NodeVisitor visitor) {
-
-        visitor.visit(this);
-    }
-
-
-    @Override
-    public TextBlock getTextBlock() {
-
-        return leafTextBlock;
-    }
-
-}

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

@@ -1,53 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-import lombok.experimental.SuperBuilder;
-
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@EqualsAndHashCode(callSuper = true)
-public class Section extends AbstractSemanticNode {
-
-    @Override
-    public NodeType getType() {
-
-        return NodeType.SECTION;
-    }
-
-
-    public Headline getHeadline() {
-
-        return streamChildrenOfType(NodeType.HEADLINE).map(node -> (Headline) node)
-                .findFirst().orElseGet(() -> getParent().getHeadline());
-    }
-
-
-    @Override
-    public void accept(NodeVisitor visitor) {
-
-        visitor.visit(this);
-    }
-
-
-    public boolean hasTables() {
-
-        return streamAllSubNodesOfType(NodeType.TABLE).findAny().isPresent();
-    }
-
-
-    @Override
-    public String toString() {
-
-        return getTreeId() + ": " + NodeType.SECTION + ": " + this.getTextBlock().buildSummary();
-    }
-
-}

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

@@ -1,507 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import static java.lang.String.format;
-
-import java.awt.geom.Rectangle2D;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-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.TextRange;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.EntityType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.TextEntity;
-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.BBoxMergingUtility;
-import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
-
-public interface SemanticNode {
-
-    /**
-     * Returns the type of this node, such as Section, Paragraph, etc.
-     *
-     * @return NodeType of this node
-     */
-    NodeType getType();
-
-
-    /**
-     * Searches all Nodes located underneath this Node in the DocumentTree and concatenates their AtomicTextBlocks into a single TextBlock.
-     * So, for a Section all TextBlocks of Subsections, Paragraphs, and Tables are concatenated into a single TextBlock
-     * If the Node is a Leaf, the LeafTextBlock will be returned instead.
-     *
-     * @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());
-    }
-
-
-    /**
-     * Any Node maintains its own Set of Entities.
-     * This Set contains all Entities whose boundary intersects the boundary of this node.
-     *
-     * @return Set of all Entities associated with this Node
-     */
-    Set<TextEntity> getEntities();
-
-
-    /**
-     * Each AtomicTextBlock is assigned a page, so to get the pages this node appears on, it collects the PageNodes from each AtomicTextBlock belonging to this node's TextBlock.
-     *
-     * @return Set of PageNodes this node appears on.
-     */
-    default Set<Page> getPages() {
-
-        return getTextBlock().getPages();
-    }
-
-
-    default Page getFirstPage() {
-
-        return getTextBlock().getPages()
-                .stream()
-                .min(Comparator.comparingInt(Page::getNumber)).orElseThrow(() -> new IllegalStateException("SemanticNode has no Page!"));
-    }
-
-
-    /**
-     * Each AtomicTextBlock is assigned a page, so to get the pages for this boundary, it collects the PageNodes from each AtomicTextBlock belonging to this node's TextBlock.
-     *
-     * @return Set of PageNodes this node appears on.
-     */
-    default Set<Page> getPages(TextRange textRange) {
-
-        if (!getBoundary().contains(textRange)) {
-            throw new IllegalArgumentException(format("%s which was used to query for pages is not contained in the %s of this node!", textRange, getBoundary()));
-        }
-        return getTextBlock().getPages(textRange);
-    }
-
-
-    default boolean isOnPage(int pageNumber) {
-
-        return getPages().stream()
-                .anyMatch(page -> page.getNumber() == pageNumber);
-    }
-
-
-    /**
-     * Returns the DocumentTree Object.
-     *
-     * @return the DocumentTree of the Document this node belongs to
-     */
-    DocumentTree getDocumentTree();
-
-
-    /**
-     * The id is a List of Integers uniquely identifying this node in the DocumentTree.
-     *
-     * @return the DocumentTree ID
-     */
-    List<Integer> getTreeId();
-
-
-    /**
-     * This should only be used during graph construction.
-     *
-     * @param tocId List of Integers
-     */
-    void setTreeId(List<Integer> tocId);
-
-
-    /**
-     * Traverses the Tree up, until it hits a Headline or hits a Section which will then return the first Headline from its children.
-     * Throws NotFoundException if no Headline is found this way
-     *
-     * @return First Headline found
-     */
-    default Headline getHeadline() {
-
-        return getParent().getHeadline();
-    }
-
-
-    /**
-     * Checks if its TocId has a length greater than zero.
-     *
-     * @return boolean indicating whether this Node has a Parent in the DocumentTree
-     */
-    default boolean hasParent() {
-
-        return getDocumentTree().hasParentById(getTreeId());
-    }
-
-
-    /**
-     * @return The SemanticNode representing the Parent in the DocumentTree
-     * throws NotFoundException, when no parent is present
-     */
-    default SemanticNode getParent() {
-
-        return getDocumentTree().getParentEntryById(getTreeId()).getNode();
-    }
-
-
-    /**
-     * @return The SemanticNode which is directly underneath the document and also under which this node is.
-     * if this is the highest child node or the document itself, it returns itself.
-     */
-    default SemanticNode getHighestParent() {
-
-        return getDocumentTree().getHighestParentById(getTreeId());
-    }
-
-
-    /**
-     * Leaf means a SemanticNode has direct access to a TextBlock, by default this is false and must be overridden.
-     * Currently only Sections, Images, and Tables are not leaves.
-     * A TableCell might be a leaf depending on its area compared to the page.
-     *
-     * @return boolean, indicating if a Node has direct access to a TextBlock
-     */
-    default boolean isLeaf() {
-
-        return false;
-    }
-
-
-    /**
-     * Leaf means a SemanticNode has direct access to a TextBlock, by default this is false and must be overridden.
-     * Currently only Sections and Tables are no leaves.
-     *
-     * @return AtomicTextBlock
-     */
-    default TextBlock getLeafTextBlock() {
-
-        throw new UnsupportedOperationException("Only leaf Nodes have access to LeafTextBlocks!");
-    }
-
-
-    /**
-     * Should only be used during construction of the Graph. Sets the LeafTextBlock of this SemanticNode.
-     *
-     * @param textBlock the TextBlock to set as the LeafTextBlock of this SemanticNode
-     */
-    default void setLeafTextBlock(TextBlock textBlock) {
-
-        throw new UnsupportedOperationException();
-    }
-
-
-    /**
-     * Checks whether this SemanticNode has any Entity with EntityType.ENTITY of the provided type.
-     *
-     * @param type string representing the type of entity to check for
-     * @return true, if this SemanticNode has at least one Entity of the provided type
-     */
-    default boolean hasEntitiesOfType(String type) {
-
-        return getEntities().stream()
-                .filter(entity -> entity.getEntityType().equals(EntityType.ENTITY))
-                .anyMatch(redactionEntity -> redactionEntity.getType().equals(type));
-    }
-
-
-    /**
-     * Returns a List of Entities in this SemanticNode which are of the provided type such as "CBI_author".
-     *
-     * @param type string representing the type of entities to return
-     * @return List of RedactionEntities of any the type
-     */
-    default List<TextEntity> getEntitiesOfType(String type) {
-
-        return getEntities().stream()
-                .filter(redactionEntity -> redactionEntity.getType().equals(type))
-                .toList();
-    }
-
-
-    /**
-     * Returns a List of Entities in this SemanticNode which have any of the provided types such as "CBI_author".
-     *
-     * @param types A list of strings representing the types of entities to return
-     * @return List of RedactionEntities of any provided type
-     */
-    default List<TextEntity> getEntitiesOfType(List<String> types) {
-
-        return getEntities().stream()
-                .filter(redactionEntity -> redactionEntity.isAnyType(types))
-                .toList();
-    }
-
-
-    /**
-     * Each AtomicTextBlock has an index on its page, this returns the number of the first AtomicTextBlock underneath this node.
-     * If this node does not have any AtomicTexBlocks underneath it, e.g. an empty TableCell. It returns -1.
-     *
-     * @return Integer representing the number on the page
-     */
-    default Integer getNumberOnPage() {
-
-        TextBlock textBlock = getTextBlock();
-        if (!textBlock.getAtomicTextBlocks().isEmpty()) {
-            return getTextBlock().getAtomicTextBlocks().get(0).getNumberOnPage();
-        } else {
-            return -1;
-        }
-    }
-
-
-    /**
-     * Checks if the SemanticNode contains any text.
-     *
-     * @return true, if this node's TextBlock is not empty
-     */
-    default boolean hasText() {
-
-        return !getTextBlock().isEmpty();
-    }
-
-
-    /**
-     * Checks whether this SemanticNode contains the provided String.
-     *
-     * @param string A String which the TextBlock might contain
-     * @return true, if this node's TextBlock contains the string
-     */
-    default boolean containsString(String string) {
-
-        return getTextBlock().getSearchText().contains(string);
-    }
-
-
-    /**
-     * Checks whether this SemanticNode contains all the provided Strings.
-     *
-     * @param strings A List of Strings which the TextBlock might contain
-     * @return true, if this node's TextBlock contains all strings
-     */
-    default boolean containsStrings(List<String> strings) {
-
-        return strings.stream()
-                .allMatch(this::containsString);
-    }
-
-
-    /**
-     * Checks whether this SemanticNode contains all the provided Strings ignoring case.
-     *
-     * @param string A String which the TextBlock might contain
-     * @return true, if this node's TextBlock contains the string ignoring case
-     */
-    default boolean containsStringIgnoreCase(String string) {
-
-        return getTextBlock().getSearchText().toLowerCase(Locale.ROOT).contains(string.toLowerCase(Locale.ROOT));
-    }
-
-
-    /**
-     * Checks whether this SemanticNode contains any of the provided Strings.
-     *
-     * @param strings A List of Strings which the TextBlock might contain
-     * @return true, if this node's TextBlock contains any of the strings
-     */
-    default boolean containsAnyString(List<String> strings) {
-
-        return strings.stream()
-                .anyMatch(this::containsString);
-    }
-
-
-    /**
-     * Checks whether this SemanticNode contains any of the provided Strings ignoring case.
-     *
-     * @param strings A List of Strings which the TextBlock might contain
-     * @return true, if this node's TextBlock contains any of the strings
-     */
-    default boolean containsAnyStringIgnoreCase(List<String> strings) {
-
-        return strings.stream()
-                .anyMatch(this::containsStringIgnoreCase);
-    }
-
-
-    /**
-     * This function is used during insertion of EntityNodes into the graph, it checks if the boundary of the RedactionEntity intersects or even contains the RedactionEntity.
-     * It sets the fields accordingly and recursively calls this function on all its children.
-     *
-     * @param textEntity RedactionEntity, which is being inserted into the graph
-     */
-    default void addThisToEntityIfIntersects(TextEntity textEntity) {
-
-        TextBlock textBlock = getTextBlock();
-        if (textBlock.getTextRange().intersects(textEntity.getTextRange())) {
-            if (textBlock.containsBoundary(textEntity.getTextRange())) {
-                textEntity.setDeepestFullyContainingNode(this);
-            }
-
-            textEntity.addIntersectingNode(this);
-            streamChildren().filter(semanticNode -> semanticNode.getBoundary().intersects(textEntity.getTextRange()))
-                    .forEach(node -> node.addThisToEntityIfIntersects(textEntity));
-        }
-    }
-
-
-    /**
-     * 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.
-     *
-     * @return Stream of all children
-     */
-    default Stream<SemanticNode> streamChildren() {
-
-        return getDocumentTree().childNodes(getTreeId());
-    }
-
-
-    /**
-     * Streams all children located directly underneath this node in the DocumentTree of the provided type.
-     *
-     * @return Stream of all children
-     */
-    default Stream<SemanticNode> streamChildrenOfType(NodeType nodeType) {
-
-        return getDocumentTree().childNodesOfType(getTreeId(), nodeType);
-    }
-
-
-    /**
-     * Recursively streams all SemanticNodes located underneath this node in the DocumentTree in order.
-     *
-     * @return Stream of all SubNodes
-     */
-    default Stream<SemanticNode> streamAllSubNodes() {
-
-        return getDocumentTree().allSubEntriesInOrder(getTreeId())
-                .map(DocumentTree.Entry::getNode);
-    }
-
-
-    /**
-     * Recursively streams all SemanticNodes of the provided type located underneath this node in the DocumentTree in order.
-     *
-     * @return Stream of all SubNodes
-     */
-    default Stream<SemanticNode> streamAllSubNodesOfType(NodeType nodeType) {
-
-        return getDocumentTree().allSubEntriesInOrder(getTreeId())
-                .filter(entry -> entry.getType().equals(nodeType))
-                .map(DocumentTree.Entry::getNode);
-    }
-
-
-    /**
-     * The Boundary is the start and end string offsets in the reading order of the document.
-     *
-     * @return Boundary of this Node's TextBlock
-     */
-    default TextRange getBoundary() {
-
-        return getTextBlock().getTextRange();
-    }
-
-
-    /**
-     * If this Node is a Leaf it will calculate the boundingBox of its LeafTextBlock, otherwise it will calculate the Union of the BoundingBoxes of all its Children.
-     * If called on the Document, it will return the cropbox of each page
-     *
-     * @return Rectangle2D fully encapsulating this Node for each page.
-     */
-    default Map<Page, Rectangle2D> getBBox() {
-
-        if (isLeaf()) {
-            return getBBoxFromLeafTextBlock();
-        }
-
-        return getBBoxFromChildren();
-    }
-
-
-    /**
-     * Checks whether the Bounding Box of this SemanticNode contains the provided rectangle on the provided page.
-     *
-     * @param rectangle2D The rectangle to check if it is contained
-     * @param pageNumber  The Page number on which the rectangle should be checked
-     * @return boolean
-     */
-    default boolean containsRectangle(Rectangle2D rectangle2D, Integer pageNumber) {
-
-        Page helperPage = Page.builder().number(pageNumber).build();
-        if (!getPages().contains(helperPage)) {
-            return false;
-        }
-        return getBBox().get(helperPage).contains(rectangle2D);
-    }
-
-
-    /**
-     * 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() {
-
-        List<Map<Page, Rectangle2D>> childrenBBoxes = streamChildren().filter(child -> !isFullPageImage(child))
-                .map(SemanticNode::getBBox)
-                .toList();
-        return BBoxMergingUtility.mergeBBoxes(childrenBBoxes);
-    }
-
-
-    private static boolean isFullPageImage(SemanticNode child) {
-
-        if (!child.getType().equals(NodeType.IMAGE)) {
-            return false;
-        }
-        return ((Image) child).isFullPageImage();
-    }
-
-
-    /**
-     * @return The union of all BoundingBoxes of the TextBlock of this node
-     */
-    private Map<Page, Rectangle2D> getBBoxFromLeafTextBlock() {
-
-        Map<Page, Rectangle2D> bBoxPerPage = new HashMap<>();
-        Map<Page, List<AtomicTextBlock>> atomicTextBlockPerPage = getTextBlock().getAtomicTextBlocks()
-                .stream()
-                .collect(Collectors.groupingBy(AtomicTextBlock::getPage));
-        atomicTextBlockPerPage.forEach((page, atbs) -> bBoxPerPage.put(page, RectangleTransformations.bBoxUnionAtomicTextBlock(atbs)));
-        return bBoxPerPage;
-    }
-
-
-    void accept(NodeVisitor visitor);
-
-}

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

@@ -1,47 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-import lombok.experimental.SuperBuilder;
-
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@EqualsAndHashCode(callSuper = true)
-public class SuperSection extends AbstractSemanticNode {
-
-    @Override
-    public NodeType getType() {
-
-        return NodeType.SUPER_SECTION;
-    }
-
-
-    public Headline getHeadline() {
-
-        return streamChildrenOfType(NodeType.HEADLINE).map(node -> (Headline) node)
-                .findFirst().orElseGet(() -> getParent().getHeadline());
-    }
-
-
-    @Override
-    public void accept(NodeVisitor visitor) {
-
-        visitor.visit(this);
-    }
-
-
-    @Override
-    public String toString() {
-
-        return getTreeId() + ": " + NodeType.SUPER_SECTION + ": " + this.getTextBlock().buildSummary();
-    }
-
-}

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

@@ -1,363 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import static java.lang.String.format;
-
-import java.awt.geom.Rectangle2D;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-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.NodeVisitor;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.TextEntity;
-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;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@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;
-
-    int numberOfRows;
-    int numberOfCols;
-    TextBlock textBlock;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<TextEntity> entities = new HashSet<>();
-
-    @EqualsAndHashCode.Exclude
-    Map<Page, Rectangle2D> bBoxCache;
-
-    /**
-     * Streams all entities in this table, that appear in a row, which contains any of the provided strings.
-     *
-     * @param strings Strings to check whether a row contains them
-     * @return Stream of all entities in this table, that appear in a row, which contains any of the provided strings
-     */
-    public Stream<TextEntity> streamEntitiesWhereRowContainsStringsIgnoreCase(List<String> strings) {
-
-        return IntStream.range(0, numberOfRows).boxed()
-                .filter(row -> rowContainsStringsIgnoreCase(row, strings))
-                .flatMap(this::streamRow)
-                .map(TableCell::getEntities)
-                .flatMap(Collection::stream);
-    }
-
-
-    /**
-     * Checks whether the specified row contains all the provided strings.
-     *
-     * @param row     the row to check as an Integer, must be smaller than numberOfRows
-     * @param strings a list of strings to check for
-     * @return true, if all strings appear in the provided row
-     */
-    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);
-    }
-
-
-    /**
-     * Streams all entities which appear in a row where at least one cell has the provided header and the provided value.
-     *
-     * @param header the header value to search for
-     * @param value  the string which the table cell should contain
-     * @return a stream of all entities, which appear in a row where at least one cell has the provided header and the provided value.
-     */
-    public Stream<TextEntity> streamEntitiesWhereRowHasHeaderAndValue(String header, String value) {
-
-        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);
-    }
-
-
-    /**
-     * Streams all entities which appear in a row where at least one cell has the provided header and any provided value.
-     *
-     * @param header the header value to search for
-     * @param values the strings which the table cell should contain
-     * @return a stream of all entities, which appear in a row where at least one cell has the provided header and any provided value.
-     */
-    public Stream<TextEntity> streamEntitiesWhereRowHasHeaderAndAnyValue(String header, List<String> values) {
-
-        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);
-    }
-
-
-    /**
-     * Streams all entities in this table, that appear in a row, which contains at least one entity with any of the provided types.
-     *
-     * @param types type strings to check whether a row contains an entity like them
-     * @return Stream of all entities in this table, that appear in a row, which contains at least one entity with any of the provided types.
-     */
-    public Stream<TextEntity> 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))))
-                .toList();
-
-        return rowsWithEntityOfType.stream()
-                .flatMap(this::streamRow)
-                .map(TableCell::getEntities)
-                .flatMap(Collection::stream);
-    }
-
-
-    /**
-     * Streams all entities in this table, that appear in a row, which does not contain any entity with any of the provided types.
-     *
-     * @param types type strings to check whether a row doesn't contain an entity like it
-     * @return Stream of all entities in this table, that appear in a row, which does not contain any entity with any of the provided types.
-     */
-    public Stream<TextEntity> 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))))
-                .toList();
-
-        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(TextEntity::getType)
-                .distinct();
-    }
-
-
-    /**
-     * Returns a TableCell at the provided row and column location.
-     *
-     * @param row int representing the row, must be smaller than numberOfRows
-     * @param col int representing the col, must be smaller than numberOfCols
-     * @return TableCell at the provided location in the table
-     */
-    public TableCell getCell(int row, int col) {
-
-        if (numberOfRows - row < 0 || numberOfCols - col < 0) {
-            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();
-    }
-
-
-    /**
-     * Streams all TableCells in this Table row-wise.
-     *
-     * @return Stream of all TableCells
-     */
-    public Stream<TableCell> streamTableCells() {
-
-        return streamChildrenOfType(NodeType.TABLE_CELL).map(node -> (TableCell) node);
-    }
-
-
-    /**
-     * Streams all TableCells in this Table which have the provided header row-wise.
-     *
-     * @return Stream of all TableCells which have the provided header
-     */
-    public Stream<TableCell> streamTableCellsWithHeader(String header) {
-
-        return streamHeaders().filter(tableCellNode -> tableCellNode.getTextBlock().getSearchText().contains(header))
-                .map(TableCell::getCol)
-                .flatMap(this::streamCol)
-                .filter(tableCellNode -> !tableCellNode.isHeader());
-    }
-
-
-    /**
-     * Streams all TableCells belonging to the provided column from top down.
-     *
-     * @param col int representing the column
-     * @return Stream of all TableCell in the provided column
-     */
-    public Stream<TableCell> streamCol(int col) {
-
-        return IntStream.range(0, numberOfRows).boxed()
-                .map(row -> getCell(row, col));
-    }
-
-
-    /**
-     * Streams all TableCells belonging to the provided row from left to right.
-     *
-     * @param row int representing the row
-     * @return Stream of all TableCell in the provided row
-     */
-    public Stream<TableCell> streamRow(int row) {
-
-        return IntStream.range(0, numberOfCols).boxed()
-                .map(col -> getCell(row, col));
-    }
-
-
-    /**
-     * Streams all TableCells row-wise and filters them with header == true.
-     *
-     * @return Stream of all TableCells with header == true
-     */
-    public Stream<TableCell> streamHeaders() {
-
-        return streamTableCells().filter(TableCell::isHeader);
-    }
-
-
-    /**
-     * Streams all TableCells of the provided row and column and filters them with header == true.
-     *
-     * @param row int representing the row
-     * @param col int representing the column
-     * @return Stream of all TableCells with header == true in the provided row or col
-     */
-    public Stream<TableCell> streamHeadersForCell(int row, int col) {
-
-        return Stream.concat(streamRow(row), streamCol(col))
-                .filter(TableCell::isHeader);
-    }
-
-
-    /**
-     * Streams all Headers and checks if any equal the provided string.
-     *
-     * @param header string to check the headers for
-     * @return true, if at least one header equals the provided string
-     */
-    public boolean hasHeader(String header) {
-
-        return streamHeaders().anyMatch(tableCellNode -> tableCellNode.getTextBlock().getSearchText().strip().equals(header));
-    }
-
-
-    /**
-     * Checks if this table has a column with the provided header and any of the table cells in that column contain the provided value.
-     *
-     * @param header string to find header cells
-     * @param value  string to check cells with provided header
-     * @return true, if this table has a column with the provided header and any of the table cells in that column contain the provided value
-     */
-    public boolean hasRowWithHeaderAndValue(String header, String value) {
-
-        return streamTableCellsWithHeader(header).anyMatch(tableCellNode -> tableCellNode.containsString(value));
-    }
-
-
-    /**
-     * Checks if this table has a column with the provided header and any of the table cells in that column contains any of the provided values.
-     *
-     * @param header string to find header cells
-     * @param values List of strings to check cells with provided header
-     * @return true, if this table has a column with the provided header and any of the table cells in that column contains any of the provided values.
-     */
-    public boolean hasRowWithHeaderAndAnyValue(String header, List<String> values) {
-
-        return streamTableCellsWithHeader(header).anyMatch(tableCellNode -> tableCellNode.containsAnyString(values));
-    }
-
-
-    /**
-     * Finds all entities of the provided type, which appear in the same row that the provided entity appears in.
-     *
-     * @param type            the type of entities to search for
-     * @param textEntity the entity, which appears in the row to search
-     * @return List of all entities of the provided type, which appear in the same row that the provided entity appears in.
-     */
-    public List<TextEntity> getEntitiesOfTypeInSameRow(String type, TextEntity textEntity) {
-
-        return textEntity.getIntersectingNodes()
-                .stream()
-                .filter(node -> node instanceof TableCell)
-                .map(node -> (TableCell) node)
-                .flatMap(tableCellNode -> streamRow(tableCellNode.getRow()))
-                .map(cell -> cell.getEntitiesOfType(type))
-                .flatMap(Collection::stream)
-                .toList();
-    }
-
-
-    @Override
-    public NodeType getType() {
-
-        return NodeType.TABLE;
-    }
-
-
-    @Override
-    public TextBlock getTextBlock() {
-
-        if (textBlock == null) {
-            textBlock = SemanticNode.super.getTextBlock();
-        }
-        return textBlock;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return treeId.toString() + ": " + NodeType.TABLE + ": #cols: " + numberOfCols + ", #rows: " + numberOfRows + ", " + this.getTextBlock().buildSummary();
-    }
-
-
-    @Override
-    public Map<Page, Rectangle2D> getBBox() {
-
-        if (bBoxCache == null) {
-            bBoxCache = SemanticNode.super.getBBox();
-        }
-        return bBoxCache;
-    }
-
-
-    @Override
-    public void accept(NodeVisitor visitor) {
-        visitor.visit(this);
-    }
-
-}

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

@@ -1,95 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
-
-import java.awt.geom.Rectangle2D;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
-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;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-import lombok.experimental.SuperBuilder;
-
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class TableCell extends AbstractSemanticNode {
-
-    int row;
-    int col;
-    boolean header;
-
-    Rectangle2D bBox;
-
-    TextBlock leafTextBlock;
-
-    TextBlock textBlock;
-
-
-    @Override
-    public Map<Page, Rectangle2D> getBBox() {
-
-        Map<Page, Rectangle2D> bBoxPerPage = new HashMap<>();
-        getPages().forEach(page -> bBoxPerPage.put(page, bBox));
-        return bBoxPerPage;
-    }
-
-
-    @Override
-    public void accept(NodeVisitor visitor) {
-
-        visitor.visit(this);
-    }
-
-
-    @Override
-    public NodeType getType() {
-
-        return NodeType.TABLE_CELL;
-    }
-
-
-    @Override
-    public boolean isLeaf() {
-
-        return getDocumentTree().getEntryById(getTreeId()).getChildren().isEmpty();
-    }
-
-
-    @Override
-    public TextBlock getTextBlock() {
-
-        if (isLeaf()) {
-            return leafTextBlock;
-        }
-
-        if (textBlock == null) {
-            textBlock = buildTextBlock();
-        }
-        return textBlock;
-    }
-
-
-    private TextBlock buildTextBlock() {
-
-        return streamAllSubNodes().filter(SemanticNode::isLeaf)
-                .map(SemanticNode::getLeafTextBlock)
-                .collect(new TextBlockCollector());
-    }
-
-
-    @Override
-    public String toString() {
-
-        return getTreeId() + ": " + NodeType.TABLE_CELL + ": " + this.getTextBlock().buildSummary();
-    }
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/AtomicTextBlock.java

@@ -1,275 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock;
-
-import static java.lang.String.format;
-
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPositionData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentTextData;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.TextRange;
-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.utils.RectangleTransformations;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class AtomicTextBlock implements TextBlock {
-
-    Long id;
-    Integer numberOnPage;
-    Page page;
-
-    //string coordinates
-    TextRange textRange;
-    String searchText;
-    @Builder.Default
-    List<Integer> lineBreaks = new ArrayList<>();
-    @Builder.Default
-    List<TextRange> boldTextBoundaries = new ArrayList<>();
-    @Builder.Default
-    List<TextRange> italicTextBoundaries = new ArrayList<>();
-    String orientation;
-    int textDirection;
-
-    //position coordinates
-    @Builder.Default
-    List<Integer> stringIdxToPositionIdx = new ArrayList<>();
-    @Builder.Default
-    List<Rectangle2D> positions = new ArrayList<>();
-
-    @EqualsAndHashCode.Exclude
-    SemanticNode parent;
-
-
-    @Override
-    public int numberOfLines() {
-
-        return lineBreaks.size() + 1;
-    }
-
-
-    @Override
-    public String subSequenceWithLineBreaks(TextRange stringTextRange) {
-
-        if (stringTextRange.length() == 0 || !getTextRange().contains(stringTextRange)) {
-            return "";
-        }
-
-        Set<Integer> lbInBoundary = lineBreaks.stream()
-                .map(i -> i + this.textRange.start())
-                .filter(stringTextRange::contains)
-                .collect(Collectors.toSet());
-        if (stringTextRange.end() == getTextRange().end()) {
-            lbInBoundary.add(getTextRange().end());
-        }
-        StringBuilder sb = new StringBuilder();
-        for (int i = stringTextRange.start(); i < stringTextRange.end(); i++) {
-            char character = this.charAt(i);
-            if (lbInBoundary.contains(i + 1)) {
-                // always plus one, due to the linebreaks being an exclusive end index
-                if (!Character.isWhitespace(character)) {
-                    lbInBoundary.remove(i + 1);
-                    lbInBoundary.add(i + 2);
-                    sb.append(character);
-                    continue;
-                }
-                sb.append("\n");
-            } else {
-                sb.append(character);
-            }
-        }
-        return sb.toString();
-    }
-
-
-    public static AtomicTextBlock fromSearchTextWithTextPosition(String searchText,
-                                                                 List<Integer> lineBreaks,
-                                                                 List<TextRange> boldTextBoundaries,
-                                                                 List<TextRange> italicTextBoundaries,
-                                                                 List<Rectangle2D> positions,
-                                                                 List<Integer> stringIdxToPositionIdx,
-                                                                 long idx,
-                                                                 SemanticNode parent,
-                                                                 int numberOnPage,
-                                                                 Page page,
-                                                                 int offset,
-                                                                 String orientation,
-                                                                 int textDirection) {
-
-        return AtomicTextBlock.builder()
-                .id(idx)
-                .parent(parent)
-                .searchText(searchText)
-                .numberOnPage(numberOnPage)
-                .page(page)
-                .lineBreaks(lineBreaks)
-                .boldTextBoundaries(boldTextBoundaries)
-                .italicTextBoundaries(italicTextBoundaries)
-                .positions(positions)
-                .stringIdxToPositionIdx(stringIdxToPositionIdx)
-                .textRange(new TextRange(offset, offset + searchText.length()))
-                .textDirection(textDirection)
-                .orientation(orientation)
-                .build();
-    }
-
-
-    public static AtomicTextBlock empty(Long textBlockIdx, int stringOffset, Page page, int numberOnPage, SemanticNode parent) {
-
-        return AtomicTextBlock.builder()
-                .id(textBlockIdx)
-                .textRange(new TextRange(stringOffset, stringOffset))
-                .searchText("")
-                .page(page)
-                .numberOnPage(numberOnPage)
-                .parent(parent)
-                .build();
-    }
-
-
-    public static AtomicTextBlock fromAtomicTextBlockData(DocumentTextData documentTextData, DocumentPositionData documentPositionData, SemanticNode parent, Page page) {
-
-        return AtomicTextBlock.builder()
-                .id(documentTextData.getId())
-                .numberOnPage(documentTextData.getNumberOnPage())
-                .page(page)
-                .textRange(new TextRange(documentTextData.getStart(), documentTextData.getEnd()))
-                .searchText(documentTextData.getSearchText())
-                .lineBreaks(Arrays.stream(documentTextData.getLineBreaks()).boxed()
-                                    .toList())
-                .stringIdxToPositionIdx(Arrays.stream(documentPositionData.getStringIdxToPositionIdx()).boxed()
-                                                .toList())
-                .positions(toRectangle2DList(documentPositionData.getPositions()))
-                .parent(parent)
-                .build();
-    }
-
-
-    private static List<Rectangle2D> toRectangle2DList(float[][] positions) {
-
-        return Arrays.stream(positions)
-                .map(floatArr -> (Rectangle2D) new Rectangle2D.Float(floatArr[0], floatArr[1], floatArr[2], floatArr[3]))
-                .toList();
-    }
-
-
-    public CharSequence getLine(int lineNumber) {
-
-        if (lineNumber >= numberOfLines() || lineNumber < 0) {
-            throw new IndexOutOfBoundsException(format("line %d out of range for AtomicTextBlock with %d lines", lineNumber, numberOfLines()));
-        }
-        if (lineNumber == 0) {
-            if (lineBreaks.isEmpty()) {
-                return searchText;
-            }
-            return subSequence(textRange.start(), lineBreaks.get(0) + textRange.start());
-        } else if (lineNumber == numberOfLines() - 1) {
-            return subSequence(lineBreaks.get(lineBreaks.size() - 1) + textRange.start(), textRange.end());
-        }
-        return subSequence(lineBreaks.get(lineNumber - 1) + textRange.start(), lineBreaks.get(lineNumber) + textRange.start());
-    }
-
-
-    @Override
-    public List<AtomicTextBlock> getAtomicTextBlocks() {
-
-        return List.of(this);
-    }
-
-
-    @Override
-    public int getNextLinebreak(int fromIndex) {
-
-        return lineBreaks.stream()//
-                       .filter(linebreak -> linebreak > fromIndex - textRange.start()) //
-                       .findFirst() //
-                       .orElse(searchText.length()) + textRange.start();
-    }
-
-
-    @Override
-    public int getPreviousLinebreak(int fromIndex) {
-
-        return lineBreaks.stream()//
-                       .filter(linebreak -> linebreak <= fromIndex - textRange.start())//
-                       .reduce((a, b) -> b)//
-                       .orElse(0) + textRange.start();
-    }
-
-
-    @Override
-    public Rectangle2D getPosition(int stringIdx) {
-
-        return positions.get(stringIdxToPositionIdx.get(stringIdx - textRange.start()));
-    }
-
-
-    @Override
-    public List<Rectangle2D> getPositions(TextRange stringTextRange) {
-
-        if (!containsBoundary(stringTextRange)) {
-            throw new IndexOutOfBoundsException(format("%s is out of bounds for %s", stringTextRange, this.textRange));
-        }
-        if (stringTextRange.length() == 0) {
-            return Collections.emptyList();
-        }
-
-        int startPositionIdx = stringIdxToPositionIdx.get(stringTextRange.start() - this.textRange.start());
-
-        if (stringTextRange.end() == this.textRange.end()) {
-            return positions.subList(startPositionIdx, positions.size());
-        }
-
-        return positions.subList(startPositionIdx, stringIdxToPositionIdx.get(stringTextRange.end() - this.textRange.start()));
-
-    }
-
-
-    public Map<Page, List<Rectangle2D>> getPositionsPerPage(TextRange stringTextRange) {
-
-        List<Rectangle2D> rectanglesPerLine = stringTextRange.split(getAllLineBreaksInBoundary(stringTextRange))
-                .stream()
-                .map(this::getPositions)
-                .map(RectangleTransformations::rectangleBBoxWithGaps)
-                .flatMap(Collection::stream)
-                .toList();
-        Map<Page, List<Rectangle2D>> rectanglePerLinePerPage = new HashMap<>();
-        rectanglePerLinePerPage.put(page, rectanglesPerLine);
-        return rectanglePerLinePerPage;
-    }
-
-
-    protected List<Integer> getAllLineBreaksInBoundary(TextRange textRange) {
-
-        return getLineBreaks().stream()
-                .map(linebreak -> linebreak + this.textRange.start())
-                .filter(textRange::contains)
-                .toList();
-    }
-
-
-    @Override
-    public String toString() {
-
-        return searchText;
-    }
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/ConcatenatedTextBlock.java

@@ -1,271 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock;
-
-import static java.lang.String.format;
-
-import java.awt.geom.Rectangle2D;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.TextRange;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page;
-
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class ConcatenatedTextBlock implements TextBlock {
-
-    List<AtomicTextBlock> atomicTextBlocks;
-    String searchText;
-    TextRange textRange;
-
-
-    public static ConcatenatedTextBlock empty() {
-
-        return new ConcatenatedTextBlock(Collections.emptyList());
-    }
-
-
-    public ConcatenatedTextBlock(List<AtomicTextBlock> atomicTextBlocks) {
-
-        this.atomicTextBlocks = new LinkedList<>();
-        if (atomicTextBlocks.isEmpty()) {
-            textRange = new TextRange(-1, -1);
-            return;
-        }
-        var firstTextBlock = atomicTextBlocks.get(0);
-        this.atomicTextBlocks.add(firstTextBlock);
-        textRange = new TextRange(firstTextBlock.getTextRange().start(), firstTextBlock.getTextRange().end());
-
-        atomicTextBlocks.subList(1, atomicTextBlocks.size())
-                .forEach(this::concat);
-    }
-
-
-    public ConcatenatedTextBlock concat(TextBlock textBlock) {
-
-        int start = textBlock.getTextRange().start();
-        int end = textBlock.getTextRange().end();
-        if (this.atomicTextBlocks.isEmpty()) {
-            textRange.setStart(start);
-            textRange.setEnd(end);
-        } else if (textRange.end() != start) {
-            throw new UnsupportedOperationException(format("Can only concat consecutive TextBlocks, trying to concat %s and %s", textRange, textBlock.getTextRange()));
-        }
-        this.atomicTextBlocks.addAll(textBlock.getAtomicTextBlocks());
-        textRange.setEnd(end);
-        this.searchText = null;
-        return this;
-    }
-
-
-    private AtomicTextBlock getAtomicTextBlockByStringIndex(int stringIdx) {
-
-        return atomicTextBlocks.stream()
-                .filter(textBlock -> textBlock.getTextRange().containsExclusive(stringIdx))
-                .findAny()
-                .orElseThrow(IndexOutOfBoundsException::new);
-    }
-
-
-    private List<AtomicTextBlock> getAllAtomicTextBlocksPartiallyInStringBoundary(TextRange textRange) {
-
-        return atomicTextBlocks.stream()
-                .filter(tb -> tb.getTextRange().intersects(textRange))
-                .toList();
-    }
-
-
-    @Override
-    public String getSearchText() {
-
-        if (searchText == null) {
-            StringBuilder sb = new StringBuilder();
-            getAtomicTextBlocks().forEach(atb -> sb.append(atb.getSearchText()));
-            searchText = sb.toString();
-        }
-        return searchText;
-    }
-
-
-    @Override
-    public int numberOfLines() {
-
-        return atomicTextBlocks.stream()
-                .map(AtomicTextBlock::getLineBreaks)
-                .mapToInt(List::size).sum();
-    }
-
-
-    @Override
-    public int getNextLinebreak(int fromIndex) {
-
-        return getAtomicTextBlockByStringIndex(fromIndex).getNextLinebreak(fromIndex);
-    }
-
-
-    @Override
-    public int getPreviousLinebreak(int fromIndex) {
-
-        return getAtomicTextBlockByStringIndex(fromIndex).getPreviousLinebreak(fromIndex);
-    }
-
-
-    @Override
-    public List<Integer> getLineBreaks() {
-
-        return getAtomicTextBlocks().stream()
-                .flatMap(atomicTextBlock -> atomicTextBlock.getLineBreaks()
-                        .stream())
-                .toList();
-    }
-
-
-    @Override
-    public Rectangle2D getPosition(int stringIdx) {
-
-        return getAtomicTextBlockByStringIndex(stringIdx).getPosition(stringIdx);
-    }
-
-
-    @Override
-    public List<Rectangle2D> getPositions(TextRange stringTextRange) {
-
-        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringTextRange);
-
-        if (textBlocks.size() == 1) {
-            return textBlocks.get(0).getPositions(stringTextRange);
-        }
-
-        AtomicTextBlock firstTextBlock = textBlocks.get(0);
-        List<Rectangle2D> positions = new LinkedList<>(firstTextBlock.getPositions(new TextRange(stringTextRange.start(), firstTextBlock.getTextRange().end())));
-
-        for (AtomicTextBlock textBlock : textBlocks.subList(1, textBlocks.size() - 1)) {
-            positions.addAll(textBlock.getPositions());
-        }
-
-        var lastTextBlock = textBlocks.get(textBlocks.size() - 1);
-        positions.addAll(lastTextBlock.getPositions(new TextRange(lastTextBlock.getTextRange().start(), stringTextRange.end())));
-
-        return positions;
-    }
-
-
-    @Override
-    public Map<Page, List<Rectangle2D>> getPositionsPerPage(TextRange stringTextRange) {
-
-        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringTextRange);
-
-        if (textBlocks.size() == 1) {
-            return textBlocks.get(0).getPositionsPerPage(stringTextRange);
-        }
-
-        AtomicTextBlock firstTextBlock = textBlocks.get(0);
-        Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = firstTextBlock.getPositionsPerPage(new TextRange(stringTextRange.start(), firstTextBlock.getTextRange().end()));
-
-        for (AtomicTextBlock textBlock : textBlocks.subList(1, textBlocks.size() - 1)) {
-            rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage, textBlock.getPositionsPerPage(textBlock.getTextRange()));
-        }
-
-        AtomicTextBlock lastTextBlock = textBlocks.get(textBlocks.size() - 1);
-        rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage,
-                                                                        lastTextBlock.getPositionsPerPage(new TextRange(lastTextBlock.getTextRange().start(),
-                                                                                                                        stringTextRange.end())));
-
-        return rectanglesPerLinePerPage;
-    }
-
-
-    private Map<Page, List<Rectangle2D>> mergeEntityPositionsWithSamePageNode(Map<Page, List<Rectangle2D>> map1, Map<Page, List<Rectangle2D>> map2) {
-
-        Map<Page, List<Rectangle2D>> mergedMap = new HashMap<>(map1);
-        map2.forEach((pageNode, rectangles) -> mergedMap.merge(pageNode,
-                                                               rectangles,
-                                                               (l1, l2) -> Stream.concat(l1.stream(), l2.stream())
-                                                                       .toList()));
-        return mergedMap;
-    }
-
-
-    @Override
-    public String subSequenceWithLineBreaks(TextRange stringTextRange) {
-
-        if (stringTextRange.length() == 0 || !getTextRange().contains(stringTextRange)) {
-            return "";
-        }
-
-        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringTextRange);
-
-        if (textBlocks.size() == 1) {
-            return textBlocks.get(0).subSequenceWithLineBreaks(stringTextRange);
-        }
-
-        StringBuilder sb = new StringBuilder();
-        AtomicTextBlock firstTextBlock = textBlocks.get(0);
-        sb.append(firstTextBlock.subSequenceWithLineBreaks(new TextRange(stringTextRange.start(), firstTextBlock.getTextRange().end())));
-
-        for (AtomicTextBlock textBlock : textBlocks.subList(1, textBlocks.size() - 1)) {
-            sb.append(textBlock.searchTextWithLineBreaks());
-        }
-
-        var lastTextBlock = textBlocks.get(textBlocks.size() - 1);
-        sb.append(lastTextBlock.subSequenceWithLineBreaks(new TextRange(lastTextBlock.getTextRange().start(), stringTextRange.end())));
-
-        return sb.toString();
-    }
-
-
-    @Override
-    public String toString() {
-
-        return getSearchText();
-    }
-
-
-    @Override
-    public List<TextRange> getBoldTextBoundaries() {
-
-        return getAtomicTextBlocks().stream()
-                .map(AtomicTextBlock::getBoldTextBoundaries)
-                .flatMap(Collection::stream)
-                .toList();
-    }
-
-
-    @Override
-    public List<TextRange> getItalicTextBoundaries() {
-
-        return getAtomicTextBlocks().stream()
-                .map(AtomicTextBlock::getItalicTextBoundaries)
-                .flatMap(Collection::stream)
-                .toList();
-    }
-
-
-    @Override
-    public String getOrientation() {
-
-        if (atomicTextBlocks.isEmpty()) {
-            return "";
-        }
-        return atomicTextBlocks.get(0).getOrientation();
-    }
-
-
-    @Override
-    public int getTextDirection() {
-
-        if (atomicTextBlocks.isEmpty()) {
-            return 0;
-        }
-        return atomicTextBlocks.get(0).getTextDirection();
-    }
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/TextBlock.java

@@ -1,158 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock;
-
-import static java.lang.String.format;
-
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.TextRange;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page;
-
-public interface TextBlock extends CharSequence {
-
-    String getSearchText();
-
-
-    List<AtomicTextBlock> getAtomicTextBlocks();
-
-
-    List<TextRange> getBoldTextBoundaries();
-
-
-    List<TextRange> getItalicTextBoundaries();
-
-
-    String getOrientation();
-
-
-    int getTextDirection();
-
-
-    TextRange getTextRange();
-
-
-    int getNextLinebreak(int fromIndex);
-
-
-    int getPreviousLinebreak(int fromIndex);
-
-
-    List<Integer> getLineBreaks();
-
-
-    Rectangle2D getPosition(int stringIdx);
-
-
-    List<Rectangle2D> getPositions(TextRange stringTextRange);
-
-
-    Map<Page, List<Rectangle2D>> getPositionsPerPage(TextRange stringTextRange);
-
-
-    int numberOfLines();
-
-
-    String subSequenceWithLineBreaks(TextRange stringTextRange);
-
-
-    default String searchTextWithLineBreaks() {
-
-        return subSequenceWithLineBreaks(getTextRange());
-    }
-
-    default int indexOf(String searchTerm) {
-
-        return indexOf(searchTerm, getTextRange().start());
-    }
-
-
-    default Set<Page> getPages() {
-
-        return getAtomicTextBlocks().stream()
-                .map(AtomicTextBlock::getPage)
-                .collect(Collectors.toUnmodifiableSet());
-    }
-
-
-    default Set<Page> getPages(TextRange textRange) {
-
-        return getAtomicTextBlocks().stream()
-                .filter(atomicTextBlock -> atomicTextBlock.getTextRange().intersects(textRange))
-                .map(AtomicTextBlock::getPage)
-                .collect(Collectors.toUnmodifiableSet());
-    }
-
-
-    default int indexOf(String searchTerm, int startOffset) {
-
-        int start = getSearchText().indexOf(searchTerm, startOffset - getTextRange().start());
-        if (start == -1) {
-            return -1;
-        }
-        return start + getTextRange().start();
-    }
-
-
-    default CharSequence getFirstLine() {
-
-        return subSequence(getTextRange().start(), getNextLinebreak(getTextRange().start()));
-    }
-
-
-    default boolean containsBoundary(TextRange textRange) {
-
-        if (textRange.end() < textRange.start()) {
-            throw new IllegalArgumentException(format("Invalid %s, StartIndex must be smaller than EndIndex", textRange));
-        }
-        return getTextRange().contains(textRange);
-    }
-
-
-    default boolean containsIndex(int stringIndex) {
-
-        return getTextRange().containsExclusive(stringIndex);
-    }
-
-
-    default CharSequence subSequence(TextRange textRange) {
-
-        return subSequence(textRange.start(), textRange.end());
-    }
-
-
-    default String buildSummary() {
-
-        String[] words = getSearchText().split(" ");
-        int bound = Math.min(words.length, 4);
-        List<String> list = new ArrayList<>(Arrays.asList(words).subList(0, bound));
-
-        return String.join(" ", list);
-    }
-
-
-    @Override
-    default CharSequence subSequence(int start, int end) {
-
-        return getSearchText().substring(start - getTextRange().start(), end - getTextRange().start());
-    }
-
-
-    @Override
-    default int length() {
-
-        return getTextRange().length();
-    }
-
-
-    @Override
-    default char charAt(int index) {
-
-        return getSearchText().charAt(index - getTextRange().start());
-    }
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/TextBlockCollector.java

@@ -1,49 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock;
-
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.BinaryOperator;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collector;
-
-import lombok.NoArgsConstructor;
-
-@NoArgsConstructor
-public class TextBlockCollector implements Collector<TextBlock, ConcatenatedTextBlock, TextBlock> {
-
-    @Override
-    public Supplier<ConcatenatedTextBlock> supplier() {
-
-        return ConcatenatedTextBlock::empty;
-    }
-
-
-    @Override
-    public BiConsumer<ConcatenatedTextBlock, TextBlock> accumulator() {
-
-        return ConcatenatedTextBlock::concat;
-    }
-
-
-    @Override
-    public BinaryOperator<ConcatenatedTextBlock> combiner() {
-
-        return ConcatenatedTextBlock::concat;
-    }
-
-
-    @Override
-    public Function<ConcatenatedTextBlock, TextBlock> finisher() {
-
-        return a -> a;
-    }
-
-
-    @Override
-    public Set<Characteristics> characteristics() {
-
-        return Set.of(Characteristics.IDENTITY_FINISH, Characteristics.CONCURRENT);
-    }
-
-}

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

@@ -2,7 +2,7 @@ package com.knecon.fforesight.service.layoutparser.processor.model.image;
 
 import java.awt.geom.Rectangle2D;
 
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.ImageType;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -22,11 +22,10 @@ public class ClassifiedImage {
     private boolean isAppendedToSection;
     private boolean hasTransparency;
     private int page;
-    @NonNull
     private String representation;
 
 
-    public ClassifiedImage(@NonNull Rectangle2D position, @NonNull ImageType imageType, boolean hasTransparency, int page, @NonNull String representation) {
+    public ClassifiedImage(@NonNull Rectangle2D position, @NonNull ImageType imageType, boolean hasTransparency, int page, String representation) {
 
         this.position = position;
         this.imageType = imageType;

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

@@ -1,12 +1,15 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.outline;
 
+import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSArray;
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSDictionary;
@@ -26,6 +29,9 @@ import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocume
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
 import org.springframework.stereotype.Service;
 
+import com.knecon.fforesight.service.layoutparser.processor.utils.CoordinateTransforms;
+import com.knecon.fforesight.service.layoutparser.processor.model.PageInformation;
+
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
@@ -44,19 +50,22 @@ public class OutlineExtractorService {
 
 
     @SneakyThrows
-    public OutlineObjectTree getOutlineObjectTree(PDDocument document) {
+    public OutlineObjectTree getOutlineObjectTree(File documentFile) {
 
-        PDDocumentOutline documentOutline = document.getDocumentCatalog().getDocumentOutline();
+        try (var document = Loader.loadPDF(documentFile)) {
 
-        List<OutlineObjectTreeNode> rootNodes = new ArrayList<>();
-        if (documentOutline != null) {
-            for (PDOutlineItem child : documentOutline.children()) {
-                Optional<OutlineObjectTreeNode> outlineObjectWithChildren = createOutlineObjectWithChildren(child, document, 1);
-                outlineObjectWithChildren.ifPresent(rootNodes::add);
+            PDDocumentOutline documentOutline = document.getDocumentCatalog().getDocumentOutline();
+
+            List<OutlineObjectTreeNode> rootNodes = new ArrayList<>();
+            if (documentOutline != null) {
+                for (PDOutlineItem child : documentOutline.children()) {
+                    Optional<OutlineObjectTreeNode> outlineObjectWithChildren = createOutlineObjectWithChildren(child, document, 1);
+                    outlineObjectWithChildren.ifPresent(rootNodes::add);
+                }
             }
-        }
 
-        return new OutlineObjectTree(rootNodes);
+            return new OutlineObjectTree(rootNodes);
+        }
     }
 
 
@@ -89,12 +98,13 @@ public class OutlineExtractorService {
             if (page == null) {
                 return Optional.empty();
             }
-        }catch (IOException e){
+        } catch (IOException e) {
             log.info(String.format("Error occurred during position resolution for outline item with title %s: " + e, title));
             return Optional.empty();
         }
 
-        int pageNumber = document.getPages().indexOf(page);
+        int pageNumber = document.getPages().indexOf(page) + 1;
+        AffineTransform userSpaceToPageCoords = CoordinateTransforms.calculateInitialUserSpaceCoordsToPageCoords(PageInformation.fromPDPage(pageNumber, page));
 
         Optional<Point2D> outlinePosition = Optional.empty();
 
@@ -123,8 +133,13 @@ public class OutlineExtractorService {
             log.info(String.format("Error occurred during position resolution for outline item on page %s with title %s: " + e, pageNumber, title));
         }
 
-        return Optional.of(new OutlineObjectTreeNode(new OutlineObject(title, pageNumber, outlinePosition.orElse(new Point2D.Float(0, 0)), depth)));
+        return Optional.of(new OutlineObjectTreeNode(new OutlineObject(title, pageNumber, transformPointToPageCoords(outlinePosition, userSpaceToPageCoords), depth)));
+    }
 
+
+    private static Point2D transformPointToPageCoords(Optional<Point2D> outlinePosition, AffineTransform userSpaceToPageCoords) {
+
+        return outlinePosition.map(point -> userSpaceToPageCoords.transform(point, null)).orElse(null);
     }
 
 

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

@@ -1,27 +1,34 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.outline;
 
 import java.awt.geom.Point2D;
+import java.util.Optional;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
+import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.BoundingBox;
+
+import lombok.Getter;
+import lombok.Setter;
 
-@Data
-@RequiredArgsConstructor
-@AllArgsConstructor
 public class OutlineObject {
 
+    @Getter
     private final String title;
+    @Getter
     private final int pageNumber;
-    private Point2D point;
+    @Getter
     private final int treeDepth;
 
+    private Point2D point; // java coordinates, (0, 0) is always top left
+
+    @Getter
+    @Setter
     private boolean found;
 
 
     public OutlineObject(String title, int pageNumber, Point2D point2D, int depth) {
 
-        this(title, pageNumber, depth);
+        this.title = title;
+        this.pageNumber = pageNumber;
+        this.treeDepth = depth;
         this.point = point2D;
     }
 
@@ -32,4 +39,39 @@ public class OutlineObject {
         return "OutlineObject{" + "title='" + title + '\'' + '}';
     }
 
+
+    public Optional<Point2D> getPoint() {
+
+        return Optional.ofNullable(point);
+    }
+
+
+    public boolean isAbove(BoundingBox boundingBox) {
+
+        if (point == null) {
+            return true;
+        }
+        return point.getY() <= boundingBox.getMaxY();
+    }
+
+
+    public double distance(BoundingBox boundingBox) {
+
+        if (point == null) {
+            return 0;
+        }
+        if (boundingBox.getBBox().contains(point)) {
+            return 0;
+        }
+        double deltaX = Math.min(Math.abs(boundingBox.getMinX() - point.getX()), Math.abs(boundingBox.getMaxX() - point.getX()));
+        double deltaY = Math.min(Math.abs(boundingBox.getMinY() - point.getY()), Math.abs(boundingBox.getMaxY() - point.getY()));
+        return Math.sqrt(deltaX * deltaX + deltaY * deltaY);
+    }
+
+
+    public void resetPoint() {
+
+        this.point = null;
+    }
+
 }

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

@@ -39,4 +39,28 @@ public class OutlineObjectTree {
         }
     }
 
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("OutlineObjectTree(\n");
+        for (OutlineObjectTreeNode node : rootNodes) {
+            buildString(node, sb, 1);
+        }
+        sb.append(")");
+        return sb.toString();
+    }
+
+    private void buildString(OutlineObjectTreeNode node, StringBuilder sb, int depth) {
+
+        for (int i = 0; i < depth; i++) {
+            sb.append("  ");
+        }
+        sb.append(node.getOutlineObject().getTitle()).append("\n");
+
+        for (OutlineObjectTreeNode child : node.getChildren()) {
+            buildString(child, sb, depth + 1);
+        }
+    }
+
 }

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

@@ -14,12 +14,12 @@ import lombok.RequiredArgsConstructor;
 
 @Data
 @RequiredArgsConstructor
-public class TableOfContents implements Iterable<TableOfContentItem> {
+public class SectionTree implements Iterable<SectionTreeEntry> {
 
-    private List<TableOfContentItem> mainSections = new ArrayList<>();
+    private List<SectionTreeEntry> mainSections = new ArrayList<>();
 
 
-    public TableOfContents(List<TableOfContentItem> mainSections) {
+    public SectionTree(List<SectionTreeEntry> mainSections) {
 
         this.mainSections = mainSections;
     }
@@ -28,36 +28,36 @@ public class TableOfContents implements Iterable<TableOfContentItem> {
     public List<TextPageBlock> getAllTextPageBlocks() {
 
         List<TextPageBlock> allTextPageBlocks = new ArrayList<>();
-        for (TableOfContentItem item : mainSections) {
+        for (SectionTreeEntry item : mainSections) {
             collectTextPageBlocks(item, allTextPageBlocks);
         }
         return allTextPageBlocks;
     }
 
 
-    private void collectTextPageBlocks(TableOfContentItem item, List<TextPageBlock> textPageBlocks) {
+    private void collectTextPageBlocks(SectionTreeEntry item, List<TextPageBlock> textPageBlocks) {
 
         textPageBlocks.add(item.getHeadline());
-        for (TableOfContentItem child : item.getChildren()) {
+        for (SectionTreeEntry child : item.getChildren()) {
             collectTextPageBlocks(child, textPageBlocks);
         }
     }
 
 
-    public List<TableOfContentItem> getAllTableOfContentItems() {
+    public List<SectionTreeEntry> getAllTableOfContentItems() {
 
-        List<TableOfContentItem> allItems = new ArrayList<>();
-        for (TableOfContentItem item : mainSections) {
+        List<SectionTreeEntry> allItems = new ArrayList<>();
+        for (SectionTreeEntry item : mainSections) {
             collectTableOfContentItems(item, allItems);
         }
         return allItems;
     }
 
 
-    private void collectTableOfContentItems(TableOfContentItem item, List<TableOfContentItem> allItems) {
+    private void collectTableOfContentItems(SectionTreeEntry item, List<SectionTreeEntry> allItems) {
 
         allItems.add(item);
-        for (TableOfContentItem child : item.getChildren()) {
+        for (SectionTreeEntry child : item.getChildren()) {
             collectTableOfContentItems(child, allItems);
         }
     }
@@ -65,7 +65,7 @@ public class TableOfContents implements Iterable<TableOfContentItem> {
 
     private boolean containsBlock(TextPageBlock block) {
 
-        for (TableOfContentItem existingItem : this.getMainSections()) {
+        for (SectionTreeEntry existingItem : this.getMainSections()) {
             if (existingItem.getHeadline().equals(block) || existingItem.contains(block)) {
                 return true;
             }
@@ -74,9 +74,9 @@ public class TableOfContents implements Iterable<TableOfContentItem> {
     }
 
 
-    private boolean containsItem(TableOfContentItem tocItem) {
+    private boolean containsItem(SectionTreeEntry tocItem) {
 
-        for (TableOfContentItem existingItem : this.getMainSections()) {
+        for (SectionTreeEntry existingItem : this.getMainSections()) {
             if (existingItem.equals(tocItem) || existingItem.contains(tocItem)) {
                 return true;
             }
@@ -86,18 +86,18 @@ public class TableOfContents implements Iterable<TableOfContentItem> {
 
 
     @Override
-    public @NonNull Iterator<TableOfContentItem> iterator() {
+    public @NonNull Iterator<SectionTreeEntry> iterator() {
 
-        return new TableOfContentItemIterator(mainSections);
+        return new SectionTreeEntryIterator(mainSections);
     }
 
 
-    private static class TableOfContentItemIterator implements Iterator<TableOfContentItem> {
+    private static class SectionTreeEntryIterator implements Iterator<SectionTreeEntry> {
 
-        private final Stack<Iterator<TableOfContentItem>> stack = new Stack<>();
+        private final Stack<Iterator<SectionTreeEntry>> stack = new Stack<>();
 
 
-        TableOfContentItemIterator(List<TableOfContentItem> mainSections) {
+        SectionTreeEntryIterator(List<SectionTreeEntry> mainSections) {
 
             stack.push(mainSections.iterator());
         }
@@ -112,10 +112,10 @@ public class TableOfContents implements Iterable<TableOfContentItem> {
 
 
         @Override
-        public TableOfContentItem next() {
+        public SectionTreeEntry next() {
 
             ensureStackTopIsCurrent();
-            TableOfContentItem currentItem = stack.peek().next();
+            SectionTreeEntry currentItem = stack.peek().next();
             if (currentItem.getChildren() != null && !currentItem.getChildren().isEmpty()) {
                 stack.push(currentItem.getChildren()
                                    .iterator());

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

@@ -1,5 +1,6 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.outline;
 
+import static com.knecon.fforesight.service.layoutparser.processor.model.PageBlockType.TABLE_OF_CONTENTS_HEADLINE;
 import static com.knecon.fforesight.service.layoutparser.processor.model.PageBlockType.getHeadlineNumber;
 
 import java.util.ArrayList;
@@ -10,6 +11,7 @@ import java.util.TreeSet;
 
 import org.springframework.stereotype.Service;
 
+import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationDocument;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
 
 import io.micrometer.observation.annotation.Observed;
@@ -17,21 +19,23 @@ import lombok.extern.slf4j.Slf4j;
 
 @Service
 @Slf4j
-public class OutlineValidationService {
+public class SectionTreeBuilderService {
 
     @Observed(name = "OutlineValidationService", contextualName = "create-toc")
-    public TableOfContents createToC(List<TextPageBlock> headlines) {
+    public SectionTree createSectionTree(ClassificationDocument classificationDocument) {
 
-        List<TableOfContentItem> mainSections = new ArrayList<>();
-        Map<Integer, TableOfContentItem> lastItemsPerDepth = new HashMap<>();
-        TableOfContentItem last = null;
+        List<TextPageBlock> headlines = extractHeadlines(classificationDocument);
+
+        List<SectionTreeEntry> mainSections = new ArrayList<>();
+        Map<Integer, SectionTreeEntry> lastItemsPerDepth = new HashMap<>();
+        SectionTreeEntry last = null;
         TreeSet<Integer> depths = new TreeSet<>();
 
         for (TextPageBlock current : headlines) {
             int currentDepth = getHeadlineNumber(current.getClassification());
             Integer parentDepth = depths.floor(currentDepth - 1);
 
-            var tocItem = new TableOfContentItem(current);
+            var tocItem = new SectionTreeEntry(current);
 
             if (parentDepth == null) {
                 mainSections.add(tocItem);
@@ -41,14 +45,16 @@ public class OutlineValidationService {
             } else {
                 assert last != null;
                 int lastDepth = getHeadlineNumber(last.getHeadline().getClassification());
-
-                if (lastDepth < parentDepth) {
+                if (last.getHeadline().getClassification().equals(TABLE_OF_CONTENTS_HEADLINE) && !current.getClassification().equals(TABLE_OF_CONTENTS_HEADLINE)) {
+                    // headline after toc should always start a main section
+                    parentDepth = 1;
+                } else if (lastDepth < parentDepth) {
                     parentDepth = lastDepth;
                 } else if (lastDepth == currentDepth && last.getParent() != null) {
                     parentDepth = getHeadlineNumber(last.getParent().getHeadline().getClassification());
                 }
 
-                TableOfContentItem parent = lastItemsPerDepth.get(parentDepth);
+                SectionTreeEntry parent = lastItemsPerDepth.get(parentDepth);
                 parent.addChild(tocItem);
             }
 
@@ -57,7 +63,20 @@ public class OutlineValidationService {
             depths.add(currentDepth);
         }
 
-        return new TableOfContents(mainSections);
+        return new SectionTree(mainSections);
+
+    }
+
+
+    private static List<TextPageBlock> extractHeadlines(ClassificationDocument classificationDocument) {
+
+        return classificationDocument.getPages()
+                .stream()
+                .flatMap(classificationPage -> classificationPage.getTextBlocks()
+                        .stream()
+                        .filter(tb -> tb instanceof TextPageBlock && tb.getClassification() != null && tb.getClassification().isHeadline())
+                        .map(tb -> (TextPageBlock) tb))
+                .toList();
     }
 
 }

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

@@ -1,6 +1,7 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.outline;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -9,8 +10,8 @@ import org.springframework.stereotype.Service;
 
 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.text.ClassificationFooter;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.ClassificationHeader;
 import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage;
 import com.knecon.fforesight.service.layoutparser.processor.model.PageBlockType;
 import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage;
@@ -22,28 +23,28 @@ import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @Service
-public class TOCEnrichmentService {
+public class SectionTreeEnhancementService {
 
     public void assignSectionBlocksAndImages(ClassificationDocument document) {
 
-        TableOfContents toc = document.getTableOfContents();
-        Iterator<TableOfContentItem> iterator = toc.iterator();
-        TableOfContentItem currentTOCItem = null;
+        SectionTree toc = document.getSectionTree();
+        Iterator<SectionTreeEntry> iterator = toc.iterator();
+        SectionTreeEntry currentTOCItem = null;
         if (iterator.hasNext()) {
             currentTOCItem = iterator.next();
         }
         List<AbstractPageBlock> startBlocks = new ArrayList<>();
         List<ClassifiedImage> startImages = new ArrayList<>();
-        TableOfContentItem currentSection = null;
+        SectionTreeEntry currentSection = null;
         boolean foundFirstHeadline = false;
 
         List<ClassificationHeader> headers = new ArrayList<>();
         List<ClassificationFooter> footers = new ArrayList<>();
         TablePageBlock previousTable = null;
-        List<TableOfContentItem> lastFoundTOCItems = new ArrayList<>();
+        List<SectionTreeEntry> lastFoundTOCItems = new ArrayList<>();
 
         for (ClassificationPage page : document.getPages()) {
-            List<TableOfContentItem> currentPageTOCItems = new ArrayList<>();
+            List<SectionTreeEntry> currentPageTOCItems = new ArrayList<>();
             List<TextPageBlock> header = new ArrayList<>();
             List<TextPageBlock> footer = new ArrayList<>();
             for (AbstractPageBlock current : page.getTextBlocks()) {
@@ -100,7 +101,7 @@ public class TOCEnrichmentService {
                 Double xMax = null;
                 Double yMax = null;
 
-                for (TableOfContentItem tocItem : lastFoundTOCItems) {
+                for (SectionTreeEntry tocItem : lastFoundTOCItems) {
                     var headline = tocItem.getHeadline();
 
                     if (headline.getPage() != page.getPageNumber()) {
@@ -167,11 +168,11 @@ public class TOCEnrichmentService {
             }
         }
 
-        if (!startBlocks.isEmpty()) {
-            TableOfContentItem unassigned = new TableOfContentItem(null);
+        if (!startBlocks.isEmpty() || !startImages.isEmpty()) {
+            SectionTreeEntry unassigned = new SectionTreeEntry(null);
             unassigned.setSectionBlocks(startBlocks);
             unassigned.setImages(startImages);
-            document.getTableOfContents().getMainSections().add(0, unassigned);
+            document.getSectionTree().getMainSections().add(0, unassigned);
         }
         document.setHeaders(headers);
         document.setFooters(footers);
@@ -185,12 +186,8 @@ public class TOCEnrichmentService {
             List<Cell> previousTableNonHeaderRow = getRowWithNonHeaderCells(previousTable);
             List<Cell> tableNonHeaderRow = getRowWithNonHeaderCells(currentTable);
             // Allow merging of tables if header row is separated from first logical non-header row
-            if (previousTableNonHeaderRow.isEmpty()
-                && previousTable.getRowCount() == 1
-                && previousTable.getRows()
-                           .get(0).size() == tableNonHeaderRow.size()) {
-                previousTableNonHeaderRow = previousTable.getRows()
-                        .get(0)
+            if (previousTableNonHeaderRow.isEmpty() && previousTable.getRowCount() == 1 && previousTable.getRows().get(0).size() == tableNonHeaderRow.size()) {
+                previousTableNonHeaderRow = previousTable.getRows().get(0)
                         .stream()
                         .map(cell -> {
                             Cell fakeCell = Cell.copy(cell);
@@ -201,8 +198,7 @@ public class TOCEnrichmentService {
             }
             if (previousTableNonHeaderRow.size() == tableNonHeaderRow.size()) {
                 for (int i = currentTable.getRowCount() - 1; i >= 0; i--) { // Non header rows are most likely at bottom of table
-                    List<Cell> row = currentTable.getRows()
-                            .get(i);
+                    List<Cell> row = currentTable.getRows().get(i);
                     if (row.size() == tableNonHeaderRow.size() && row.stream()
                             .allMatch(cell -> cell.getHeaderCells().isEmpty())) {
                         for (int j = 0; j < row.size(); j++) {
@@ -225,18 +221,15 @@ public class TOCEnrichmentService {
 
         return table.getRows()
                 .stream()
-                .flatMap(row -> row.stream()
-                        .filter(cell -> !cell.getHeaderCells().isEmpty()))
-                .findAny().isEmpty();
-
+                .flatMap(Collection::stream)
+                .allMatch(cell -> cell.getHeaderCells().isEmpty());
     }
 
 
     private List<Cell> getRowWithNonHeaderCells(TablePageBlock table) {
 
         for (int i = table.getRowCount() - 1; i >= 0; i--) { // Non header rows are most likely at bottom of table
-            List<Cell> row = table.getRows()
-                    .get(i);
+            List<Cell> row = table.getRows().get(i);
             if (row.size() == 1) {
                 continue;
             }

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

@@ -2,10 +2,12 @@ package com.knecon.fforesight.service.layoutparser.processor.model.outline;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.GenericSemanticNode;
 import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.AbstractSemanticNode;
+import com.knecon.fforesight.service.layoutparser.processor.model.PageBlockType;
 import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
 
@@ -14,52 +16,68 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class TableOfContentItem {
+public class SectionTreeEntry {
+
+    public enum Type {
+        SECTION,
+        SUPER_SECTION,
+        TOC_SECTION
+    }
 
     @EqualsAndHashCode.Include
     private TextPageBlock headline;
-    private List<TableOfContentItem> children = new ArrayList<>();
-    private TableOfContentItem parent;
+    private List<SectionTreeEntry> children = new ArrayList<>();
+    private SectionTreeEntry parent;
 
     private List<AbstractPageBlock> sectionBlocks = new ArrayList<>();
     private List<ClassifiedImage> images = new ArrayList<>();
 
-    private AbstractSemanticNode section;
+    private GenericSemanticNode section;
 
 
-    public TableOfContentItem(TextPageBlock headline) {
+    public SectionTreeEntry(TextPageBlock headline) {
 
         this.headline = headline;
     }
 
 
-    public void addChild(TableOfContentItem tableOfContentItem) {
+    public Type getType() {
 
-        children.add(tableOfContentItem);
-        tableOfContentItem.setParent(this);
+        if (!Objects.isNull(headline) && headline.getClassification().equals(PageBlockType.TABLE_OF_CONTENTS_HEADLINE)) {
+            return Type.TOC_SECTION;
+        }
+        if (children.isEmpty()) {
+            return Type.SECTION;
+        }
+        return Type.SUPER_SECTION;
     }
 
 
-    public TableOfContentItem getSiblingBefore() {
+    public void addChild(SectionTreeEntry sectionTreeEntry) {
+
+        children.add(sectionTreeEntry);
+        sectionTreeEntry.setParent(this);
+    }
+
+
+    public SectionTreeEntry getSiblingBefore() {
 
         if (parent != null) {
             int index = parent.getChildren().indexOf(this);
             if (index > 0) {
-                return parent.getChildren()
-                        .get(index - 1);
+                return parent.getChildren().get(index - 1);
             }
         }
         return null;
     }
 
 
-    public TableOfContentItem getSiblingAfter() {
+    public SectionTreeEntry getSiblingAfter() {
 
         if (parent != null) {
             int index = parent.getChildren().indexOf(this);
             if (index >= 0 && index < parent.getChildren().size() - 1) {
-                return parent.getChildren()
-                        .get(index + 1);
+                return parent.getChildren().get(index + 1);
             }
         }
         return null;
@@ -71,7 +89,7 @@ public class TableOfContentItem {
         if (headline.equals(block)) {
             return true;
         }
-        for (TableOfContentItem child : children) {
+        for (SectionTreeEntry child : children) {
             if (child.contains(block)) {
                 return true;
             }
@@ -80,12 +98,12 @@ public class TableOfContentItem {
     }
 
 
-    public boolean contains(TableOfContentItem tocItem) {
+    public boolean contains(SectionTreeEntry tocItem) {
 
         if (this.equals(tocItem)) {
             return true;
         }
-        for (TableOfContentItem child : children) {
+        for (SectionTreeEntry child : children) {
             if (child.contains(tocItem)) {
                 return true;
             }
@@ -93,17 +111,19 @@ public class TableOfContentItem {
         return false;
     }
 
+
     public List<AbstractPageBlock> getNonEmptySectionBlocks() {
 
-        return sectionBlocks.stream().filter(pageBlock -> !pageBlock.isEmpty()).collect(Collectors.toList());
+        return sectionBlocks.stream()
+                .filter(pageBlock -> !pageBlock.isEmpty())
+                .collect(Collectors.toList());
     }
 
+
     @Override
     public String toString() {
 
         return "OutlineObjectTreeNode{" + "textPageBlock=" + headline + '}';
     }
 
-
-
 }

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

@@ -4,13 +4,15 @@ import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.Collection;
 import java.util.List;
 
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.BoundingBox;
-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.model.AbstractPageBlock;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.Word;
+import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
 import com.knecon.fforesight.service.layoutparser.processor.utils.TextNormalizationUtilities;
+import com.knecon.fforesight.service.ocr.v1.api.model.TableCell;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -22,7 +24,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class Cell extends BoundingBox {
 
-    private List<TextPageBlock> textBlocks = new ArrayList<>();
+    private List<AbstractPageBlock> textBlocks = new ArrayList<>();
 
     private List<Cell> headerCells = new ArrayList<>();
 
@@ -33,17 +35,41 @@ public class Cell extends BoundingBox {
     private int pageNumber;
 
 
-    public Cell(Point2D topLeft, Point2D bottomRight) {
+    public Cell(Point2D topLeft, Point2D bottomRight, AffineTransform pdfToPageTransform) {
 
         this.bBoxPdf = new Rectangle2D.Double(topLeft.getX(), topLeft.getY(), (bottomRight.getX() - topLeft.getX()), (bottomRight.getY() - topLeft.getY()));
-        this.bBox = bBoxPdf;
+        this.bBox = RectangleTransformations.transform(bBoxPdf, pdfToPageTransform);
     }
 
 
-    public Cell(Rectangle2D bBoxInitialUserSpace, AffineTransform initialUserSpaceToJava) {
+    public static Cell fromPageCoordinates(Point2D topLeft, Point2D bottomRight, AffineTransform pageToPdfTransform) {
+
+        var bBox = new Rectangle2D.Double(topLeft.getX(), topLeft.getY(), (bottomRight.getX() - topLeft.getX()), (bottomRight.getY() - topLeft.getY()));
+        return fromPageCoordinates(bBox, pageToPdfTransform);
+    }
+
+
+    public static Cell fromPageCoordinates(Rectangle2D r, AffineTransform pageToPdfTransform) {
+
+        Cell cell = new Cell();
+        var bBoxPdf = RectangleTransformations.transform(r, pageToPdfTransform);
+        cell.bBox = r;
+        cell.bBoxPdf = bBoxPdf;
+        return cell;
+    }
+
+
+    public Cell(TableCell tableCell, AffineTransform pdfToPageTransform) {
+
+        this.bBoxPdf = tableCell.textRegion().region().bbox().get().getBounds2D();
+        this.bBox = RectangleTransformations.transform(bBoxPdf, pdfToPageTransform);
+    }
+
+
+    public Cell(Rectangle2D bBoxInitialUserSpace, AffineTransform pdfToPageTransform) {
 
         this.bBoxPdf = bBoxInitialUserSpace;
-        this.bBox = initialUserSpaceToJava.createTransformedShape(bBoxInitialUserSpace).getBounds2D();
+        this.bBox = RectangleTransformations.transform(bBoxPdf, pdfToPageTransform);
     }
 
 
@@ -56,9 +82,12 @@ public class Cell extends BoundingBox {
     }
 
 
-    public void addTextBlock(TextPageBlock textBlock) {
+    public List<Word> getWords() {
 
-        textBlocks.add(textBlock);
+        return getTextBlocks().stream()
+                .map(AbstractPageBlock::getWords)
+                .flatMap(Collection::stream)
+                .toList();
     }
 
 
@@ -67,27 +96,15 @@ public class Cell extends BoundingBox {
 
         StringBuilder sb = new StringBuilder();
 
-        Iterator<TextPageBlock> itty = textBlocks.iterator();
-        TextPositionSequence previous = null;
-        while (itty.hasNext()) {
-
-            TextPageBlock textBlock = itty.next();
-
-            for (TextPositionSequence word : textBlock.getSequences()) {
-                if (previous != null) {
-                    if (Math.abs(previous.getMaxYDirAdj() - word.getMaxYDirAdj()) > word.getTextHeight()) {
-                        sb.append('\n');
-                    } else {
-                        sb.append(' ');
-                    }
-                }
-                sb.append(word.toString());
-                previous = word;
+        for (int i = 0; i < textBlocks.size(); i++) {
+            AbstractPageBlock textBlock = textBlocks.get(i);
+            sb.append(textBlock);
+            if (i < textBlocks.size() - 1) {
+                sb.append("\n");
             }
-
         }
 
-        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString()).replaceAll("\n", " ").replaceAll(" {2}", " ");
+        return TextNormalizationUtilities.cleanString(sb.toString());
     }
 
 

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

@@ -22,6 +22,12 @@ public class CleanRulings {
     List<Ruling> verticals; // unmodifiable sorted by X list
 
 
+    public static CleanRulings empty() {
+
+        return new CleanRulings(Collections.emptyList(), Collections.emptyList());
+    }
+
+
     public CleanRulings(List<Ruling> horizontals, List<Ruling> verticals) {
 
         this.horizontals = horizontals.stream()

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

@@ -0,0 +1,334 @@
+package com.knecon.fforesight.service.layoutparser.processor.model.table;
+
+import java.awt.geom.Line2D;
+import java.awt.geom.Point2D;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.Word;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Getter
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class LinkedQuadPointCell {
+
+    public static final int MAX_NEIGHBOUR_DISTANCE = 2;
+    public static final int MAX_ANGLE_DIFFERENCE = 5;
+    public static final double LINE_INTERSECT_THRESHOLD = 2;
+
+    final QuadPoint quadPoint;
+    final List<AbstractPageBlock> pageBlocks;
+    final List<LinkedQuadPointCell> rights = new ArrayList<>();
+    final List<LinkedQuadPointCell> lefts = new ArrayList<>();
+    final List<LinkedQuadPointCell> aboves = new ArrayList<>();
+    final List<LinkedQuadPointCell> belows = new ArrayList<>();
+
+    @Setter
+    boolean headerCell;
+
+
+    public LinkedQuadPointCell(QuadPoint quadPoint, List<AbstractPageBlock> pageBlocks) {
+
+        this.quadPoint = quadPoint;
+        this.pageBlocks = pageBlocks;
+        headerCell = false;
+    }
+
+
+    public boolean contains(Word word) {
+
+        return quadPoint.contains(word.getBBox().getCenterX(), word.getBBox().getCenterY());
+    }
+
+
+    public String toString() {
+
+        return getPageBlocks().stream()
+                .map(AbstractPageBlock::toString)
+                .collect(Collectors.joining("\n"));
+    }
+
+
+    public void addToNeighbours(LinkedQuadPointCell otherCell, double minWidth, double minHeight) {
+
+        if (rightNeighbour(otherCell, minHeight)) {
+            rights.add(otherCell);
+        }
+        if (leftNeighbour(otherCell, minHeight)) {
+            lefts.add(otherCell);
+        }
+        if (aboveNeighbour(otherCell, minWidth)) {
+            aboves.add(otherCell);
+        }
+        if (belowNeighbour(otherCell, minWidth)) {
+            belows.add(otherCell);
+        }
+    }
+
+
+    public boolean leftNeighbour(LinkedQuadPointCell other, double minHeight) {
+
+        Line2D right = this.quadPoint.getLeftLine();
+        Line2D left = other.quadPoint.getRightLine();
+        return isYIntersectionSignificant(right, left, minHeight) && areLinesSimilar(right, left);
+    }
+
+
+    public boolean rightNeighbour(LinkedQuadPointCell other, double minHeight) {
+
+        Line2D right = other.quadPoint.getLeftLine();
+        Line2D left = this.quadPoint.getRightLine();
+        return isYIntersectionSignificant(right, left, minHeight) && areLinesSimilar(right, left);
+    }
+
+
+    public boolean aboveNeighbour(LinkedQuadPointCell other, double minWidth) {
+
+        Line2D top = other.quadPoint.getTopLine();
+        Line2D bottom = this.quadPoint.getBottomLine();
+        return isXIntersectionSignificant(top, bottom, minWidth) && areLinesSimilar(top, bottom);
+    }
+
+
+    public boolean belowNeighbour(LinkedQuadPointCell other, double minWidth) {
+
+        Line2D top = this.quadPoint.getTopLine();
+        Line2D bottom = other.quadPoint.getBottomLine();
+        return isXIntersectionSignificant(top, bottom, minWidth) && areLinesSimilar(top, bottom);
+    }
+
+
+    public static boolean areLinesSimilar(Line2D line1, Line2D line2) {
+
+        double angle1 = Math.atan2(line1.getY2() - line1.getY1(), line1.getX2() - line1.getX1());
+        double angle2 = Math.atan2(line2.getY2() - line2.getY1(), line2.getX2() - line2.getX1());
+
+        double angleDifference = Math.toDegrees(Math.abs(angle1 - angle2));
+
+        angleDifference = Math.min(angleDifference, 360 - angleDifference);
+
+        if (angleDifference >= MAX_ANGLE_DIFFERENCE) {
+            return false;
+        }
+
+        double distance1 = line1.ptSegDist(line2.getP1());
+        double distance2 = line1.ptSegDist(line2.getP2());
+        double distance3 = line2.ptSegDist(line1.getP1());
+        double distance4 = line2.ptSegDist(line1.getP2());
+
+        double minDistance = Math.min(Math.min(distance1, distance2), Math.min(distance3, distance4));
+
+        return minDistance < MAX_NEIGHBOUR_DISTANCE;
+    }
+
+
+    public static boolean isXIntersectionSignificant(Line2D line1, Line2D line2, double minWidth) {
+
+        double start1 = Math.min(line1.getX1(), line1.getX2());
+        double end1 = Math.max(line1.getX1(), line1.getX2());
+        double start2 = Math.min(line2.getX1(), line2.getX2());
+        double end2 = Math.max(line2.getX1(), line2.getX2());
+        double intersectionStart = Math.max(start1, start2);
+        double intersectionEnd = Math.min(end1, end2);
+        return intersectionEnd - intersectionStart >= minWidth;
+    }
+
+
+    public static boolean isYIntersectionSignificant(Line2D line1, Line2D line2, double minHeight) {
+
+        double start1 = Math.min(line1.getY1(), line1.getY2());
+        double end1 = Math.max(line1.getY1(), line1.getY2());
+        double start2 = Math.min(line2.getY1(), line2.getY2());
+        double end2 = Math.max(line2.getY1(), line2.getY2());
+        double intersectionStart = Math.max(start1, start2);
+        double intersectionEnd = Math.min(end1, end2);
+        return intersectionEnd - intersectionStart >= minHeight;
+    }
+
+
+    public void resetNeighbours() {
+
+        rights.clear();
+        lefts.clear();
+        aboves.clear();
+        belows.clear();
+    }
+
+
+    public boolean needsSplit() {
+
+        return rights.size() > 1 || lefts.size() > 1 || aboves.size() > 1 || belows.size() > 1;
+    }
+
+
+    private LinkedQuadPointCell copyCell(Point2D a, Point2D b, Point2D c, Point2D d) {
+
+        var cell = new LinkedQuadPointCell(new QuadPoint(a, b, c, d), pageBlocks);
+        cell.setHeaderCell(headerCell);
+        return cell;
+    }
+
+
+    public boolean isTopLeft() {
+
+        return lefts.isEmpty() && aboves.isEmpty();
+    }
+
+
+    public Collection<LinkedQuadPointCell> split(double minWidth, double minHeight) {
+
+        List<LinkedQuadPointCell> newCells;
+        if (rights.size() > 1 && rights.size() >= lefts.size()) {
+            newCells = splitY(rights, minHeight);
+            return newCells;
+        }
+        if (lefts.size() > 1) {
+            newCells = splitY(lefts, minHeight);
+            return newCells;
+        }
+        if (aboves.size() > 1 && aboves.size() >= belows.size()) {
+            newCells = splitX(aboves, minWidth);
+            return newCells;
+        }
+        if (belows.size() > 1) {
+            newCells = splitX(belows, minWidth);
+            return newCells;
+        }
+        return List.of(this);
+    }
+
+
+    private List<LinkedQuadPointCell> splitY(List<LinkedQuadPointCell> neighbours, double minHeight) {
+
+        List<LinkedQuadPointCell> splitCells = new LinkedList<>();
+        List<Line2D> ySplitLines = neighbours.stream()
+                .map(LinkedQuadPointCell::getQuadPoint)
+                .map(QuadPoint::getTopLine)
+                .sorted(Comparator.comparing(line -> (line.getY1() + line.getY2()) / 2))
+                .toList();
+        Line2D rightLine = quadPoint.getRightLine();
+        Line2D leftLine = quadPoint.getLeftLine();
+        Line2D topLine = quadPoint.getTopLine();
+        Point2D lowerLeft = quadPoint.getLowerLeft();
+        Point2D lowerRight = quadPoint.getLowerRight();
+        Point2D topLeft;
+        Point2D topRight;
+        for (Line2D neighborLine : ySplitLines) {
+            if (Math.abs(neighborLine.getY1() - topLine.getY1()) < minHeight || Math.abs(neighborLine.getY2() - topLine.getY2()) < minHeight) {
+                continue;
+            }
+            var topLeftOptional = findIntersectionPoint(leftLine, neighborLine);
+            var lowerRightOptional = findIntersectionPoint(rightLine, neighborLine);
+            if (topLeftOptional.isEmpty() || lowerRightOptional.isEmpty()) {
+                continue;
+            }
+            topLeft = topLeftOptional.get();
+            topRight = lowerRightOptional.get();
+            if (Math.abs(topLeft.getY() - lowerLeft.getY()) < minHeight || Math.abs(topRight.getY() - lowerRight.getY()) < minHeight) {
+                continue;
+            }
+            LinkedQuadPointCell cell = copyCell(topLeft, lowerLeft, lowerRight, topRight);
+            splitCells.add(cell);
+            lowerLeft = topLeft;
+            lowerRight = topRight;
+        }
+        LinkedQuadPointCell cell = copyCell(topLine.getP1(), lowerLeft, lowerRight, topLine.getP2());
+        splitCells.add(cell);
+        return splitCells;
+    }
+
+
+    /*
+    Finds the intersection point of the line and the extended line. Where the intersectionPoint must lie within the range of the line, but the extendedLine may be extended as far as needed.
+     */
+    private Optional<Point2D> findIntersectionPoint(Line2D line, Line2D lineToExtend) {
+
+        double x1 = line.getX1();
+        double y1 = line.getY1();
+        double x2 = line.getX2();
+        double y2 = line.getY2();
+
+        double x3 = lineToExtend.getX1();
+        double y3 = lineToExtend.getY1();
+        double x4 = lineToExtend.getX2();
+        double y4 = lineToExtend.getY2();
+
+        double denom = (x1 - x2) * (y3 - y4) - (y1 - y2) * (x3 - x4);
+
+        // If denominator is 0, lines are parallel or coincident
+        if (denom == 0) {
+            return Optional.empty();
+        }
+
+        double intersectX = ((x1 * y2 - y1 * x2) * (x3 - x4) - (x1 - x2) * (x3 * y4 - y3 * x4)) / denom;
+        double intersectY = ((x1 * y2 - y1 * x2) * (y3 - y4) - (y1 - y2) * (x3 * y4 - y3 * x4)) / denom;
+
+        Point2D intersection = new Point2D.Double(intersectX, intersectY);
+
+        // Check if the intersection point lies within the bounds of the line segment
+        if (intersection.getX() >= Math.min(x1 - LINE_INTERSECT_THRESHOLD, x2 - LINE_INTERSECT_THRESHOLD) && intersection.getX() <= Math.max(x1 + LINE_INTERSECT_THRESHOLD,
+                                                                                                                                             x2 + LINE_INTERSECT_THRESHOLD)//
+            && intersection.getY() >= Math.min(y1 - LINE_INTERSECT_THRESHOLD, y2 - LINE_INTERSECT_THRESHOLD) && intersection.getY() <= Math.max(y1 + LINE_INTERSECT_THRESHOLD,
+                                                                                                                                                y2 + LINE_INTERSECT_THRESHOLD)) {
+            return Optional.of(intersection);
+        }
+
+        return Optional.empty();
+    }
+
+
+    private List<LinkedQuadPointCell> splitX(List<LinkedQuadPointCell> neighbours, double minWidth) {
+
+        List<Line2D> xSplitLines = neighbours.stream()
+                .map(LinkedQuadPointCell::getQuadPoint)
+                .map(QuadPoint::getRightLine)
+                .sorted(Comparator.comparing(line -> (line.getX1() + line.getX2()) / 2))
+                .toList();
+        if (xSplitLines.isEmpty()) {
+            return List.of(this);
+        }
+        List<LinkedQuadPointCell> splitCells = new LinkedList<>();
+        Line2D topLine = quadPoint.getTopLine();
+        Line2D bottomLine = quadPoint.getBottomLine();
+        Line2D rightLine = quadPoint.getRightLine();
+        Point2D topLeft = quadPoint.getTopLeft();
+        Point2D lowerLeft = quadPoint.getLowerLeft();
+        Point2D topRight;
+        Point2D lowerRight;
+        for (Line2D neighborLine : xSplitLines) {
+            if (Math.abs(rightLine.getX1() - neighborLine.getX1()) < minWidth || Math.abs(rightLine.getX2() - neighborLine.getX2()) < minWidth) {
+                continue;
+            }
+            var topRightOptional = findIntersectionPoint(topLine, neighborLine);
+            var lowerRightOptional = findIntersectionPoint(bottomLine, neighborLine);
+            if (topRightOptional.isEmpty() || lowerRightOptional.isEmpty()) {
+                continue;
+            }
+            topRight = topRightOptional.get();
+            lowerRight = lowerRightOptional.get();
+            if (Math.abs(topRight.getX() - topLeft.getX()) < minWidth || Math.abs(lowerRight.getX() - lowerLeft.getX()) < minWidth) {
+                continue;
+            }
+            LinkedQuadPointCell cell = copyCell(lowerLeft, topLeft, topRight, lowerRight);
+            topLeft = topRight;
+            lowerLeft = lowerRight;
+            splitCells.add(cell);
+        }
+        LinkedQuadPointCell cell = copyCell(lowerLeft, topLeft, rightLine.getP1(), rightLine.getP2());
+        splitCells.add(cell);
+        return splitCells;
+    }
+
+}

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

@@ -0,0 +1,291 @@
+package com.knecon.fforesight.service.layoutparser.processor.model.table;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Line2D;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+import com.knecon.fforesight.service.ocr.v1.api.model.QuadPointData;
+
+import lombok.Getter;
+
+public final class QuadPoint {
+
+        /*
+        B _____ C
+         |     |
+        A|_____|D
+        */
+
+    @Getter
+    private final Point2D a;
+    @Getter
+    private final Point2D b;
+    @Getter
+    private final Point2D c;
+    @Getter
+    private final Point2D d;
+
+    private Line2D left;
+    private Line2D right;
+    private Line2D top;
+    private Line2D bottom;
+
+
+    // This constructor assumes, the points form a convex polygon, I will omit the assertion for performance reasons.
+    public QuadPoint(Point2D a, Point2D b, Point2D c, Point2D d) {
+
+        List<Point2D> points = new ArrayList<>(4);
+        points.add(a);
+        points.add(b);
+        points.add(c);
+        points.add(d);
+        points.sort(Comparator.comparingDouble(Point2D::getX).thenComparing(Point2D::getY));
+        if (points.get(0).getY() >= points.get(1).getY()) {
+            this.a = points.get(0);
+            this.b = points.get(1);
+        } else {
+            this.a = points.get(1);
+            this.b = points.get(0);
+        }
+
+        if (points.get(2).getY() < points.get(3).getY()) {
+            this.c = points.get(2);
+            this.d = points.get(3);
+        } else {
+            this.c = points.get(3);
+            this.d = points.get(2);
+        }
+    }
+
+
+    public static QuadPoint fromRectangle2D(Rectangle2D rectangle2D) {
+
+        var lowerLeft = new Point2D.Double(rectangle2D.getX(), rectangle2D.getY());
+        var upperLeft = new Point2D.Double(rectangle2D.getX(), rectangle2D.getMaxY());
+        var upperRight = new Point2D.Double(rectangle2D.getMaxX(), rectangle2D.getMaxY());
+        var lowerRight = new Point2D.Double(rectangle2D.getMaxX(), rectangle2D.getY());
+
+        return new QuadPoint(lowerLeft, upperLeft, upperRight, lowerRight);
+    }
+
+
+    public Rectangle2D getBounds2D() {
+
+        double minX = Math.min(Math.min(Math.min(a.getX(), b.getX()), c.getX()), d.getX());
+        double minY = Math.min(Math.min(Math.min(a.getY(), b.getY()), c.getY()), d.getY());
+        double maxX = Math.max(Math.max(Math.max(a.getX(), b.getX()), c.getX()), d.getX());
+        double maxY = Math.max(Math.max(Math.max(a.getY(), b.getY()), c.getY()), d.getY());
+
+        return new Rectangle2D.Double(minX, minY, maxX - minX, maxY - minY);
+    }
+
+
+    public static QuadPoint fromData(QuadPointData data) {
+
+        return new QuadPoint(new Point2D.Double(data.values()[0], data.values()[1]),
+                             new Point2D.Double(data.values()[2], data.values()[3]),
+                             new Point2D.Double(data.values()[4], data.values()[5]),
+                             new Point2D.Double(data.values()[6], data.values()[7]));
+
+    }
+
+
+    public Stream<Line2D> asLines() {
+
+        return Stream.of(new Line2D.Double(getA(), getB()), new Line2D.Double(getB(), getC()), new Line2D.Double(getC(), getD()), new Line2D.Double(getD(), getA()));
+
+    }
+
+
+    public QuadPoint getTransformed(AffineTransform at) {
+
+        return new QuadPoint(at.transform(a, null), at.transform(b, null), at.transform(c, null), at.transform(d, null));
+    }
+
+
+    public boolean contains(double x, double y) {
+        // split into two triangles, test if either contains the point, assumes the QuadPoint is convex and created correctly. More specifically, the points must be in the correct order.
+        return triangleContains(a, b, c, x, y) || triangleContains(a, c, d, x, y);
+    }
+
+
+    /*
+    checks if a triangle contains a point by converting the point to barycentric coordinates using cramer's rule and then checking if the linear combination is within the bounds of the triangle.
+    https://en.wikipedia.org/wiki/Barycentric_coordinate_system#Barycentric_coordinates_on_triangles
+     */
+    private boolean triangleContains(Point2D a, Point2D b, Point2D c, double x, double y) {
+
+        // area of the triangle
+        double denominator = ((b.getY() - c.getY()) * (a.getX() - c.getX()) + (c.getX() - b.getX()) * (a.getY() - c.getY()));
+        double invertedDenominator = 1.0 / denominator;
+        double alpha = ((b.getY() - c.getY()) * (x - c.getX()) + (c.getX() - b.getX()) * (y - c.getY())) * invertedDenominator;
+        double beta = ((c.getY() - a.getY()) * (x - c.getX()) + (a.getX() - c.getX()) * (y - c.getY())) * invertedDenominator;
+
+        return alpha >= 0 && beta >= 0 && alpha + beta <= 1;
+    }
+
+
+    public boolean contains(Point2D p) {
+
+        return contains(p.getX(), p.getY());
+    }
+
+
+    public boolean contains(Rectangle2D r) {
+
+        double x = r.getX();
+        double y = r.getY();
+        double maxY = r.getMaxY();
+        double maxX = r.getMaxX();
+
+        Point2D p1 = new Point2D.Double(x, y);
+        Point2D p2 = new Point2D.Double(x, maxY);
+        Point2D p3 = new Point2D.Double(maxX, maxY);
+        Point2D p4 = new Point2D.Double(maxX, y);
+
+        return contains(p1) && contains(p2) && contains(p3) && contains(p4);
+    }
+
+
+    public double getCenterX() {
+
+        return (a.getX() + b.getX() + c.getX() + d.getX()) / 4;
+    }
+
+
+    public double getCenterY() {
+
+        return (a.getY() + b.getY() + c.getY() + d.getY()) / 4;
+    }
+
+
+    public Point2D getCenter() {
+
+        return new Point2D.Double(getCenterX(), getCenterY());
+    }
+
+
+    public boolean intersects(Line2D line) {
+
+        return contains(line.getP1()) || contains(line.getP2()) || asLines().anyMatch(qLine -> qLine.intersectsLine(line));
+    }
+
+
+    public Line2D getRightLine() {
+
+        if (right == null) {
+            right = new Line2D.Double(getLowerRight(), getTopRight());
+        }
+
+        return right;
+    }
+
+
+    public Line2D getLeftLine() {
+
+        if (left == null) {
+            left = new Line2D.Double(getLowerLeft(), getTopLeft());
+        }
+        return left;
+    }
+
+
+    public Line2D getBottomLine() {
+
+        if (bottom == null) {
+            bottom = new Line2D.Double(getLowerLeft(), getLowerRight());
+        }
+        return bottom;
+    }
+
+
+    public Line2D getTopLine() {
+
+        if (top == null) {
+            top = new Line2D.Double(getTopLeft(), getTopRight());
+        }
+        return top;
+    }
+
+
+    public Point2D getTopLeft() {
+
+        return a;
+
+    }
+
+
+    public Point2D getTopRight() {
+
+        return d;
+    }
+
+
+    public Point2D getLowerRight() {
+
+        return c;
+    }
+
+
+    public Point2D getLowerLeft() {
+
+        return b;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return String.format("A:(%.2f, %.2f) | B:(%.2f, %.2f) | C:(%.2f, %.2f) | D:(%.2f, %.2f)",
+                             getA().getX(),
+                             getA().getY(),
+                             getB().getX(),
+                             getB().getY(),
+                             getC().getX(),
+                             getC().getY(),
+                             getD().getX(),
+                             getD().getY());
+    }
+
+
+    public double getAngle() {
+
+        return calculateAngle(a, d);
+    }
+
+
+    private static double calculateAngle(Point2D a, Point2D d) {
+
+        double deltaY = d.getY() - a.getY();
+        double deltaX = d.getX() - a.getX();
+        return Math.atan2(deltaY, deltaX);
+    }
+
+
+    @Override
+    public boolean equals(Object obj) {
+
+        if (obj == this) {
+            return true;
+        }
+        if (obj == null || obj.getClass() != this.getClass()) {
+            return false;
+        }
+        var that = (QuadPoint) obj;
+        return Objects.equals(this.a, that.a) && Objects.equals(this.b, that.b) && Objects.equals(this.c, that.c) && Objects.equals(this.d, that.d);
+    }
+
+
+    @Override
+    public int hashCode() {
+
+        return Objects.hash(a, b, c, d);
+    }
+
+}

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

@@ -30,15 +30,24 @@ public class Ruling extends Line2D.Float {
         OTHER
     }
 
+    public enum Style {
+        SOLID,
+        DASHED
+    }
+
     @Getter
     @Setter
     private Classification classification;
+    @Getter
+    @Setter
+    private Style style;
 
 
     public Ruling(Point2D p1, Point2D p2) {
 
         super(p1, p2);
         this.classification = Classification.OTHER;
+        this.style = Style.SOLID;
     }
 
 

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

@@ -1,48 +1,48 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.table;
 
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
+import java.util.Collection;
 import java.util.List;
-import java.util.Set;
-import java.util.TreeMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.BoundingBox;
 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 com.knecon.fforesight.service.layoutparser.processor.model.text.Word;
 
 import lombok.Getter;
-import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
+@Getter
 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 TextPageBlock caption;
 
-    private final int rotation;
-    @Getter
-    @Setter
-    private String headline;
-    private int unrotatedRowCount;
-    private int unrotatedColCount;
-    private List<List<Cell>> rows;
-    @Getter
-    @Setter
-    private List<Cell> cells;
+    private final List<List<Cell>> rows;
 
 
-    public TablePageBlock(List<Cell> cells, int rotation) {
+    public TablePageBlock(TextPageBlock caption, List<List<Cell>> rows) {
 
-        setToBBoxOfComponents(cells);
-        this.cells = cells;
-        addCells(cells);
-        classification = PageBlockType.TABLE;
-        this.rotation = rotation;
+        this.classification = PageBlockType.TABLE;
+        this.caption = caption;
+        this.rows = rows;
+        setBBoxes();
+    }
+
+
+    private void setBBoxes() {
+
+        List<BoundingBox> components = Stream.of(getCells().stream(),
+                                                 getCells().stream()
+                                                         .map(Cell::getTextBlocks)
+                                                         .flatMap(Collection::stream))
+                .flatMap(Function.identity())
+                .map(o -> (BoundingBox) o)
+                .toList();
+        setToBBoxOfComponents(components);
     }
 
 
@@ -53,28 +53,19 @@ public class TablePageBlock extends AbstractPageBlock {
     }
 
 
-    public List<List<Cell>> getRows() {
-
-        if (rows == null) {
-            rows = computeRows();
-
-            // Ignore rows that does not contain any cells and values.
-            List<List<Cell>> rowsToRemove = new ArrayList<>();
-            for (List<Cell> row : rows) {
-                if (row.size() == 1 && row.get(0).getTextBlocks().isEmpty()) {
-                    rowsToRemove.add(row);
-                }
-            }
-            rows.removeAll(rowsToRemove);
-
-            computeHeaders();
-        }
-
-        return rows;
+    @Override
+    public List<Word> getWords() {
 
+        return getCells().stream()
+                .map(Cell::getTextBlocks)
+                .flatMap(Collection::stream)
+                .map(AbstractPageBlock::getWords)
+                .flatMap(Collection::stream)
+                .toList();
     }
 
 
+
     public int getRowCount() {
 
         return getRows().size();
@@ -85,259 +76,16 @@ public class TablePageBlock extends AbstractPageBlock {
 
         return getRows().stream()
                 .mapToInt(List::size)
-                .max()
-                .orElse(0);
+                .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.
-     * Defaults to row.
-     */
-    private void computeHeaders() {
-
-        if (rows == null) {
-            rows = computeRows();
-        }
-        // A bold originalCell is a header originalCell as long as every originalCell 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);
-            if (rowCells.size() == 1) {
-                continue;
-            }
-
-            for (int colIndex = 0; colIndex < rowCells.size(); colIndex++) {
-                Cell cell = rowCells.get(colIndex);
-                List<Cell> cellsToTheLeft = rowCells.subList(0, colIndex);
-                Cell lastHeaderCell = null;
-                for (Cell leftCell : cellsToTheLeft) {
-                    if (leftCell.isHeaderCell()) {
-                        lastHeaderCell = leftCell;
-                    } else {
-                        break;
-                    }
-                }
-                if (lastHeaderCell != null) {
-                    cell.getHeaderCells().add(lastHeaderCell);
-                }
-                List<Cell> cellsToTheTop = new ArrayList<>();
-                for (int i = 0; i < rowIndex; i++) {
-                    try {
-                        cellsToTheTop.add(rows.get(i)
-                                                  .get(colIndex));
-                    } catch (IndexOutOfBoundsException e) {
-                        log.debug("No cell {} in row {}, ignoring.", colIndex, rowIndex);
-                    }
-                }
-                for (Cell topCell : cellsToTheTop) {
-                    if (topCell.isHeaderCell()) {
-                        lastHeaderCell = topCell;
-                    } else {
-                        break;
-                    }
-                }
-                if (lastHeaderCell != null) {
-                    cell.getHeaderCells().add(lastHeaderCell);
-                }
-                if (!cell.getTextBlocks().isEmpty() && cell.getTextBlocks()
-                        .get(0).getMostPopularWordStyle().equals("bold")) {
-                    cell.setHeaderCell(true);
-                }
-            }
-        }
-
-    }
-
-
-    private List<List<Cell>> computeRows() {
-
-        List<List<Cell>> rows = new ArrayList<>();
-        if (rotation == 90) {
-            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));
-                    if (cell != null) {
-                        lastRow.add(cell);
-                    }
-                }
-                rows.add(lastRow);
-            }
-        } else if (rotation == 270) {
-            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));
-                    if (cell != null) {
-                        lastRow.add(cell);
-                    }
-                }
-                rows.add(lastRow);
-            }
-        } else {
-            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()
-                    if (cell != null) {
-                        lastRow.add(cell);
-                    }
-                }
-                rows.add(lastRow);
-            }
-        }
-
-        return rows;
-
-    }
-
-
-    private void addCells(List<Cell> cells) {
-
-        if (cells.isEmpty()) {
-            return;
-        }
-
-        cells.removeIf(cell -> cell.getWidth() < 1.1 || cell.getHeight() < 1.1);
-
-        List<List<Cell>> rowsOfCellsMatrix = calculateTableStructure(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);
-            }
-        }
-
-    }
-
-
-    /**
-     * 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
-     */
-    private List<List<Cell>> calculateTableStructure(List<Cell> cells) {
-
-        if (cells.isEmpty()) {
-            return new ArrayList<>();
-        }
-
-        Set<Double> uniqueX = new HashSet<>();
-        Set<Double> uniqueY = new HashSet<>();
-        cells.stream()
-                .filter(c -> !c.getTextBlocks().isEmpty() || c.getHeight() > 3 && c.getWidth() > 3)
-                .forEach(c -> {
-                    uniqueX.add(c.getPdfMinX());
-                    uniqueX.add(c.getPdfMaxX());
-                    uniqueY.add(c.getPdfMinY());
-                    uniqueY.add(c.getPdfMaxY());
-                });
-
-        var sortedUniqueX = uniqueX.stream()
-                .sorted()
-                .toList();
-        var sortedUniqueY = uniqueY.stream()
-                .sorted()
-                .toList();
-
-        List<List<Cell>> rowsOfCells = new ArrayList<>();
-
-        Double prevY = null;
-
-        for (Double y : sortedUniqueY) {
-
-            List<Cell> row = new ArrayList<>();
-
-            Double prevX = null;
-            for (Double x : sortedUniqueX) {
-
-                if (prevY != null && prevX != null) {
-                    var cellFromGridStructure = new Cell(new Point2D.Double(prevX, prevY), new Point2D.Double(x, y));
-
-                    if (cellFromGridStructure.hasMinimumSize()) {
-
-                        cells.stream()
-                                .map(originalCell -> new CellWithIntersection(originalCell,
-                                                                              RectangleTransformations.calculateIntersectedArea(cellFromGridStructure.getBBoxPdf(),
-                                                                                                                                originalCell.getBBoxPdf())))
-                                .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);
-                    }
-                }
-                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);
-            }
-            prevY = y;
-        }
-
-        Collections.reverse(rowsOfCells);
-
-        // 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;
-    }
-
-
-    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 List<Cell> getCells() {
 
+        return getRows().stream()
+                .flatMap(List::stream)
+                .collect(Collectors.toList());
     }
 
 
@@ -360,7 +108,7 @@ public class TablePageBlock extends AbstractPageBlock {
                     }
                     if (column != null && column.getTextBlocks() != null) {
                         boolean first = true;
-                        for (TextPageBlock textBlock : column.getTextBlocks()) {
+                        for (AbstractPageBlock textBlock : column.getTextBlocks()) {
                             if (!first) {
                                 sb.append("\n");
                             }
@@ -392,7 +140,7 @@ public class TablePageBlock extends AbstractPageBlock {
                     sb.append(i == 0 ? "\n<th>" : "\n<td>");
                     if (column != null && column.getTextBlocks() != null) {
                         boolean first = true;
-                        for (TextPageBlock textBlock : column.getTextBlocks()) {
+                        for (AbstractPageBlock textBlock : column.getTextBlocks()) {
                             if (!first) {
                                 sb.append("<br />");
                             }
@@ -411,9 +159,4 @@ public class TablePageBlock extends AbstractPageBlock {
         return sb.toString();
     }
 
-
-    record CellWithIntersection(Cell originalCell, double intersectedArea) {
-
-    }
-
 }

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

@@ -0,0 +1,8 @@
+package com.knecon.fforesight.service.layoutparser.processor.model.text;
+
+import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
+import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage;
+
+public record AbstractBlockOnPage(AbstractPageBlock block, ClassificationPage page) {
+
+}

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

@@ -1,9 +1,7 @@
-package com.knecon.fforesight.service.layoutparser.processor.model;
+package com.knecon.fforesight.service.layoutparser.processor.model.text;
 
 import java.util.List;
 
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

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

@@ -1,9 +1,7 @@
-package com.knecon.fforesight.service.layoutparser.processor.model;
+package com.knecon.fforesight.service.layoutparser.processor.model.text;
 
 import java.util.List;
 
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

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

@@ -0,0 +1,21 @@
+package com.knecon.fforesight.service.layoutparser.processor.model.text;
+
+import com.knecon.fforesight.service.layoutparser.processor.model.FloatFrequencyCounter;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@NoArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class FrequencyCounters {
+
+    FloatFrequencyCounter lineHeightFrequencyCounter = new FloatFrequencyCounter();
+    FloatFrequencyCounter fontSizeFrequencyCounter = new FloatFrequencyCounter();
+    FloatFrequencyCounter spaceFrequencyCounter = new FloatFrequencyCounter();
+    StringFrequencyCounter fontFrequencyCounter = new StringFrequencyCounter();
+    StringFrequencyCounter styleFrequencyCounter = new StringFrequencyCounter();
+
+}

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

@@ -0,0 +1,107 @@
+package com.knecon.fforesight.service.layoutparser.processor.model.text;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@AllArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class ListIdentifier {
+
+    public static final Pattern NUMBER_WITH_DOT = Pattern.compile("^\\s*([1-9]{1,4})\\.\\s+");
+    public static final Pattern NUMBER_IN_PARENTHESES = Pattern.compile("^\\s*\\(([1-9]{1,4})\\)\\s+");
+
+    enum Format {
+        NUMBER_WITH_DOT,
+        NUMBER_IN_PARENTHESES
+    }
+
+    Format format;
+    @Getter
+    Word word;
+    @Getter
+    int page;
+    int representation;
+
+
+    public static Optional<ListIdentifier> parse(TextPageBlock textPageBlock, int page) {
+
+        return parse(textPageBlock.getWords().subList(0, Math.min(5, textPageBlock.getWords().size())), page);
+    }
+
+
+    public static Optional<ListIdentifier> parse(List<Word> sequences, int page) {
+
+        StringBuilder sb = new StringBuilder();
+        for (Word sequence : sequences) {
+            sb.append(sequence.toString());
+            sb.append(" ");
+        }
+        sb.replace(sb.length() - 1, sb.length(), "");
+        String text = sb.toString();
+
+        Matcher numberMatcher = NUMBER_WITH_DOT.matcher(text);
+
+        if (numberMatcher.find()) {
+            Optional<Integer> representation = parseInteger(numberMatcher.group(1));
+            if (representation.isPresent()) {
+                return Optional.of(new ListIdentifier(Format.NUMBER_WITH_DOT, sequences.get(0), page, representation.get()));
+            }
+        }
+
+        Matcher parenthesisMatcher = NUMBER_IN_PARENTHESES.matcher(text);
+        if (parenthesisMatcher.find()) {
+            Optional<Integer> representation = parseInteger(parenthesisMatcher.group(1));
+            if (representation.isPresent()) {
+                return Optional.of(new ListIdentifier(Format.NUMBER_IN_PARENTHESES, sequences.get(0), page, representation.get()));
+            }
+        }
+        return Optional.empty();
+    }
+
+
+    private static Optional<Integer> parseInteger(String text) {
+
+        try {
+            return Optional.of(Integer.parseInt(text));
+        } catch (NumberFormatException e) {
+            return Optional.empty();
+        }
+    }
+
+
+    public static boolean isInOrder(List<ListIdentifier> listIdentifiers) {
+
+        if (listIdentifiers.size() <= 1) {
+            return true;
+        }
+
+        for (int i = 1; i < listIdentifiers.size(); i++) {
+            ListIdentifier current = listIdentifiers.get(i);
+            ListIdentifier previous = listIdentifiers.get(i - 1);
+            if (current.format != previous.format) {
+                return false;
+            }
+            if (current.representation <= previous.representation) {
+                return false;
+            }
+            if (!current.word.intersectsXDirAdj(previous.word, 2)) {
+                return false;
+            }
+            if (current.page == previous.page && !current.word.isBelowDirAdj(previous.word)) {
+                return false;
+            }
+            if (current.page < previous.page) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+}

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

@@ -7,6 +7,7 @@ import org.apache.pdfbox.text.TextPosition;
 
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.TextBoundingBox;
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.utils.FastAtan2;
+import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -63,7 +64,7 @@ public class RedTextPosition extends TextBoundingBox {
         pos.setBBoxDirAdj(dirAdjPosition);
 
         AffineTransform affineTransform = getRotationMatrix(TextDirection.fromDegrees(textPosition.getDir()), textPosition.getPageWidth(), textPosition.getPageHeight());
-        Rectangle2D bBoxInitialUserSpace = affineTransform.createTransformedShape(dirAdjPosition).getBounds2D();
+        Rectangle2D bBoxInitialUserSpace = RectangleTransformations.transform(dirAdjPosition, affineTransform);
 
         pos.setBBoxPdf(bBoxInitialUserSpace); // These are definitely correct
 

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

@@ -2,6 +2,7 @@ package com.knecon.fforesight.service.layoutparser.processor.model.text;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import com.knecon.fforesight.service.layoutparser.processor.utils.TextNormalizationUtilities;
 
 import lombok.Getter;
@@ -9,18 +10,18 @@ import lombok.Getter;
 @Getter
 public class SearchableText {
 
-    private final List<TextPositionSequence> sequences = new ArrayList<>();
+    private final List<Word> sequences = new ArrayList<>();
 
 
-    public void add(TextPositionSequence textPositionSequence) {
+    public void add(Word word) {
 
-        sequences.add(textPositionSequence);
+        sequences.add(word);
     }
 
 
-    public void addAll(List<TextPositionSequence> textPositionSequences) {
+    public void addAll(List<Word> words) {
 
-        sequences.addAll(textPositionSequences);
+        sequences.addAll(words);
     }
 
 
@@ -31,18 +32,14 @@ public class SearchableText {
     }
 
 
-    public static String buildString(List<TextPositionSequence> sequences) {
+    public static String buildString(List<Word> sequences) {
 
         StringBuilder sb = new StringBuilder();
-        for (TextPositionSequence word : sequences) {
+        for (Word word : sequences) {
             sb.append(word);
             sb.append(' ');
         }
-        String text = sb.toString();
-        text = TextNormalizationUtilities.removeHyphenLineBreaks(text);
-        text = TextNormalizationUtilities.removeLineBreaks(text);
-        text = TextNormalizationUtilities.removeRepeatingWhitespaces(text);
-        return text;
+        return TextNormalizationUtilities.cleanString(sb.toString());
     }
 
 }

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

@@ -9,10 +9,14 @@ public class StringFrequencyCounter {
 
     @Getter
     private final Map<String, Integer> countPerValue = new HashMap<>();
+    boolean changed;
+    String mostPopularCache;
 
 
     public void add(String value) {
 
+        changed = true;
+
         if (!countPerValue.containsKey(value)) {
             countPerValue.put(value, 1);
         } else {
@@ -23,6 +27,8 @@ public class StringFrequencyCounter {
 
     public void addAll(Map<String, Integer> otherCounter) {
 
+        changed = true;
+
         for (Map.Entry<String, Integer> entry : otherCounter.entrySet()) {
             if (countPerValue.containsKey(entry.getKey())) {
                 countPerValue.put(entry.getKey(), countPerValue.get(entry.getKey()) + entry.getValue());
@@ -35,13 +41,18 @@ public class StringFrequencyCounter {
 
     public String getMostPopular() {
 
-        Map.Entry<String, Integer> mostPopular = null;
-        for (Map.Entry<String, Integer> entry : countPerValue.entrySet()) {
-            if (mostPopular == null || entry.getValue() > mostPopular.getValue()) {
-                mostPopular = entry;
+        if (changed || mostPopularCache == null) {
+            Map.Entry<String, Integer> mostPopular = null;
+            for (Map.Entry<String, Integer> entry : countPerValue.entrySet()) {
+                if (mostPopular == null || entry.getValue() >= mostPopular.getValue()) {
+                    mostPopular = entry;
+                }
             }
+            mostPopularCache = mostPopular != null ? mostPopular.getKey() : null;
+            changed = false;
         }
-        return mostPopular != null ? mostPopular.getKey() : null;
+
+        return mostPopularCache;
     }
 
 }

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

@@ -0,0 +1,7 @@
+package com.knecon.fforesight.service.layoutparser.processor.model.text;
+
+import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage;
+
+public record TextBlockOnPage(TextPageBlock textBlock, ClassificationPage page) {
+
+}

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

@@ -2,79 +2,93 @@ package com.knecon.fforesight.service.layoutparser.processor.model.text;
 
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
-import com.knecon.fforesight.service.layoutparser.processor.model.FloatFrequencyCounter;
+import com.knecon.fforesight.service.layoutparser.processor.model.Orientation;
 import com.knecon.fforesight.service.layoutparser.processor.model.PageBlockType;
-import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
 import com.knecon.fforesight.service.layoutparser.processor.utils.TextNormalizationUtilities;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-@AllArgsConstructor
-@Builder
 @NoArgsConstructor
 public class TextPageBlock extends AbstractPageBlock {
 
-    @Builder.Default
-    private List<TextPositionSequence> sequences = new ArrayList<>();
+    @EqualsAndHashCode.Exclude
+    private List<Word> words = new ArrayList<>();
+    @EqualsAndHashCode.Exclude
+    private FrequencyCounters frequencyCounters = new FrequencyCounters();
 
-    private Rectangle2D bBoxDirAdj;
-
-    private String mostPopularWordFont;
-
-    private String mostPopularWordStyle;
-
-    private double mostPopularWordFontSize;
-
-    private double mostPopularWordHeight;
-
-    private double mostPopularWordSpaceWidth;
-
-    private double highestFontSize;
+    private boolean underlined;
 
     private PageBlockType classification;
 
     private boolean toDuplicate;
 
+    @EqualsAndHashCode.Exclude
+    private String text;
+    private boolean changed;
 
-    public TextPageBlock(List<TextPositionSequence> sequences) {
 
-        this.sequences = sequences;
-        if (!sequences.isEmpty()) {
-            calculateFrequencyCounters();
+    public TextPageBlock(List<Word> words, int page, PageBlockType classification, Set<LayoutEngine> engines, Orientation orientation) {
+
+        this.page = page;
+        this.classification = classification;
+        this.engines = engines;
+        this.orientation = orientation;
+        setDefaultFields(words);
+    }
+
+
+    public TextPageBlock(List<Word> words) {
+
+        setDefaultFields(words);
+    }
+
+
+    private void setDefaultFields(List<Word> words) {
+
+        this.words = new ArrayList<>(words);
+        this.frequencyCounters = new FrequencyCounters();
+
+        if (!words.isEmpty()) {
+            addToFrequencyCounters(words);
         }
         calculateBBox();
     }
 
 
+    public List<Word> getWords() {
+
+        return Collections.unmodifiableList(words);
+    }
+
+
     public TextDirection getDir() {
 
-        return sequences.get(0).getDir();
+        return words.get(0).getDir();
     }
 
 
     private void calculateBBox() {
 
-        if (sequences == null) {
+        if (words == null) {
             this.bBox = new Rectangle2D.Double();
             this.bBoxPdf = new Rectangle2D.Double();
             this.bBoxDirAdj = new Rectangle2D.Double();
             return;
         }
-        this.bBoxDirAdj = sequences.stream()
-                .map(TextPositionSequence::getBBoxDirAdj)
-                .collect(RectangleTransformations.collectBBox());
-
-        setToBBoxOfComponents(sequences);
+        setToBBoxOfComponents(words);
     }
 
 
@@ -84,7 +98,7 @@ public class TextPageBlock extends AbstractPageBlock {
     }
 
 
-    public static TextPageBlock merge(List<TextPageBlock> textBlocksToMerge) {
+    public static TextPageBlock merge(Collection<TextPageBlock> textBlocksToMerge) {
 
         if (textBlocksToMerge.isEmpty()) {
             throw new IllegalArgumentException("Need to provide at least one TextPageBlock.");
@@ -95,49 +109,57 @@ public class TextPageBlock extends AbstractPageBlock {
                     .count() != 1) {
             throw new IllegalArgumentException("Cannot merge textBlocks on different pages.");
         }
-
-        List<TextPositionSequence> sequences = textBlocksToMerge.stream()
-                .map(TextPageBlock::getSequences)
-                .flatMap(java.util.Collection::stream)
-                .toList();
-        sequences = new ArrayList<>(sequences);
-
-        return new TextPageBlock(sequences);
-    }
-
-
-    private void calculateFrequencyCounters() {
-
-        FloatFrequencyCounter lineHeightFrequencyCounter = new FloatFrequencyCounter();
-        FloatFrequencyCounter fontSizeFrequencyCounter = new FloatFrequencyCounter();
-        FloatFrequencyCounter spaceFrequencyCounter = new FloatFrequencyCounter();
-        StringFrequencyCounter fontFrequencyCounter = new StringFrequencyCounter();
-        StringFrequencyCounter styleFrequencyCounter = new StringFrequencyCounter();
-
-        for (TextPositionSequence wordBlock : sequences) {
-
-            lineHeightFrequencyCounter.add(wordBlock.getTextHeight());
-            fontSizeFrequencyCounter.add(wordBlock.getFontSize());
-            spaceFrequencyCounter.add(wordBlock.getSpaceWidth());
-            fontFrequencyCounter.add(wordBlock.getFont());
-            styleFrequencyCounter.add(wordBlock.getFontStyle());
-
+        if (textBlocksToMerge.stream()
+                    .map(AbstractPageBlock::getClassification)
+                    .distinct()
+                    .count() != 1) {
+            throw new IllegalArgumentException("Cannot merge textBlocks of different types.");
+        }
+        if (textBlocksToMerge.stream()
+                    .map(AbstractPageBlock::getDir)
+                    .distinct()
+                    .count() != 1) {
+            throw new IllegalArgumentException("Cannot merge textBlocks of different directions.");
         }
 
-        setMostPopularWordFont(fontFrequencyCounter.getMostPopular());
-        setMostPopularWordStyle(styleFrequencyCounter.getMostPopular());
-        setMostPopularWordFontSize(fontSizeFrequencyCounter.getMostPopular());
-        setMostPopularWordHeight(lineHeightFrequencyCounter.getMostPopular());
-        setMostPopularWordSpaceWidth(spaceFrequencyCounter.getMostPopular());
-        setHighestFontSize(fontSizeFrequencyCounter.getHighest());
+        List<Word> sequences = textBlocksToMerge.stream()
+                .map(TextPageBlock::getWords)
+                .flatMap(Collection::stream)
+                .collect(Collectors.toList());
+
+        TextPageBlock first = textBlocksToMerge.iterator().next();
+        return new TextPageBlock(sequences,
+                                 first.getPage(),
+                                 first.getClassification(),
+                                 textBlocksToMerge.stream()
+                                         .map(AbstractPageBlock::getEngines)
+                                         .flatMap(Collection::stream)
+                                         .collect(Collectors.toSet()),
+                                 Orientation.NONE);
     }
 
 
-    public TextPageBlock union(TextPositionSequence r) {
+    private void addToFrequencyCounters(List<Word> sequences) {
+
+        for (Word wordBlock : sequences) {
+
+            frequencyCounters.getLineHeightFrequencyCounter().add(wordBlock.getTextHeight());
+            frequencyCounters.getFontSizeFrequencyCounter().add(wordBlock.getFontSize());
+            frequencyCounters.getSpaceFrequencyCounter().add(wordBlock.getSpaceWidth());
+            frequencyCounters.getFontFrequencyCounter().add(wordBlock.getFont());
+            frequencyCounters.getStyleFrequencyCounter().add(wordBlock.getFontStyle());
+        }
+
+        setUnderlined(this.words.stream()
+                              .allMatch(Word::isUnderline));
+    }
+
+
+    public TextPageBlock union(Word r) {
 
         TextPageBlock union = this.copy();
-        union.getSequences().add(r);
-        calculateFrequencyCounters();
+        union.add(r);
+        addToFrequencyCounters(List.of(r));
         calculateBBox();
         return union;
     }
@@ -146,51 +168,58 @@ public class TextPageBlock extends AbstractPageBlock {
     public TextPageBlock union(TextPageBlock r) {
 
         TextPageBlock union = this.copy();
-        union.getSequences().addAll(r.getSequences());
-        calculateFrequencyCounters();
+        union.addAll(r.getWords());
+        addToFrequencyCounters(r.getWords());
         calculateBBox();
         return union;
     }
 
 
-    public void add(TextPageBlock r) {
+    public void add(TextPageBlock textPageBlock) {
 
-        sequences.addAll(r.getSequences());
-        calculateFrequencyCounters();
+        changed = true;
+        words.addAll(textPageBlock.getWords());
+        addToFrequencyCounters(textPageBlock.getWords());
         calculateBBox();
     }
 
 
-    public void add(TextPositionSequence r) {
+    public void add(Word word) {
 
-        sequences.add(r);
-        calculateFrequencyCounters();
+        changed = true;
+        words.add(word);
+        addToFrequencyCounters(List.of(word));
         calculateBBox();
     }
 
 
+    public void addAll(List<Word> words) {
+
+        changed = true;
+        this.words.addAll(words);
+        addToFrequencyCounters(words);
+        calculateBBox();
+    }
+
+
+    public void removeAll(List<Word> words) {
+
+        changed = true;
+        this.words.removeAll(words);
+        setDefaultFields(this.words);
+    }
+
+
     public TextPageBlock copy() {
 
-        return new TextPageBlock(new ArrayList<>(sequences));
+        return new TextPageBlock(new ArrayList<>(words));
     }
 
 
     @Override
     public String toString() {
 
-        StringBuilder builder = new StringBuilder();
-
-        for (int i = 0; i < sequences.size(); i++) {
-            String sequenceAsString = sequences.get(i).toString();
-            // Fix for missing Whitespace. This is recognized in getSequences method. See PDFTextStripper Line 1730.
-            if (i != 0 && sequences.get(i - 1).charAt(sequences.get(i - 1).length() - 1) != ' ' && sequenceAsString.charAt(0) != ' ') {
-                builder.append(' ');
-            }
-            builder.append(sequenceAsString);
-        }
-
-        return builder.toString();
-
+        return getText();
     }
 
 
@@ -198,30 +227,36 @@ public class TextPageBlock extends AbstractPageBlock {
     @JsonIgnore
     public String getText() {
 
-        StringBuilder sb = new StringBuilder();
+        if (text == null || changed) {
 
-        TextPositionSequence previous = null;
-        for (TextPositionSequence word : sequences) {
-            if (previous != null) {
-                if (Math.abs(previous.getMaxYDirAdj() - word.getMaxYDirAdj()) > word.getTextHeight()) {
-                    sb.append('\n');
-                } else {
-                    sb.append(' ');
+            StringBuilder sb = new StringBuilder();
+
+            Word previous = null;
+            for (Word word : words) {
+                if (previous != null) {
+                    if (Math.abs(previous.getMaxYDirAdj() - word.getMaxYDirAdj()) > word.getTextHeight()) {
+                        sb.append('\n');
+                    } else {
+                        sb.append(' ');
+                    }
                 }
+                sb.append(word.toString());
+                previous = word;
             }
-            sb.append(word.toString());
-            previous = word;
+
+            text = TextNormalizationUtilities.removeHyphenLinebreaks(sb.toString());
+            changed = false;
         }
 
-        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString());
+        return text;
     }
 
 
     public int getNumberOfLines() {
 
         int numberOfLines = 1;
-        TextPositionSequence previous = null;
-        for (TextPositionSequence word : sequences) {
+        Word previous = null;
+        for (Word word : words) {
             if (previous != null) {
                 if (word.getMaxYDirAdj() - previous.getMaxYDirAdj() > word.getTextHeight()) {
                     numberOfLines++;
@@ -233,10 +268,47 @@ public class TextPageBlock extends AbstractPageBlock {
     }
 
 
+    public String getMostPopularWordFont() {
+
+        return frequencyCounters.getFontFrequencyCounter().getMostPopular();
+    }
+
+
+    public String getMostPopularWordStyle() {
+
+        return frequencyCounters.getStyleFrequencyCounter().getMostPopular();
+    }
+
+
+    public double getMostPopularWordFontSize() {
+
+        return frequencyCounters.getFontSizeFrequencyCounter().getMostPopular();
+    }
+
+
+    public double getMostPopularWordHeight() {
+
+        return frequencyCounters.getLineHeightFrequencyCounter().getMostPopular();
+    }
+
+
+    public double getMostPopularWordSpaceWidth() {
+
+        return frequencyCounters.getSpaceFrequencyCounter().getMostPopular();
+    }
+
+
+    public double getHighestFontSize() {
+
+        Double highest = frequencyCounters.getFontSizeFrequencyCounter().getHighest();
+        return highest == null ? 0 : highest;
+    }
+
+
     @Override
     public boolean isEmpty() {
 
-        return sequences.isEmpty();
+        return words.isEmpty();
     }
 
 }

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

@@ -1,190 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.text;
-
-import static com.knecon.fforesight.service.layoutparser.processor.model.text.RedTextPosition.HEIGHT_PADDING;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.stream.Collectors;
-
-import org.apache.pdfbox.text.TextPosition;
-
-import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.TextBoundingBox;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = true) // needs the bbox to be unique
-public class TextPositionSequence extends TextBoundingBox implements CharSequence {
-
-    public static final String STANDARD = "standard";
-    public static final String BOLD_ITALIC = "bold, italic";
-    public static final String BOLD = "bold";
-    public static final String ITALIC = "italic";
-
-    @EqualsAndHashCode.Include
-    private int page;
-
-    @EqualsAndHashCode.Include
-    @Builder.Default
-    private List<RedTextPosition> textPositions = new ArrayList<>();
-
-    private boolean isParagraphStart;
-    private boolean strikethrough;
-    private boolean underline;
-
-
-    public TextPositionSequence(List<TextPosition> textPositions, int pageNumber, boolean isParagraphStart) {
-
-        this.textPositions = textPositions.stream()
-                .map(RedTextPosition::fromTextPosition)
-                .collect(Collectors.toList());
-        this.page = pageNumber;
-        this.isParagraphStart = isParagraphStart;
-        calculateBBox();
-    }
-
-
-    private void calculateBBox() {
-
-        setToBBoxOfComponents(getTextPositions());
-    }
-
-
-    public TextPositionSequence(List<RedTextPosition> textPositions, int page) {
-
-        this.textPositions = textPositions;
-        this.page = page;
-        calculateBBox();
-    }
-
-
-    @Override
-    public int length() {
-
-        return textPositions.size();
-    }
-
-
-    @Override
-    public char charAt(int index) {
-
-        RedTextPosition textPosition = textPositionAt(index);
-        String text = textPosition.getUnicode();
-        return text.charAt(0);
-    }
-
-
-    public char charAt(int index, boolean caseInSensitive) {
-
-        RedTextPosition textPosition = textPositionAt(index);
-        String text = textPosition.getUnicode();
-        return caseInSensitive ? text.toLowerCase(Locale.ROOT).charAt(0) : text.charAt(0);
-    }
-
-
-    @Override
-    public TextPositionSequence subSequence(int start, int end) {
-
-        var textPositionSequence = new TextPositionSequence();
-        textPositionSequence.textPositions = textPositions.subList(start, end);
-        textPositionSequence.page = page;
-        textPositionSequence.dir = dir;
-        textPositionSequence.setToBBoxOfComponents(getTextPositions());
-        return textPositionSequence;
-    }
-
-
-    @Override
-    public String toString() {
-
-        StringBuilder builder = new StringBuilder(length());
-        for (int i = 0; i < length(); i++) {
-            builder.append(charAt(i));
-        }
-        return builder.toString();
-    }
-
-
-    public RedTextPosition textPositionAt(int index) {
-
-        return textPositions.get(index);
-    }
-
-
-    public void add(TextPositionSequence textPositionSequence, RedTextPosition textPosition) {
-
-        this.textPositions.add(textPosition);
-        this.page = textPositionSequence.getPage();
-        calculateBBox();
-    }
-
-
-    public void add(TextPosition textPosition) {
-
-        this.textPositions.add(RedTextPosition.fromTextPosition(textPosition));
-        calculateBBox();
-    }
-
-    public double getTextHeightNoPadding() {
-
-        return textPositions.get(0).getHeightDirAdj();
-    }
-
-
-    public double getTextHeight() {
-
-        return textPositions.get(0).getHeightDirAdj() + HEIGHT_PADDING;
-    }
-
-
-    public String getFont() {
-
-        if (textPositions.get(0).getFontName() == null) {
-            return "none";
-        }
-        return textPositions.get(0).getFontName().toLowerCase(Locale.ROOT).replaceAll(",bold", "").replaceAll(",italic", "");
-    }
-
-
-    public String getFontStyle() {
-
-        if (textPositions.get(0).getFontName() == null) {
-            return STANDARD;
-        }
-        String lowercaseFontName = textPositions.get(0).getFontName().toLowerCase(Locale.ROOT);
-
-        if (lowercaseFontName.contains(BOLD) && lowercaseFontName.contains(ITALIC)) {
-            return BOLD_ITALIC;
-        } else if (lowercaseFontName.contains(BOLD)) {
-            return BOLD;
-        } else if (lowercaseFontName.contains(ITALIC)) {
-            return ITALIC;
-        } else {
-            return STANDARD;
-        }
-    }
-
-
-    public float getFontSize() {
-
-        return textPositions.get(0).getFontSizeInPt();
-    }
-
-
-    public float getSpaceWidth() {
-
-        return textPositions.get(0).getWidthOfSpace();
-    }
-
-}
-

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

@@ -0,0 +1,36 @@
+package com.knecon.fforesight.service.layoutparser.processor.model.text;
+
+import java.util.Comparator;
+import java.util.HashMap;
+
+import com.knecon.fforesight.service.layoutparser.processor.services.classification.NumberWord;
+
+public class TocNumberComparator implements Comparator<NumberWord> {
+
+    private HashMap<NumberWord, TextBlockOnPage> lookup;
+
+
+    public TocNumberComparator(HashMap<NumberWord, TextBlockOnPage> lookup) {
+
+        this.lookup = lookup;
+    }
+
+
+    @Override
+    public int compare(NumberWord number1, NumberWord number2) {
+
+        int page1 = lookup.get(number1).page().getPageNumber();
+        int page2 = lookup.get(number2).page().getPageNumber();
+
+        if (page1 != page2) {
+            return Integer.compare(page1, page2);
+        }
+
+        if (number1.word().getY() != number2.word().getY()) {
+            return Double.compare(number1.word().getY(), number2.word().getY());
+        }
+
+        return Integer.compare(number1.number(), number2.number());
+    }
+
+}

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

@@ -0,0 +1,273 @@
+package com.knecon.fforesight.service.layoutparser.processor.model.text;
+
+import static com.knecon.fforesight.service.layoutparser.processor.model.text.RedTextPosition.HEIGHT_PADDING;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import org.apache.pdfbox.text.TextPosition;
+
+import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Character;
+import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.TextBoundingBox;
+import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@SuppressWarnings("pmd")
+public class Word extends TextBoundingBox implements CharSequence {
+
+    public static final String STANDARD = "standard";
+    public static final String BOLD_ITALIC = "bold, italic";
+    public static final String BOLD = "bold";
+    public static final String ITALIC = "italic";
+    public static final Pattern FONT_CLEANER = Pattern.compile(",bold|,italic");
+
+    private int page;
+
+    @Builder.Default
+    private List<Character> characters = new ArrayList<>();
+    private boolean isParagraphStart;
+    private boolean strikethrough;
+    private boolean underline;
+
+    private Integer hashcodeCache;
+
+
+    public Word(List<TextPosition> textPositions, int pageNumber, boolean isParagraphStart) {
+
+        this.characters = textPositions.stream()
+                .map(RedTextPosition::fromTextPosition)
+                .map(Character::new)
+                .collect(Collectors.toList());
+        this.page = pageNumber;
+        this.isParagraphStart = isParagraphStart;
+        calculateBBoxAndHashcode();
+    }
+
+
+    private void calculateBBoxAndHashcode() {
+
+        setToBBoxOfComponents(getTextPositions());
+        hashcodeCache = null;
+    }
+
+
+    public Word(List<Character> characters, int page) {
+
+        this.characters = new ArrayList<>(characters);
+        this.page = page;
+        calculateBBoxAndHashcode();
+    }
+
+
+    @Override
+    public int length() {
+
+        return characters.size();
+    }
+
+
+    @Override
+    public char charAt(int index) {
+
+        RedTextPosition textPosition = textPositionAt(index);
+        String text = textPosition.getUnicode();
+        return text.charAt(0);
+    }
+
+
+    public char charAt(int index, boolean caseInSensitive) {
+
+        RedTextPosition textPosition = textPositionAt(index);
+        String text = textPosition.getUnicode();
+        return caseInSensitive ? text.toLowerCase(Locale.ROOT).charAt(0) : text.charAt(0);
+    }
+
+
+    @Override
+    public Word subSequence(int start, int end) {
+
+        var word = new Word();
+        word.characters = characters.subList(start, end);
+        word.page = page;
+        word.dir = dir;
+        word.setToBBoxOfComponents(getTextPositions());
+        return word;
+    }
+
+
+    @Override
+    public String toString() {
+
+        StringBuilder builder = new StringBuilder(length());
+        for (int i = 0; i < length(); i++) {
+            builder.append(charAt(i));
+        }
+        return builder.toString();
+    }
+
+
+    public RedTextPosition textPositionAt(int index) {
+
+        return characters.get(index).getTextPosition();
+    }
+
+
+    public void add(Word word, RedTextPosition textPosition) {
+
+        this.characters.add(new Character(textPosition));
+        this.page = word.getPage();
+        calculateBBoxAndHashcode();
+    }
+
+
+    public void add(Character current) {
+
+        characters.add(current);
+        calculateBBoxAndHashcode();
+    }
+
+
+    public void add(TextPosition textPosition) {
+
+        add(new Character(RedTextPosition.fromTextPosition(textPosition)));
+    }
+
+
+    public double getTextHeightNoPadding() {
+
+        return characters.get(0).getTextPosition().getHeightDirAdj();
+    }
+
+
+    public double getTextHeight() {
+
+        return characters.get(0).getTextPosition().getHeightDirAdj() + HEIGHT_PADDING;
+    }
+
+
+    public String getFont() {
+
+        if (characters.get(0).getTextPosition().getFontName() == null) {
+            return "none";
+        }
+
+        return FONT_CLEANER.matcher(characters.get(0).getTextPosition().getFontName().toLowerCase(Locale.ROOT)).replaceAll("");
+    }
+
+
+    public String getFontStyle() {
+
+        if (characters.get(0).getTextPosition().getFontName() == null) {
+            return STANDARD;
+        }
+        String lowercaseFontName = characters.get(0).getTextPosition().getFontName().toLowerCase(Locale.ROOT);
+
+        if (lowercaseFontName.contains(BOLD) && lowercaseFontName.contains(ITALIC)) {
+            return BOLD_ITALIC;
+        } else if (lowercaseFontName.contains(BOLD)) {
+            return BOLD;
+        } else if (lowercaseFontName.contains(ITALIC)) {
+            return ITALIC;
+        } else {
+            return STANDARD;
+        }
+    }
+
+
+    public float getFontSize() {
+
+        return characters.get(0).getTextPosition().getFontSizeInPt();
+    }
+
+
+    public float getSpaceWidth() {
+
+        return characters.get(0).getTextPosition().getWidthOfSpace();
+    }
+
+
+    public boolean equals(final Object o) {
+        // auto-generated with lombok
+        if (o == this) {
+            return true;
+        }
+        if (!(o instanceof Word other)) {
+            return false;
+        }
+        if (!other.canEqual((Object) this)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        if (this.getPage() != other.getPage()) {
+            return false;
+        }
+        final Object this$textPositions = this.getTextPositions();
+        final Object other$textPositions = other.getTextPositions();
+        if (!Objects.equals(this$textPositions, other$textPositions)) {
+            return false;
+        }
+        return Objects.equals(this.getHashcodeCache(), other.getHashcodeCache());
+    }
+
+
+    protected boolean canEqual(final Object other) {return other instanceof Word;}
+
+
+    public int hashCode() {
+
+        if (hashcodeCache == null) {
+            hashcodeCache = hashcodeCalculation();
+        }
+
+        return hashcodeCache;
+    }
+
+
+    private int hashcodeCalculation() {
+
+        final int PRIME = 59;
+        int result = super.hashCode();
+        result = result * PRIME + this.getPage();
+        final Object $textPositions = this.getTextPositions();
+        result = result * PRIME + ($textPositions == null ? 43 : $textPositions.hashCode());
+        return result;
+    }
+
+
+    private List<RedTextPosition> getTextPositions() {
+
+        return characters.stream()
+                .map(Character::getTextPosition)
+                .toList();
+    }
+
+
+    public void transform(AffineTransform rotateInstance) {
+
+        for (RedTextPosition textPosition : getTextPositions()) {
+            Rectangle2D exactDirAdjCoordinates = RectangleTransformations.transform(textPosition.getBBoxDirAdj(), rotateInstance);
+            textPosition.setBBoxDirAdj(exactDirAdjCoordinates);
+        }
+        calculateBBoxAndHashcode();
+    }
+
+}
+

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

@@ -9,11 +9,14 @@ import java.util.Map;
 
 import org.springframework.stereotype.Service;
 
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType;
 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.graph.nodes.ImageType;
 import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage;
+import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageMetadata;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse;
+import com.knecon.fforesight.service.ocr.v1.api.model.Figure;
+import com.knecon.fforesight.service.ocr.v1.api.model.IdpResult;
 
 import lombok.RequiredArgsConstructor;
 
@@ -21,48 +24,78 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class ImageServiceResponseAdapter {
 
-    public Map<Integer, List<ClassifiedImage>> buildClassifiedImagesPerPage(ImageServiceResponse imageServiceResponse) {
+    public Map<Integer, List<ClassifiedImage>> buildClassifiedImagesPerPage(ImageServiceResponse imageServiceResponse, IdpResult idpResult) {
 
         Map<Integer, List<ClassifiedImage>> images = new HashMap<>();
-        imageServiceResponse.getData().forEach(imageMetadata -> {
-            var classification = imageMetadata.getFilters().isAllPassed() ? ImageType.valueOf(imageMetadata.getClassification()
-                    .getLabel()
-                    .toUpperCase(Locale.ROOT)) : ImageType.OTHER;
-            images.computeIfAbsent(imageMetadata.getPosition().getPageNumber(), x -> new ArrayList<>())
-                    .add(new ClassifiedImage(new Rectangle2D.Double(imageMetadata.getPosition().getX1(),
-                            imageMetadata.getPosition().getY1(),
-                            imageMetadata.getGeometry().getWidth(),
-                            imageMetadata.getGeometry().getHeight()), classification, imageMetadata.isAlpha(), imageMetadata.getPosition().getPageNumber(),imageMetadata.getRepresentation()));
-        });
 
-        // Currently This is a copy but, it will be changed later because i don' t think that we should unclassified images.
-        imageServiceResponse.getDataCV().forEach(imageMetadata -> {
-            var classification = imageMetadata.getFilters().isAllPassed() ? ImageType.valueOf(imageMetadata.getClassification()
-                    .getLabel()
-                    .toUpperCase(Locale.ROOT)) : ImageType.OTHER;
-            images.computeIfAbsent(imageMetadata.getPosition().getPageNumber(), x -> new ArrayList<>())
-                    .add(new ClassifiedImage(new Rectangle2D.Double(imageMetadata.getPosition().getX1(),
-                            imageMetadata.getPosition().getY1(),
-                            imageMetadata.getGeometry().getWidth(),
-                            imageMetadata.getGeometry().getHeight()), classification, imageMetadata.isAlpha(), imageMetadata.getPosition().getPageNumber(),imageMetadata.getRepresentation()));
-        });
+        imageServiceResponse.getData()
+                .forEach(imageMetadata -> addImageMetaData(imageMetadata, images));
+        imageServiceResponse.getDataCV()
+                .forEach(imageMetadata -> addImageMetaData(imageMetadata, images));
+        idpResult.figures()
+                .forEach(figure -> addFigure(figure, images));
 
         return images;
     }
 
 
+    private static void addFigure(Figure figure, Map<Integer, List<ClassifiedImage>> images) {
+
+        var classification = ImageType.GRAPHIC;
+        ClassifiedImage image = new ClassifiedImage(figure.image().bbox().get().getBounds2D(), classification, false, figure.image().pageNumber(), "");
+        getImagesOnPage(figure.image().pageNumber(), images).add(image);
+    }
+
+
+    private static void addImageMetaData(ImageMetadata imageMetadata, Map<Integer, List<ClassifiedImage>> images) {
+
+        var image = new ClassifiedImage(getPosition(imageMetadata),
+                                        getImageType(imageMetadata),
+                                        imageMetadata.isAlpha(),
+                                        imageMetadata.getPosition().getPageNumber(),
+                                        imageMetadata.getRepresentation());
+        getImagesOnPage(imageMetadata.getPosition().getPageNumber(), images).add(image);
+    }
+
+
+    private static Rectangle2D.Double getPosition(ImageMetadata imageMetadata) {
+
+        return new Rectangle2D.Double(imageMetadata.getPosition().getX1(),
+                                      imageMetadata.getPosition().getY1(),
+                                      imageMetadata.getGeometry().getWidth(),
+                                      imageMetadata.getGeometry().getHeight());
+    }
+
+
+    private static ImageType getImageType(ImageMetadata imageMetadata) {
+
+        if (imageMetadata.getFilters().isAllPassed()) {
+            return ImageType.valueOf(imageMetadata.getClassification().getLabel().toUpperCase(Locale.ROOT));
+        } else {
+            return ImageType.OTHER;
+        }
+    }
+
+
+    private static List<ClassifiedImage> getImagesOnPage(int pageNumber, Map<Integer, List<ClassifiedImage>> images) {
+
+        return images.computeIfAbsent(pageNumber, x -> new ArrayList<>());
+    }
+
+
     public void findOcr(ClassificationPage classificationPage) {
 
-        classificationPage.getImages().forEach(image -> {
-            if (image.getImageType().equals(ImageType.OTHER)) {
-                for (AbstractPageBlock textblock : classificationPage.getTextBlocks()) {
-                    if (image.getPosition().contains(textblock.getBBoxPdf())) {
-                        image.setImageType(ImageType.OCR);
-                        return;
+        classificationPage.getImages()
+                .forEach(image -> {
+                    if (image.getImageType().equals(ImageType.OTHER)) {
+                        for (AbstractPageBlock textblock : classificationPage.getTextBlocks()) {
+                            if (image.getPosition().contains(textblock.getBBoxPdf())) {
+                                image.setImageType(ImageType.OCR);
+                                return;
+                            }
+                        }
                     }
-                }
-            }
-        });
+                });
     }
 
 }

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

@@ -8,7 +8,7 @@ import java.util.Map;
 
 import org.springframework.stereotype.Service;
 
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.ImageType;
+import com.iqser.red.service.redaction.v1.server.model.document.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;
@@ -79,7 +79,7 @@ public class VisualLayoutParsingAdapter {
                 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,"");
+                        t.getBox().getY2() - t.getBox().getY1()), ImageType.SIGNATURE, true, false, false, pageNumber, "");
 
                 signatures.add(signature);
             }

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

@@ -183,7 +183,7 @@ public class BodyTextFrameService {
                             if (cell == null || cell.getTextBlocks() == null) {
                                 continue;
                             }
-                            for (TextPageBlock textBlock : cell.getTextBlocks()) {
+                            for (AbstractPageBlock textBlock : cell.getTextBlocks()) {
                                 expandRectangle(textBlock, page, expansionsRectangle);
                             }
                         }
@@ -198,7 +198,7 @@ public class BodyTextFrameService {
     }
 
 
-    private void expandRectangle(TextPageBlock textBlock, ClassificationPage page, BodyTextFrameExpansionsRectangle expansionsRectangle) {
+    private void expandRectangle(AbstractPageBlock textBlock, ClassificationPage page, BodyTextFrameExpansionsRectangle expansionsRectangle) {
 
         if (page.getPageWidth() > page.getPageHeight() && page.getRotation() != 0) {
             if (textBlock.getPdfMinY() < expansionsRectangle.minX) {

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

@@ -1,25 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.services;
-
-import java.awt.geom.Rectangle2D;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.LineInformation;
-import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
-
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public class MainBodyTextFrameExtractionService {
-
-    private static final double TEXT_FRAME_PAD_WIDTH = 0.0;
-    private static final double TEXT_FRAME_PAD_HEIGHT = 0.02;
-
-
-    public Rectangle2D calculateMainBodyTextFrame(LineInformation lineInformation) {
-
-        Rectangle2D mainBodyTextFrame = lineInformation.getLineBBox().stream()
-                .collect(RectangleTransformations.collectBBox());
-
-        return RectangleTransformations.pad(mainBodyTextFrame, mainBodyTextFrame.getWidth() * TEXT_FRAME_PAD_WIDTH, mainBodyTextFrame.getHeight() * TEXT_FRAME_PAD_HEIGHT);
-    }
-
-}