RED-9353: implement ViewerDocService in PDFTron

.gitlab-ci.yml

@@ -21,6 +21,5 @@ 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

@@ -42,19 +42,6 @@ tasks.jacocoTestReport {
 }
 
 allprojects {
-
-    tasks.withType<Javadoc> {
-        options {
-            this as StandardJavadocDocletOptions
-            addBooleanOption("Xdoclint:none", true)
-            addStringOption("Xmaxwarns", "1")
-        }
-    }
-
-    pmd {
-        setConsoleOutput(true)
-    }
-
     publishing {
         publications {
             create<MavenPublication>(name) {
@@ -77,7 +64,6 @@ java {
     withJavadocJar()
 }
 
-
 repositories {
     mavenLocal()
     mavenCentral()

layoutparser-service/layoutparser-service-internal-api/build.gradle.kts

@@ -7,5 +7,4 @@ description = "layoutparser-service-internal-api"
 
 dependencies {
     implementation("io.swagger.core.v3:swagger-annotations:2.2.15")
-    implementation("com.google.protobuf:protobuf-java-util:4.27.1")
 }

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

@@ -2,11 +2,6 @@ package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
 
 import java.io.Serializable;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPageProto.AllDocumentPages;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPositionDataProto.AllDocumentPositionData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructureProto.DocumentStructure;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentTextDataProto.AllDocumentTextData;
-
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -18,26 +13,16 @@ import lombok.experimental.FieldDefaults;
 @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.")
+@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.")
-    AllDocumentPages documentPages;
+    DocumentPage[] documentPages;
     @Schema(description = "Contains information about the document's text.")
-    AllDocumentTextData documentTextData;
+    DocumentTextData[] documentTextData;
     @Schema(description = "Contains information about the document's text positions.")
-    AllDocumentPositionData documentPositions;
+    DocumentPositionData[] documentPositions;
     @Schema(description = "Contains information about the document's semantic structure.")
-    DocumentStructureWrapper documentStructureWrapper;
-
-
-    public DocumentStructure getDocumentStructure() {
-
-        return documentStructureWrapper.getDocumentStructure();
-    }
+    DocumentStructure documentStructure;
 
 }

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

@@ -10,7 +10,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
-@Deprecated
 @Data
 @Builder
 @NoArgsConstructor

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

@@ -10,7 +10,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
-@Deprecated
 @Data
 @Builder
 @NoArgsConstructor

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

@@ -16,7 +16,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
-@Deprecated
 @Data
 @Builder
 @NoArgsConstructor

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

@@ -1,799 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
-
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// NO CHECKED-IN PROTOBUF GENCODE
-// source: DocumentStructure.proto
-// Protobuf Java Version: 4.27.1
-@SuppressWarnings("all")
-public final class DocumentStructureProto {
-
-    private DocumentStructureProto() {}
-
-
-    static {
-        com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-                /* major= */ 4,
-                /* minor= */ 27,
-                /* patch= */ 1,
-                /* suffix= */ "", DocumentStructureProto.class.getName());
-    }
-
-    public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {
-
-    }
-
-
-    public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
-
-        registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
-    }
-
-
-    public interface DocumentStructureOrBuilder extends
-            // @@protoc_insertion_point(interface_extends:DocumentStructure)
-            com.google.protobuf.MessageOrBuilder {
-
-        /**
-         * <pre>
-         * The root EntryData represents the Document.
-         * </pre>
-         *
-         * <code>.EntryData root = 1;</code>
-         *
-         * @return Whether the root field is set.
-         */
-        boolean hasRoot();
-
-
-        /**
-         * <pre>
-         * The root EntryData represents the Document.
-         * </pre>
-         *
-         * <code>.EntryData root = 1;</code>
-         *
-         * @return The root.
-         */
-        EntryDataProto.EntryData getRoot();
-
-
-        /**
-         * <pre>
-         * The root EntryData represents the Document.
-         * </pre>
-         *
-         * <code>.EntryData root = 1;</code>
-         */
-        EntryDataProto.EntryDataOrBuilder getRootOrBuilder();
-
-    }
-
-    /**
-     * Protobuf type {@code DocumentStructure}
-     */
-    public static final class DocumentStructure extends com.google.protobuf.GeneratedMessage implements
-            // @@protoc_insertion_point(message_implements:DocumentStructure)
-            DocumentStructureOrBuilder {
-
-        private static final long serialVersionUID = 0L;
-
-        static {
-            com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-                    /* major= */ 4,
-                    /* minor= */ 27,
-                    /* patch= */ 1,
-                    /* suffix= */ "", DocumentStructure.class.getName());
-        }
-
-        // Use DocumentStructure.newBuilder() to construct.
-        private DocumentStructure(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
-
-            super(builder);
-        }
-
-
-        private DocumentStructure() {
-
-        }
-
-
-        public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-
-            return DocumentStructureProto.internal_static_DocumentStructure_descriptor;
-        }
-
-
-        @Override
-        protected FieldAccessorTable internalGetFieldAccessorTable() {
-
-            return DocumentStructureProto.internal_static_DocumentStructure_fieldAccessorTable.ensureFieldAccessorsInitialized(DocumentStructure.class, Builder.class);
-        }
-
-
-        private int bitField0_;
-        public static final int ROOT_FIELD_NUMBER = 1;
-        private EntryDataProto.EntryData root_;
-
-
-        /**
-         * <pre>
-         * The root EntryData represents the Document.
-         * </pre>
-         *
-         * <code>.EntryData root = 1;</code>
-         *
-         * @return Whether the root field is set.
-         */
-        @Override
-        public boolean hasRoot() {
-
-            return ((bitField0_ & 0x00000001) != 0);
-        }
-
-
-        /**
-         * <pre>
-         * The root EntryData represents the Document.
-         * </pre>
-         *
-         * <code>.EntryData root = 1;</code>
-         *
-         * @return The root.
-         */
-        @Override
-        public EntryDataProto.EntryData getRoot() {
-
-            return root_ == null ? EntryDataProto.EntryData.getDefaultInstance() : root_;
-        }
-
-
-        /**
-         * <pre>
-         * The root EntryData represents the Document.
-         * </pre>
-         *
-         * <code>.EntryData root = 1;</code>
-         */
-        @Override
-        public EntryDataProto.EntryDataOrBuilder getRootOrBuilder() {
-
-            return root_ == null ? EntryDataProto.EntryData.getDefaultInstance() : root_;
-        }
-
-
-        private byte memoizedIsInitialized = -1;
-
-
-        @Override
-        public final boolean isInitialized() {
-
-            byte isInitialized = memoizedIsInitialized;
-          if (isInitialized == 1) {
-            return true;
-          }
-          if (isInitialized == 0) {
-            return false;
-          }
-
-            memoizedIsInitialized = 1;
-            return true;
-        }
-
-
-        @Override
-        public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-
-            if (((bitField0_ & 0x00000001) != 0)) {
-                output.writeMessage(1, getRoot());
-            }
-            getUnknownFields().writeTo(output);
-        }
-
-
-        @Override
-        public int getSerializedSize() {
-
-            int size = memoizedSize;
-          if (size != -1) {
-            return size;
-          }
-
-            size = 0;
-            if (((bitField0_ & 0x00000001) != 0)) {
-                size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getRoot());
-            }
-            size += getUnknownFields().getSerializedSize();
-            memoizedSize = size;
-            return size;
-        }
-
-
-        @Override
-        public boolean equals(final Object obj) {
-
-            if (obj == this) {
-                return true;
-            }
-            if (!(obj instanceof DocumentStructure)) {
-                return super.equals(obj);
-            }
-            DocumentStructure other = (DocumentStructure) obj;
-
-          if (hasRoot() != other.hasRoot()) {
-            return false;
-          }
-            if (hasRoot()) {
-              if (!getRoot().equals(other.getRoot())) {
-                return false;
-              }
-            }
-          if (!getUnknownFields().equals(other.getUnknownFields())) {
-            return false;
-          }
-            return true;
-        }
-
-
-        @Override
-        public int hashCode() {
-
-            if (memoizedHashCode != 0) {
-                return memoizedHashCode;
-            }
-            int hash = 41;
-            hash = (19 * hash) + getDescriptor().hashCode();
-            if (hasRoot()) {
-                hash = (37 * hash) + ROOT_FIELD_NUMBER;
-                hash = (53 * hash) + getRoot().hashCode();
-            }
-            hash = (29 * hash) + getUnknownFields().hashCode();
-            memoizedHashCode = hash;
-            return hash;
-        }
-
-
-        public static DocumentStructure parseFrom(java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
-
-            return PARSER.parseFrom(data);
-        }
-
-
-        public static DocumentStructure parseFrom(java.nio.ByteBuffer data,
-                                                  com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException {
-
-            return PARSER.parseFrom(data, extensionRegistry);
-        }
-
-
-        public static DocumentStructure parseFrom(com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException {
-
-            return PARSER.parseFrom(data);
-        }
-
-
-        public static DocumentStructure parseFrom(com.google.protobuf.ByteString data,
-                                                  com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException {
-
-            return PARSER.parseFrom(data, extensionRegistry);
-        }
-
-
-        public static DocumentStructure parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
-
-            return PARSER.parseFrom(data);
-        }
-
-
-        public static DocumentStructure parseFrom(byte[] data,
-                                                  com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException {
-
-            return PARSER.parseFrom(data, extensionRegistry);
-        }
-
-
-        public static DocumentStructure parseFrom(java.io.InputStream input) throws java.io.IOException {
-
-            return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
-        }
-
-
-        public static DocumentStructure parseFrom(java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
-
-            return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input, extensionRegistry);
-        }
-
-
-        public static DocumentStructure parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
-
-            return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input);
-        }
-
-
-        public static DocumentStructure parseDelimitedFrom(java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
-
-            return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-        }
-
-
-        public static DocumentStructure parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-
-            return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
-        }
-
-
-        public static DocumentStructure parseFrom(com.google.protobuf.CodedInputStream input,
-                                                  com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
-
-            return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input, extensionRegistry);
-        }
-
-
-        @Override
-        public Builder newBuilderForType() {return newBuilder();}
-
-
-        public static Builder newBuilder() {
-
-            return DEFAULT_INSTANCE.toBuilder();
-        }
-
-
-        public static Builder newBuilder(DocumentStructure prototype) {
-
-            return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-        }
-
-
-        @Override
-        public Builder toBuilder() {
-
-            return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
-        }
-
-
-        @Override
-        protected Builder newBuilderForType(BuilderParent parent) {
-
-            Builder builder = new Builder(parent);
-            return builder;
-        }
-
-
-        /**
-         * Protobuf type {@code DocumentStructure}
-         */
-        public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-                // @@protoc_insertion_point(builder_implements:DocumentStructure)
-                DocumentStructureOrBuilder {
-
-            public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-
-                return DocumentStructureProto.internal_static_DocumentStructure_descriptor;
-            }
-
-
-            @Override
-            protected FieldAccessorTable internalGetFieldAccessorTable() {
-
-                return DocumentStructureProto.internal_static_DocumentStructure_fieldAccessorTable.ensureFieldAccessorsInitialized(DocumentStructure.class, Builder.class);
-            }
-
-
-            // Construct using DocumentStructureOuterClass.DocumentStructure.newBuilder()
-            private Builder() {
-
-                maybeForceBuilderInitialization();
-            }
-
-
-            private Builder(BuilderParent parent) {
-
-                super(parent);
-                maybeForceBuilderInitialization();
-            }
-
-
-            private void maybeForceBuilderInitialization() {
-
-                if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-                    getRootFieldBuilder();
-                }
-            }
-
-
-            @Override
-            public Builder clear() {
-
-                super.clear();
-                bitField0_ = 0;
-                root_ = null;
-                if (rootBuilder_ != null) {
-                    rootBuilder_.dispose();
-                    rootBuilder_ = null;
-                }
-                return this;
-            }
-
-
-            @Override
-            public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-
-                return DocumentStructureProto.internal_static_DocumentStructure_descriptor;
-            }
-
-
-            @Override
-            public DocumentStructure getDefaultInstanceForType() {
-
-                return DocumentStructure.getDefaultInstance();
-            }
-
-
-            @Override
-            public DocumentStructure build() {
-
-                DocumentStructure result = buildPartial();
-                if (!result.isInitialized()) {
-                    throw newUninitializedMessageException(result);
-                }
-                return result;
-            }
-
-
-            @Override
-            public DocumentStructure buildPartial() {
-
-                DocumentStructure result = new DocumentStructure(this);
-                if (bitField0_ != 0) {
-                    buildPartial0(result);
-                }
-                onBuilt();
-                return result;
-            }
-
-
-            private void buildPartial0(DocumentStructure result) {
-
-                int from_bitField0_ = bitField0_;
-                int to_bitField0_ = 0;
-                if (((from_bitField0_ & 0x00000001) != 0)) {
-                    result.root_ = rootBuilder_ == null ? root_ : rootBuilder_.build();
-                    to_bitField0_ |= 0x00000001;
-                }
-                result.bitField0_ |= to_bitField0_;
-            }
-
-
-            @Override
-            public Builder mergeFrom(com.google.protobuf.Message other) {
-
-                if (other instanceof DocumentStructure) {
-                    return mergeFrom((DocumentStructure) other);
-                } else {
-                    super.mergeFrom(other);
-                    return this;
-                }
-            }
-
-
-            public Builder mergeFrom(DocumentStructure other) {
-
-              if (other == DocumentStructure.getDefaultInstance()) {
-                return this;
-              }
-                if (other.hasRoot()) {
-                    mergeRoot(other.getRoot());
-                }
-                this.mergeUnknownFields(other.getUnknownFields());
-                onChanged();
-                return this;
-            }
-
-
-            @Override
-            public final boolean isInitialized() {
-
-                return true;
-            }
-
-
-            @Override
-            public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
-
-                if (extensionRegistry == null) {
-                    throw new NullPointerException();
-                }
-                try {
-                    boolean done = false;
-                    while (!done) {
-                        int tag = input.readTag();
-                        switch (tag) {
-                            case 0:
-                                done = true;
-                                break;
-                            case 10: {
-                                input.readMessage(getRootFieldBuilder().getBuilder(), extensionRegistry);
-                                bitField0_ |= 0x00000001;
-                                break;
-                            } // case 10
-                            default: {
-                                if (!super.parseUnknownField(input, extensionRegistry, tag)) {
-                                    done = true; // was an endgroup tag
-                                }
-                                break;
-                            } // default:
-                        } // switch (tag)
-                    } // while (!done)
-                } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                    throw e.unwrapIOException();
-                } finally {
-                    onChanged();
-                } // finally
-                return this;
-            }
-
-
-            private int bitField0_;
-
-            private EntryDataProto.EntryData root_;
-            private com.google.protobuf.SingleFieldBuilder<EntryDataProto.EntryData, EntryDataProto.EntryData.Builder, EntryDataProto.EntryDataOrBuilder> rootBuilder_;
-
-
-            /**
-             * <pre>
-             * The root EntryData represents the Document.
-             * </pre>
-             *
-             * <code>.EntryData root = 1;</code>
-             *
-             * @return Whether the root field is set.
-             */
-            public boolean hasRoot() {
-
-                return ((bitField0_ & 0x00000001) != 0);
-            }
-
-
-            /**
-             * <pre>
-             * The root EntryData represents the Document.
-             * </pre>
-             *
-             * <code>.EntryData root = 1;</code>
-             *
-             * @return The root.
-             */
-            public EntryDataProto.EntryData getRoot() {
-
-                if (rootBuilder_ == null) {
-                    return root_ == null ? EntryDataProto.EntryData.getDefaultInstance() : root_;
-                } else {
-                    return rootBuilder_.getMessage();
-                }
-            }
-
-
-            /**
-             * <pre>
-             * The root EntryData represents the Document.
-             * </pre>
-             *
-             * <code>.EntryData root = 1;</code>
-             */
-            public Builder setRoot(EntryDataProto.EntryData value) {
-
-                if (rootBuilder_ == null) {
-                    if (value == null) {
-                        throw new NullPointerException();
-                    }
-                    root_ = value;
-                } else {
-                    rootBuilder_.setMessage(value);
-                }
-                bitField0_ |= 0x00000001;
-                onChanged();
-                return this;
-            }
-
-
-            /**
-             * <pre>
-             * The root EntryData represents the Document.
-             * </pre>
-             *
-             * <code>.EntryData root = 1;</code>
-             */
-            public Builder setRoot(EntryDataProto.EntryData.Builder builderForValue) {
-
-                if (rootBuilder_ == null) {
-                    root_ = builderForValue.build();
-                } else {
-                    rootBuilder_.setMessage(builderForValue.build());
-                }
-                bitField0_ |= 0x00000001;
-                onChanged();
-                return this;
-            }
-
-
-            /**
-             * <pre>
-             * The root EntryData represents the Document.
-             * </pre>
-             *
-             * <code>.EntryData root = 1;</code>
-             */
-            public Builder mergeRoot(EntryDataProto.EntryData value) {
-
-                if (rootBuilder_ == null) {
-                    if (((bitField0_ & 0x00000001) != 0) && root_ != null && root_ != EntryDataProto.EntryData.getDefaultInstance()) {
-                        getRootBuilder().mergeFrom(value);
-                    } else {
-                        root_ = value;
-                    }
-                } else {
-                    rootBuilder_.mergeFrom(value);
-                }
-                if (root_ != null) {
-                    bitField0_ |= 0x00000001;
-                    onChanged();
-                }
-                return this;
-            }
-
-
-            /**
-             * <pre>
-             * The root EntryData represents the Document.
-             * </pre>
-             *
-             * <code>.EntryData root = 1;</code>
-             */
-            public Builder clearRoot() {
-
-                bitField0_ = (bitField0_ & ~0x00000001);
-                root_ = null;
-                if (rootBuilder_ != null) {
-                    rootBuilder_.dispose();
-                    rootBuilder_ = null;
-                }
-                onChanged();
-                return this;
-            }
-
-
-            /**
-             * <pre>
-             * The root EntryData represents the Document.
-             * </pre>
-             *
-             * <code>.EntryData root = 1;</code>
-             */
-            public EntryDataProto.EntryData.Builder getRootBuilder() {
-
-                bitField0_ |= 0x00000001;
-                onChanged();
-                return getRootFieldBuilder().getBuilder();
-            }
-
-
-            /**
-             * <pre>
-             * The root EntryData represents the Document.
-             * </pre>
-             *
-             * <code>.EntryData root = 1;</code>
-             */
-            public EntryDataProto.EntryDataOrBuilder getRootOrBuilder() {
-
-                if (rootBuilder_ != null) {
-                    return rootBuilder_.getMessageOrBuilder();
-                } else {
-                    return root_ == null ? EntryDataProto.EntryData.getDefaultInstance() : root_;
-                }
-            }
-
-
-            /**
-             * <pre>
-             * The root EntryData represents the Document.
-             * </pre>
-             *
-             * <code>.EntryData root = 1;</code>
-             */
-            private com.google.protobuf.SingleFieldBuilder<EntryDataProto.EntryData, EntryDataProto.EntryData.Builder, EntryDataProto.EntryDataOrBuilder> getRootFieldBuilder() {
-
-                if (rootBuilder_ == null) {
-                    rootBuilder_ = new com.google.protobuf.SingleFieldBuilder<EntryDataProto.EntryData, EntryDataProto.EntryData.Builder, EntryDataProto.EntryDataOrBuilder>(getRoot(),
-                                                                                                                                                                             getParentForChildren(),
-                                                                                                                                                                             isClean());
-                    root_ = null;
-                }
-                return rootBuilder_;
-            }
-
-            // @@protoc_insertion_point(builder_scope:DocumentStructure)
-        }
-
-        // @@protoc_insertion_point(class_scope:DocumentStructure)
-        private static final DocumentStructure DEFAULT_INSTANCE;
-
-        static {
-            DEFAULT_INSTANCE = new DocumentStructure();
-        }
-
-        public static DocumentStructure getDefaultInstance() {
-
-            return DEFAULT_INSTANCE;
-        }
-
-
-        private static final com.google.protobuf.Parser<DocumentStructure> PARSER = new com.google.protobuf.AbstractParser<DocumentStructure>() {
-            @Override
-            public DocumentStructure parsePartialFrom(com.google.protobuf.CodedInputStream input,
-                                                      com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException {
-
-                Builder builder = newBuilder();
-                try {
-                    builder.mergeFrom(input, extensionRegistry);
-                } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-                    throw e.setUnfinishedMessage(builder.buildPartial());
-                } catch (com.google.protobuf.UninitializedMessageException e) {
-                    throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
-                } catch (java.io.IOException e) {
-                    throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(builder.buildPartial());
-                }
-                return builder.buildPartial();
-            }
-        };
-
-
-        public static com.google.protobuf.Parser<DocumentStructure> parser() {
-
-            return PARSER;
-        }
-
-
-        @Override
-        public com.google.protobuf.Parser<DocumentStructure> getParserForType() {
-
-            return PARSER;
-        }
-
-
-        @Override
-        public DocumentStructure getDefaultInstanceForType() {
-
-            return DEFAULT_INSTANCE;
-        }
-
-    }
-
-    private static final com.google.protobuf.Descriptors.Descriptor internal_static_DocumentStructure_descriptor;
-    private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_DocumentStructure_fieldAccessorTable;
-
-
-    public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
-
-        return descriptor;
-    }
-
-
-    private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
-
-    static {
-        String[] descriptorData = {"\n\027DocumentStructure.proto\032\017EntryData.pro"
-                                   + "to\"-\n\021DocumentStructure\022\030\n\004root\030\001 \001(\0132\n."
-                                   + "EntryDatab\006proto3"};
-        descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData,
-                                                                                                   new com.google.protobuf.Descriptors.FileDescriptor[]{EntryDataProto.getDescriptor(),});
-        internal_static_DocumentStructure_descriptor = getDescriptor().getMessageTypes()
-                .get(0);
-        internal_static_DocumentStructure_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable(internal_static_DocumentStructure_descriptor,
-                                                                                                                           new String[]{"Root",});
-        descriptor.resolveAllFeaturesImmutable();
-        EntryDataProto.getDescriptor();
-    }
-
-    // @@protoc_insertion_point(outer_class_scope)
-}

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

@@ -1,126 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
-
-import static com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructureProto.DocumentStructure;
-
-import java.awt.geom.Rectangle2D;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Stream;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.EntryDataProto.EntryData;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class DocumentStructureWrapper implements Serializable {
-
-    private final DocumentStructure documentStructure;
-
-
-    @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 documentStructure.getRoot();
-        }
-        EntryData entry = documentStructure.getRoot().getChildrenList()
-                .get(tocId.get(0));
-        for (int id : tocId.subList(1, tocId.size())) {
-            entry = entry.getChildrenList()
-                    .get(id);
-        }
-        return entry;
-    }
-
-
-    public Stream<EntryData> streamAllEntries() {
-
-        return Stream.concat(Stream.of(documentStructure.getRoot()),
-                             documentStructure.getRoot().getChildrenList()
-                                     .stream())
-                .flatMap(DocumentStructureWrapper::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.getChildrenList()
-                                     .stream()
-                                     .flatMap(DocumentStructureWrapper::flatten));
-    }
-
-}

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

@@ -10,7 +10,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
-@Deprecated
 @Data
 @Builder
 @NoArgsConstructor

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

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

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

@@ -1,193 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
-
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// NO CHECKED-IN PROTOBUF GENCODE
-// source: LayoutEngine.proto
-// Protobuf Java Version: 4.27.1
-@SuppressWarnings("all")
-public final class LayoutEngineProto {
-
-    private LayoutEngineProto() {}
-
-
-    static {
-        com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-                /* major= */ 4,
-                /* minor= */ 27,
-                /* patch= */ 1,
-                /* suffix= */ "", LayoutEngineProto.class.getName());
-    }
-
-    public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {
-
-    }
-
-
-    public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
-
-        registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
-    }
-
-
-    /**
-     * Protobuf enum {@code LayoutEngine}
-     */
-    public enum LayoutEngine implements com.google.protobuf.ProtocolMessageEnum {
-        /**
-         * <code>ALGORITHM = 0;</code>
-         */
-        ALGORITHM(0),
-        /**
-         * <code>AI = 1;</code>
-         */
-        AI(1),
-        /**
-         * <code>OUTLINE = 2;</code>
-         */
-        OUTLINE(2),
-        UNRECOGNIZED(-1),
-        ;
-
-
-        static {
-            com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-                    /* major= */ 4,
-                    /* minor= */ 27,
-                    /* patch= */ 1,
-                    /* suffix= */ "", LayoutEngine.class.getName());
-        }
-
-        /**
-         * <code>ALGORITHM = 0;</code>
-         */
-        public static final int ALGORITHM_VALUE = 0;
-        /**
-         * <code>AI = 1;</code>
-         */
-        public static final int AI_VALUE = 1;
-        /**
-         * <code>OUTLINE = 2;</code>
-         */
-        public static final int OUTLINE_VALUE = 2;
-
-
-        public final int getNumber() {
-
-            if (this == UNRECOGNIZED) {
-                throw new IllegalArgumentException("Can't get the number of an unknown enum value.");
-            }
-            return value;
-        }
-
-
-        /**
-         * @param value The numeric wire value of the corresponding enum entry.
-         * @return The enum associated with the given numeric wire value.
-         * @deprecated Use {@link #forNumber(int)} instead.
-         */
-        @Deprecated
-        public static LayoutEngine valueOf(int value) {
-
-            return forNumber(value);
-        }
-
-
-        /**
-         * @param value The numeric wire value of the corresponding enum entry.
-         * @return The enum associated with the given numeric wire value.
-         */
-        public static LayoutEngine forNumber(int value) {
-
-            switch (value) {
-                case 0:
-                    return ALGORITHM;
-                case 1:
-                    return AI;
-                case 2:
-                    return OUTLINE;
-                default:
-                    return null;
-            }
-        }
-
-
-        public static com.google.protobuf.Internal.EnumLiteMap<LayoutEngine> internalGetValueMap() {
-
-            return internalValueMap;
-        }
-
-
-        private static final com.google.protobuf.Internal.EnumLiteMap<LayoutEngine> internalValueMap = new com.google.protobuf.Internal.EnumLiteMap<LayoutEngine>() {
-            public LayoutEngine findValueByNumber(int number) {
-
-                return LayoutEngine.forNumber(number);
-            }
-        };
-
-
-        public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
-
-            if (this == UNRECOGNIZED) {
-                throw new IllegalStateException("Can't get the descriptor of an unrecognized enum value.");
-            }
-            return getDescriptor().getValues()
-                    .get(ordinal());
-        }
-
-
-        public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
-
-            return getDescriptor();
-        }
-
-
-        public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-
-            return LayoutEngineProto.getDescriptor().getEnumTypes()
-                    .get(0);
-        }
-
-
-        private static final LayoutEngine[] VALUES = values();
-
-
-        public static LayoutEngine valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-
-            if (desc.getType() != getDescriptor()) {
-                throw new IllegalArgumentException("EnumValueDescriptor is not for this type.");
-            }
-            if (desc.getIndex() == -1) {
-                return UNRECOGNIZED;
-            }
-            return VALUES[desc.getIndex()];
-        }
-
-
-        private final int value;
-
-
-        private LayoutEngine(int value) {
-
-            this.value = value;
-        }
-
-        // @@protoc_insertion_point(enum_scope:LayoutEngine)
-    }
-
-
-    public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
-
-        return descriptor;
-    }
-
-
-    private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
-
-    static {
-        String[] descriptorData = {"\n\022LayoutEngine.proto*2\n\014LayoutEngine\022\r\n\t" + "ALGORITHM\020\000\022\006\n\002AI\020\001\022\013\n\007OUTLINE\020\002b\006proto3"};
-        descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[]{});
-        descriptor.resolveAllFeaturesImmutable();
-    }
-
-    // @@protoc_insertion_point(outer_class_scope)
-}

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

@@ -3,7 +3,6 @@ package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
 import java.io.Serializable;
 import java.util.Locale;
 
-@Deprecated
 public enum NodeType implements Serializable {
     DOCUMENT,
     SECTION,

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

@@ -1,274 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
-
-import java.util.Locale;
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// NO CHECKED-IN PROTOBUF GENCODE
-// source: NodeType.proto
-// Protobuf Java Version: 4.27.1
-@SuppressWarnings("all")
-public final class NodeTypeProto {
-
-    private NodeTypeProto() {}
-
-
-    static {
-        com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-                /* major= */ 4,
-                /* minor= */ 27,
-                /* patch= */ 1,
-                /* suffix= */ "", NodeTypeProto.class.getName());
-    }
-
-    public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {
-
-    }
-
-
-    public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
-
-        registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
-    }
-
-
-    /**
-     * Protobuf enum {@code NodeType}
-     */
-    public enum NodeType implements com.google.protobuf.ProtocolMessageEnum {
-        /**
-         * <code>DOCUMENT = 0;</code>
-         */
-        DOCUMENT(0),
-        /**
-         * <code>SECTION = 1;</code>
-         */
-        SECTION(1),
-        /**
-         * <code>SUPER_SECTION = 2;</code>
-         */
-        SUPER_SECTION(2),
-        /**
-         * <code>HEADLINE = 3;</code>
-         */
-        HEADLINE(3),
-        /**
-         * <code>PARAGRAPH = 4;</code>
-         */
-        PARAGRAPH(4),
-        /**
-         * <code>TABLE = 5;</code>
-         */
-        TABLE(5),
-        /**
-         * <code>TABLE_CELL = 6;</code>
-         */
-        TABLE_CELL(6),
-        /**
-         * <code>IMAGE = 7;</code>
-         */
-        IMAGE(7),
-        /**
-         * <code>HEADER = 8;</code>
-         */
-        HEADER(8),
-        /**
-         * <code>FOOTER = 9;</code>
-         */
-        FOOTER(9),
-        UNRECOGNIZED(-1),
-        ;
-
-
-        public String toString() {
-
-            return this.name().charAt(0) + this.name().substring(1).toLowerCase(Locale.ROOT);
-        }
-
-
-        static {
-            com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
-                    /* major= */ 4,
-                    /* minor= */ 27,
-                    /* patch= */ 1,
-                    /* suffix= */ "", NodeType.class.getName());
-        }
-
-        /**
-         * <code>DOCUMENT = 0;</code>
-         */
-        public static final int DOCUMENT_VALUE = 0;
-        /**
-         * <code>SECTION = 1;</code>
-         */
-        public static final int SECTION_VALUE = 1;
-        /**
-         * <code>SUPER_SECTION = 2;</code>
-         */
-        public static final int SUPER_SECTION_VALUE = 2;
-        /**
-         * <code>HEADLINE = 3;</code>
-         */
-        public static final int HEADLINE_VALUE = 3;
-        /**
-         * <code>PARAGRAPH = 4;</code>
-         */
-        public static final int PARAGRAPH_VALUE = 4;
-        /**
-         * <code>TABLE = 5;</code>
-         */
-        public static final int TABLE_VALUE = 5;
-        /**
-         * <code>TABLE_CELL = 6;</code>
-         */
-        public static final int TABLE_CELL_VALUE = 6;
-        /**
-         * <code>IMAGE = 7;</code>
-         */
-        public static final int IMAGE_VALUE = 7;
-        /**
-         * <code>HEADER = 8;</code>
-         */
-        public static final int HEADER_VALUE = 8;
-        /**
-         * <code>FOOTER = 9;</code>
-         */
-        public static final int FOOTER_VALUE = 9;
-
-
-        public final int getNumber() {
-
-            if (this == UNRECOGNIZED) {
-                throw new IllegalArgumentException("Can't get the number of an unknown enum value.");
-            }
-            return value;
-        }
-
-
-        /**
-         * @param value The numeric wire value of the corresponding enum entry.
-         * @return The enum associated with the given numeric wire value.
-         * @deprecated Use {@link #forNumber(int)} instead.
-         */
-        @Deprecated
-        public static NodeType valueOf(int value) {
-
-            return forNumber(value);
-        }
-
-
-        /**
-         * @param value The numeric wire value of the corresponding enum entry.
-         * @return The enum associated with the given numeric wire value.
-         */
-        public static NodeType forNumber(int value) {
-
-            switch (value) {
-                case 0:
-                    return DOCUMENT;
-                case 1:
-                    return SECTION;
-                case 2:
-                    return SUPER_SECTION;
-                case 3:
-                    return HEADLINE;
-                case 4:
-                    return PARAGRAPH;
-                case 5:
-                    return TABLE;
-                case 6:
-                    return TABLE_CELL;
-                case 7:
-                    return IMAGE;
-                case 8:
-                    return HEADER;
-                case 9:
-                    return FOOTER;
-                default:
-                    return null;
-            }
-        }
-
-
-        public static com.google.protobuf.Internal.EnumLiteMap<NodeType> internalGetValueMap() {
-
-            return internalValueMap;
-        }
-
-
-        private static final com.google.protobuf.Internal.EnumLiteMap<NodeType> internalValueMap = new com.google.protobuf.Internal.EnumLiteMap<NodeType>() {
-            public NodeType findValueByNumber(int number) {
-
-                return NodeType.forNumber(number);
-            }
-        };
-
-
-        public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
-
-            if (this == UNRECOGNIZED) {
-                throw new IllegalStateException("Can't get the descriptor of an unrecognized enum value.");
-            }
-            return getDescriptor().getValues()
-                    .get(ordinal());
-        }
-
-
-        public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
-
-            return getDescriptor();
-        }
-
-
-        public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
-
-            return NodeTypeProto.getDescriptor().getEnumTypes()
-                    .get(0);
-        }
-
-
-        private static final NodeType[] VALUES = values();
-
-
-        public static NodeType valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-
-            if (desc.getType() != getDescriptor()) {
-                throw new IllegalArgumentException("EnumValueDescriptor is not for this type.");
-            }
-            if (desc.getIndex() == -1) {
-                return UNRECOGNIZED;
-            }
-            return VALUES[desc.getIndex()];
-        }
-
-
-        private final int value;
-
-
-        private NodeType(int value) {
-
-            this.value = value;
-        }
-
-        // @@protoc_insertion_point(enum_scope:NodeType)
-    }
-
-
-    public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
-
-        return descriptor;
-    }
-
-
-    private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
-
-    static {
-        String[] descriptorData = {"\n\016NodeType.proto*\223\001\n\010NodeType\022\014\n\010DOCUMEN"
-                                   + "T\020\000\022\013\n\007SECTION\020\001\022\021\n\rSUPER_SECTION\020\002\022\014\n\010H"
-                                   + "EADLINE\020\003\022\r\n\tPARAGRAPH\020\004\022\t\n\005TABLE\020\005\022\016\n\nT"
-                                   + "ABLE_CELL\020\006\022\t\n\005IMAGE\020\007\022\n\n\006HEADER\020\010\022\n\n\006FO"
-                                   + "OTER\020\tb\006proto3"};
-        descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[]{});
-        descriptor.resolveAllFeaturesImmutable();
-    }
-
-    // @@protoc_insertion_point(outer_class_scope)
-}

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

@@ -19,16 +19,6 @@ public class SimplifiedText {
     @Schema(description = "Number of pages in the entire document.")
     private int numberOfPages;
     @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/data/taas/StructureObject.java

@@ -1,7 +1,5 @@
 package com.knecon.fforesight.service.layoutparser.internal.api.data.taas;
 
-import java.util.List;
-
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -15,8 +13,6 @@ public class StructureObject {
 
     @Schema(description = "The ID of this StructureObject.")
     Integer structureObjectNumber;
-    @Schema(description = "The Tree ID of this StructureObject.")
-    List<Integer> treeId;
     @Schema(description = "This value indicates the start of the string offsets in this Object, with respect to the reading order.")
     int page;
     @Schema(description = "This stringOffset indicates the start of the string offsets in this Object, with respect to the reading order of the entire document. It is equal to the previous' StructureObject stringOffset + its length.")

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

@@ -2,9 +2,6 @@ package com.knecon.fforesight.service.layoutparser.internal.api.queue;
 
 public class LayoutParsingQueueNames {
 
-    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";
+    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";
 }

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

@@ -19,6 +19,7 @@ public record LayoutParsingRequest(
         @Schema(description = "Path to the original PDF file.")//
         @NonNull String originFileStorageId,//
 
+
         @Schema(description = "Optional Path to the table extraction file.")//
         Optional<String> tablesFileStorageId,//
         @Schema(description = "Optional Path to the image classification file.")//
@@ -36,12 +37,9 @@ public record LayoutParsingRequest(
         @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
-) {
+        @NonNull String viewerDocumentStorageId) {
 
 }

layoutparser-service/layoutparser-service-internal-api/src/main/resources/DocumentPage.proto

@@ -1,21 +0,0 @@
-syntax = "proto3";
-
-message AllDocumentPages {
-
-  repeated DocumentPage documentPages = 1;
-}
-
-message DocumentPage {
-  // The page number, starting with 1.
-  int32 number = 1;
-
-  // The page height in PDF user units.
-  int32 height = 2;
-
-  // The page width in PDF user units.
-  int32 width = 3;
-
-  // The page rotation as specified by the PDF.
-  int32 rotation = 4;
-}
-

layoutparser-service/layoutparser-service-internal-api/src/main/resources/DocumentPositionData.proto

@@ -1,25 +0,0 @@
-syntax = "proto3";
-
-message AllDocumentPositionData {
-
-  repeated DocumentPositionData documentPositionData = 1;
-}
-
-message DocumentPositionData {
-  // Identifier of the text block.
-  int64 id = 1;
-
-  // 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.
-  repeated int32 stringIdxToPositionIdx = 2;
-
-  // 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.
-  repeated Position positions = 3;
-
-  // Definition of a BoundingBox that contains x, y, width, and height.
-  message Position {
-    repeated float value = 1;
-  }
-}

layoutparser-service/layoutparser-service-internal-api/src/main/resources/DocumentStructure.proto

@@ -1,8 +0,0 @@
-syntax = "proto3";
-
-import "EntryData.proto";
-
-message DocumentStructure {
-  // The root EntryData represents the Document.
-  EntryData root = 1;
-}

layoutparser-service/layoutparser-service-internal-api/src/main/resources/DocumentTextData.proto

@@ -1,29 +0,0 @@
-syntax = "proto3";
-
-message AllDocumentTextData {
-
-  repeated DocumentTextData documentTextData = 1;
-}
-
-message DocumentTextData {
-  // Identifier of the text block.
-  int64 id = 1;
-
-  // The page the text block occurs on.
-  int64 page = 2;
-
-  // The text of the text block.
-  string searchText = 3;
-
-  // Each text block is assigned a number on a page, starting from 0.
-  int32 numberOnPage = 4;
-
-  // The text blocks are ordered, this number represents the start of the text block as a string offset.
-  int32 start = 5;
-
-  // The text blocks are ordered, this number represents the end of the text block as a string offset.
-  int32 end = 6;
-
-  // 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.
-  repeated int32 lineBreaks = 7;
-}

layoutparser-service/layoutparser-service-internal-api/src/main/resources/EntryData.proto

@@ -1,27 +0,0 @@
-syntax = "proto3";
-
-import "LayoutEngine.proto";
-import "NodeType.proto";
-
-message EntryData {
-  // Type of the semantic node.
-  NodeType type = 1;
-
-  // Specifies the position in the parsed tree structure.
-  repeated int32 treeId = 2;
-
-  // Specifies the text block IDs associated with this semantic node.
-  repeated int64 atomicBlockIds = 3;
-
-  // Specifies the pages this semantic node appears on.
-  repeated int64 pageNumbers = 4;
-
-  // Some semantic nodes have additional information, this information is stored in this Map.
-  map<string, string> properties = 5;
-
-  // All child Entries of this Entry.
-  repeated EntryData children = 6;
-
-  // Describes the origin of the semantic node.
-  repeated LayoutEngine engines = 7;
-}

layoutparser-service/layoutparser-service-internal-api/src/main/resources/LayoutEngine.proto

@@ -1,7 +0,0 @@
-syntax = "proto3";
-
-enum LayoutEngine {
-  ALGORITHM = 0;
-  AI = 1;
-  OUTLINE = 2;
-}

layoutparser-service/layoutparser-service-internal-api/src/main/resources/NodeType.proto

@@ -1,14 +0,0 @@
-syntax = "proto3";
-
-enum NodeType {
-  DOCUMENT = 0;
-  SECTION = 1;
-  SUPER_SECTION = 2;
-  HEADLINE = 3;
-  PARAGRAPH = 4;
-  TABLE = 5;
-  TABLE_CELL = 6;
-  IMAGE = 7;
-  HEADER = 8;
-  FOOTER = 9;
-}

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

@@ -12,14 +12,12 @@ dependencies {
     implementation(project(":layoutparser-service-internal-api"))
     implementation(project(":viewer-doc-processor"))
 
-    implementation("com.iqser.red.service:persistence-service-shared-api-v1:2.564.0-RED9010.0") {
+    implementation("com.iqser.red.service:persistence-service-shared-api-v1:2.144.0") {
         exclude("org.springframework.boot", "spring-boot-starter-security")
         exclude("org.springframework.boot", "spring-boot-starter-validation")
     }
-    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")
+    implementation("com.knecon.fforesight:tenant-commons:0.21.0")
+    implementation("com.iqser.red.commons:storage-commons:2.45.0")
 
     implementation("org.apache.pdfbox:pdfbox:${pdfBoxVersion}")
     implementation("org.apache.pdfbox:pdfbox-tools:${pdfBoxVersion}")
@@ -27,14 +25,5 @@ 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")
-
-    implementation("com.google.protobuf:protobuf-java-util:4.27.1")
 }

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

@@ -2,15 +2,13 @@ package com.knecon.fforesight.service.layoutparser.processor;
 
 import static java.lang.String.format;
 
-import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
 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;
@@ -22,16 +20,10 @@ import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.documentinterchange.markedcontent.PDMarkedContent;
 import org.springframework.stereotype.Service;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeTypeProto.NodeType;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.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.docstrum.model.Character;
-import com.knecon.fforesight.service.layoutparser.processor.model.table.Ruling;
-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.services.classification.ClassificationService;
-import com.knecon.fforesight.service.layoutparser.processor.services.mapper.MarkdownMapper;
 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;
@@ -46,7 +38,7 @@ import com.knecon.fforesight.service.layoutparser.processor.model.outline.TableO
 import com.knecon.fforesight.service.layoutparser.processor.model.table.Cell;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.CleanRulings;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
-import com.knecon.fforesight.service.layoutparser.processor.model.text.Word;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.adapter.CvTableParsingAdapter;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.adapter.ImageServiceResponseAdapter;
 import com.knecon.fforesight.service.layoutparser.processor.python_api.adapter.VisualLayoutParsingAdapter;
@@ -54,6 +46,7 @@ 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.RulingCleaningService;
 import com.knecon.fforesight.service.layoutparser.processor.services.SectionsBuilderService;
 import com.knecon.fforesight.service.layoutparser.processor.services.SimplifiedSectionTextService;
@@ -63,6 +56,9 @@ import com.knecon.fforesight.service.layoutparser.processor.services.blockificat
 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.factory.DocumentGraphFactory;
 import com.knecon.fforesight.service.layoutparser.processor.services.graphics.Box;
 import com.knecon.fforesight.service.layoutparser.processor.services.graphics.GraphicExtractorService;
@@ -72,7 +68,6 @@ import com.knecon.fforesight.service.layoutparser.processor.services.parsing.PDF
 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.utils.TextPositionOperations;
 
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
@@ -94,7 +89,10 @@ public class LayoutParsingPipeline {
     CvTableParsingAdapter cvTableParsingAdapter;
     LayoutParsingStorageService layoutParsingStorageService;
     SectionsBuilderService sectionsBuilderService;
+    RedactManagerClassificationService redactManagerClassificationService;
+    DocuMineClassificationService docuMineClassificationService;
     SimplifiedSectionTextService simplifiedSectionTextService;
+    BodyTextFrameService bodyTextFrameService;
     RulingCleaningService rulingCleaningService;
     TableExtractionService tableExtractionService;
     DocuMineBlockificationService docuMineBlockificationService;
@@ -104,12 +102,12 @@ public class LayoutParsingPipeline {
     LayoutGridService layoutGridService;
     ObservationRegistry observationRegistry;
     VisualLayoutParsingAdapter visualLayoutParsingAdapter;
+    ClarifyndClassificationService clarifyndClassificationService;
     GraphicExtractorService graphicExtractorService;
     OutlineExtractorService outlineExtractorService;
     OutlineValidationService outlineValidationService;
     TOCEnrichmentService tocEnrichmentService;
     LayoutparserSettings settings;
-    ClassificationService classificationService;
 
 
     public LayoutParsingFinishedEvent parseLayoutAndSaveFilesToStorage(LayoutParsingRequest layoutParsingRequest) throws IOException {
@@ -118,14 +116,29 @@ public class LayoutParsingPipeline {
         log.info("Starting layout parsing for {}", layoutParsingRequest.identifier());
 
         File originFile = layoutParsingStorageService.getOriginFile(layoutParsingRequest.originFileStorageId());
-        File viewerDocumentFile = layoutParsingStorageService.getViewerDocFile(layoutParsingRequest.viewerDocumentStorageId()).orElse(originFile);
+//        File viewerDocumentFile = layoutParsingStorageService.getViewerDocFile(layoutParsingRequest.viewerDocumentStorageId()).orElse(originFile);
+        File viewerDocumentFile = originFile;
 
-        VisualLayoutParsingResponse visualLayoutParsingResponse = layoutParsingRequest.visualLayoutParsingFileId()
-                .map(layoutParsingStorageService::getVisualLayoutParsingFile).orElse(new VisualLayoutParsingResponse());
-        ImageServiceResponse imageServiceResponse = layoutParsingRequest.imagesFileStorageId()
-                .map(layoutParsingStorageService::getImagesFile).orElse(new ImageServiceResponse());
-        TableServiceResponse tableServiceResponse = layoutParsingRequest.tablesFileStorageId()
-                .map(layoutParsingStorageService::getTablesFile).orElse(new TableServiceResponse());
+        VisualLayoutParsingResponse visualLayoutParsingResponse = new VisualLayoutParsingResponse();
+        if (layoutParsingRequest.visualLayoutParsingFileId()
+                .isPresent()) {
+            visualLayoutParsingResponse = layoutParsingStorageService.getVisualLayoutParsingFile(layoutParsingRequest.visualLayoutParsingFileId()
+                                                                                                         .get());
+        }
+
+        ImageServiceResponse imageServiceResponse = new ImageServiceResponse();
+        if (layoutParsingRequest.imagesFileStorageId()
+                .isPresent()) {
+            imageServiceResponse = layoutParsingStorageService.getImagesFile(layoutParsingRequest.imagesFileStorageId()
+                                                                                     .get());
+        }
+
+        TableServiceResponse tableServiceResponse = new TableServiceResponse();
+        if (layoutParsingRequest.tablesFileStorageId()
+                .isPresent()) {
+            tableServiceResponse = layoutParsingStorageService.getTablesFile(layoutParsingRequest.tablesFileStorageId()
+                                                                                     .get());
+        }
 
         ClassificationDocument classificationDocument = parseLayout(settings.getLayoutParsingTypeOverride() == null //
                                                                             ? layoutParsingRequest.layoutParsingType() : settings.getLayoutParsingTypeOverride(),
@@ -142,14 +155,16 @@ public class LayoutParsingPipeline {
 
         log.info("Creating viewer document for {}", layoutParsingRequest.identifier());
 
-        layoutGridService.addLayoutGrid(viewerDocumentFile, documentGraph, viewerDocumentFile, false);
+        layoutGridService.addLayoutGrid(viewerDocumentFile,
+                                        documentGraph,
+                                        viewerDocumentFile,
+                                        false,
+                                        layoutParsingRequest.visualLayoutParsingFileId()
+                                                .isPresent());
 
         log.info("Storing resulting files for {}", layoutParsingRequest.identifier());
 
         layoutParsingStorageService.storeDocumentData(layoutParsingRequest, DocumentDataMapper.toDocumentData(documentGraph));
-        if (layoutParsingRequest.documentMarkdownFileStorageId().isPresent()) {
-            layoutParsingStorageService.storeMarkdownFile(layoutParsingRequest.documentMarkdownFileStorageId().get(), new MarkdownMapper().toMarkdownContent(documentGraph));
-        }
         layoutParsingStorageService.storeSimplifiedText(layoutParsingRequest, simplifiedSectionTextService.toSimplifiedText(documentGraph));
         layoutParsingStorageService.storeViewerDocument(layoutParsingRequest, viewerDocumentFile);
 
@@ -160,9 +175,9 @@ public class LayoutParsingPipeline {
         }
 
         if (!viewerDocumentFile.equals(originFile)) {
-            assert !viewerDocumentFile.exists() || viewerDocumentFile.delete();
+            viewerDocumentFile.delete();
         }
-        assert !originFile.exists() || originFile.delete();
+        originFile.delete();
 
         return LayoutParsingFinishedEvent.builder()
                 .identifier(layoutParsingRequest.identifier())
@@ -234,16 +249,19 @@ public class LayoutParsingPipeline {
         Map<Integer, List<TableCells>> pdfTableCells = cvTableParsingAdapter.buildCvParsedTablesPerPage(tableServiceResponse);
         Map<Integer, List<ClassifiedImage>> pdfImages = imageServiceResponseAdapter.buildClassifiedImagesPerPage(imageServiceResponse);
         Map<Integer, List<ClassifiedImage>> signatures = visualLayoutParsingAdapter.buildExtractedSignaturesPerPage(visualLayoutParsingResponse);
-
         ClassificationDocument classificationDocument = new ClassificationDocument();
 
         if (settings.isDebug() || identifier.containsKey("debug")) {
-            classificationDocument.getLayoutDebugLayer().setActive(true);
+            classificationDocument.getVisualizations().setActive(true);
         }
 
         List<ClassificationPage> classificationPages = new ArrayList<>();
+        OutlineObject lastProcessedOutlineObject = null;
 
-        classificationDocument.setOutlineObjectTree(outlineExtractorService.getOutlineObjectTree(originDocument));
+        // 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();
 
@@ -267,55 +285,69 @@ public class LayoutParsingPipeline {
             stripper.setStartPage(pageNumber);
             stripper.setEndPage(pageNumber);
             stripper.setPdpage(pdPage);
-            stripper.getText(originDocument);
-            List<Word> words = stripper.getWords();
-
-//            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.sortWords(lines);
+                stripper.setSortByPosition(true);
             }
-            classificationDocument.getLayoutDebugLayer().addTextVisualizations(words, pageNumber);
+            stripper.getText(originDocument);
+            List<TextPositionSequence> words = stripper.getTextPositionSequences();
+            classificationDocument.getVisualizations().addTextVisualizations(words, pageNumber);
 
             PDRectangle pdr = pdPage.getMediaBox();
 
-            List<Ruling> rulings = stripper.getRulings();
-            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.getVisualizations().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.getVisualizations().addCellVisualizations(emptyTableCells, pageNumber);
 
             TextRulingsClassifier.classifyUnderlinedAndStrikethroughText(words, cleanRulings);
 
-            List<Box> graphics = graphicExtractorService.extractPathElementGraphics(originDocument, pdPage, pageNumber, cleanRulings, stripper.getWords(), false);
+            List<Box> graphics = graphicExtractorService.extractPathElementGraphics(originDocument, pdPage, pageNumber, cleanRulings, stripper.getTextPositionSequences(),
+
+                                                                                    false);
 
             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(),
-                                                                  ""))
+                                    .map(g -> new ClassifiedImage(new Rectangle2D.Double(g.x1, g.y1, g.width(), g.height()), ImageType.GRAPHIC, false, stripper.getPageNumber()))
                                     .toList());
 
             ClassificationPage classificationPage = switch (layoutParsingType) {
-                case REDACT_MANAGER_OLD -> redactManagerBlockificationService.blockify(stripper.getWords(), cleanRulings, classificationDocument.getLayoutDebugLayer());
+                case REDACT_MANAGER_OLD ->
+                        redactManagerBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings, classificationDocument.getVisualizations());
                 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);
+                        docstrumBlockificationService.blockify(words, cleanRulings, true, classificationDocument.getVisualizations(), layoutParsingType);
                 case CLARIFYND, CLARIFYND_PARAGRAPH_DEBUG ->
-                        docstrumBlockificationService.blockify(words, cleanRulings, false, classificationDocument.getLayoutDebugLayer(), layoutParsingType);
+                        docstrumBlockificationService.blockify(words, cleanRulings, false, classificationDocument.getVisualizations(), layoutParsingType);
             };
 
-            updateClassificationPage(pdPage, pdr, classificationPage, cleanRulings, pageNumber, pageInformation);
+            classificationPage.setCleanRulings(cleanRulings);
+            classificationPage.setRotation(rotation);
+            classificationPage.setLandscape(isLandscape);
+            classificationPage.setPageNumber(pageNumber);
+            classificationPage.setPageWidth(cropbox.getWidth());
+            classificationPage.setPageHeight(cropbox.getHeight());
 
-            blockificationPostprocessingService.findHeadlinesFromOutline(classificationDocument, pageNumber, classificationPage, pageInformation);
+            if (layoutParsingType != LayoutParsingType.REDACT_MANAGER_OLD && layoutParsingType != LayoutParsingType.DOCUMINE_OLD) {
+                List<OutlineObject> outlineObjects = classificationDocument.getOutlineObjectTree().getOutlineObjectsPerPage().getOrDefault(pageNumber - 1, new ArrayList<>());
 
-            classificationDocument.getLayoutDebugLayer().addMarkedContentVisualizations(stripper.getMarkedContents(), pageNumber);
+                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);
+                }
+            }
+
+            classificationDocument.getVisualizations().addMarkedContentVisualizations(stripper.getMarkedContents(), pageNumber);
             // MarkedContent needs to be converted at this point, otherwise it leads to GC Problems in Pdfbox.
             classificationPage.setMarkedContentBboxPerType(convertMarkedContents(stripper.getMarkedContents()));
 
@@ -343,9 +375,27 @@ public class LayoutParsingPipeline {
 
         originDocument.close();
 
-        classificationService.classify(classificationDocument, layoutParsingType, identifier);
+        log.info("Calculating BodyTextFrame for {}", identifier);
+        bodyTextFrameService.setBodyTextFrames(classificationDocument, layoutParsingType);
+        for (ClassificationPage page : classificationDocument.getPages()) {
+            classificationDocument.getVisualizations().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);
+        }
 
-        TableOfContents tableOfContents = outlineValidationService.createToC(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);
 
         log.info("Building Sections for {}", identifier);
@@ -359,50 +409,6 @@ public class LayoutParsingPipeline {
     }
 
 
-    private static void updateClassificationPage(PDPage pdPage,
-                                                 PDRectangle pdr,
-                                                 ClassificationPage classificationPage,
-                                                 CleanRulings cleanRulings,
-                                                 int pageNumber,
-                                                 PageInformation pageInformation) {
-
-        int rotation = pdPage.getRotation();
-        boolean isLandscape = pdr.getWidth() > pdr.getHeight() && (rotation == 0 || rotation == 180) || pdr.getHeight() > pdr.getWidth() && (rotation == 90 || rotation == 270);
-        classificationPage.setCleanRulings(cleanRulings);
-        classificationPage.setRotation(rotation);
-        classificationPage.setLandscape(isLandscape);
-        classificationPage.setPageNumber(pageNumber);
-        classificationPage.setPageWidth((float) pageInformation.width());
-        classificationPage.setPageHeight((float) pageInformation.height());
-    }
-
-
-    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) {
@@ -444,10 +450,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).getWords() == null) {
+                if (((TextPageBlock) textBlock).getSequences() == null) {
                     continue;
                 }
-                for (Word word : ((TextPageBlock) textBlock).getWords()) {
+                for (TextPositionSequence word : ((TextPageBlock) textBlock).getSequences()) {
                     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/LayoutParsingServiceProcessorConfiguration.java

@@ -5,7 +5,10 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
-import com.knecon.fforesight.service.viewerdoc.service.PDFTronViewerDocumentService;
+import com.google.common.base.Strings;
+import com.knecon.fforesight.service.viewerdoc.service.IViewerDocumentService;
+import com.knecon.fforesight.service.viewerdoc.service.pdftron.PDFTronViewerDocumentService;
+import com.knecon.fforesight.service.viewerdoc.service.ViewerDocumentService;
 
 import io.micrometer.observation.ObservationRegistry;
 
@@ -15,9 +18,14 @@ public class LayoutParsingServiceProcessorConfiguration {
 
     @Bean
     @Autowired
-    public PDFTronViewerDocumentService viewerDocumentService(ObservationRegistry registry) {
+    public IViewerDocumentService viewerDocumentService(ObservationRegistry registry, LayoutparserSettings settings) {
+
+        if (!Strings.isNullOrEmpty(settings.getPdftronLicense())) {
+            return new PDFTronViewerDocumentService(registry, settings.getPdftronLicense());
+        } else {
+            return new ViewerDocumentService(registry);
+        }
 
-        return new PDFTronViewerDocumentService(registry);
     }
 
 }

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

@@ -1,19 +1,15 @@
 package com.knecon.fforesight.service.layoutparser.processor;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 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;
@@ -25,7 +21,6 @@ import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsi
 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.viewerdoc.service.ViewerDocVersioningUtility;
 import com.knecon.fforesight.tenantcommons.TenantContext;
 
 import io.micrometer.observation.annotation.Observed;
@@ -41,9 +36,6 @@ 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 {
 
@@ -61,18 +53,11 @@ public class LayoutParsingStorageService {
         }
         File tempFile = createTempFile("viewerDocument", ".pdf");
         storageService.downloadTo(TenantContext.getTenantId(), storageId, tempFile);
-
-        if (!ViewerDocVersioningUtility.isCurrentVersion(tempFile)) {
-            assert tempFile.delete();
-            return Optional.empty();
-        }
-
         return Optional.of(tempFile);
     }
 
 
-    @SneakyThrows
-    public ImageServiceResponse getImagesFile(String storageId) {
+    public ImageServiceResponse getImagesFile(String storageId) throws IOException {
 
         try (InputStream inputStream = getObject(storageId)) {
 
@@ -83,8 +68,7 @@ public class LayoutParsingStorageService {
     }
 
 
-    @SneakyThrows
-    public TableServiceResponse getTablesFile(String storageId) {
+    public TableServiceResponse getTablesFile(String storageId) throws IOException {
 
         try (var tableClassificationStream = getObject(storageId)) {
 
@@ -94,45 +78,22 @@ public class LayoutParsingStorageService {
         }
     }
 
-
-@SneakyThrows
-    public VisualLayoutParsingResponse getVisualLayoutParsingFile(String storageId) {
+    public VisualLayoutParsingResponse getVisualLayoutParsingFile(String storageId) throws IOException {
 
         try (InputStream inputStream = getObject(storageId)) {
-            return objectMapper.readValue(inputStream, VisualLayoutParsingResponse.class);
+            VisualLayoutParsingResponse visualLayoutParsingResponse = objectMapper.readValue(inputStream, VisualLayoutParsingResponse.class);
+            return visualLayoutParsingResponse;
         }
     }
 
 
-    @SneakyThrows
     @Observed(name = "LayoutParsingStorageService", contextualName = "store-document-data")
     public void storeDocumentData(LayoutParsingRequest layoutParsingRequest, DocumentData documentData) {
 
-        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.getDocumentPositions());
-
-        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();
+        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());
     }
 
 
@@ -193,16 +154,4 @@ public class LayoutParsingStorageService {
         }
     }
 
-
-    @SneakyThrows
-    @Observed(name = "LayoutParsingStorageService", contextualName = "store-markdown-file")
-    public void storeMarkdownFile(String markdownFileStorageId, String markdownContent) {
-
-        try (InputStream inputStream = new ByteArrayInputStream(markdownContent.getBytes(StandardCharsets.UTF_8))) {
-
-            storageService.storeObject(TenantContext.getTenantId(), markdownFileStorageId, inputStream);
-        }
-
-    }
-
 }

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

@@ -1,7 +1,6 @@
 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;
 
@@ -18,8 +17,8 @@ import com.knecon.fforesight.service.layoutparser.processor.docstrum.service.Zon
 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.Word;
-import com.knecon.fforesight.service.layoutparser.processor.visualization.LayoutDebugLayer;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
+import com.knecon.fforesight.service.layoutparser.processor.visualization.LayoutparsingVisualizations;
 
 import lombok.RequiredArgsConstructor;
 
@@ -27,7 +26,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,57 +33,30 @@ public class DocstrumSegmentationService {
     private final ReadingOrderService readingOrderService;
 
 
-    public List<Zone> segmentPage(List<Word> textPositions, boolean xyOrder, CleanRulings usedRulings, LayoutDebugLayer visualizations) {
+    public List<Zone> segmentPage(List<TextPositionSequence> textPositions, boolean xyOrder, CleanRulings usedRulings, LayoutparsingVisualizations visualizations) {
 
-        EnumMap<TextDirection, Integer> directionCounts = new EnumMap<>(TextDirection.class);
+        List<Zone> zones = new ArrayList<>();
+        zones.addAll(computeZones(textPositions, usedRulings, visualizations, TextDirection.ZERO));
+        zones.addAll(computeZones(textPositions, usedRulings, visualizations, TextDirection.QUARTER_CIRCLE));
+        zones.addAll(computeZones(textPositions, usedRulings, visualizations, TextDirection.HALF_CIRCLE));
+        zones.addAll(computeZones(textPositions, usedRulings, visualizations, TextDirection.THREE_QUARTER_CIRCLE));
 
-        List<Zone> newZones = computeZones(textPositions, usedRulings, visualizations, TextDirection.ZERO);
-        directionCounts.put(TextDirection.ZERO, newZones.size());
-        List<Zone> zones = new ArrayList<>(newZones);
-
-        newZones = computeZones(textPositions, usedRulings, visualizations, TextDirection.QUARTER_CIRCLE);
-        directionCounts.put(TextDirection.QUARTER_CIRCLE, newZones.size());
-        zones.addAll(newZones);
-
-        newZones = computeZones(textPositions, usedRulings, visualizations, TextDirection.HALF_CIRCLE);
-        directionCounts.put(TextDirection.HALF_CIRCLE, newZones.size());
-        zones.addAll(newZones);
-
-        newZones = computeZones(textPositions, usedRulings, visualizations, TextDirection.THREE_QUARTER_CIRCLE);
-        directionCounts.put(TextDirection.THREE_QUARTER_CIRCLE, newZones.size());
-        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<TextPositionSequence> textPositions, CleanRulings rulings, LayoutparsingVisualizations visualizations, 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<Word> textPositions, CleanRulings rulings, LayoutDebugLayer visualizations, TextDirection direction) {
-
-        List<Character> characters = textPositions.stream()
+        List<RedTextPosition> positions = textPositions.stream()
                 .filter(t -> t.getDir() == direction)
-                .map(Word::getCharacters)
+                .map(TextPositionSequence::getTextPositions)
                 .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/AngleFilter.java

@@ -15,16 +15,10 @@ public class AngleFilter {
 
     public boolean matches(Neighbor neighbor) {
 
-        return matches(neighbor.getAngle());
-    }
-
-
-    public boolean matches(double angle) {
-
         if (lowerAngle <= upperAngle) {
-            return lowerAngle <= angle && angle < upperAngle;
+            return lowerAngle <= neighbor.getAngle() && neighbor.getAngle() < upperAngle;
         } else {
-            return lowerAngle <= angle || angle < upperAngle;
+            return lowerAngle <= neighbor.getAngle() || neighbor.getAngle() < upperAngle;
         }
     }
 

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

@@ -7,12 +7,8 @@ import java.util.List;
 import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
 
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
 @Data
-@SuperBuilder
-@NoArgsConstructor
 public abstract class BoundingBox {
 
     // Java coordinate system: (0, 0) is always upper left, x is increasing left to right and y is increasing from top to bottom.
@@ -23,7 +19,7 @@ public abstract class BoundingBox {
     // This rotates completely in 90 degree steps with page rotation.
     // Needs to be used when writing to a PDF.
     // Also, these are definitely correct and should be used whenever possible.
-    protected Rectangle2D bBoxPdf;
+    protected Rectangle2D bBoxInitialUserSpace;
 
     protected static final float VERTICAL_COMPARISON_THRESHOLD = 0.4f;
 
@@ -54,25 +50,25 @@ public abstract class BoundingBox {
 
     public double getPdfMinX() {
 
-        return bBoxPdf.getMinX();
+        return bBoxInitialUserSpace.getMinX();
     }
 
 
     public double getPdfMaxX() {
 
-        return bBoxPdf.getMaxX();
+        return bBoxInitialUserSpace.getMaxX();
     }
 
 
     public double getPdfMinY() {
 
-        return bBoxPdf.getMinY();
+        return bBoxInitialUserSpace.getMinY();
     }
 
 
     public double getPdfMaxY() {
 
-        return bBoxPdf.getMaxY();
+        return bBoxInitialUserSpace.getMaxY();
     }
 
 
@@ -133,31 +129,13 @@ public abstract class BoundingBox {
     }
 
 
-    public boolean intersectsX(BoundingBox other, float threshold) {
-
-        return this.getX() - threshold <= other.getMaxX() && this.getMaxX() + threshold >= other.getX();
-    }
-
-
-    public boolean intersectsPdf(BoundingBox other) {
-
-        return this.intersectsXPdf(other) && this.intersectsYPdf(other);
-    }
-
-
-    public boolean intersectsPdf(BoundingBox other, float yThreshold, float xThreshold) {
-
-        return this.intersectsXPdf(other, xThreshold) && this.intersectsYPdf(other, yThreshold);
-    }
-
-
-    public boolean intersectsYPdf(BoundingBox other) {
+    public boolean intersectsY(BoundingBox other) {
 
         return this.getPdfMinY() <= other.getPdfMaxY() && this.getPdfMaxY() >= other.getPdfMinY();
     }
 
 
-    public boolean intersectsY(BoundingBox other) {
+    public boolean intersectsYJava(BoundingBox other) {
 
         return this.getY() <= other.getMaxY() && this.getMaxY() >= other.getY();
     }
@@ -165,31 +143,25 @@ public abstract class BoundingBox {
 
     public boolean intersectsY(BoundingBox other, float threshold) {
 
-        return this.getY() - threshold <= other.getMaxY() && this.getMaxY() + threshold >= other.getY();
-    }
-
-
-    public boolean intersectsYPdf(BoundingBox other, float threshold) {
-
         return this.getPdfMinY() - threshold <= other.getPdfMaxY() && this.getPdfMaxY() + threshold >= other.getPdfMinY();
     }
 
 
-    public boolean intersectsXPdf(BoundingBox other) {
-
-        return this.getPdfMinX() <= other.getPdfMaxX() && this.getPdfMaxX() >= other.getPdfMinX();
-    }
-
-
     public boolean intersectsX(BoundingBox other) {
 
+        return this.getPdfMinX() <= other.getPdfMaxX() && this.getPdfMaxX() >= other.getPdfMinX();
+    }
+
+
+    public boolean intersectsXJava(BoundingBox other) {
+
         return this.getX() <= other.getMaxX() && this.getMaxX() >= other.getMinX();
     }
 
 
-    public boolean intersectsXPdf(BoundingBox other, float threshold) {
+    public boolean intersectsX(BoundingBox other, float threshold) {
 
-        return this.getPdfMinX() - threshold <= other.getPdfMaxX() && this.getMaxX() + threshold >= other.getPdfMinX();
+        return this.getPdfMinX() - threshold <= other.getMaxX() && this.getMaxX() + threshold >= other.getPdfMinX();
     }
 
 
@@ -198,8 +170,8 @@ public abstract class BoundingBox {
         this.bBox = components.stream()
                 .map(BoundingBox::getBBox)
                 .collect(RectangleTransformations.collectBBox());
-        this.bBoxPdf = components.stream()
-                .map(BoundingBox::getBBoxPdf)
+        this.bBoxInitialUserSpace = components.stream()
+                .map(BoundingBox::getBBoxInitialUserSpace)
                 .collect(RectangleTransformations.collectBBox());
     }
 
@@ -225,55 +197,57 @@ public abstract class BoundingBox {
 
     public double horizontalDistance(BoundingBox other) {
 
-        double rect1Right = getMaxX();
-        double rect1Left = getMinX();
-        double rect2Right = other.getMaxX();
-        double rect2Left = other.getMinX();
-
-        if (rect1Left > rect2Right || rect2Left > rect1Right) {
-            return Math.max(rect2Left - rect1Right, rect1Left - rect2Right);
+        Rectangle2D left;
+        Rectangle2D right;
+        if (this.leftOf(other)) {
+            left = this.getBBox();
+            right = other.getBBox();
         } else {
-            return 0;
+            left = other.getBBox();
+            right = this.getBBox();
         }
+
+        return Math.max(0, right.getMinX() - left.getMaxX());
     }
 
 
     public double verticalDistance(BoundingBox other) {
 
-        double rect1Top = getMaxY();
-        double rect1Bottom = getMinY();
-        double rect2Top = other.getMaxY();
-        double rect2Bottom = other.getMinY();
-
-        if (rect1Bottom > rect2Top || rect2Bottom > rect1Top) {
-            return Math.max(rect2Bottom - rect1Top, rect1Bottom - rect2Top);
+        Rectangle2D bottom;
+        Rectangle2D top;
+        if (this.isAbove(other)) {
+            top = this.getBBox();
+            bottom = other.getBBox();
         } else {
-            return 0;
+            bottom = this.getBBox();
+            top = other.getBBox();
         }
+
+        return Math.max(0, bottom.getMinY() - top.getMaxY());
     }
 
 
     public boolean rightOf(BoundingBox other) {
 
-        return this.intersectsY(other) && other.getMaxX() <= this.getMinX();
+        return this.intersectsYJava(other) && other.getMaxX() <= this.getMinX();
     }
 
 
     public boolean leftOf(BoundingBox other) {
 
-        return this.intersectsY(other) && other.getMinX() >= this.getMaxX();
+        return this.intersectsYJava(other) && other.getMinX() >= this.getMaxX();
     }
 
 
     public boolean isAbove(BoundingBox other) {
 
-        return this.intersectsX(other) && other.getMinY() >= this.getMaxY();
+        return this.intersectsXJava(other) && other.getMinY() >= this.getMaxY();
     }
 
 
     public boolean isBelow(BoundingBox other) {
 
-        return this.intersectsX(other) && this.getMinY() >= other.getMaxY();
+        return this.intersectsXJava(other) && this.getMinY() >= other.getMaxY();
     }
 
 }

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

@@ -35,7 +35,7 @@ public class Character {
 
     public double getHeight() {
 
-        return textPosition.getHeightDirAdj();
+        return textPosition.getHeightDir();
     }
 
 
@@ -65,9 +65,9 @@ public class Character {
         double s = Math.sin(-0);
         double c = Math.cos(-0);
         xs[0] = c * x - s * y;
-        xs[1] = c * (x + textPosition.getWidthDirAdj()) - s * (y + textPosition.getHeightDirAdj());
+        xs[1] = c * (x + textPosition.getWidthDirAdj()) - s * (y + textPosition.getHeightDir());
         xs[2] = c * other.x - s * other.y;
-        xs[3] = c * (other.x + other.textPosition.getWidthDirAdj()) - s * (other.y + other.textPosition.getHeightDirAdj());
+        xs[3] = c * (other.x + other.textPosition.getWidthDirAdj()) - s * (other.y + other.textPosition.getHeightDir());
         boolean overlapping = xs[1] >= xs[2] && xs[3] >= xs[0];
         Arrays.sort(xs);
         return Math.abs(xs[2] - xs[1]) * (overlapping ? 1 : -1);

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

@@ -1,30 +1,20 @@
 package com.knecon.fforesight.service.layoutparser.processor.docstrum.model;
 
-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;
-import java.util.Comparator;
-import java.util.EnumMap;
 import java.util.List;
-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.Word;
-import com.knecon.fforesight.service.layoutparser.processor.model.text.FontStyle;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = false)
-public class Line extends TextBoundingBox {
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+public class Line extends BoundingBox {
 
-    private static final double WORD_DISTANCE_MULTIPLIER = 0.17;
+    private static final double WORD_DISTANCE_MULTIPLIER = 0.18;
 
     @EqualsAndHashCode.Include
     private final double x0;
@@ -36,13 +26,16 @@ public class Line extends TextBoundingBox {
     @EqualsAndHashCode.Include
     private final double y1;
 
-    private FontStyle fontStyle;
+    private final double height;
 
-    private final List<Word> words;
+    private final List<Character> characters;
+    private final List<TextPositionSequence> words = new ArrayList<>();
 
 
     public Line(List<Character> characters, double wordSpacing) {
 
+        this.characters = characters;
+
         if (characters.size() >= 2) {
             // linear regression
             double sx = 0.0;
@@ -71,43 +64,9 @@ public class Line extends TextBoundingBox {
             this.y0 = character.getY() - dy;
             this.y1 = character.getY() + dy;
         }
-        this.words = new ArrayList<>();
-        computeWords(characters, wordSpacing * WORD_DISTANCE_MULTIPLIER);
+        height = computeHeight();
+        computeWords(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 (Word word : words) {
-            switch (word.getFontStyle()) {
-                case STANDARD -> fontStyleCounter.get(FontStyle.REGULAR).getAndIncrement();
-                case BOLD -> fontStyleCounter.get(FontStyle.BOLD).getAndIncrement();
-                case ITALIC -> fontStyleCounter.get(FontStyle.ITALIC).getAndIncrement();
-                case BOLD_ITALIC -> fontStyleCounter.get(FontStyle.BOLD_ITALIC).getAndIncrement();
-            }
-        }
-        fontStyle = fontStyleCounter.entrySet()
-                .stream()
-                .max(Comparator.comparing(entry -> entry.getValue().get()))
-                .map(Map.Entry::getKey).orElse(FontStyle.REGULAR);
     }
 
 
@@ -123,6 +82,14 @@ 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());
@@ -155,22 +122,19 @@ public class Line extends TextBoundingBox {
     }
 
 
-    private void computeWords(List<Character> characters, double wordSpacing) {
+    private void computeWords(double wordSpacing) {
 
-        // 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();
+        TextPositionSequence word = new TextPositionSequence();
         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 Word();
+                    word = new TextPositionSequence();
                 }
             }
-            word.add(current);
+            word.getTextPositions().add(current.getTextPosition());
             previous = current;
         }
         words.add(word);
@@ -179,7 +143,9 @@ public class Line extends TextBoundingBox {
 
     private void buildBBox() {
 
-        this.setToBBoxOfComponents(words);
+        this.setToBBoxOfComponents(characters.stream()
+                                       .map(Character::getTextPosition)
+                                       .toList());
     }
 
 

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

@@ -1,180 +0,0 @@
-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.stream.Collectors;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.text.TextDirection;
-import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
-
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.SuperBuilder;
-
-@Getter
-@Setter
-@SuperBuilder
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-public abstract class TextBoundingBox extends BoundingBox {
-
-    protected Rectangle2D bBoxDirAdj;
-
-    protected TextDirection dir;
-
-
-    @Override
-    public void setToBBoxOfComponents(List<? extends BoundingBox> components) {
-
-        super.setToBBoxOfComponents(components);
-        this.bBoxDirAdj = components.stream()
-                .filter(c -> c instanceof TextBoundingBox)
-                .map(c -> (TextBoundingBox) c)
-                .map(TextBoundingBox::getBBoxDirAdj)
-                .collect(RectangleTransformations.collectBBox());
-
-        Set<TextDirection> textDirections = components.stream()
-                .filter(c -> c instanceof TextBoundingBox)
-                .map(c -> (TextBoundingBox) c)
-                .map(TextBoundingBox::getDir)
-                .collect(Collectors.toSet());
-
-        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();
-        }
-    }
-
-
-    public double getXDirAdj() {
-
-        return this.bBoxDirAdj.getX();
-    }
-
-
-    public double getYDirAdj() {
-
-        return this.bBoxDirAdj.getY();
-    }
-
-
-    public double getWidthDirAdj() {
-
-        return this.bBoxDirAdj.getWidth();
-    }
-
-
-    public double getHeightDirAdj() {
-
-        return this.bBoxDirAdj.getHeight();
-    }
-
-
-    public double getMaxXDirAdj() {
-
-        return this.bBoxDirAdj.getMaxX();
-    }
-
-
-    public double getMaxYDirAdj() {
-
-        return this.bBoxDirAdj.getMaxY();
-    }
-
-
-    public double getCenterYDirAdj() {
-
-        return this.bBoxDirAdj.getCenterY();
-    }
-
-
-    public double getCenterXDirAdj() {
-
-        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/UnionFind.java

@@ -28,10 +28,4 @@ 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/docstrum/model/Zone.java

@@ -6,11 +6,9 @@ import java.util.List;
 import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
-public class Zone extends TextBoundingBox {
+public class Zone extends BoundingBox {
 
     private List<Line> lines;
 
@@ -18,6 +16,7 @@ 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

@@ -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.toRadians(5);
+    private static final double ANGLE_TOLERANCE = Math.PI / 6;
 
 
     public List<Line> buildLines(List<Character> characters, double characterSpacing, double lineSpacing, CleanRulings rulings) {

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

@@ -1,17 +1,15 @@
 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.HashMap;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 
-import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.TextBoundingBox;
+import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.BoundingBox;
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.Zone;
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.utils.DoubleUtils;
 
@@ -21,30 +19,21 @@ public class ReadingOrderService {
     private static final double THRESHOLD = 5;
     public static final double MULTI_COLUMN_DETECTION_THRESHOLD = 1.5;
 
-    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));
 
-    private static final Comparator<TextBoundingBox> COMPARATOR_DIR_ADJ = //
-            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<Zone> resolve(List<Zone> zones, boolean xyReadingOrder) {
 
         if (zones.isEmpty() || zones.size() == 1) {
             return zones;
         }
 
         if (xyReadingOrder) {
-            return resolveSingleColumnReadingOrder(zones, useDirAdjCoords);
+            return resolveSingleColumnReadingOrder(zones);
         }
 
         Map<Long, Integer> histogram = new HashMap<>();
         for (Zone zone : zones) {
-            Rectangle2D bbox = useDirAdjCoords ? zone.getBBoxDirAdj() : zone.getBBox();
-            long minY = Math.round(bbox.getMinY());
-            long maxY = Math.round(bbox.getMaxY());
+            long minY = Math.round(zone.getBBox().getMinY());
+            long maxY = Math.round(zone.getBBox().getMaxY());
             for (long i = minY; i <= maxY; i++) {
                 histogram.put(i, histogram.getOrDefault(i, 0) + 1);
             }
@@ -54,32 +43,24 @@ public class ReadingOrderService {
                     .stream()
                     .mapToInt(Integer::intValue).average()
                     .orElse(1) < MULTI_COLUMN_DETECTION_THRESHOLD) {
-            return resolveSingleColumnReadingOrder(zones, useDirAdjCoords);
+            return resolveSingleColumnReadingOrder(zones);
         } else {
 
-            return resolveMultiColumnReadingOder(zones, useDirAdjCoords);
+            return resolveMultiColumnReadingOder(zones);
         }
 
     }
 
 
-    private static List<Zone> resolveSingleColumnReadingOrder(List<Zone> zones, boolean useDirAdjCoords) {
+    private static List<Zone> resolveSingleColumnReadingOrder(List<Zone> zones) {
 
-        if (useDirAdjCoords) {
-            return zones.stream()
-                    .collect(Collectors.groupingBy(TextBoundingBox::getDir)).values()
-                    .stream()
-                    .flatMap(words -> words.stream()
-                            .sorted(COMPARATOR_DIR_ADJ))
-                    .toList();
-        }
-
-        zones.sort(COMPARATOR);
+        zones.sort(Comparator.comparing(BoundingBox::getY, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD))
+                           .thenComparing(BoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD)));
         return zones;
     }
 
 
-    private List<Zone> resolveMultiColumnReadingOder(List<Zone> zones, boolean useDirAdjCoords) {
+    private List<Zone> resolveMultiColumnReadingOder(List<Zone> zones) {
 
         // 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
@@ -88,12 +69,11 @@ public class ReadingOrderService {
         double maxX = Double.NEGATIVE_INFINITY;
 
         for (Zone zone : zones) {
-            Rectangle2D bbox = useDirAdjCoords ? zone.getBBoxDirAdj() : zone.getBBox();
-            if (bbox.getX() < minX) {
-                minX = zone.getXDirAdj();
+            if (zone.getX() < minX) {
+                minX = zone.getX();
             }
-            if (bbox.getMaxX() > maxX) {
-                maxX = zone.getMaxXDirAdj();
+            if (zone.getX() + zone.getWidth() > maxX) {
+                maxX = zone.getX() + zone.getWidth();
             }
         }
 
@@ -102,27 +82,24 @@ public class ReadingOrderService {
         List<Zone> leftOf = new ArrayList<>();
         List<Zone> rightOf = new ArrayList<>();
         List<Zone> middle = new ArrayList<>();
-
         for (Zone zone : zones) {
-            Rectangle2D bbox = useDirAdjCoords ? zone.getBBoxDirAdj() : zone.getBBox();
-            if (bbox.getX() < midLineXCoordinate && bbox.getX() + bbox.getWidth() < midLineXCoordinate) {
+            if (zone.getX() < midLineXCoordinate && zone.getX() + zone.getWidth() < midLineXCoordinate) {
                 leftOf.add(zone);
-            } else if (bbox.getX() > midLineXCoordinate && bbox.getX() + bbox.getWidth() > midLineXCoordinate) {
+            } else if (zone.getX() > midLineXCoordinate && zone.getX() + zone.getWidth() > midLineXCoordinate) {
                 rightOf.add(zone);
             } else {
                 middle.add(zone);
             }
         }
 
-        if (useDirAdjCoords) {
-            leftOf.sort(COMPARATOR_DIR_ADJ);
-            rightOf.sort(COMPARATOR_DIR_ADJ);
-            middle.sort(COMPARATOR_DIR_ADJ);
-        } else {
-            leftOf.sort(COMPARATOR);
-            rightOf.sort(COMPARATOR);
-            middle.sort(COMPARATOR);
-        }
+        leftOf.sort(Comparator.comparing(BoundingBox::getY, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD))
+                            .thenComparing(BoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD)));
+
+        rightOf.sort(Comparator.comparing(BoundingBox::getY, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD))
+                             .thenComparing(BoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD)));
+
+        middle.sort(Comparator.comparing(BoundingBox::getY, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD))
+                            .thenComparing(BoundingBox::getX, (o1, o2) -> DoubleUtils.compareDouble(o1, o2, THRESHOLD)));
 /*
         List<Zone> leftNotIntersecting = new ArrayList<>();
         for (Zone leftZone : leftOf) {
@@ -174,9 +151,8 @@ public class ReadingOrderService {
 
         while (itty.hasNext()) {
             Zone 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()) {
+                if (current.getY() < sortedZones.get(i).getY()) {
                     sortedZones.add(i, current);
                     itty.remove();
                     break;

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

@@ -1,7 +1,7 @@
 package com.knecon.fforesight.service.layoutparser.processor.docstrum.service;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -9,12 +9,11 @@ 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.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 {
@@ -22,7 +21,7 @@ public class ZoneBuilderService {
     private static final double MIN_HORIZONTAL_DISTANCE_MULTIPLIER = -0.5;
     private static final double MAX_VERTICAL_DISTANCE_MULTIPLIER = 1.2;
 
-    private static final double MIN_HORIZONTAL_MERGE_DISTANCE_MULTIPLIER = -7;
+    private static final double MIN_HORIZONTAL_MERGE_DISTANCE_MULTIPLIER = -3.0;
 
     private static final double MAX_VERTICAL_MERGE_DISTANCE_MULTIPLIER = 0.5;
 
@@ -30,7 +29,7 @@ public class ZoneBuilderService {
 
     private static final double MAX_LINE_SIZE_SCALE = 2.5;
 
-    private static final double ANGLE_TOLERANCE = Math.toRadians(5);
+    private static final double ANGLE_TOLERANCE = Math.PI / 6;
 
     private static final double MAX_VERTICAL_MERGE_DISTANCE = 0.5;
 
@@ -39,7 +38,7 @@ public class ZoneBuilderService {
 
         double minHorizontalDistance = characterSpacing * MIN_HORIZONTAL_DISTANCE_MULTIPLIER;
         double maxVerticalDistance = lineSpacing * MAX_VERTICAL_DISTANCE_MULTIPLIER;
-        double minHorizontalMergeDistance = lineSpacing * MIN_HORIZONTAL_MERGE_DISTANCE_MULTIPLIER;
+        double minHorizontalMergeDistance = characterSpacing * MIN_HORIZONTAL_MERGE_DISTANCE_MULTIPLIER;
         double maxVerticalMergeDistance = lineSpacing * MAX_VERTICAL_MERGE_DISTANCE_MULTIPLIER;
 
         UnionFind<Line> unionFind = new UnionFind<>(new HashSet<>(lines));
@@ -55,26 +54,11 @@ public class ZoneBuilderService {
                     return;
                 }
 
-//                if (!innerLine.getFontStyle().equals(outerLine.getFontStyle()) //
-//                    && !outerLine.intersectsY(innerLine, -2f)) {
-//                    return;
-//                }
+                double scale = Math.min(outerLine.getHeight(), innerLine.getHeight()) / meanHeight;
+                scale = Math.max(MIN_LINE_SIZE_SCALE, Math.min(scale, MAX_LINE_SIZE_SCALE));
 
-                double horizontalScale = Math.min(outerLine.getHeightDirAdj(), innerLine.getHeightDirAdj()) / meanHeight;
-                horizontalScale = Math.max(MIN_LINE_SIZE_SCALE, Math.min(horizontalScale, MAX_LINE_SIZE_SCALE));
-                double verticalScale = horizontalScale;
-
-//                if (innerLine.toString().endsWith(":")
-//                    || outerLine.toString().endsWith(":")
-//                    || numericalIdentifierPattern.matcher(innerLine.toString()).matches()
-//                    || numericalIdentifierPattern.matcher(outerLine.toString()).matches()) {
-//
-//                    horizontalScale *= 5;
-//                    verticalScale /= 10;
-//                }
-
-                double horizontalDistance = outerLine.horizontalDistance(innerLine) / horizontalScale;
-                double verticalDistance = outerLine.verticalDistance(innerLine) / verticalScale;
+                double horizontalDistance = outerLine.horizontalDistance(innerLine) / scale;
+                double verticalDistance = outerLine.verticalDistance(innerLine) / scale;
 
                 if ((!(minHorizontalDistance <= horizontalDistance) || !(verticalDistance <= maxVerticalDistance)) //
                     && (!(minHorizontalMergeDistance <= horizontalDistance) || !(verticalDistance <= maxVerticalMergeDistance))) {
@@ -103,7 +87,7 @@ public class ZoneBuilderService {
         double weights = 0.0;
         for (Line line : lines) {
             double weight = line.getLength();
-            meanHeight += line.getHeightDirAdj() * weight;
+            meanHeight += line.getHeight() * weight;
             weights += weight;
         }
         meanHeight /= weights;
@@ -113,14 +97,64 @@ public class ZoneBuilderService {
 
     private Zone mergeLinesInZone(List<Line> lines, double characterSpacing, double lineSpacing) {
 
-        Set<Word> words = lines.stream()
-                .map(Line::getWords)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toSet());
-        Collection<Set<Word>> groupedLines = TextPositionOperations.groupByLine(words);
+        double maxHorizontalDistance = 0;
+        double minVerticalDistance = 0;
+        double maxVerticalDistance = lineSpacing * MAX_VERTICAL_MERGE_DISTANCE;
 
-        List<Line> sortedLines = TextPositionOperations.sortLines(groupedLines);
-        return new Zone(sortedLines);
+        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()));
     }
 
 }

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

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

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

@@ -4,7 +4,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngineProto.LayoutEngine;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
 import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.BoundingBox;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
 

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

@@ -7,7 +7,7 @@ import com.knecon.fforesight.service.layoutparser.processor.model.outline.Outlin
 import com.knecon.fforesight.service.layoutparser.processor.model.outline.TableOfContents;
 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;
+import com.knecon.fforesight.service.layoutparser.processor.visualization.LayoutparsingVisualizations;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -25,7 +25,7 @@ public class ClassificationDocument {
     private FloatFrequencyCounter fontSizeCounter = new FloatFrequencyCounter();
     private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
     private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
-    private LayoutDebugLayer layoutDebugLayer = new LayoutDebugLayer();
+    private LayoutparsingVisualizations visualizations = new LayoutparsingVisualizations();
     private boolean headlines;
 
     private long rulesVersion;

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

@@ -18,7 +18,6 @@ import lombok.RequiredArgsConstructor;
 
 @Data
 @RequiredArgsConstructor
-
 public class ClassificationPage {
 
     @NonNull
@@ -26,7 +25,7 @@ public class ClassificationPage {
 
     private List<OutlineObject> outlineObjects = new ArrayList<>();
 
-    private List<AbstractPageBlock> headlines = new ArrayList<>();
+    private List<AbstractPageBlock> headlines  = new ArrayList<>();
 
     private List<ClassifiedImage> images = new ArrayList<>();
 
@@ -45,7 +44,7 @@ public class ClassificationPage {
     private float pageWidth;
     private float pageHeight;
 
-    private CleanRulings cleanRulings;
+    CleanRulings cleanRulings;
 
     private Map<String, List<Rectangle2D>> markedContentBboxPerType = new HashMap<>();
 

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

@@ -1,5 +1,6 @@
 package com.knecon.fforesight.service.layoutparser.processor.model;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -11,14 +12,10 @@ import lombok.Getter;
 @Getter
 public class FloatFrequencyCounter {
 
-    Map<Double, Integer> countPerValue = new HashMap<>();
-    boolean changed;
-    Double mostPopularCache;
+    Map<Float, Integer> countPerValue = new HashMap<>();
 
 
-    public void add(double value) {
-
-        changed = true;
+    public void add(float value) {
 
         if (!countPerValue.containsKey(value)) {
             countPerValue.put(value, 1);
@@ -28,11 +25,9 @@ public class FloatFrequencyCounter {
     }
 
 
-    public void addAll(Map<Double, Integer> otherCounter) {
+    public void addAll(Map<Float, Integer> otherCounter) {
 
-        changed = true;
-
-        for (Map.Entry<Double, Integer> entry : otherCounter.entrySet()) {
+        for (Map.Entry<Float, Integer> entry : otherCounter.entrySet()) {
             if (countPerValue.containsKey(entry.getKey())) {
                 countPerValue.put(entry.getKey(), countPerValue.get(entry.getKey()) + entry.getValue());
             } else {
@@ -42,36 +37,36 @@ public class FloatFrequencyCounter {
     }
 
 
-    public Double getMostPopular() {
+    public Float getMostPopular() {
 
-        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;
-                }
+        Map.Entry<Float, Integer> mostPopular = null;
+        for (Map.Entry<Float, Integer> entry : countPerValue.entrySet()) {
+            if (mostPopular == null || entry.getValue() >= mostPopular.getValue()) {
+                mostPopular = entry;
+            }
+        }
+        return mostPopular != null ? mostPopular.getKey() : null;
+    }
+
+
+    public List<Float> getHighterThanMostPopular() {
+
+        Float mostPopular = getMostPopular();
+        List<Float> higher = new ArrayList<>();
+        for (Float value : countPerValue.keySet()) {
+            if (value > mostPopular) {
+                higher.add(value);
             }
-            mostPopularCache = mostPopular != null ? mostPopular.getKey() : 0;
-            changed = false;
         }
 
-        return mostPopularCache;
+        return higher.stream().sorted(Collections.reverseOrder()).collect(Collectors.toList());
     }
 
 
-    public List<Double> getValuesInReverseOrder() {
+    public Float getHighest() {
 
-        return countPerValue.keySet()
-                .stream()
-                .sorted(Collections.reverseOrder())
-                .collect(Collectors.toList());
-    }
-
-
-    public Double getHighest() {
-
-        Double highest = null;
-        for (Double value : countPerValue.keySet()) {
+        Float highest = null;
+        for (Float value : countPerValue.keySet()) {
             if (highest == null || value > highest) {
                 highest = value;
             }

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

@@ -3,7 +3,7 @@ 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.text.Word;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -16,8 +16,8 @@ import lombok.experimental.FieldDefaults;
 public class LineInformation {
 
     List<Rectangle2D> lineBBox;
-    List<List<Word>> sequencesByLines;
+    List<List<TextPositionSequence>> sequencesByLines;
     List<List<Rectangle2D>> bBoxWithGapsByLines;
-    List<List<List<Word>>> sequencesWithGapsByLines;
+    List<List<List<TextPositionSequence>>> sequencesWithGapsByLines;
 
 }

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

@@ -9,13 +9,12 @@ public enum PageBlockType {
     H6,
     HEADER,
     FOOTER,
+    TITLE,
     PARAGRAPH,
     PARAGRAPH_BOLD,
     PARAGRAPH_ITALIC,
     PARAGRAPH_UNKNOWN,
     OTHER,
-    TABLE_OF_CONTENTS_ITEM,
-    LIST_ITEM,
     TABLE;
 
 

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

@@ -4,7 +4,7 @@ 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.Word;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -15,7 +15,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public class PageContents {
 
-    List<Word> sortedWords;
+    List<TextPositionSequence> sortedTextPositionSequences;
     Rectangle2D cropBox;
     Rectangle2D mediaBox;
     List<Ruling> rulings;

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

@@ -3,7 +3,6 @@ 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.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -16,13 +15,11 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
 public class SectionIdentifier {
 
-    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.,;]?");
+    static Pattern numericalIdentifierPattern = Pattern.compile("^[\\s]?(\\d+)[\\s.,;]?(\\d+)?[\\s.,;]?(\\d+)?[\\s.,;]?(\\d+)?");
 
     public enum Format {
         EMPTY,
         NUMERICAL,
-        ALPHANUMERIC,
         DOCUMENT
     }
 
@@ -44,10 +41,6 @@ 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();
     }
@@ -82,36 +75,7 @@ public class SectionIdentifier {
             }
             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.ALPHANUMERIC,
-                                     identifierString,
-                                     identifiers.stream()
-                                             .toList(),
-                                     false);
+        return new SectionIdentifier(Format.NUMERICAL, identifierString, identifiers.stream().toList(), false);
     }
 
 
@@ -159,22 +123,4 @@ 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/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);
-    }
-
-
-    protected 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/Boundary.java

@@ -13,13 +13,13 @@ import lombok.Setter;
 @Setter
 @EqualsAndHashCode
 @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName")
-public class TextRange implements Comparable<TextRange> {
+public class Boundary implements Comparable<Boundary> {
 
     private int start;
     private int end;
 
 
-    public TextRange(int start, int end) {
+    public Boundary(int start, int end) {
 
         if (start > end) {
             throw new IllegalArgumentException(format("start: %d > end: %d", start, end));
@@ -47,15 +47,15 @@ public class TextRange implements Comparable<TextRange> {
     }
 
 
-    public boolean contains(TextRange textRange) {
+    public boolean contains(Boundary boundary) {
 
-        return start <= textRange.start() && textRange.end() <= end;
+        return start <= boundary.start() && boundary.end() <= end;
     }
 
 
-    public boolean containedBy(TextRange textRange) {
+    public boolean containedBy(Boundary boundary) {
 
-        return textRange.contains(this);
+        return boundary.contains(this);
     }
 
 
@@ -79,33 +79,22 @@ public class TextRange implements Comparable<TextRange> {
 
     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) {
+    public boolean intersects(Boundary boundary) {
 
-        return textRange.start() < this.end && this.start < textRange.end();
+        return boundary.start() < this.end && this.start < boundary.end();
     }
 
 
-    public List<TextRange> split(List<Integer> splitIndices) {
+    public List<Boundary> split(List<Integer> splitIndices) {
 
-        if (splitIndices.stream()
-                .anyMatch(idx -> !this.contains(idx))) {
-            throw new IndexOutOfBoundsException(format("%s splitting indices are out of range for %s",
-                                                       splitIndices.stream()
-                                                               .filter(idx -> !this.contains(idx))
-                                                               .toList(),
-                                                       this));
+        if (splitIndices.stream().anyMatch(idx -> !this.contains(idx))) {
+            throw new IndexOutOfBoundsException(format("%s splitting indices are out of range for %s", splitIndices.stream().filter(idx -> !this.contains(idx)).toList(), this));
         }
-        List<TextRange> splitBoundaries = new LinkedList<>();
+        List<Boundary> splitBoundaries = new LinkedList<>();
         int previousIndex = start;
         for (int splitIndex : splitIndices) {
 
@@ -113,33 +102,23 @@ public class TextRange implements Comparable<TextRange> {
             if (splitIndex == previousIndex) {
                 continue;
             }
-            splitBoundaries.add(new TextRange(previousIndex, splitIndex));
+            splitBoundaries.add(new Boundary(previousIndex, splitIndex));
             previousIndex = splitIndex;
         }
-        if (previousIndex != end) {
-            splitBoundaries.add(new TextRange(previousIndex, end));
-        }
+        splitBoundaries.add(new Boundary(previousIndex, end));
         return splitBoundaries;
     }
 
-
     public IntStream intStream() {
 
         return IntStream.range(start, end);
     }
 
+    public static Boundary merge(Collection<Boundary> boundaries) {
 
-    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);
+        int minStart = boundaries.stream().mapToInt(Boundary::start).min().orElseThrow(IllegalArgumentException::new);
+        int maxEnd = boundaries.stream().mapToInt(Boundary::end).max().orElseThrow(IllegalArgumentException::new);
+        return new Boundary(minStart, maxEnd);
     }
 
 
@@ -151,12 +130,12 @@ public class TextRange implements Comparable<TextRange> {
 
 
     @Override
-    public int compareTo(TextRange textRange) {
+    public int compareTo(Boundary boundary) {
 
-        if (end < textRange.end() && start < textRange.start()) {
+        if (end < boundary.end() && start < boundary.start()) {
             return -1;
         }
-        if (start > textRange.start() && end > textRange.end()) {
+        if (start > boundary.start() && end > boundary.end()) {
             return 1;
         }
 

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

@@ -2,13 +2,12 @@ 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.NodeTypeProto.NodeType;
+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;
@@ -40,10 +39,7 @@ public class DocumentTree {
 
     public TextBlock buildTextBlock() {
 
-        return allEntriesInOrder().map(Entry::getNode)
-                .filter(SemanticNode::isLeaf)
-                .map(SemanticNode::getLeafTextBlock)
-                .collect(new TextBlockCollector());
+        return allEntriesInOrder().map(Entry::getNode).filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).collect(new TextBlockCollector());
     }
 
 
@@ -117,16 +113,13 @@ public class DocumentTree {
 
     public Stream<SemanticNode> childNodes(List<Integer> treeId) {
 
-        return getEntryById(treeId).children.stream()
-                .map(Entry::getNode);
+        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);
+        return getEntryById(treeId).children.stream().filter(entry -> entry.node.getType().equals(nodeType)).map(Entry::getNode);
     }
 
 
@@ -163,32 +156,26 @@ public class DocumentTree {
 
     public Stream<Entry> allEntriesInOrder() {
 
-        return Stream.of(root)
-                .flatMap(DocumentTree::flatten);
+        return Stream.of(root).flatMap(DocumentTree::flatten);
     }
 
 
     public Stream<Entry> allSubEntriesInOrder(List<Integer> parentId) {
 
-        return getEntryById(parentId).children.stream()
-                .flatMap(DocumentTree::flatten);
+        return getEntryById(parentId).children.stream().flatMap(DocumentTree::flatten);
     }
 
 
     @Override
     public String toString() {
 
-        return String.join("\n",
-                           allEntriesInOrder().map(Entry::toString)
-                                   .toList());
+        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));
+        return Stream.concat(Stream.of(entry), entry.children.stream().flatMap(DocumentTree::flatten));
     }
 
 

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/entity/RedactionEntity.java

@@ -11,7 +11,7 @@ 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.Boundary;
 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;
@@ -28,11 +28,11 @@ import lombok.experimental.FieldDefaults;
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class TextEntity {
+public class RedactionEntity {
 
     // initial values
     @EqualsAndHashCode.Include
-    final TextRange textRange;
+    final Boundary boundary;
     @EqualsAndHashCode.Include
     final String type;
     @EqualsAndHashCode.Include
@@ -47,7 +47,7 @@ public class TextEntity {
     boolean dictionaryEntry;
     boolean dossierDictionaryEntry;
     Set<Engine> engines;
-    Set<TextEntity> references;
+    Set<RedactionEntity> references;
     @Builder.Default
     Deque<Integer> matchedRules = new LinkedList<>();
     String redactionReason;
@@ -66,9 +66,9 @@ public class TextEntity {
     SemanticNode deepestFullyContainingNode;
 
 
-    public static TextEntity initialEntityNode(TextRange textRange, String type, EntityType entityType) {
+    public static RedactionEntity initialEntityNode(Boundary boundary, String type, EntityType entityType) {
 
-        return TextEntity.builder().type(type).entityType(entityType).textRange(textRange).engines(new HashSet<>()).references(new HashSet<>()).build();
+        return RedactionEntity.builder().type(type).entityType(entityType).boundary(boundary).engines(new HashSet<>()).references(new HashSet<>()).build();
     }
 
 
@@ -132,7 +132,7 @@ public class TextEntity {
     public List<RedactionPosition> getRedactionPositionsPerPage() {
 
         if (redactionPositionsPerPage == null || redactionPositionsPerPage.isEmpty()) {
-            Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = deepestFullyContainingNode.getTextBlock().getPositionsPerPage(textRange);
+            Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = deepestFullyContainingNode.getTextBlock().getPositionsPerPage(boundary);
 
             Page firstPage = rectanglesPerLinePerPage.keySet()
                     .stream()
@@ -155,21 +155,21 @@ public class TextEntity {
     }
 
 
-    public boolean containedBy(TextEntity textEntity) {
+    public boolean containedBy(RedactionEntity redactionEntity) {
 
-        return this.textRange.containedBy(textEntity.getTextRange());
+        return this.boundary.containedBy(redactionEntity.getBoundary());
     }
 
 
-    public boolean contains(TextEntity textEntity) {
+    public boolean contains(RedactionEntity redactionEntity) {
 
-        return this.textRange.contains(textEntity.getTextRange());
+        return this.boundary.contains(redactionEntity.getBoundary());
     }
 
 
-    public boolean intersects(TextEntity textEntity) {
+    public boolean intersects(RedactionEntity redactionEntity) {
 
-        return this.textRange.intersects(textEntity.getTextRange());
+        return this.boundary.intersects(redactionEntity.getBoundary());
     }
 
 
@@ -185,13 +185,13 @@ public class TextEntity {
     }
 
 
-    public void addReference(TextEntity reference) {
+    public void addReference(RedactionEntity reference) {
 
         references.add(reference);
     }
 
 
-    public void addReferences(List<TextEntity> references) {
+    public void addReferences(List<RedactionEntity> references) {
 
         this.references.addAll(references);
     }
@@ -210,7 +210,7 @@ public class TextEntity {
         sb.append("Entity[\"");
         sb.append(value);
         sb.append("\", ");
-        sb.append(textRange);
+        sb.append(boundary);
         sb.append(", pages[");
         pages.forEach(page -> {
             sb.append(page.getNumber());

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

@@ -6,9 +6,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngineProto.LayoutEngine;
+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.entity.RedactionEntity;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
 
 import lombok.AccessLevel;
@@ -39,7 +39,7 @@ public abstract class AbstractSemanticNode implements GenericSemanticNode {
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
-    Set<TextEntity> entities = new HashSet<>();
+    Set<RedactionEntity> entities = new HashSet<>();
 
     @EqualsAndHashCode.Exclude
     Map<Page, Rectangle2D> bBoxCache;

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

@@ -9,11 +9,10 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeTypeProto.NodeType;
+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 com.knecon.fforesight.service.layoutparser.processor.visualization.LayoutparsingVisualizations;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -34,7 +33,7 @@ public class Document extends AbstractSemanticNode {
     Set<Page> pages;
     Integer numberOfPages;
 
-    LayoutDebugLayer layoutDebugLayer;
+    LayoutparsingVisualizations visualizations;
 
 
     @Override
@@ -61,8 +60,8 @@ public class Document extends AbstractSemanticNode {
      *
      * @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.
+     *  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() {
@@ -102,7 +101,8 @@ public class Document extends AbstractSemanticNode {
     public Headline getHeadline() {
 
         return streamAllSubNodesOfType(NodeType.HEADLINE).map(node -> (Headline) node)
-                .findFirst().orElse(Headline.builder().build());
+                .findFirst()
+                .orElse(Headline.builder().build());
     }
 
 
@@ -163,11 +163,4 @@ public class Document extends AbstractSemanticNode {
         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

@@ -25,4 +25,11 @@ public class DuplicatedParagraph extends Paragraph {
 
     }
 
+
+    @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,7 +1,6 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeTypeProto.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
 
 import lombok.AccessLevel;
@@ -35,12 +34,6 @@ public class Footer extends AbstractSemanticNode {
     }
 
 
-    @Override
-    public void accept(NodeVisitor visitor) {
-        visitor.visit(this);
-    }
-
-
     @Override
     public TextBlock getTextBlock() {
 

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

@@ -1,7 +1,6 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeTypeProto.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
 
 import lombok.AccessLevel;
@@ -28,13 +27,6 @@ public class Header extends AbstractSemanticNode {
     }
 
 
-    @Override
-    public void accept(NodeVisitor visitor) {
-
-        visitor.visit(this);
-    }
-
-
     @Override
     public NodeType getType() {
 

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

@@ -1,7 +1,6 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeTypeProto.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
 
 import lombok.AccessLevel;
@@ -35,13 +34,6 @@ public class Headline extends AbstractSemanticNode {
     }
 
 
-    @Override
-    public void accept(NodeVisitor visitor) {
-
-        visitor.visit(this);
-    }
-
-
     @Override
     public TextBlock getTextBlock() {
 

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

@@ -6,8 +6,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeTypeProto.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
 
 import lombok.AccessLevel;
@@ -87,29 +86,10 @@ public class Image extends AbstractSemanticNode {
     }
 
 
-    @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

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

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

@@ -1,15 +1,12 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
 
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Stream;
 
 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.AtomicTextBlock;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector;
 
@@ -32,8 +29,9 @@ public class Page {
     Integer height;
     Integer width;
     Integer rotation;
+
     @EqualsAndHashCode.Exclude
-    List<AtomicTextBlock> textBlocksOnPage;
+    List<SemanticNode> mainBody;
     @EqualsAndHashCode.Exclude
     Header header;
     @EqualsAndHashCode.Exclude
@@ -41,7 +39,7 @@ public class Page {
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
-    Set<TextEntity> entities = new HashSet<>();
+    Set<RedactionEntity> entities = new HashSet<>();
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
@@ -55,41 +53,14 @@ public class Page {
                 .width((int) classificationPage.getPageWidth())
                 .number(classificationPage.getPageNumber())
                 .rotation(classificationPage.getRotation())
-                .textBlocksOnPage(new LinkedList<>())
+                .mainBody(new LinkedList<>())
                 .build();
     }
 
 
-    /**
-     * Constructs and returns a {@link TextBlock} representing the concatenated text of all leaf semantic nodes in the main body.
-     *
-     * @return The main body text block.
-     */
     public TextBlock getMainBodyTextBlock() {
 
-        return textBlocksOnPage.stream()
-                .filter(atb -> !atb.isEmpty())
-                .collect(new TextBlockCollector());
-    }
-
-
-    public List<SemanticNode> getMainBody() {
-
-        return textBlocksOnPage.stream()
-                .map(AtomicTextBlock::getParent)
-                .map(this::getHighestParentOnPage)
-                .distinct()
-                .toList();
-    }
-
-
-    private SemanticNode getHighestParentOnPage(SemanticNode node) {
-
-        SemanticNode currentNode = node;
-        while (currentNode.hasParent() && currentNode.getParent().onlyOnPage(this)) {
-            currentNode = currentNode.getParent();
-        }
-        return currentNode;
+        return mainBody.stream().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).collect(new TextBlockCollector());
     }
 
 
@@ -113,10 +84,4 @@ public class Page {
         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,7 +1,6 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeTypeProto.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
 
 import lombok.AccessLevel;
@@ -35,13 +34,6 @@ public class Paragraph extends AbstractSemanticNode {
     }
 
 
-    @Override
-    public void accept(NodeVisitor visitor) {
-
-        visitor.visit(this);
-    }
-
-
     @Override
     public TextBlock getTextBlock() {
 

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

@@ -1,8 +1,6 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
 
-
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeTypeProto.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -28,20 +26,15 @@ public class Section extends AbstractSemanticNode {
     public Headline getHeadline() {
 
         return streamChildrenOfType(NodeType.HEADLINE).map(node -> (Headline) node)
-                .findFirst().orElseGet(() -> getParent().getHeadline());
-    }
-
-
-    @Override
-    public void accept(NodeVisitor visitor) {
-
-        visitor.visit(this);
+                .findFirst()
+                .orElseGet(() -> getParent().getHeadline());
     }
 
 
     public boolean hasTables() {
 
-        return streamAllSubNodesOfType(NodeType.TABLE).findAny().isPresent();
+        return streamAllSubNodesOfType(NodeType.TABLE).findAny()
+                .isPresent();
     }
 
 

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

@@ -12,18 +12,16 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngineProto.LayoutEngine;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeTypeProto.NodeType;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngine;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.Boundary;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
-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.entity.RedactionEntity;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector;
-import com.knecon.fforesight.service.layoutparser.processor.utils.BBoxMergingUtility;
 import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
 
 public interface SemanticNode {
 
@@ -44,9 +42,7 @@ public interface SemanticNode {
      */
     default TextBlock getTextBlock() {
 
-        return streamAllSubNodes().filter(SemanticNode::isLeaf)
-                .map(SemanticNode::getTextBlock)
-                .collect(new TextBlockCollector());
+        return streamAllSubNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getTextBlock).collect(new TextBlockCollector());
     }
 
 
@@ -56,7 +52,7 @@ public interface SemanticNode {
      *
      * @return Set of all Entities associated with this Node
      */
-    Set<TextEntity> getEntities();
+    Set<RedactionEntity> getEntities();
 
 
     /**
@@ -72,10 +68,7 @@ public interface SemanticNode {
 
     default Page getFirstPage() {
 
-        return getTextBlock().getPages()
-                .stream()
-                .min(Comparator.comparingInt(Page::getNumber))
-                .orElseThrow(() -> new IllegalStateException("SemanticNode has no Page!"));
+        return getTextBlock().getPages().stream().min(Comparator.comparingInt(Page::getNumber)).orElseThrow(() -> new IllegalStateException("SemanticNode has no Page!"));
     }
 
 
@@ -84,19 +77,18 @@ public interface SemanticNode {
      *
      * @return Set of PageNodes this node appears on.
      */
-    default Set<Page> getPages(TextRange textRange) {
+    default Set<Page> getPages(Boundary boundary) {
 
-        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()));
+        if (!getBoundary().contains(boundary)) {
+            throw new IllegalArgumentException(format("%s which was used to query for pages is not contained in the %s of this node!", boundary, getBoundary()));
         }
-        return getTextBlock().getPages(textRange);
+        return getTextBlock().getPages(boundary);
     }
 
 
     default boolean isOnPage(int pageNumber) {
 
-        return getPages().stream()
-                .anyMatch(page -> page.getNumber() == pageNumber);
+        return getPages().stream().anyMatch(page -> page.getNumber() == pageNumber);
     }
 
 
@@ -211,9 +203,7 @@ public interface SemanticNode {
      */
     default boolean hasEntitiesOfType(String type) {
 
-        return getEntities().stream()
-                .filter(entity -> entity.getEntityType().equals(EntityType.ENTITY))
-                .anyMatch(redactionEntity -> redactionEntity.getType().equals(type));
+        return getEntities().stream().filter(entity -> entity.getEntityType().equals(EntityType.ENTITY)).anyMatch(redactionEntity -> redactionEntity.getType().equals(type));
     }
 
 
@@ -223,11 +213,9 @@ public interface SemanticNode {
      * @param type string representing the type of entities to return
      * @return List of RedactionEntities of any the type
      */
-    default List<TextEntity> getEntitiesOfType(String type) {
+    default List<RedactionEntity> getEntitiesOfType(String type) {
 
-        return getEntities().stream()
-                .filter(redactionEntity -> redactionEntity.getType().equals(type))
-                .toList();
+        return getEntities().stream().filter(redactionEntity -> redactionEntity.getType().equals(type)).toList();
     }
 
 
@@ -237,11 +225,9 @@ public interface SemanticNode {
      * @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) {
+    default List<RedactionEntity> getEntitiesOfType(List<String> types) {
 
-        return getEntities().stream()
-                .filter(redactionEntity -> redactionEntity.isAnyType(types))
-                .toList();
+        return getEntities().stream().filter(redactionEntity -> redactionEntity.isAnyType(types)).toList();
     }
 
 
@@ -293,8 +279,7 @@ public interface SemanticNode {
      */
     default boolean containsStrings(List<String> strings) {
 
-        return strings.stream()
-                .allMatch(this::containsString);
+        return strings.stream().allMatch(this::containsString);
     }
 
 
@@ -318,8 +303,7 @@ public interface SemanticNode {
      */
     default boolean containsAnyString(List<String> strings) {
 
-        return strings.stream()
-                .anyMatch(this::containsString);
+        return strings.stream().anyMatch(this::containsString);
     }
 
 
@@ -331,8 +315,7 @@ public interface SemanticNode {
      */
     default boolean containsAnyStringIgnoreCase(List<String> strings) {
 
-        return strings.stream()
-                .anyMatch(this::containsStringIgnoreCase);
+        return strings.stream().anyMatch(this::containsStringIgnoreCase);
     }
 
 
@@ -340,19 +323,19 @@ public interface SemanticNode {
      * 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
+     * @param redactionEntity RedactionEntity, which is being inserted into the graph
      */
-    default void addThisToEntityIfIntersects(TextEntity textEntity) {
+    default void addThisToEntityIfIntersects(RedactionEntity redactionEntity) {
 
         TextBlock textBlock = getTextBlock();
-        if (textBlock.getTextRange().intersects(textEntity.getTextRange())) {
-            if (textBlock.containsBoundary(textEntity.getTextRange())) {
-                textEntity.setDeepestFullyContainingNode(this);
+        if (textBlock.getBoundary().intersects(redactionEntity.getBoundary())) {
+            if (textBlock.containsBoundary(redactionEntity.getBoundary())) {
+                redactionEntity.setDeepestFullyContainingNode(this);
             }
 
-            textEntity.addIntersectingNode(this);
-            streamChildren().filter(semanticNode -> semanticNode.getBoundary().intersects(textEntity.getTextRange()))
-                    .forEach(node -> node.addThisToEntityIfIntersects(textEntity));
+            redactionEntity.addIntersectingNode(this);
+            streamChildren().filter(semanticNode -> semanticNode.getBoundary().intersects(redactionEntity.getBoundary()))
+                    .forEach(node -> node.addThisToEntityIfIntersects(redactionEntity));
         }
     }
 
@@ -403,8 +386,7 @@ public interface SemanticNode {
      */
     default Stream<SemanticNode> streamAllSubNodes() {
 
-        return getDocumentTree().allSubEntriesInOrder(getTreeId())
-                .map(DocumentTree.Entry::getNode);
+        return getDocumentTree().allSubEntriesInOrder(getTreeId()).map(DocumentTree.Entry::getNode);
     }
 
 
@@ -415,9 +397,7 @@ public interface SemanticNode {
      */
     default Stream<SemanticNode> streamAllSubNodesOfType(NodeType nodeType) {
 
-        return getDocumentTree().allSubEntriesInOrder(getTreeId())
-                .filter(entry -> entry.getType().equals(nodeType))
-                .map(DocumentTree.Entry::getNode);
+        return getDocumentTree().allSubEntriesInOrder(getTreeId()).filter(entry -> entry.getType().equals(nodeType)).map(DocumentTree.Entry::getNode);
     }
 
 
@@ -426,9 +406,9 @@ public interface SemanticNode {
      *
      * @return Boundary of this Node's TextBlock
      */
-    default TextRange getBoundary() {
+    default Boundary getBoundary() {
 
-        return getTextBlock().getTextRange();
+        return getTextBlock().getBoundary();
     }
 
 
@@ -473,19 +453,17 @@ public interface SemanticNode {
      */
     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;
+        Map<Page, Rectangle2D> bBoxPerPage = new HashMap<>();
+        List<Map<Page, Rectangle2D>> childrenBBoxes = streamChildren().map(SemanticNode::getBBox).toList();
+        Set<Page> pages = childrenBBoxes.stream().flatMap(map -> map.keySet().stream()).collect(Collectors.toSet());
+        for (Page page : pages) {
+            Rectangle2D bBoxOnPage = childrenBBoxes.stream()
+                    .filter(childBboxPerPage -> childBboxPerPage.containsKey(page))
+                    .map(childBboxPerPage -> childBboxPerPage.get(page))
+                    .collect(RectangleTransformations.collectBBox());
+            bBoxPerPage.put(page, bBoxOnPage);
         }
-        return ((Image) child).isFullPageImage();
+        return bBoxPerPage;
     }
 
 
@@ -495,27 +473,9 @@ public interface SemanticNode {
     private Map<Page, Rectangle2D> getBBoxFromLeafTextBlock() {
 
         Map<Page, Rectangle2D> bBoxPerPage = new HashMap<>();
-        Map<Page, List<AtomicTextBlock>> atomicTextBlockPerPage = getTextBlock().getAtomicTextBlocks()
-                .stream()
-                .collect(Collectors.groupingBy(AtomicTextBlock::getPage));
+        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);
-
-
-    /**
-     * Checks wether this SemanticNode appears on a single page only, and if that page is the provided one.
-     *
-     * @param page the page to check
-     * @return true, when SemanticNode is on a single page only and the page is the provided page. Otherwise, false.
-     */
-    default boolean onlyOnPage(Page page) {
-
-        Set<Page> pages = getPages();
-        return pages.size() == 1 && pages.contains(page);
-    }
-
 }

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

@@ -1,7 +1,6 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeTypeProto.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -27,14 +26,8 @@ public class SuperSection extends AbstractSemanticNode {
     public Headline getHeadline() {
 
         return streamChildrenOfType(NodeType.HEADLINE).map(node -> (Headline) node)
-                .findFirst().orElseGet(() -> getParent().getHeadline());
-    }
-
-
-    @Override
-    public void accept(NodeVisitor visitor) {
-
-        visitor.visit(this);
+                .findFirst()
+                .orElseGet(() -> getParent().getHeadline());
     }
 
 

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

@@ -12,11 +12,10 @@ import java.util.Set;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.LayoutEngineProto.LayoutEngine;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeTypeProto.NodeType;
+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.entity.RedactionEntity;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector;
 
@@ -44,7 +43,7 @@ public class Table implements SemanticNode {
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
-    Set<TextEntity> entities = new HashSet<>();
+    Set<RedactionEntity> entities = new HashSet<>();
 
     @EqualsAndHashCode.Exclude
     Map<Page, Rectangle2D> bBoxCache;
@@ -55,7 +54,7 @@ public class Table implements SemanticNode {
      * @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) {
+    public Stream<RedactionEntity> streamEntitiesWhereRowContainsStringsIgnoreCase(List<String> strings) {
 
         return IntStream.range(0, numberOfRows).boxed()
                 .filter(row -> rowContainsStringsIgnoreCase(row, strings))
@@ -89,7 +88,7 @@ public class Table implements SemanticNode {
      * @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) {
+    public Stream<RedactionEntity> streamEntitiesWhereRowHasHeaderAndValue(String header, String value) {
 
         List<Integer> vertebrateStudyCols = streamHeaders().filter(headerNode -> headerNode.containsString(header))
                 .map(TableCell::getCol)
@@ -108,7 +107,7 @@ public class Table implements SemanticNode {
      * @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) {
+    public Stream<RedactionEntity> streamEntitiesWhereRowHasHeaderAndAnyValue(String header, List<String> values) {
 
         List<Integer> colsWithHeader = streamHeaders().filter(headerNode -> headerNode.containsString(header))
                 .map(TableCell::getCol)
@@ -126,7 +125,7 @@ public class Table implements SemanticNode {
      * @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) {
+    public Stream<RedactionEntity> streamEntitiesWhereRowContainsEntitiesOfType(List<String> types) {
 
         List<Integer> rowsWithEntityOfType = IntStream.range(0, numberOfRows).boxed()
                 .filter(rowNumber -> streamEntityTypesInRow(rowNumber).anyMatch(existingType -> types.stream()
@@ -146,7 +145,7 @@ public class Table implements SemanticNode {
      * @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) {
+    public Stream<RedactionEntity> streamEntitiesWhereRowContainsNoEntitiesOfType(List<String> types) {
 
         List<Integer> rowsWithNoEntityOfType = IntStream.range(0, numberOfRows).boxed()
                 .filter(rowNumber -> streamEntityTypesInRow(rowNumber).noneMatch(existingType -> types.stream()
@@ -164,7 +163,7 @@ public class Table implements SemanticNode {
 
         return streamRow(rowNumber).map(TableCell::getEntities)
                 .flatMap(Collection::stream)
-                .map(TextEntity::getType)
+                .map(RedactionEntity::getType)
                 .distinct();
     }
 
@@ -305,12 +304,12 @@ public class Table implements SemanticNode {
      * 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
+     * @param redactionEntity 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) {
+    public List<RedactionEntity> getEntitiesOfTypeInSameRow(String type, RedactionEntity redactionEntity) {
 
-        return textEntity.getIntersectingNodes()
+        return redactionEntity.getIntersectingNodes()
                 .stream()
                 .filter(node -> node instanceof TableCell)
                 .map(node -> (TableCell) node)
@@ -354,10 +353,4 @@ public class Table implements SemanticNode {
         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

@@ -4,8 +4,7 @@ import java.awt.geom.Rectangle2D;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeTypeProto.NodeType;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.NodeVisitor;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector;
 
@@ -43,13 +42,6 @@ public class TableCell extends AbstractSemanticNode {
     }
 
 
-    @Override
-    public void accept(NodeVisitor visitor) {
-
-        visitor.visit(this);
-    }
-
-
     @Override
     public NodeType getType() {
 

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

@@ -1,6 +1,5 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock;
 
-import static com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentTextDataProto.DocumentTextData;
 import static java.lang.String.format;
 
 import java.awt.geom.Rectangle2D;
@@ -11,12 +10,10 @@ 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.DocumentPositionDataProto.DocumentPositionData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPositionDataProto.DocumentPositionData.Position;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.TextRange;
+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.Boundary;
 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;
@@ -39,14 +36,14 @@ public class AtomicTextBlock implements TextBlock {
     Page page;
 
     //string coordinates
-    TextRange textRange;
+    Boundary boundary;
     String searchText;
     @Builder.Default
     List<Integer> lineBreaks = new ArrayList<>();
     @Builder.Default
-    List<TextRange> boldTextBoundaries = new ArrayList<>();
+    List<Boundary> boldTextBoundaries = new ArrayList<>();
     @Builder.Default
-    List<TextRange> italicTextBoundaries = new ArrayList<>();
+    List<Boundary> italicTextBoundaries = new ArrayList<>();
     String orientation;
     int textDirection;
 
@@ -67,44 +64,10 @@ public class AtomicTextBlock implements TextBlock {
     }
 
 
-    @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<Boundary> boldTextBoundaries,
+                                                                 List<Boundary> italicTextBoundaries,
                                                                  List<Rectangle2D> positions,
                                                                  List<Integer> stringIdxToPositionIdx,
                                                                  long idx,
@@ -126,7 +89,7 @@ public class AtomicTextBlock implements TextBlock {
                 .italicTextBoundaries(italicTextBoundaries)
                 .positions(positions)
                 .stringIdxToPositionIdx(stringIdxToPositionIdx)
-                .textRange(new TextRange(offset, offset + searchText.length()))
+                .boundary(new Boundary(offset, offset + searchText.length()))
                 .textDirection(textDirection)
                 .orientation(orientation)
                 .build();
@@ -137,7 +100,7 @@ public class AtomicTextBlock implements TextBlock {
 
         return AtomicTextBlock.builder()
                 .id(textBlockIdx)
-                .textRange(new TextRange(stringOffset, stringOffset))
+                .boundary(new Boundary(stringOffset, stringOffset))
                 .searchText("")
                 .page(page)
                 .numberOnPage(numberOnPage)
@@ -146,17 +109,20 @@ public class AtomicTextBlock implements TextBlock {
     }
 
 
-    public static AtomicTextBlock fromAtomicTextBlockData(DocumentTextData documentTextData, DocumentPositionData documentPositionData, SemanticNode parent, Page page) {
+    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()))
+                .boundary(new Boundary(documentTextData.getStart(), documentTextData.getEnd()))
                 .searchText(documentTextData.getSearchText())
-                .lineBreaks(documentTextData.getLineBreaksList())
-                .stringIdxToPositionIdx(documentPositionData.getStringIdxToPositionIdxList())
-                .positions(toRectangle2DList(documentPositionData.getPositionsList()))
+                .lineBreaks(Arrays.stream(documentTextData.getLineBreaks()).boxed().toList())
+                .stringIdxToPositionIdx(Arrays.stream(documentPositionData.getStringIdxToPositionIdx()).boxed().toList())
+                .positions(toRectangle2DList(documentPositionData.getPositions()))
                 .parent(parent)
                 .build();
     }
@@ -164,17 +130,7 @@ public class AtomicTextBlock implements TextBlock {
 
     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();
-    }
-
-
-    private static List<Rectangle2D> toRectangle2DList(List<Position> positions) {
-
-        return positions.stream()
-                .map(pos -> (Rectangle2D) new Rectangle2D.Float(pos.getValue(0), pos.getValue(1), pos.getValue(2), pos.getValue(3)))
-                .toList();
+        return Arrays.stream(positions).map(floatArr -> (Rectangle2D) new Rectangle2D.Float(floatArr[0], floatArr[1], floatArr[2], floatArr[3])).toList();
     }
 
 
@@ -184,14 +140,11 @@ public class AtomicTextBlock implements TextBlock {
             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());
+            return subSequence(boundary.start(), lineBreaks.get(0) + boundary.start());
         } else if (lineNumber == numberOfLines() - 1) {
-            return subSequence(lineBreaks.get(lineBreaks.size() - 1) + textRange.start(), textRange.end());
+            return subSequence(lineBreaks.get(lineBreaks.size() - 1) + boundary.start(), boundary.end());
         }
-        return subSequence(lineBreaks.get(lineNumber - 1) + textRange.start(), lineBreaks.get(lineNumber) + textRange.start());
+        return subSequence(lineBreaks.get(lineNumber - 1) + boundary.start(), lineBreaks.get(lineNumber) + boundary.start());
     }
 
 
@@ -206,9 +159,9 @@ public class AtomicTextBlock implements TextBlock {
     public int getNextLinebreak(int fromIndex) {
 
         return lineBreaks.stream()//
-                       .filter(linebreak -> linebreak > fromIndex - textRange.start()) //
-                       .findFirst() //
-                       .orElse(searchText.length()) + textRange.start();
+                .filter(linebreak -> linebreak > fromIndex - boundary.start()) //
+                .findFirst() //
+                .orElse(searchText.length()) + boundary.start();
     }
 
 
@@ -216,43 +169,43 @@ public class AtomicTextBlock implements TextBlock {
     public int getPreviousLinebreak(int fromIndex) {
 
         return lineBreaks.stream()//
-                       .filter(linebreak -> linebreak <= fromIndex - textRange.start())//
-                       .reduce((a, b) -> b)//
-                       .orElse(0) + textRange.start();
+                .filter(linebreak -> linebreak <= fromIndex - boundary.start())//
+                .reduce((a, b) -> b)//
+                .orElse(0) + boundary.start();
     }
 
 
     @Override
     public Rectangle2D getPosition(int stringIdx) {
 
-        return positions.get(stringIdxToPositionIdx.get(stringIdx - textRange.start()));
+        return positions.get(stringIdxToPositionIdx.get(stringIdx - boundary.start()));
     }
 
 
     @Override
-    public List<Rectangle2D> getPositions(TextRange stringTextRange) {
+    public List<Rectangle2D> getPositions(Boundary stringBoundary) {
 
-        if (!containsBoundary(stringTextRange)) {
-            throw new IndexOutOfBoundsException(format("%s is out of bounds for %s", stringTextRange, this.textRange));
+        if (!containsBoundary(stringBoundary)) {
+            throw new IndexOutOfBoundsException(format("%s is out of bounds for %s", stringBoundary, this.boundary));
         }
-        if (stringTextRange.length() == 0) {
+        if (stringBoundary.length() == 0) {
             return Collections.emptyList();
         }
 
-        int startPositionIdx = stringIdxToPositionIdx.get(stringTextRange.start() - this.textRange.start());
+        int startPositionIdx = stringIdxToPositionIdx.get(stringBoundary.start() - this.boundary.start());
 
-        if (stringTextRange.end() == this.textRange.end()) {
+        if (stringBoundary.end() == this.boundary.end()) {
             return positions.subList(startPositionIdx, positions.size());
         }
 
-        return positions.subList(startPositionIdx, stringIdxToPositionIdx.get(stringTextRange.end() - this.textRange.start()));
+        return positions.subList(startPositionIdx, stringIdxToPositionIdx.get(stringBoundary.end() - this.boundary.start()));
 
     }
 
 
-    public Map<Page, List<Rectangle2D>> getPositionsPerPage(TextRange stringTextRange) {
+    public Map<Page, List<Rectangle2D>> getPositionsPerPage(Boundary stringBoundary) {
 
-        List<Rectangle2D> rectanglesPerLine = stringTextRange.split(getAllLineBreaksInBoundary(stringTextRange))
+        List<Rectangle2D> rectanglesPerLine = stringBoundary.split(getAllLineBreaksInBoundary(stringBoundary))
                 .stream()
                 .map(this::getPositions)
                 .map(RectangleTransformations::rectangleBBoxWithGaps)
@@ -264,12 +217,9 @@ public class AtomicTextBlock implements TextBlock {
     }
 
 
-    protected List<Integer> getAllLineBreaksInBoundary(TextRange textRange) {
+    private List<Integer> getAllLineBreaksInBoundary(Boundary boundary) {
 
-        return getLineBreaks().stream()
-                .map(linebreak -> linebreak + this.textRange.start())
-                .filter(textRange::contains)
-                .toList();
+        return getLineBreaks().stream().map(linebreak -> linebreak + this.boundary.start()).filter(boundary::contains).toList();
     }
 
 

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

@@ -11,7 +11,7 @@ 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.Boundary;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page;
 
 import lombok.AccessLevel;
@@ -24,7 +24,7 @@ public class ConcatenatedTextBlock implements TextBlock {
 
     List<AtomicTextBlock> atomicTextBlocks;
     String searchText;
-    TextRange textRange;
+    Boundary boundary;
 
 
     public static ConcatenatedTextBlock empty() {
@@ -37,30 +37,29 @@ public class ConcatenatedTextBlock implements TextBlock {
 
         this.atomicTextBlocks = new LinkedList<>();
         if (atomicTextBlocks.isEmpty()) {
-            textRange = new TextRange(-1, -1);
+            boundary = new Boundary(-1, -1);
             return;
         }
         var firstTextBlock = atomicTextBlocks.get(0);
         this.atomicTextBlocks.add(firstTextBlock);
-        textRange = new TextRange(firstTextBlock.getTextRange().start(), firstTextBlock.getTextRange().end());
+        boundary = new Boundary(firstTextBlock.getBoundary().start(), firstTextBlock.getBoundary().end());
 
-        atomicTextBlocks.subList(1, atomicTextBlocks.size())
-                .forEach(this::concat);
+        atomicTextBlocks.subList(1, atomicTextBlocks.size()).forEach(this::concat);
     }
 
 
     public ConcatenatedTextBlock concat(TextBlock textBlock) {
 
-        int start = textBlock.getTextRange().start();
-        int end = textBlock.getTextRange().end();
+        int start = textBlock.getBoundary().start();
+        int end = textBlock.getBoundary().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()));
+            boundary.setStart(start);
+            boundary.setEnd(end);
+        } else if (boundary.end() != start) {
+            throw new UnsupportedOperationException(format("Can only concat consecutive TextBlocks, trying to concat %s and %s", boundary, textBlock.getBoundary()));
         }
         this.atomicTextBlocks.addAll(textBlock.getAtomicTextBlocks());
-        textRange.setEnd(end);
+        boundary.setEnd(end);
         this.searchText = null;
         return this;
     }
@@ -68,18 +67,13 @@ public class ConcatenatedTextBlock implements TextBlock {
 
     private AtomicTextBlock getAtomicTextBlockByStringIndex(int stringIdx) {
 
-        return atomicTextBlocks.stream()
-                .filter(textBlock -> textBlock.getTextRange().containsExclusive(stringIdx))
-                .findAny()
-                .orElseThrow(IndexOutOfBoundsException::new);
+        return atomicTextBlocks.stream().filter(textBlock -> textBlock.getBoundary().contains(stringIdx)).findAny().orElseThrow(IndexOutOfBoundsException::new);
     }
 
 
-    private List<AtomicTextBlock> getAllAtomicTextBlocksPartiallyInStringBoundary(TextRange textRange) {
+    private List<AtomicTextBlock> getAllAtomicTextBlocksPartiallyInStringBoundary(Boundary boundary) {
 
-        return atomicTextBlocks.stream()
-                .filter(tb -> tb.getTextRange().intersects(textRange))
-                .toList();
+        return atomicTextBlocks.stream().filter(tb -> tb.getBoundary().intersects(boundary)).toList();
     }
 
 
@@ -98,9 +92,7 @@ public class ConcatenatedTextBlock implements TextBlock {
     @Override
     public int numberOfLines() {
 
-        return atomicTextBlocks.stream()
-                .map(AtomicTextBlock::getLineBreaks)
-                .mapToInt(List::size).sum();
+        return atomicTextBlocks.stream().map(AtomicTextBlock::getLineBreaks).mapToInt(List::size).sum();
     }
 
 
@@ -121,10 +113,7 @@ public class ConcatenatedTextBlock implements TextBlock {
     @Override
     public List<Integer> getLineBreaks() {
 
-        return getAtomicTextBlocks().stream()
-                .flatMap(atomicTextBlock -> atomicTextBlock.getLineBreaks()
-                        .stream())
-                .toList();
+        return getAtomicTextBlocks().stream().flatMap(atomicTextBlock -> atomicTextBlock.getLineBreaks().stream()).toList();
     }
 
 
@@ -136,48 +125,47 @@ public class ConcatenatedTextBlock implements TextBlock {
 
 
     @Override
-    public List<Rectangle2D> getPositions(TextRange stringTextRange) {
+    public List<Rectangle2D> getPositions(Boundary stringBoundary) {
 
-        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringTextRange);
+        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringBoundary);
 
         if (textBlocks.size() == 1) {
-            return textBlocks.get(0).getPositions(stringTextRange);
+            return textBlocks.get(0).getPositions(stringBoundary);
         }
 
         AtomicTextBlock firstTextBlock = textBlocks.get(0);
-        List<Rectangle2D> positions = new LinkedList<>(firstTextBlock.getPositions(new TextRange(stringTextRange.start(), firstTextBlock.getTextRange().end())));
+        List<Rectangle2D> positions = new LinkedList<>(firstTextBlock.getPositions(new Boundary(stringBoundary.start(), firstTextBlock.getBoundary().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())));
+        positions.addAll(lastTextBlock.getPositions(new Boundary(lastTextBlock.getBoundary().start(), stringBoundary.end())));
 
         return positions;
     }
 
 
     @Override
-    public Map<Page, List<Rectangle2D>> getPositionsPerPage(TextRange stringTextRange) {
+    public Map<Page, List<Rectangle2D>> getPositionsPerPage(Boundary stringBoundary) {
 
-        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringTextRange);
+        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringBoundary);
 
         if (textBlocks.size() == 1) {
-            return textBlocks.get(0).getPositionsPerPage(stringTextRange);
+            return textBlocks.get(0).getPositionsPerPage(stringBoundary);
         }
 
         AtomicTextBlock firstTextBlock = textBlocks.get(0);
-        Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = firstTextBlock.getPositionsPerPage(new TextRange(stringTextRange.start(), firstTextBlock.getTextRange().end()));
+        Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = firstTextBlock.getPositionsPerPage(new Boundary(stringBoundary.start(), firstTextBlock.getBoundary().end()));
 
         for (AtomicTextBlock textBlock : textBlocks.subList(1, textBlocks.size() - 1)) {
-            rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage, textBlock.getPositionsPerPage(textBlock.getTextRange()));
+            rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage, textBlock.getPositionsPerPage(textBlock.getBoundary()));
         }
 
         AtomicTextBlock lastTextBlock = textBlocks.get(textBlocks.size() - 1);
         rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage,
-                                                                        lastTextBlock.getPositionsPerPage(new TextRange(lastTextBlock.getTextRange().start(),
-                                                                                                                        stringTextRange.end())));
+                lastTextBlock.getPositionsPerPage(new Boundary(lastTextBlock.getBoundary().start(), stringBoundary.end())));
 
         return rectanglesPerLinePerPage;
     }
@@ -186,42 +174,11 @@ public class ConcatenatedTextBlock implements TextBlock {
     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()));
+        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() {
 
@@ -230,22 +187,16 @@ public class ConcatenatedTextBlock implements TextBlock {
 
 
     @Override
-    public List<TextRange> getBoldTextBoundaries() {
+    public List<Boundary> getBoldTextBoundaries() {
 
-        return getAtomicTextBlocks().stream()
-                .map(AtomicTextBlock::getBoldTextBoundaries)
-                .flatMap(Collection::stream)
-                .toList();
+        return getAtomicTextBlocks().stream().map(AtomicTextBlock::getBoldTextBoundaries).flatMap(Collection::stream).toList();
     }
 
 
     @Override
-    public List<TextRange> getItalicTextBoundaries() {
+    public List<Boundary> getItalicTextBoundaries() {
 
-        return getAtomicTextBlocks().stream()
-                .map(AtomicTextBlock::getItalicTextBoundaries)
-                .flatMap(Collection::stream)
-                .toList();
+        return getAtomicTextBlocks().stream().map(AtomicTextBlock::getItalicTextBoundaries).flatMap(Collection::stream).toList();
     }
 
 

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

@@ -10,7 +10,7 @@ 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.Boundary;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page;
 
 public interface TextBlock extends CharSequence {
@@ -21,10 +21,10 @@ public interface TextBlock extends CharSequence {
     List<AtomicTextBlock> getAtomicTextBlocks();
 
 
-    List<TextRange> getBoldTextBoundaries();
+    List<Boundary> getBoldTextBoundaries();
 
 
-    List<TextRange> getItalicTextBoundaries();
+    List<Boundary> getItalicTextBoundaries();
 
 
     String getOrientation();
@@ -33,7 +33,7 @@ public interface TextBlock extends CharSequence {
     int getTextDirection();
 
 
-    TextRange getTextRange();
+    Boundary getBoundary();
 
 
     int getNextLinebreak(int fromIndex);
@@ -48,41 +48,31 @@ public interface TextBlock extends CharSequence {
     Rectangle2D getPosition(int stringIdx);
 
 
-    List<Rectangle2D> getPositions(TextRange stringTextRange);
+    List<Rectangle2D> getPositions(Boundary stringBoundary);
 
 
-    Map<Page, List<Rectangle2D>> getPositionsPerPage(TextRange stringTextRange);
+    Map<Page, List<Rectangle2D>> getPositionsPerPage(Boundary stringBoundary);
 
 
     int numberOfLines();
 
 
-    String subSequenceWithLineBreaks(TextRange stringTextRange);
-
-
-    default String searchTextWithLineBreaks() {
-
-        return subSequenceWithLineBreaks(getTextRange());
-    }
-
     default int indexOf(String searchTerm) {
 
-        return indexOf(searchTerm, getTextRange().start());
+        return indexOf(searchTerm, getBoundary().start());
     }
 
 
     default Set<Page> getPages() {
 
-        return getAtomicTextBlocks().stream()
-                .map(AtomicTextBlock::getPage)
-                .collect(Collectors.toUnmodifiableSet());
+        return getAtomicTextBlocks().stream().map(AtomicTextBlock::getPage).collect(Collectors.toUnmodifiableSet());
     }
 
 
-    default Set<Page> getPages(TextRange textRange) {
+    default Set<Page> getPages(Boundary boundary) {
 
         return getAtomicTextBlocks().stream()
-                .filter(atomicTextBlock -> atomicTextBlock.getTextRange().intersects(textRange))
+                .filter(atomicTextBlock -> atomicTextBlock.getBoundary().intersects(boundary))
                 .map(AtomicTextBlock::getPage)
                 .collect(Collectors.toUnmodifiableSet());
     }
@@ -90,38 +80,38 @@ public interface TextBlock extends CharSequence {
 
     default int indexOf(String searchTerm, int startOffset) {
 
-        int start = getSearchText().indexOf(searchTerm, startOffset - getTextRange().start());
+        int start = getSearchText().indexOf(searchTerm, startOffset - getBoundary().start());
         if (start == -1) {
             return -1;
         }
-        return start + getTextRange().start();
+        return start + getBoundary().start();
     }
 
 
     default CharSequence getFirstLine() {
 
-        return subSequence(getTextRange().start(), getNextLinebreak(getTextRange().start()));
+        return subSequence(getBoundary().start(), getNextLinebreak(getBoundary().start()));
     }
 
 
-    default boolean containsBoundary(TextRange textRange) {
+    default boolean containsBoundary(Boundary boundary) {
 
-        if (textRange.end() < textRange.start()) {
-            throw new IllegalArgumentException(format("Invalid %s, StartIndex must be smaller than EndIndex", textRange));
+        if (boundary.end() < boundary.start()) {
+            throw new IllegalArgumentException(format("Invalid %s, StartIndex must be smaller than EndIndex", boundary));
         }
-        return getTextRange().contains(textRange);
+        return getBoundary().contains(boundary);
     }
 
 
     default boolean containsIndex(int stringIndex) {
 
-        return getTextRange().containsExclusive(stringIndex);
+        return getBoundary().contains(stringIndex);
     }
 
 
-    default CharSequence subSequence(TextRange textRange) {
+    default CharSequence subSequence(Boundary boundary) {
 
-        return subSequence(textRange.start(), textRange.end());
+        return subSequence(boundary.start(), boundary.end());
     }
 
 
@@ -138,21 +128,21 @@ public interface TextBlock extends CharSequence {
     @Override
     default CharSequence subSequence(int start, int end) {
 
-        return getSearchText().substring(start - getTextRange().start(), end - getTextRange().start());
+        return getSearchText().substring(start - getBoundary().start(), end - getBoundary().start());
     }
 
 
     @Override
     default int length() {
 
-        return getTextRange().length();
+        return getBoundary().length();
     }
 
 
     @Override
     default char charAt(int index) {
 
-        return getSearchText().charAt(index - getTextRange().start());
+        return getSearchText().charAt(index - getBoundary().start());
     }
 
 }

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

@@ -10,8 +10,8 @@ import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
 @Data
-@AllArgsConstructor
 @RequiredArgsConstructor
+@AllArgsConstructor
 public class ClassifiedImage {
 
     @NonNull
@@ -20,18 +20,11 @@ public class ClassifiedImage {
     private ImageType imageType;
     private boolean sourceByAi;
     private boolean isAppendedToSection;
+    @NonNull
     private boolean hasTransparency;
+    @NonNull
     private int page;
+    @NonNull
     private String representation;
 
-
-    public ClassifiedImage(@NonNull Rectangle2D position, @NonNull ImageType imageType, boolean hasTransparency, int page, String representation) {
-
-        this.position = position;
-        this.imageType = imageType;
-        this.hasTransparency = hasTransparency;
-        this.page = page;
-        this.representation = representation;
-    }
-
 }

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

@@ -1,6 +1,5 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.outline;
 
-import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -27,9 +26,6 @@ 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.utils.PageInformation;
-
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
@@ -86,20 +82,11 @@ public class OutlineExtractorService {
 
         String title = item.getTitle();
 
-        PDPage page;
-        try {
-            // Can throw: "Error: can't convert to Destination COSArray" for some OCR'd PDFs
-            page = item.findDestinationPage(document);
-            if (page == null) {
-                return Optional.empty();
-            }
-        } catch (IOException e) {
-            log.info(String.format("Error occurred during position resolution for outline item with title %s: " + e, title));
+        PDPage page = item.findDestinationPage(document);
+        if (page == null) {
             return Optional.empty();
         }
-
-        int pageNumber = document.getPages().indexOf(page) + 1;
-        AffineTransform userSpaceToPageCoords = CoordinateTransforms.calculateInitialUserSpaceCoordsToPageCoords(PageInformation.fromPDPage(pageNumber, page));
+        int pageNumber = document.getPages().indexOf(page);
 
         Optional<Point2D> outlinePosition = Optional.empty();
 
@@ -128,15 +115,8 @@ 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,
-                                                                       transformPointToPageCoords(outlinePosition, userSpaceToPageCoords), depth)));
-    }
+        return Optional.of(new OutlineObjectTreeNode(new OutlineObject(title, pageNumber, outlinePosition.orElse(new Point2D.Float(0, 0)), 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,34 +1,27 @@
 package com.knecon.fforesight.service.layoutparser.processor.model.outline;
 
 import java.awt.geom.Point2D;
-import java.util.Optional;
 
-import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.BoundingBox;
-
-import lombok.Getter;
-import lombok.Setter;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
 
+@Data
+@RequiredArgsConstructor
+@AllArgsConstructor
 public class OutlineObject {
 
-    @Getter
     private final String title;
-    @Getter
     private final int pageNumber;
-    @Getter
+    private Point2D point;
     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 = title;
-        this.pageNumber = pageNumber;
-        this.treeDepth = depth;
+        this(title, pageNumber, depth);
         this.point = point2D;
     }
 
@@ -39,39 +32,4 @@ 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,28 +39,4 @@ 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/OutlineValidationService.java

@@ -10,20 +10,15 @@ 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;
 import lombok.extern.slf4j.Slf4j;
 
 @Service
 @Slf4j
 public class OutlineValidationService {
 
-    @Observed(name = "OutlineValidationService", contextualName = "create-toc")
-    public TableOfContents createToC(ClassificationDocument classificationDocument) {
-
-        List<TextPageBlock> headlines = extractHeadlines(classificationDocument);
+    public TableOfContents createToC(List<TextPageBlock> headlines) {
 
         List<TableOfContentItem> mainSections = new ArrayList<>();
         Map<Integer, TableOfContentItem> lastItemsPerDepth = new HashMap<>();
@@ -63,16 +58,4 @@ public class OutlineValidationService {
         return new TableOfContents(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/TOCEnrichmentService.java

@@ -1,7 +1,6 @@
 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;
@@ -168,7 +167,7 @@ public class TOCEnrichmentService {
             }
         }
 
-        if (!startBlocks.isEmpty() || !startImages.isEmpty()) {
+        if (!startBlocks.isEmpty()) {
             TableOfContentItem unassigned = new TableOfContentItem(null);
             unassigned.setSectionBlocks(startBlocks);
             unassigned.setImages(startImages);
@@ -186,8 +185,12 @@ 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);
@@ -198,7 +201,8 @@ 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++) {
@@ -221,15 +225,18 @@ public class TOCEnrichmentService {
 
         return table.getRows()
                 .stream()
-                .flatMap(Collection::stream)
-                .allMatch(cell -> cell.getHeaderCells().isEmpty());
+                .flatMap(row -> row.stream()
+                        .filter(cell -> !cell.getHeaderCells().isEmpty()))
+                .findAny().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/TableOfContentItem.java

@@ -5,7 +5,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.GenericSemanticNode;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.AbstractSemanticNode;
 import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage;
 import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock;
 
@@ -24,7 +24,7 @@ public class TableOfContentItem {
     private List<AbstractPageBlock> sectionBlocks = new ArrayList<>();
     private List<ClassifiedImage> images = new ArrayList<>();
 
-    private GenericSemanticNode section;
+    private AbstractSemanticNode section;
 
 
     public TableOfContentItem(TextPageBlock headline) {
@@ -45,7 +45,8 @@ public class TableOfContentItem {
         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;
@@ -57,7 +58,8 @@ public class TableOfContentItem {
         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;
@@ -91,19 +93,17 @@ 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

@@ -9,7 +9,7 @@ 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.Word;
+import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
 import com.knecon.fforesight.service.layoutparser.processor.utils.TextNormalizationUtilities;
 
 import lombok.Data;
@@ -35,14 +35,14 @@ public class Cell extends BoundingBox {
 
     public Cell(Point2D topLeft, Point2D bottomRight) {
 
-        this.bBoxPdf = new Rectangle2D.Double(topLeft.getX(), topLeft.getY(), (bottomRight.getX() - topLeft.getX()), (bottomRight.getY() - topLeft.getY()));
-        this.bBox = bBoxPdf;
+        this.bBoxInitialUserSpace = new Rectangle2D.Double(topLeft.getX(), topLeft.getY(), (bottomRight.getX() - topLeft.getX()), (bottomRight.getY() - topLeft.getY()));
+        this.bBox = bBoxInitialUserSpace;
     }
 
 
     public Cell(Rectangle2D bBoxInitialUserSpace, AffineTransform initialUserSpaceToJava) {
 
-        this.bBoxPdf = bBoxInitialUserSpace;
+        this.bBoxInitialUserSpace = bBoxInitialUserSpace;
         this.bBox = initialUserSpaceToJava.createTransformedShape(bBoxInitialUserSpace).getBounds2D();
     }
 
@@ -50,7 +50,7 @@ public class Cell extends BoundingBox {
     public static Cell copy(Cell cell) {
 
         Cell copy = new Cell();
-        copy.bBoxPdf = cell.bBoxPdf;
+        copy.bBoxInitialUserSpace = cell.bBoxInitialUserSpace;
         copy.bBox = cell.bBox;
         return copy;
     }
@@ -68,12 +68,12 @@ public class Cell extends BoundingBox {
         StringBuilder sb = new StringBuilder();
 
         Iterator<TextPageBlock> itty = textBlocks.iterator();
-        Word previous = null;
+        TextPositionSequence previous = null;
         while (itty.hasNext()) {
 
             TextPageBlock textBlock = itty.next();
 
-            for (Word word : textBlock.getWords()) {
+            for (TextPositionSequence word : textBlock.getSequences()) {
                 if (previous != null) {
                     if (Math.abs(previous.getMaxYDirAdj() - word.getMaxYDirAdj()) > word.getTextHeight()) {
                         sb.append('\n');
@@ -87,7 +87,7 @@ public class Cell extends BoundingBox {
 
         }
 
-        return TextNormalizationUtilities.cleanString(sb.toString());
+        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString()).replaceAll("\n", " ").replaceAll(" {2}", " ");
     }
 
 

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

@@ -70,7 +70,7 @@ public class CleanRulings {
 
     public boolean lineBetween(BoundingBox a, BoundingBox b) {
 
-        return lineBetween(a.getBBoxPdf(), b.getBBoxPdf());
+        return lineBetween(a.getBBoxInitialUserSpace(), b.getBBoxInitialUserSpace());
     }
 
 

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

@@ -263,8 +263,8 @@ public class TablePageBlock extends AbstractPageBlock {
 
                         cells.stream()
                                 .map(originalCell -> new CellWithIntersection(originalCell,
-                                                                              RectangleTransformations.calculateIntersectedArea(cellFromGridStructure.getBBoxPdf(),
-                                                                                                                                originalCell.getBBoxPdf())))
+                                                                              RectangleTransformations.calculateIntersectedArea(cellFromGridStructure.getBBoxInitialUserSpace(),
+                                                                                                                                originalCell.getBBoxInitialUserSpace())))
                                 .filter(cellWithIntersection -> cellWithIntersection.intersectedArea > 0)
                                 .filter(cellWithIntersection -> cellWithIntersection.originalCell.getArea() > cellWithIntersection.intersectedArea * CELL_AREA_CONTAINED_THRESHOLD)
                                 .max(Comparator.comparing(CellWithIntersection::intersectedArea))

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

@@ -1,8 +0,0 @@
-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/FontStyle.java

@@ -1,9 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.text;
-
-
-public enum FontStyle {
-    REGULAR,
-    BOLD,
-    ITALIC,
-    BOLD_ITALIC;
-}

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

@@ -1,21 +0,0 @@
-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

@@ -1,107 +0,0 @@
-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

@@ -5,52 +5,64 @@ import java.awt.geom.Rectangle2D;
 
 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.CoordinateTransforms;
-import com.knecon.fforesight.service.layoutparser.processor.utils.PageInformation;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.BoundingBox;
 
-import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.SneakyThrows;
-import lombok.experimental.FieldDefaults;
-import lombok.experimental.SuperBuilder;
 
 @Data
-@SuperBuilder
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class RedTextPosition extends TextBoundingBox {
+public class RedTextPosition extends BoundingBox {
 
     public final static int HEIGHT_PADDING = 2;
 
-    String unicode;
+    private Rectangle2D.Float bBoxDirAdj; // adjusted to text rotation
 
-    // estimated using the TextMatrix in radians
-    float exactDir;
+    @JsonIgnore
+    private int rotation;
 
-    float widthOfSpace;
+    @JsonIgnore
+    private float pageHeight;
 
-    float fontSizeInPt;
+    @JsonIgnore
+    private float pageWidth;
 
-    String fontName;
+    private String unicode;
+
+    @JsonIgnore
+    private float dir;
+
+    // not used in reanalysis
+    @JsonIgnore
+    private float widthOfSpace;
+
+    // not used in reanalysis
+    @JsonIgnore
+    private float fontSizeInPt;
+
+    // not used in reanalysis
+    @JsonIgnore
+    private String fontName;
 
 
     @SneakyThrows
     public static RedTextPosition fromTextPosition(TextPosition textPosition) {
 
         var pos = new RedTextPosition();
+        pos.setRotation(textPosition.getRotation());
+        pos.setPageHeight(textPosition.getPageHeight());
+        pos.setPageWidth(textPosition.getPageWidth());
         pos.setUnicode(textPosition.getUnicode());
+        pos.setDir(textPosition.getDir());
         pos.setWidthOfSpace(textPosition.getWidthOfSpace());
         pos.setFontSizeInPt(textPosition.getFontSizeInPt());
         pos.setFontName(textPosition.getFont().getName());
-        pos.setExactDir((float) FastAtan2.fastAtan2(textPosition.getTextMatrix().getShearY(), textPosition.getTextMatrix().getScaleX()));
-        pos.setDir(TextDirection.fromDegrees(textPosition.getDir()));
 
         //TODO: There is a mismatch in the java coords of the text and the rulings,
         // I guess if we start with the initial user space positions and transform them the same way we do the rulings it would work.
@@ -61,18 +73,18 @@ public class RedTextPosition extends TextBoundingBox {
                                                                  textPosition.getYDirAdj() - textHeight,
                                                                  textPosition.getWidthDirAdj(),
                                                                  textHeight + HEIGHT_PADDING);
-
         pos.setBBoxDirAdj(dirAdjPosition);
 
         AffineTransform affineTransform = getRotationMatrix(TextDirection.fromDegrees(textPosition.getDir()), textPosition.getPageWidth(), textPosition.getPageHeight());
         Rectangle2D bBoxInitialUserSpace = affineTransform.createTransformedShape(dirAdjPosition).getBounds2D();
 
-        pos.setBBoxPdf(bBoxInitialUserSpace); // These are definitely correct
+        pos.setBBoxInitialUserSpace(bBoxInitialUserSpace); // These are definitely correct
 
         return pos;
     }
 
 
+
     private static AffineTransform getRotationMatrix(TextDirection textDirection, float pageWidth, float pageHeight) {
 
         AffineTransform transform = new AffineTransform();
@@ -91,4 +103,32 @@ public class RedTextPosition extends TextBoundingBox {
         return transform;
     }
 
+
+    @JsonIgnore
+    public float getXDirAdj() {
+
+        return this.bBoxDirAdj.x;
+    }
+
+
+    @JsonIgnore
+    public float getYDirAdj() {
+
+        return this.bBoxDirAdj.y;
+    }
+
+
+    @JsonIgnore
+    public float getWidthDirAdj() {
+
+        return this.bBoxDirAdj.width;
+    }
+
+
+    @JsonIgnore
+    public float getHeightDir() {
+
+        return this.bBoxDirAdj.height;
+    }
+
 }

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

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

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

@@ -9,14 +9,10 @@ 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 {
@@ -27,8 +23,6 @@ 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());
@@ -41,18 +35,13 @@ public class StringFrequencyCounter {
 
     public String getMostPopular() {
 
-        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;
-                }
+        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 mostPopularCache;
+        return mostPopular != null ? mostPopular.getKey() : null;
     }
 
 }

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

@@ -1,7 +0,0 @@
-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/TextDirection.java

@@ -44,15 +44,4 @@ public enum TextDirection {
 
         throw new IllegalArgumentException(String.format("A value of %f is not supported by TextDirection", degrees));
     }
-
-
-    public int getRotation() {
-
-        return switch (this) {
-            case ZERO -> 0;
-            case QUARTER_CIRCLE -> 1;
-            case HALF_CIRCLE -> 2;
-            case THREE_QUARTER_CIRCLE -> 3;
-        };
-    }
 }

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

@@ -2,13 +2,12 @@ package com.knecon.fforesight.service.layoutparser.processor.model.text;
 
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 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.PageBlockType;
-import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
 import com.knecon.fforesight.service.layoutparser.processor.utils.TextNormalizationUtilities;
 
 import lombok.AllArgsConstructor;
@@ -25,59 +24,62 @@ import lombok.NoArgsConstructor;
 public class TextPageBlock extends AbstractPageBlock {
 
     @Builder.Default
-    private List<Word> words = new ArrayList<>();
-    @Builder.Default
-    private FrequencyCounters frequencyCounters = new FrequencyCounters();
+    private List<TextPositionSequence> sequences = new ArrayList<>();
 
-    private Rectangle2D bBoxDirAdj;
+    private String mostPopularWordFont;
 
-    private boolean underlined;
+    private String mostPopularWordStyle;
+
+    private float mostPopularWordFontSize;
+
+    private float mostPopularWordHeight;
+
+    private float mostPopularWordSpaceWidth;
+
+    private float highestFontSize;
 
     private PageBlockType classification;
 
     private boolean toDuplicate;
 
-    private String text;
-    private boolean changed;
 
+    public TextPageBlock(List<TextPositionSequence> sequences) {
 
-    public TextPageBlock(List<Word> words) {
-
-        this.words = new ArrayList<>(words);
-        this.frequencyCounters = new FrequencyCounters();
-
-        if (!words.isEmpty()) {
-            addToFrequencyCounters(words);
-        }
+        this.sequences = sequences;
+        calculateFrequencyCounters();
         calculateBBox();
     }
 
 
-    public List<Word> getWords() {
+    @JsonIgnore
+    public TextDirection getDir() {
 
-        return Collections.unmodifiableList(words);
+        return sequences.get(0).getDir();
     }
 
 
-    public TextDirection getDir() {
+    @JsonIgnore
+    public float getPageHeight() {
 
-        return words.get(0).getDir();
+        return sequences.get(0).getPageHeight();
+    }
+
+
+    @JsonIgnore
+    public float getPageWidth() {
+
+        return sequences.get(0).getPageWidth();
     }
 
 
     private void calculateBBox() {
 
-        if (words == null) {
+        if (sequences == null) {
             this.bBox = new Rectangle2D.Double();
-            this.bBoxPdf = new Rectangle2D.Double();
-            this.bBoxDirAdj = new Rectangle2D.Double();
+            this.bBoxInitialUserSpace = new Rectangle2D.Double();
             return;
         }
-        this.bBoxDirAdj = words.stream()
-                .map(Word::getBBoxDirAdj)
-                .collect(RectangleTransformations.collectBBox());
-
-        setToBBoxOfComponents(words);
+        setToBBoxOfComponents(sequences);
     }
 
 
@@ -99,8 +101,8 @@ public class TextPageBlock extends AbstractPageBlock {
             throw new IllegalArgumentException("Cannot merge textBlocks on different pages.");
         }
 
-        List<Word> sequences = textBlocksToMerge.stream()
-                .map(TextPageBlock::getWords)
+        List<TextPositionSequence> sequences = textBlocksToMerge.stream()
+                .map(TextPageBlock::getSequences)
                 .flatMap(java.util.Collection::stream)
                 .toList();
         sequences = new ArrayList<>(sequences);
@@ -109,27 +111,38 @@ public class TextPageBlock extends AbstractPageBlock {
     }
 
 
-    private void addToFrequencyCounters(List<Word> sequences) {
+    private void calculateFrequencyCounters() {
 
-        for (Word wordBlock : sequences) {
+        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());
 
-            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));
+        setMostPopularWordFont(fontFrequencyCounter.getMostPopular());
+        setMostPopularWordStyle(styleFrequencyCounter.getMostPopular());
+        setMostPopularWordFontSize(fontSizeFrequencyCounter.getMostPopular());
+        setMostPopularWordHeight(lineHeightFrequencyCounter.getMostPopular());
+        setMostPopularWordSpaceWidth(spaceFrequencyCounter.getMostPopular());
+        setHighestFontSize(fontSizeFrequencyCounter.getHighest());
     }
 
 
-    public TextPageBlock union(Word r) {
+    public TextPageBlock union(TextPositionSequence r) {
 
         TextPageBlock union = this.copy();
-        union.add(r);
-        addToFrequencyCounters(List.of(r));
+        union.getSequences().add(r);
+        calculateFrequencyCounters();
         calculateBBox();
         return union;
     }
@@ -138,50 +151,51 @@ public class TextPageBlock extends AbstractPageBlock {
     public TextPageBlock union(TextPageBlock r) {
 
         TextPageBlock union = this.copy();
-        union.addAll(r.getWords());
-        addToFrequencyCounters(r.getWords());
+        union.getSequences().addAll(r.getSequences());
+        calculateFrequencyCounters();
         calculateBBox();
         return union;
     }
 
 
-    public void add(TextPageBlock textPageBlock) {
+    public void add(TextPageBlock r) {
 
-        changed = true;
-        words.addAll(textPageBlock.getWords());
-        addToFrequencyCounters(textPageBlock.getWords());
+        sequences.addAll(r.getSequences());
+        calculateFrequencyCounters();
         calculateBBox();
     }
 
 
-    public void add(Word word) {
+    public void add(TextPositionSequence r) {
 
-        changed = true;
-        words.add(word);
-        addToFrequencyCounters(List.of(word));
-        calculateBBox();
-    }
-
-
-    public void addAll(List<Word> words) {
-
-        changed = true;
-        this.words.addAll(words);
-        addToFrequencyCounters(words);
+        sequences.add(r);
+        calculateFrequencyCounters();
         calculateBBox();
     }
 
 
     public TextPageBlock copy() {
 
-        return new TextPageBlock(new ArrayList<>(words));
+        return new TextPageBlock(new ArrayList<>(sequences));
     }
 
 
     @Override
     public String toString() {
 
-        return getText();
+        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();
+
     }
 
 
@@ -189,36 +203,30 @@ public class TextPageBlock extends AbstractPageBlock {
     @JsonIgnore
     public String getText() {
 
-        if (text == null || changed) {
+        StringBuilder sb = new StringBuilder();
 
-            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(' ');
-                    }
+        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(' ');
                 }
-                sb.append(word.toString());
-                previous = word;
             }
-
-            text = TextNormalizationUtilities.removeHyphenLinebreaks(sb.toString());
-            changed = false;
+            sb.append(word.toString());
+            previous = word;
         }
 
-        return text;
+        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString());
     }
 
 
     public int getNumberOfLines() {
 
         int numberOfLines = 1;
-        Word previous = null;
-        for (Word word : words) {
+        TextPositionSequence previous = null;
+        for (TextPositionSequence word : sequences) {
             if (previous != null) {
                 if (word.getMaxYDirAdj() - previous.getMaxYDirAdj() > word.getTextHeight()) {
                     numberOfLines++;
@@ -230,47 +238,10 @@ 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 words.isEmpty();
+        return sequences.isEmpty();
     }
 
 }

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

@@ -0,0 +1,271 @@
+package com.knecon.fforesight.service.layoutparser.processor.model.text;
+
+import java.awt.geom.Rectangle2D;
+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.BoundingBox;
+import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
+
+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 = false)
+public class TextPositionSequence extends BoundingBox implements CharSequence {
+
+    public static final int HEIGHT_PADDING = 2;
+
+    @EqualsAndHashCode.Include
+    private int page;
+
+    @EqualsAndHashCode.Include
+    private List<RedTextPosition> textPositions = new ArrayList<>();
+
+    private Rectangle2D bBoxDirAdj;
+    @EqualsAndHashCode.Include
+    private TextDirection dir;
+    private int rotation;
+    private float pageHeight;
+    private float pageWidth;
+    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.dir = TextDirection.fromDegrees(textPositions.get(0).getDir());
+        this.rotation = textPositions.get(0).getRotation();
+        this.pageHeight = textPositions.get(0).getPageHeight();
+        this.pageWidth = textPositions.get(0).getPageWidth();
+        this.isParagraphStart = isParagraphStart;
+        calculateBBox();
+    }
+
+
+    private void calculateBBox() {
+
+        this.bBoxDirAdj = textPositions.stream()
+                .map(RedTextPosition::getBBoxDirAdj)
+                .collect(RectangleTransformations.collectBBox());
+        setToBBoxOfComponents(getTextPositions());
+    }
+
+
+    public TextPositionSequence(List<RedTextPosition> textPositions, int page) {
+
+        this.textPositions = textPositions;
+        this.page = page;
+        this.dir = TextDirection.fromDegrees(textPositions.get(0).getDir());
+        this.rotation = textPositions.get(0).getRotation();
+        this.pageHeight = textPositions.get(0).getPageHeight();
+        this.pageWidth = textPositions.get(0).getPageWidth();
+        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.rotation = rotation;
+        textPositionSequence.pageHeight = pageHeight;
+        textPositionSequence.pageWidth = pageWidth;
+        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();
+        this.dir = textPositionSequence.getDir();
+        this.rotation = textPositionSequence.getRotation();
+        this.pageHeight = textPositionSequence.getPageHeight();
+        this.pageWidth = textPositionSequence.getPageWidth();
+        calculateBBox();
+    }
+
+
+    public void add(TextPosition textPosition) {
+
+        this.textPositions.add(RedTextPosition.fromTextPosition(textPosition));
+        this.dir = TextDirection.fromDegrees(textPositions.get(0).getDir());
+        this.rotation = textPositions.get(0).getRotation();
+        this.pageHeight = textPositions.get(0).getPageHeight();
+        this.pageWidth = textPositions.get(0).getPageWidth();
+        calculateBBox();
+    }
+
+
+    /**
+     * This value is adjusted so that 0,0 is upper left and it is adjusted based on the text direction.
+     * This method ignores the page rotation but takes the text rotation and adjusts the coordinates to awt.
+     *
+     * @return the text direction adjusted minX value
+     */
+
+    public float getMinXDirAdj() {
+
+        return textPositions.get(0).getXDirAdj();
+
+    }
+
+
+    /**
+     * This value is adjusted so that 0,0 is upper left and it is adjusted based on the text direction.
+     * This method ignores the page rotation but takes the text rotation and adjusts the coordinates to awt.
+     *
+     * @return the text direction adjusted maxX value
+     */
+
+    public float getMaxXDirAdj() {
+
+        return textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + HEIGHT_PADDING;
+
+    }
+
+
+    /**
+     * This value is adjusted so that 0,0 is upper left and it is adjusted based on the text direction.
+     * This method ignores the page rotation but takes the text rotation and adjusts the coordinates to awt.
+     *
+     * @return the text direction adjusted minY value. The upper border of the bounding box of the word.
+     */
+
+    public float getMinYDirAdj() {
+
+        return textPositions.get(0).getYDirAdj() - getTextHeight();
+
+    }
+
+
+    /**
+     * This value is adjusted so that 0,0 is upper left and it is adjusted based on the text direction.
+     * This method ignores the page rotation but takes the text rotation and adjusts the coordinates to awt.
+     *
+     * @return the text direction adjusted maxY value. The lower border of the bounding box of the word.
+     */
+
+    public float getMaxYDirAdj() {
+
+        return textPositions.get(0).getYDirAdj();
+
+    }
+
+
+    public float getTextHeightNoPadding() {
+
+        return textPositions.get(0).getHeightDir();
+    }
+
+
+    public float getTextHeight() {
+
+        return textPositions.get(0).getHeightDir() + 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

@@ -1,36 +0,0 @@
-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

@@ -1,272 +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.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 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> textPositions, int page) {
-
-        this.characters = new ArrayList<>(textPositions);
-        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 textPositionSequence = new Word();
-        textPositionSequence.characters = characters.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 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 = rotateInstance.createTransformedShape(textPosition.getBBoxDirAdj()).getBounds2D();
-            textPosition.setBBoxDirAdj(exactDirAdjCoordinates);
-        }
-        calculateBBoxAndHashcode();
-    }
-
-}
-

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

@@ -56,7 +56,7 @@ public class ImageServiceResponseAdapter {
         classificationPage.getImages().forEach(image -> {
             if (image.getImageType().equals(ImageType.OTHER)) {
                 for (AbstractPageBlock textblock : classificationPage.getTextBlocks()) {
-                    if (image.getPosition().contains(textblock.getBBoxPdf())) {
+                    if (image.getPosition().contains(textblock.getBBoxInitialUserSpace())) {
                         image.setImageType(ImageType.OCR);
                         return;
                     }