More refactoring

Reading Order
More
2024-02-20 14:04:28 +01:00 · 2024-02-20 11:56:43 +01:00 · 2024-02-16 14:51:26 +01:00 · 2024-02-16 14:50:31 +01:00 · 2024-02-16 14:08:59 +01:00 · 2024-02-16 13:48:03 +01:00
79 changed files with 2669 additions and 338 deletions
@@ -9,12 +9,13 @@
    </description>

    <rule ref="category/java/errorprone.xml">
-        <exclude name="DataflowAnomalyAnalysis"/>
        <exclude name="MissingSerialVersionUID"/>
-        <exclude name="NullAssignment"/>
        <exclude name="AvoidLiteralsInIfCondition"/>
        <exclude name="AvoidDuplicateLiterals"/>
-        <exclude name="AvoidFieldNameMatchingMethodName"/>
+        <exclude name="NullAssignment"/>
+        <exclude name="AssignmentInOperand"/>
+        <exclude name="BeanMembersShouldSerialize"/>
    </rule>

-</ruleset>
+</ruleset>
+
@@ -10,14 +10,14 @@


    <rule ref="category/java/errorprone.xml">
-        <exclude name="DataflowAnomalyAnalysis"/>
        <exclude name="MissingSerialVersionUID"/>
-        <exclude name="NullAssignment"/>
        <exclude name="AvoidLiteralsInIfCondition"/>
        <exclude name="AvoidDuplicateLiterals"/>
        <exclude name="AvoidFieldNameMatchingMethodName"/>
-        <exclude name="AvoidFieldNameMatchingTypeName"/>
+        <exclude name="NullAssignment"/>
+        <exclude name="AssignmentInOperand"/>
        <exclude name="TestClassWithoutTestCases"/>
+        <exclude name="BeanMembersShouldSerialize"/>
    </rule>

-</ruleset>
+</ruleset>
@@ -1,6 +1,6 @@
 plugins {
    id("com.knecon.fforesight.java-conventions")
-    id("io.freefair.lombok") version "8.2.2"
+    id("io.freefair.lombok") version "8.4"
 }

 description = "layoutparser-service-internal-api"
@@ -1,5 +1,7 @@
 package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;

+import java.io.Serializable;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -12,7 +14,7 @@ import lombok.experimental.FieldDefaults;
@AllArgsConstructor
@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
@Schema(description = "Object containing the complete document layout parsing information. It is split into 4 categories, structure, text, positions and pages: " + "The document tree structure of SemanticNodes such as Section, Paragraph, Headline, etc. " + "The text, which is stored as separate blocks of data. " + "The text positions, which are also stored as separate blocks. The Blocks are equal to the text blocks in length and order. " + "The page information.")
-public class DocumentData {
+public class DocumentData implements Serializable {

    @Schema(description = "Contains information about the document's pages.")
    DocumentPage[] documentPages;
@@ -1,5 +1,7 @@
 package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;

+import java.io.Serializable;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -14,7 +16,7 @@ import lombok.experimental.FieldDefaults;
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
@Schema(description = "Object containing information about the document's pages.")
-public class DocumentPage {
+public class DocumentPage implements Serializable {

    @Schema(description = "The page number, starting with 1.")
    int number;
@@ -1,5 +1,7 @@
 package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;

+import java.io.Serializable;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -14,7 +16,7 @@ import lombok.experimental.FieldDefaults;
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
@Schema(description = "Object containing text positional information of a specific text block. A document is split into multiple text blocks, which are supposed to be read in order. Every text block can only occur on a single page.")
-public class DocumentPositionData {
+public class DocumentPositionData implements Serializable {

    @Schema(description = "Identifier of the text block.")
    Long id;
@@ -1,6 +1,7 @@
 package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;

 import java.awt.geom.Rectangle2D;
+import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -20,14 +21,13 @@ import lombok.experimental.FieldDefaults;
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
@Schema(description = "Object containing information about the parsed tree structure of the SemanticNodes, such as Section, Paragraph, Headline etc inside of the document.")
-public class DocumentStructure {
+public class DocumentStructure implements Serializable {

    @Schema(description = "The root EntryData represents the Document.")
    EntryData root;

-
    @Schema(description = "Object containing the extra field names, a table has in its properties field.")
-    public static class TableProperties {
+    public static class TableProperties implements Serializable {

        public static final String NUMBER_OF_ROWS = "numberOfRows";
        public static final String NUMBER_OF_COLS = "numberOfCols";
@@ -35,7 +35,7 @@ public class DocumentStructure {
    }

    @Schema(description = "Object containing the extra field names, an Image has in its properties field.")
-    public static class ImageProperties {
+    public static class ImageProperties implements Serializable {

        public static final String TRANSPARENT = "transparent";
        public static final String IMAGE_TYPE = "imageType";
@@ -45,7 +45,7 @@ public class DocumentStructure {
    }

    @Schema(description = "Object containing the extra field names, a table cell has in its properties field.")
-    public static class TableCellProperties {
+    public static class TableCellProperties implements Serializable {

        public static final String B_BOX = "bBox";
        public static final String ROW = "row";
@@ -56,6 +56,7 @@ public class DocumentStructure {

    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();
@@ -100,7 +101,7 @@ public class DocumentStructure {
    @AllArgsConstructor
    @FieldDefaults(level = AccessLevel.PRIVATE)
    @Schema(description = "Object containing information of a SemanticNode and also structuring the layout with children.")
-    public static class EntryData {
+    public static class EntryData implements Serializable {

        @Schema(description = "Type of the semantic node.", allowableValues = {"DOCUMENT", "SECTION", "PARAGRAPH", "HEADLINE", "TABLE", "TABLE_CELL", "HEADER", "FOOTER", "IMAGE"})
        NodeType type;
@@ -1,5 +1,7 @@
 package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;

+import java.io.Serializable;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -14,7 +16,7 @@ import lombok.experimental.FieldDefaults;
@AllArgsConstructor
@FieldDefaults(level = AccessLevel.PRIVATE)
@Schema(description = "Object containing text information of a specific text block. A document is split into multiple text blocks, which are supposed to be read in order. Every text block can only occur on a single page.")
-public class DocumentTextData {
+public class DocumentTextData implements Serializable {

    @Schema(description = "Identifier of the text block.")
    Long id;
@@ -1,8 +1,9 @@
 package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;

+import java.io.Serializable;
 import java.util.Locale;

-public enum NodeType {
+public enum NodeType implements Serializable {
    DOCUMENT,
    SECTION,
    HEADLINE,
@@ -1,6 +1,6 @@
 plugins {
    id("com.knecon.fforesight.java-conventions")
-    id("io.freefair.lombok") version "8.2.2"
+    id("io.freefair.lombok") version "8.4"
 }

 description = "layoutparser-service-processor"
@@ -10,12 +10,13 @@ val pdfBoxVersion = "3.0.0"

 dependencies {
    implementation(project(":layoutparser-service-internal-api"))
+    implementation(project(":viewer-doc-processor"))

    implementation("com.iqser.red.service:persistence-service-shared-api-v1:2.144.0") {
        exclude("org.springframework.boot", "spring-boot-starter-security")
        exclude("org.springframework.boot", "spring-boot-starter-validation")
    }
-    implementation("com.knecon.fforesight:tenant-commons:0.19.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}")
@@ -10,6 +10,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;

 import org.apache.pdfbox.Loader;
@@ -26,6 +27,7 @@ import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsi
 import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
 import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationDocument;
 import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage;
+import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationSection;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
 import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage;
 import com.knecon.fforesight.service.layoutparser.processor.model.table.CleanRulings;
@@ -47,11 +49,12 @@ import com.knecon.fforesight.service.layoutparser.processor.services.blockificat
 import com.knecon.fforesight.service.layoutparser.processor.services.classification.DocuMineClassificationService;
 import com.knecon.fforesight.service.layoutparser.processor.services.classification.RedactManagerClassificationService;
 import com.knecon.fforesight.service.layoutparser.processor.services.classification.TaasClassificationService;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.DocstrumSegmentationService;
 import com.knecon.fforesight.service.layoutparser.processor.services.factory.DocumentGraphFactory;
 import com.knecon.fforesight.service.layoutparser.processor.services.mapper.DocumentDataMapper;
 import com.knecon.fforesight.service.layoutparser.processor.services.mapper.TaasDocumentDataMapper;
 import com.knecon.fforesight.service.layoutparser.processor.services.parsing.PDFLinesTextStripper;
-import com.knecon.fforesight.service.layoutparser.processor.services.visualization.ViewerDocumentService;
+import com.knecon.fforesight.service.layoutparser.processor.services.visualization.LayoutGridService;
 import com.knecon.fforesight.service.layoutparser.processor.utils.MarkedContentUtils;

 import io.micrometer.observation.Observation;
@@ -84,8 +87,9 @@ public class LayoutParsingPipeline {
    TaasBlockificationService taasBlockificationService;
    DocuMineBlockificationService docuMineBlockificationService;
    RedactManagerBlockificationService redactManagerBlockificationService;
-    ViewerDocumentService viewerDocumentService;
+    LayoutGridService layoutGridService;
    ObservationRegistry observationRegistry;
+    DocstrumSegmentationService docstrumSegmentationService;


    public LayoutParsingFinishedEvent parseLayoutAndSaveFilesToStorage(LayoutParsingRequest layoutParsingRequest) throws IOException {
@@ -94,7 +98,7 @@ public class LayoutParsingPipeline {
        log.info("Starting layout parsing for {}", layoutParsingRequest.identifier());

        File originFile = layoutParsingStorageService.getOriginFile(layoutParsingRequest.originFileStorageId());
-        File viewerDocumentFile = File.createTempFile("viewer_document", ".pdf");
+        File viewerDocumentFile = layoutParsingStorageService.getViewerDocFile(layoutParsingRequest.viewerDocumentStorageId()).orElse(originFile);

        ImageServiceResponse imageServiceResponse = new ImageServiceResponse();
        if (layoutParsingRequest.imagesFileStorageId().isPresent()) {
@@ -111,25 +115,31 @@ public class LayoutParsingPipeline {
                imageServiceResponse,
                tableServiceResponse,
                layoutParsingRequest.identifier().toString());
+
        log.info("Building document graph for {}", layoutParsingRequest.identifier());

        Document documentGraph = observeBuildDocumentGraph(classificationDocument);

+        log.info("Creating viewer document for {}", layoutParsingRequest.identifier());
+
+        layoutGridService.addLayoutGrid(viewerDocumentFile, documentGraph, viewerDocumentFile, false);
+
        log.info("Storing resulting files for {}", layoutParsingRequest.identifier());
+
        layoutParsingStorageService.storeDocumentData(layoutParsingRequest, DocumentDataMapper.toDocumentData(documentGraph));
        layoutParsingStorageService.storeSimplifiedText(layoutParsingRequest, simplifiedSectionTextService.toSimplifiedText(documentGraph));
-
-        log.info("Creating viewer document for {}", layoutParsingRequest.identifier());
-        viewerDocumentService.createViewerDocument(originFile, documentGraph, viewerDocumentFile, false);
        layoutParsingStorageService.storeViewerDocument(layoutParsingRequest, viewerDocumentFile);
+
        if (layoutParsingRequest.layoutParsingType().equals(LayoutParsingType.TAAS)) {
            log.info("Building research document data for {}", layoutParsingRequest.identifier());
            var researchDocumentData = TaasDocumentDataMapper.fromDocument(documentGraph);
            layoutParsingStorageService.storeResearchDocumentData(layoutParsingRequest, researchDocumentData);
        }

+        if (!viewerDocumentFile.equals(originFile)) {
+            viewerDocumentFile.delete();
+        }
        originFile.delete();
-        viewerDocumentFile.delete();

        return LayoutParsingFinishedEvent.builder()
                .identifier(layoutParsingRequest.identifier())
@@ -237,11 +247,37 @@ public class LayoutParsingPipeline {
            PDRectangle cropbox = pdPage.getCropBox();
            CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(pdfTableCells.get(pageNumber), stripper.getRulings());

-            ClassificationPage classificationPage = switch (layoutParsingType) {
-                case REDACT_MANAGER -> redactManagerBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
-                case TAAS -> taasBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
-                case DOCUMINE -> docuMineBlockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
-            };
+            // Docstrum
+            AtomicInteger num = new AtomicInteger(pageNumber);
+            var zones = docstrumSegmentationService.segmentPage(stripper.getTextPositionSequences());
+
+            List<AbstractPageBlock> pageBlocks = new ArrayList<>();
+            AtomicInteger numOnPage = new AtomicInteger(1);
+//            List<TextPositionSequence> textPositionSequences = new ArrayList<>();
+            zones.forEach(zone -> {
+
+                List<TextPositionSequence> textPositionSequences = new ArrayList<>();
+                zone.getLines().forEach(line -> {
+                    line.getWords().forEach(word -> {
+                        textPositionSequences.add(new TextPositionSequence(word.getTextPositions(), num.get()));
+                    });
+                });
+
+                var cps = redactManagerBlockificationService.blockify(textPositionSequences, cleanRulings.getHorizontal(), cleanRulings.getVertical());
+
+                cps.getTextBlocks().forEach(cp -> {
+                    pageBlocks.add(redactManagerBlockificationService.buildTextBlock(((TextPageBlock) cp).getSequences(), numOnPage.getAndIncrement()));
+                });
+            });
+
+//            ClassificationPage classificationPage = switch (layoutParsingType) {
+//                case REDACT_MANAGER -> redactManagerBlockificationService.blockify(textPositionSequences, cleanRulings.getHorizontal(), cleanRulings.getVertical());
+//                case TAAS -> taasBlockificationService.blockify(textPositionSequences, cleanRulings.getHorizontal(), cleanRulings.getVertical());
+//                case DOCUMINE -> docuMineBlockificationService.blockify(textPositionSequences, cleanRulings.getHorizontal(), cleanRulings.getVertical());
+//            };
+
+            ClassificationPage classificationPage = new ClassificationPage(pageBlocks);
+
            classificationPage.setCleanRulings(cleanRulings);
            classificationPage.setRotation(rotation);
            classificationPage.setLandscape(isLandscape);
@@ -277,9 +313,19 @@ public class LayoutParsingPipeline {
            case REDACT_MANAGER -> redactManagerClassificationService.classifyDocument(classificationDocument);
        }

+        List<ClassificationSection> sections = new ArrayList<>();
+        for (var page : classificationPages) {
+            page.getTextBlocks().forEach(block -> {
+                block.setPage(page.getPageNumber());
+                var section = sectionsBuilderService.buildTextBlock(List.of(block), "a");
+                sections.add(section);
+            });
+        }
+        classificationDocument.setSections(sections);
+
        log.info("Building Sections for {}", identifier);
-        sectionsBuilderService.buildSections(classificationDocument);
-        sectionsBuilderService.addImagesToSections(classificationDocument);
+//        sectionsBuilderService.buildSections(classificationDocument);
+//        sectionsBuilderService.addImagesToSections(classificationDocument);
        return classificationDocument;
    }

@@ -1,10 +1,24 @@
 package com.knecon.fforesight.service.layoutparser.processor;

+import org.springframework.beans.factory.annotation.Autowired;
+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.ViewerDocumentService;
+
+import io.micrometer.observation.ObservationRegistry;
+
@Configuration
@ComponentScan
 public class LayoutParsingServiceProcessorConfiguration {

+
+    @Bean
+    @Autowired
+    public ViewerDocumentService viewerDocumentService(ObservationRegistry registry) {
+
+        return new ViewerDocumentService(registry);
+    }
+
 }
@@ -8,6 +8,7 @@ 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 org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -36,13 +37,6 @@ public class LayoutParsingStorageService {
    private final StorageService storageService;
    private final ObjectMapper objectMapper;

-
-    public PDDocument getOriginDocument(String storageId) throws IOException {
-
-        return Loader.loadPDF(getOriginFile(storageId));
-    }
-
-
    @Observed(name = "LayoutParsingStorageService", contextualName = "get-origin-file")
    public File getOriginFile(String storageId) throws IOException {

@@ -52,6 +46,18 @@ public class LayoutParsingStorageService {
    }


+    @Observed(name = "LayoutParsingStorageService", contextualName = "get-viewer-doc-file")
+    public Optional<File> getViewerDocFile(String storageId) throws IOException {
+
+        if (!storageService.objectExists(TenantContext.getTenantId(), storageId)) {
+            return Optional.empty();
+        }
+        File tempFile = createTempFile("viewerDocument", ".pdf");
+        storageService.downloadTo(TenantContext.getTenantId(), storageId, tempFile);
+        return Optional.of(tempFile);
+    }
+
+
    public ImageServiceResponse getImagesFile(String storageId) throws IOException {

        try (InputStream inputStream = getObject(storageId)) {
@@ -137,7 +143,6 @@ public class LayoutParsingStorageService {
    public void storeViewerDocument(LayoutParsingRequest layoutParsingRequest, File out) {

        try (var in = new FileInputStream(out)) {
-
            storageService.storeObject(TenantContext.getTenantId(), layoutParsingRequest.viewerDocumentStorageId(), in);
        }
    }
@@ -12,15 +12,16 @@ import com.knecon.fforesight.service.layoutparser.processor.model.table.CleanRul
 import com.knecon.fforesight.service.layoutparser.processor.model.text.StringFrequencyCounter;

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

@Data
@RequiredArgsConstructor
 public class ClassificationPage {

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

    private List<ClassifiedImage> images = new ArrayList<>();
@@ -12,6 +12,7 @@ import lombok.Setter;

@Setter
@EqualsAndHashCode
+@SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName")
 public class Boundary implements Comparable<Boundary> {

    private int start;
@@ -45,6 +45,9 @@ public class RedTextPosition {
    @JsonIgnore
    private String fontName;

+    @JsonIgnore
+    private RedTextPosition parent;
+

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

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

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

    @JsonIgnore
@@ -73,7 +75,7 @@ public class TextPageBlock extends AbstractPageBlock {

        return sequences.get(0).getPageWidth();
    }
-    
+

    public static TextPageBlock merge(List<TextPageBlock> textBlocksToMerge) {

@@ -82,6 +84,7 @@ public class TextPageBlock extends AbstractPageBlock {
        return fromTextPositionSequences(sequences);
    }

+
    public static TextPageBlock fromTextPositionSequences(List<TextPositionSequence> wordBlockList) {

        TextPageBlock textBlock = null;
@@ -133,7 +136,6 @@ public class TextPageBlock extends AbstractPageBlock {
    }


-
    /**
     * Returns the minX value in pdf coordinate system.
     * Note: This needs to use Pdf Coordinate System where {0,0} rotated with the page rotation.
@@ -55,6 +55,18 @@ public class TextPositionSequence implements CharSequence {
    }


+    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();
+        this.isParagraphStart = false;
+    }
+
+
    @Override
    public int length() {

@@ -1,8 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.visualization;
-
-import java.awt.Color;
-import java.awt.geom.Line2D;
-
-public record ColoredLine(Line2D line, Color color) {
-
-}
@@ -1,7 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.visualization;
-
-import java.awt.geom.Point2D;
-
-public record PlacedText(String text, Point2D lineStart) {
-
-}
@@ -240,7 +240,7 @@ public class SectionsBuilderService {
    }


-    private ClassificationSection buildTextBlock(List<AbstractPageBlock> wordBlockList, String lastHeadline) {
+    public ClassificationSection buildTextBlock(List<AbstractPageBlock> wordBlockList, String lastHeadline) {

        ClassificationSection section = new ClassificationSection();

@@ -57,7 +57,7 @@ public class RedactManagerBlockificationService {
            boolean isSplitByRuling = isSplitByRuling(minX, minY, maxX, maxY, word, horizontalRulingLines, verticalRulingLines);
            boolean splitByDir = prev != null && !prev.getDir().equals(word.getDir());

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

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


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

        TextPageBlock textBlock = null;

@@ -0,0 +1,153 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Character;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.DisjointSets;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Line;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service.LineBuilderService;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service.NearestNeighbourService;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service.ReadingOrderService;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service.SpacingService;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service.ZoneBuilderService;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class DocstrumSegmentationService {
+
+    private static final double MAX_VERTICAL_MERGE_DIST = 0.5;
+
+    private final NearestNeighbourService nearestNeighbourService;
+    private final SpacingService spacingService;
+    private final LineBuilderService lineBuilderService;
+    private final ZoneBuilderService zoneBuilderService;
+    private final ReadingOrderService readingOrderService;
+
+
+    public List<Zone> segmentPage(List<TextPositionSequence> textPositions) {
+
+        var positions = textPositions.stream().map(TextPositionSequence::getTextPositions).flatMap(List::stream).toList();
+
+        var characters = positions.stream().map(Character::new).collect(Collectors.toList());
+
+        nearestNeighbourService.findNearestNeighbors(characters);
+
+        var characterSpacing = spacingService.computeCharacterSpacing(characters);
+        var lineSpacing = spacingService.computeLineSpacing(characters);
+
+        var lines = lineBuilderService.buildLines(characters, characterSpacing, lineSpacing);
+
+        var zones = zoneBuilderService.buildZones(lines, characterSpacing, lineSpacing);
+
+        zones = mergeLinesInZones(zones, characterSpacing, Double.NEGATIVE_INFINITY, 0.0, 0.0, lineSpacing * MAX_VERTICAL_MERGE_DIST);
+
+        return readingOrderService.resolve(zones, false);
+    }
+
+//    private List<Zone> mergeZones(List<Zone> zones, double tolerance) {
+//
+//        List<BxBounds> bounds = new ArrayList<BxBounds>(zones.size());
+//        for (List<ComponentLine> zone : zones) {
+//            BxBoundsBuilder builder = new BxBoundsBuilder();
+//            for (ComponentLine line : zone) {
+//                for (Component component : line.getComponents()) {
+//                    builder.expand(component.getChunk().getBounds());
+//                }
+//            }
+//            bounds.add(builder.getBounds());
+//        }
+//
+//        List<List<ComponentLine>> outputZones = new ArrayList<List<ComponentLine>>();
+//        mainFor:
+//        for (int i = 0; i < zones.size(); i++) {
+//            for (int j = 0; j < zones.size(); j++) {
+//                if (i == j || bounds.get(j) == null || bounds.get(i) == null) {
+//                    continue;
+//                }
+//                if (BxModelUtils.contains(bounds.get(j), bounds.get(i), tolerance)) {
+//                    zones.get(j).addAll(zones.get(i));
+//                    bounds.set(i, null);
+//                    continue mainFor;
+//                }
+//            }
+//            outputZones.add(zones.get(i));
+//        }
+//        return outputZones;
+//    }
+
+
+    private List<Zone> mergeLinesInZones(List<Zone> zones,
+                                         double wordSpacing,
+                                         double minHorizontalDistance,
+                                         double maxHorizontalDistance,
+                                         double minVerticalDistance,
+                                         double maxVerticalDistance) {
+
+        List<Zone> outputZones = new ArrayList<>(zones.size());
+        for (Zone zone : zones) {
+            outputZones.add(mergeLinesInZone(zone, wordSpacing, minHorizontalDistance, maxHorizontalDistance, minVerticalDistance, maxVerticalDistance));
+        }
+        return outputZones;
+    }
+
+
+    private Zone mergeLinesInZone(Zone zone,
+                                  double wordSpacing,
+                                  double minHorizontalDistance,
+                                  double maxHorizontalDistance,
+                                  double minVerticalDistance,
+                                  double maxVerticalDistance) {
+
+        DisjointSets<Line> sets = new DisjointSets<>(zone.getLines());
+        for (int i = 0; i < zone.getLines().size(); i++) {
+            Line li = zone.getLines().get(i);
+            for (int j = i + 1; j < zone.getLines().size(); j++) {
+                Line lj = zone.getLines().get(j);
+                double hDist = li.horizontalDistance(lj);
+                double vDist = li.verticalDistance(lj);
+                if (minHorizontalDistance <= hDist && hDist <= maxHorizontalDistance && minVerticalDistance <= vDist && vDist <= maxVerticalDistance) {
+                    sets.union(li, lj);
+                } else if (minVerticalDistance <= vDist && vDist <= maxVerticalDistance && Math.abs(hDist - Math.min(li.getLength(), lj.getLength())) < 0.1) {
+                    boolean componentOverlap = false;
+                    int overlappingCount = 0;
+                    for (Character ci : li.getCharacters()) {
+                        for (Character cj : lj.getCharacters()) {
+                            double dist = ci.overlappingDistance(cj);
+                            if (dist > 2) {
+                                componentOverlap = true;
+                            }
+                            if (dist > 0) {
+                                overlappingCount++;
+                            }
+                        }
+                    }
+                    if (!componentOverlap && overlappingCount <= 2) {
+                        sets.union(li, lj);
+                    }
+                }
+            }
+        }
+        List<Line> outputZone = new ArrayList<>();
+        for (Set<Line> group : sets) {
+            List<Character> components = new ArrayList<>();
+            for (Line line : group) {
+                components.addAll(line.getCharacters());
+            }
+            components.sort(Comparator.comparingDouble(Character::getX));
+
+            outputZone.add(new Line(components, wordSpacing));
+        }
+        return new Zone(outputZone);
+    }
+
+}
@@ -0,0 +1,32 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model;
+
+public class AngleFilter {
+
+    protected double lowerAngle;
+    protected double upperAngle;
+
+
+    public AngleFilter(double lowerAngle, double upperAngle) {
+
+        if (lowerAngle < -Math.PI / 2) {
+            lowerAngle += Math.PI;
+        }
+        if (upperAngle >= Math.PI / 2) {
+            upperAngle -= Math.PI;
+        }
+
+        this.lowerAngle = lowerAngle;
+        this.upperAngle = upperAngle;
+    }
+
+
+    public boolean matches(Neighbor neighbor) {
+
+        if (lowerAngle <= upperAngle) {
+            return lowerAngle <= neighbor.getAngle() && neighbor.getAngle() < upperAngle;
+        } else {
+            return lowerAngle <= neighbor.getAngle() || neighbor.getAngle() < upperAngle;
+        }
+    }
+
+}
@@ -0,0 +1,48 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model;
+
+import java.awt.geom.Rectangle2D;
+
+import lombok.Data;
+
+@Data
+public abstract class BoundingBox {
+
+    private Rectangle2D bBox;
+
+
+    public double getX() {
+
+        return bBox.getX();
+    }
+
+
+    public double getY() {
+
+        return bBox.getY();
+    }
+
+
+    public double getWidth() {
+
+        return bBox.getWidth();
+    }
+
+
+    public double getHeight() {
+
+        return bBox.getHeight();
+    }
+
+
+    public double getArea() {
+
+        return (bBox.getHeight() * bBox.getWidth());
+    }
+
+
+    public boolean contains(Rectangle2D contained, double tolerance) {
+
+        return bBox.getX() <= contained.getX() + tolerance && bBox.getY() <= contained.getY() + tolerance && bBox.getX() + bBox.getWidth() >= contained.getX() + contained.getWidth() - tolerance && bBox.getY() + bBox.getHeight() >= contained.getY() + contained.getHeight() - tolerance;
+    }
+
+}
@@ -0,0 +1,84 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.knecon.fforesight.service.layoutparser.processor.model.text.RedTextPosition;
+
+import lombok.Data;
+
+@Data
+public class Character {
+
+    private final double x;
+    private final double y;
+    private final RedTextPosition textPosition;
+
+    private List<Neighbor> neighbors = new ArrayList<>();
+
+
+    public Character(RedTextPosition chunk) {
+
+        this.x = chunk.getXDirAdj() + chunk.getWidthDirAdj() / 2;
+        this.y = chunk.getYDirAdj() + chunk.getHeightDir() / 2;
+        this.textPosition = chunk;
+    }
+
+
+    public double getHeight() {
+
+        return textPosition.getHeightDir();
+    }
+
+
+    public double distance(Character character) {
+
+        double dx = getX() - character.getX();
+        double dy = getY() - character.getY();
+        return Math.sqrt(dx * dx + dy * dy);
+    }
+
+
+    public double horizontalDistance(Character character) {
+
+        return Math.abs(getX() - character.getX());
+    }
+
+
+    public double verticalDistance(Character character) {
+
+        return Math.abs(getY() - character.getY());
+    }
+
+
+    public double overlappingDistance(Character other) {
+
+        double[] xs = new double[4];
+        double s = Math.sin(-0), c = Math.cos(-0);
+        xs[0] = c * x - s * y;
+        xs[1] = c * (x + textPosition.getWidthDirAdj()) - s * (y + textPosition.getHeightDir());
+        xs[2] = c * other.x - s * other.y;
+        xs[3] = c * (other.x + other.textPosition.getWidthDirAdj()) - s * (other.y + other.textPosition.getHeightDir());
+        boolean overlapping = xs[1] >= xs[2] && xs[3] >= xs[0];
+        Arrays.sort(xs);
+        return Math.abs(xs[2] - xs[1]) * (overlapping ? 1 : -1);
+    }
+
+
+    public void setNeighbors(List<Neighbor> neighbors) {
+
+        this.neighbors = neighbors;
+    }
+
+
+    public double angle(Character character) {
+
+        if (getX() > character.getX()) {
+            return Math.atan2(getY() - character.getY(), getX() - character.getX());
+        } else {
+            return Math.atan2(character.getY() - getY(), character.getX() - getX());
+        }
+    }
+
+}
@@ -0,0 +1,194 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model;
+
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+public class DisjointSets<E> implements Iterable<Set<E>> {
+
+    private final Map<E, Entry<E>> map = new HashMap<>();
+
+
+    public DisjointSets(Collection<? extends E> collection) {
+
+        for (E element : collection) {
+            map.put(element, new Entry<E>(element));
+        }
+    }
+
+
+    public boolean areTogether(E e1, E e2) {
+
+        return map.get(e1).findRepresentative() == map.get(e2).findRepresentative();
+    }
+
+
+    public void union(E e1, E e2) {
+
+        Entry<E> r1 = map.get(e1).findRepresentative();
+        Entry<E> r2 = map.get(e2).findRepresentative();
+        if (r1 != r2) {
+            if (r1.size <= r2.size) {
+                r2.mergeWith(r1);
+            } else {
+                r1.mergeWith(r2);
+            }
+        }
+    }
+
+
+    @Override
+    public Iterator<Set<E>> iterator() {
+
+        return new Iterator<>() {
+
+            private final Iterator<Entry<E>> iterator = map.values().iterator();
+            private Entry<E> nextRepresentative;
+
+            {
+                findNextRepresentative();
+            }
+
+            @Override
+            public boolean hasNext() {
+
+                return nextRepresentative != null;
+            }
+
+
+            @Override
+            public Set<E> next() {
+
+                if (nextRepresentative == null) {
+                    throw new NoSuchElementException();
+                }
+                Set<E> result = nextRepresentative.asSet();
+                findNextRepresentative();
+                return result;
+            }
+
+
+            private void findNextRepresentative() {
+
+                while (iterator.hasNext()) {
+                    Entry<E> candidate = iterator.next();
+                    if (candidate.isRepresentative()) {
+                        nextRepresentative = candidate;
+                        return;
+                    }
+                }
+                nextRepresentative = null;
+            }
+
+
+            @Override
+            public void remove() {
+
+                throw new UnsupportedOperationException();
+            }
+
+        };
+    }
+
+
+    private static class Entry<E> {
+
+        private int size = 1;
+        private final E value;
+        private Entry<E> parent = this;
+        private Entry<E> next = null;
+        private Entry<E> last = this;
+
+
+        Entry(E value) {
+
+            this.value = value;
+        }
+
+
+        void mergeWith(Entry<E> otherRepresentative) {
+
+            size += otherRepresentative.size;
+            last.next = otherRepresentative;
+            last = otherRepresentative.last;
+            otherRepresentative.parent = this;
+        }
+
+
+        Entry<E> findRepresentative() {
+
+            Entry<E> representative = parent;
+            while (representative.parent != representative) {
+                representative = representative.parent;
+            }
+            for (Entry<E> entry = this; entry != representative; ) {
+                Entry<E> nextEntry = entry.parent;
+                entry.parent = representative;
+                entry = nextEntry;
+            }
+            return representative;
+        }
+
+
+        boolean isRepresentative() {
+
+            return parent == this;
+        }
+
+
+        Set<E> asSet() {
+
+            return new AbstractSet<E>() {
+
+                @Override
+                public Iterator<E> iterator() {
+
+                    return new Iterator<E>() {
+
+                        private Entry<E> nextEntry = findRepresentative();
+
+
+                        @Override
+                        public boolean hasNext() {
+
+                            return nextEntry != null;
+                        }
+
+
+                        @Override
+                        public E next() {
+
+                            if (nextEntry == null) {
+                                throw new NoSuchElementException();
+                            }
+                            E result = nextEntry.value;
+                            nextEntry = nextEntry.next;
+                            return result;
+                        }
+
+
+                        @Override
+                        public void remove() {
+
+                            throw new UnsupportedOperationException();
+                        }
+
+                    };
+                }
+
+
+                @Override
+                public int size() {
+
+                    return findRepresentative().size;
+                }
+            };
+        }
+
+    }
+
+}
@@ -0,0 +1,91 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model;
+
+public class Histogram {
+
+    private static final double EPSILON = 1.0e-6;
+    private final double min;
+    private final double resolution;
+    private double[] frequencies;
+
+
+    public Histogram(double minValue, double maxValue, double resolution) {
+
+        this.min = minValue - EPSILON;
+        double delta = maxValue - minValue + 2 * EPSILON;
+        int size = Math.max(1, (int) Math.round((maxValue - minValue) / resolution));
+        this.resolution = delta / size;
+        this.frequencies = new double[size];
+    }
+
+
+    public void kernelSmooth(double[] kernel) {
+
+        double[] newFrequencies = new double[frequencies.length];
+        int shift = (kernel.length - 1) / 2;
+        for (int i = 0; i < kernel.length; i++) {
+            int jStart = Math.max(0, i - shift);
+            int jEnd = Math.min(frequencies.length, frequencies.length + i - shift);
+            for (int j = jStart; j < jEnd; j++) {
+                newFrequencies[j - i + shift] += kernel[i] * frequencies[j];
+            }
+        }
+        frequencies = newFrequencies;
+    }
+
+
+    public double[] createGaussianKernel(double length, double stdDeviation) {
+
+        int r = (int) Math.round(length / resolution) / 2;
+        stdDeviation /= resolution;
+
+        int size = 2 * r + 1;
+        double[] kernel = new double[size];
+        double sum = 0;
+        double b = 2 * stdDeviation * stdDeviation;
+        double a = 1 / Math.sqrt(Math.PI * b);
+        for (int i = 0; i < size; i++) {
+            kernel[i] = a * Math.exp(-(i - r) * (i - r) / b);
+            sum += kernel[i];
+        }
+        for (int i = 0; i < size; i++) {
+            kernel[i] /= sum;
+        }
+        return kernel;
+    }
+
+
+    public void gaussianSmooth(double windowLength, double stdDeviation) {
+
+        kernelSmooth(createGaussianKernel(windowLength, stdDeviation));
+    }
+
+
+    public void add(double value) {
+
+        frequencies[(int) ((value - min) / resolution)] += 1.0;
+    }
+
+
+    public int getSize() {
+
+        return frequencies.length;
+    }
+
+
+    public double getPeakValue() {
+
+        int peakIndex = 0;
+        for (int i = 1; i < frequencies.length; i++) {
+            if (frequencies[i] > frequencies[peakIndex]) {
+                peakIndex = i;
+            }
+        }
+        int peakEndIndex = peakIndex + 1;
+        final double EPS = 0.0001;
+        while (peakEndIndex < frequencies.length && Math.abs(frequencies[peakEndIndex] - frequencies[peakIndex]) < EPS) {
+            peakEndIndex++;
+        }
+        return ((double) peakIndex + peakEndIndex) / 2 * resolution + min;
+    }
+
+}
@@ -0,0 +1,165 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model;
+
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence;
+
+import lombok.Data;
+
+@Data
+public class Line extends BoundingBox {
+
+    private static final double WORD_DISTANCE_MULTIPLIER = 0.2;
+
+    private final double x0;
+    private final double y0;
+
+    private final double x1;
+    private final double y1;
+
+    private final double height;
+
+    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, sxx = 0.0, sxy = 0.0, sy = 0.0;
+            for (Character character : characters) {
+                sx += character.getX();
+                sxx += character.getX() * character.getX();
+                sxy += character.getX() * character.getY();
+                sy += character.getY();
+            }
+            double b = (characters.size() * sxy - sx * sy) / (characters.size() * sxx - sx * sx);
+            double a = (sy - b * sx) / characters.size();
+
+            this.x0 = characters.get(0).getX();
+            this.y0 = a + b * this.x0;
+            this.x1 = characters.get(characters.size() - 1).getX();
+            this.y1 = a + b * this.x1;
+        } else {
+            Character character = characters.get(0);
+            double dx = character.getTextPosition().getWidthDirAdj() / 3;
+            double dy = dx * Math.tan(0);
+            this.x0 = character.getX() - dx;
+            this.x1 = character.getX() + dx;
+            this.y0 = character.getY() - dy;
+            this.y1 = character.getY() + dy;
+        }
+        height = computeHeight();
+        computeWords(wordSpacing * WORD_DISTANCE_MULTIPLIER);
+        buildBBox();
+    }
+
+
+    public double getAngle() {
+
+        return Math.atan2(y1 - y0, x1 - x0);
+    }
+
+
+    public double getLength() {
+
+        return Math.sqrt((x0 - x1) * (x0 - x1) + (y0 - y1) * (y0 - y1));
+    }
+
+
+    private double computeHeight() {
+
+        double sum = 0.0;
+        for (Character component : characters) {
+            sum += component.getHeight();
+        }
+        return sum / characters.size();
+    }
+
+
+    public double angularDifference(Line j) {
+
+        double diff = Math.abs(getAngle() - j.getAngle());
+        if (diff <= Math.PI / 2) {
+            return diff;
+        } else {
+            return Math.PI - diff;
+        }
+    }
+
+
+    public double horizontalDistance(Line other) {
+
+        double[] xs = new double[4];
+        xs[0] = x0;
+        xs[1] = x1;
+        xs[2] = other.x0;
+        xs[3] = other.x1;
+        boolean overlapping = xs[1] >= xs[2] && xs[3] >= xs[0];
+        Arrays.sort(xs);
+        return Math.abs(xs[2] - xs[1]) * (overlapping ? 1 : -1);
+    }
+
+
+    public double verticalDistance(Line other) {
+
+        double ym = (y0 + y1) / 2;
+        double yn = (other.y0 + other.y1) / 2;
+        return Math.abs(ym - yn) / Math.sqrt(1);
+    }
+
+
+    private void computeWords(double wordSpacing) {
+
+        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 TextPositionSequence();
+                }
+            }
+            word.getTextPositions().add(current.getTextPosition());
+            previous = current;
+        }
+        words.add(word);
+    }
+
+
+    private void buildBBox() {
+
+        double minX = Double.POSITIVE_INFINITY;
+        double minY = Double.POSITIVE_INFINITY;
+        double maxX = Double.NEGATIVE_INFINITY;
+        double maxY = Double.NEGATIVE_INFINITY;
+
+        for (Character character : characters) {
+
+            minX = Math.min(minX, character.getTextPosition().getXDirAdj());
+            minY = Math.min(minY, character.getTextPosition().getYDirAdj());
+            maxX = Math.max(maxX, character.getTextPosition().getXDirAdj() + character.getTextPosition().getWidthDirAdj());
+            maxY = Math.max(maxY, character.getTextPosition().getYDirAdj() + character.getTextPosition().getHeightDir());
+
+        }
+
+        this.setBBox(new Rectangle2D.Double(minX, minY, maxX - minX, maxY - minY));
+    }
+
+
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        words.forEach(word -> sb.append(word.toString()).append(" "));
+        return sb.toString().trim();
+    }
+
+}
+
@@ -0,0 +1,36 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model;
+
+import lombok.Getter;
+
+public class Neighbor {
+
+    @Getter
+    private final double distance;
+    @Getter
+    private final double angle;
+    private final Character originCharacter;
+    @Getter
+    private final Character character;
+
+
+    public Neighbor(Character neighbor, Character origin) {
+
+        this.distance = neighbor.distance(origin);
+        this.angle = neighbor.angle(origin);
+        this.character = neighbor;
+        this.originCharacter = origin;
+    }
+
+
+    public double getHorizontalDistance() {
+
+        return character.horizontalDistance(originCharacter);
+    }
+
+
+    public double getVerticalDistance() {
+
+        return character.verticalDistance(originCharacter);
+    }
+
+}
@@ -0,0 +1,50 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model;
+
+import java.awt.geom.Rectangle2D;
+import java.util.Comparator;
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class Zone extends BoundingBox {
+
+    private List<Line> lines;
+
+
+    public Zone(List<Line> lines) {
+
+        lines.sort(Comparator.comparingDouble(Line::getY));
+        this.lines = lines;
+        buildBBox();
+    }
+
+
+    public void buildBBox() {
+
+        double minX = Double.POSITIVE_INFINITY;
+        double minY = Double.POSITIVE_INFINITY;
+        double maxX = Double.NEGATIVE_INFINITY;
+        double maxY = Double.NEGATIVE_INFINITY;
+
+        for (Line line : lines) {
+
+            minX = Math.min(minX, line.getX());
+            minY = Math.min(minY, line.getY());
+            maxX = Math.max(maxX, line.getX() + line.getWidth());
+            maxY = Math.max(maxY, line.getY() + line.getHeight());
+
+        }
+
+        this.setBBox(new Rectangle2D.Double(minX, minY, maxX - minX, maxY - minY));
+    }
+
+
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        lines.forEach(line -> sb.append(line.toString()).append("\n"));
+        return sb.toString().trim();
+    }
+
+}
@@ -0,0 +1,50 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.AngleFilter;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Character;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.DisjointSets;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Line;
+
+@Service
+public class LineBuilderService {
+
+    private static final double CHARACTER_SPACING_DISTANCE_MULTIPLIER = 3.5;
+    private static final double MAX_VERTICAL_CHARACTER_DISTANCE = 0.67;
+    private static final double ANGLE_TOLERANCE = Math.PI / 6;
+
+
+    public List<Line> buildLines(List<Character> characters, double characterSpacing, double lineSpacing) {
+
+        double maxHorizontalDistance = characterSpacing * CHARACTER_SPACING_DISTANCE_MULTIPLIER;
+        double maxVerticalDistance = lineSpacing * MAX_VERTICAL_CHARACTER_DISTANCE;
+
+        DisjointSets<Character> sets = new DisjointSets<>(characters);
+        AngleFilter filter = new AngleFilter(-ANGLE_TOLERANCE, ANGLE_TOLERANCE);
+
+        characters.forEach(character -> {
+            character.getNeighbors().forEach(neighbor -> {
+                double x = neighbor.getHorizontalDistance() / maxHorizontalDistance;
+                double y = neighbor.getVerticalDistance() / maxVerticalDistance;
+                if (filter.matches(neighbor) && Math.pow(x, 2) + Math.pow(y, 2) <= 1) {
+                    sets.union(character, neighbor.getCharacter());
+                }
+            });
+        });
+
+        List<Line> lines = new ArrayList<>();
+        sets.forEach(group -> {
+            List<Character> lineComponents = new ArrayList<>(group);
+            lineComponents.sort(Comparator.comparingDouble(Character::getX));
+            lines.add(new Line(lineComponents, characterSpacing));
+        });
+
+        return lines;
+    }
+
+}
@@ -0,0 +1,78 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Character;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Neighbor;
+
+@Service
+public class NearestNeighbourService {
+
+    private static final int NUMBER_OF_NEIGHBOURS = 8;
+    private static final double STEP = 16.0;
+
+
+    public void findNearestNeighbors(List<Character> characters) {
+
+        if (characters.isEmpty()) {
+            return;
+        }
+
+        characters.sort(Comparator.comparingDouble(Character::getX));
+
+        int maxNeighborCount = NUMBER_OF_NEIGHBOURS;
+        if (characters.size() <= NUMBER_OF_NEIGHBOURS) {
+            maxNeighborCount = characters.size() - 1;
+        }
+
+        for (int i = 0; i < characters.size(); i++) {
+
+            List<Neighbor> candidates = new ArrayList<>();
+
+            int start = i;
+            int end = i + 1;
+
+            double distance = Double.POSITIVE_INFINITY;
+
+            for (double searchDistance = 0; searchDistance < distance; ) {
+
+                searchDistance += STEP;
+                boolean newCandidatesFound = false;
+
+                while (start > 0 && characters.get(i).getX() - characters.get(start - 1).getX() < searchDistance) {
+                    start--;
+                    candidates.add(new Neighbor(characters.get(start), characters.get(i)));
+                    clearLeastDistant(candidates, maxNeighborCount);
+                    newCandidatesFound = true;
+                }
+
+                while (end < characters.size() && characters.get(end).getX() - characters.get(i).getX() < searchDistance) {
+                    candidates.add(new Neighbor(characters.get(end), characters.get(i)));
+                    clearLeastDistant(candidates, maxNeighborCount);
+                    end++;
+                    newCandidatesFound = true;
+                }
+
+                if (newCandidatesFound && candidates.size() >= maxNeighborCount) {
+                    distance = candidates.get(maxNeighborCount - 1).getDistance();
+                }
+            }
+            clearLeastDistant(candidates, maxNeighborCount);
+            characters.get(i).setNeighbors(new ArrayList<>(candidates));
+        }
+    }
+
+
+    private void clearLeastDistant(List<Neighbor> candidates, int maxNeighborCount) {
+
+        if (candidates.size() > maxNeighborCount) {
+            candidates.sort(Comparator.comparingDouble(Neighbor::getDistance));
+            candidates.remove(candidates.remove(candidates.size() - 1));
+        }
+    }
+
+}
@@ -0,0 +1,99 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.springframework.stereotype.Service;
+
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.BoundingBox;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.utils.DoubleUtils;
+
+@Service
+public class ReadingOrderService {
+
+    private static final double THRESHOLD = 1;
+
+
+    public List<Zone> resolve(List<Zone> zones, boolean yxOrder) {
+
+        if (zones.isEmpty() || zones.size() == 1) {
+            return zones;
+        }
+
+        if (yxOrder) {
+            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;
+        }
+
+        return resolveMultiColumnReadingOder(zones);
+    }
+
+
+    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
+
+        double minX = Double.POSITIVE_INFINITY;
+        double maxX = Double.NEGATIVE_INFINITY;
+
+        for (Zone zone : zones) {
+            if (zone.getX() < minX) {
+                minX = zone.getX();
+            }
+            if (zone.getX() + zone.getWidth() > maxX) {
+                maxX = zone.getX() + zone.getWidth();
+            }
+        }
+
+        double midLineXCoordinate = (minX + maxX) / 2;
+
+        List<Zone> leftOf = new ArrayList<>();
+        List<Zone> rightOf = new ArrayList<>();
+        List<Zone> middle = new ArrayList<>();
+        for (Zone zone : zones) {
+            if (zone.getX() < midLineXCoordinate && zone.getX() + zone.getWidth() < midLineXCoordinate) {
+                leftOf.add(zone);
+            } else if (zone.getX() > midLineXCoordinate && zone.getX() + zone.getWidth() > midLineXCoordinate) {
+                rightOf.add(zone);
+            } else {
+                middle.add(zone);
+            }
+        }
+
+        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> sortedZones = new ArrayList<>();
+        sortedZones.addAll(leftOf);
+        sortedZones.addAll(rightOf);
+
+        ListIterator<Zone> itty = middle.listIterator();
+
+        while (itty.hasNext()) {
+            Zone current = itty.next();
+            for (int i = 0; i < sortedZones.size(); i++) {
+                if (current.getY() < sortedZones.get(i).getY()) {
+                    sortedZones.add(i, current);
+                    itty.remove();
+                    break;
+                }
+            }
+        }
+
+        sortedZones.addAll(middle);
+
+        return sortedZones;
+    }
+
+}
@@ -0,0 +1,56 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.AngleFilter;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Character;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Histogram;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Neighbor;
+
+@Service
+public class SpacingService {
+
+    private static final double SPACING_HISTOGRAM_RESOLUTION = 0.5;
+    private static final double SPACING_HISTOGRAM_SMOOTHING_LENGTH = 2.5;
+    private static final double SPACING_HIST_SMOOTHING_STANDARD_DEVIATION = 0.5;
+    private static final double ANGLE_TOLERANCE = Math.PI / 6;
+
+
+    public double computeCharacterSpacing(List<Character> components) {
+
+        return computeSpacing(components, 0);
+    }
+
+
+    public double computeLineSpacing(List<Character> components) {
+
+        return computeSpacing(components, Math.PI / 2);
+    }
+
+
+    private double computeSpacing(List<Character> components, double angle) {
+
+        double maxDistance = Double.NEGATIVE_INFINITY;
+
+        for (Character component : components) {
+            for (Neighbor neighbor : component.getNeighbors()) {
+                maxDistance = Math.max(maxDistance, neighbor.getDistance());
+            }
+        }
+        Histogram histogram = new Histogram(0, maxDistance, SPACING_HISTOGRAM_RESOLUTION);
+        AngleFilter filter = new AngleFilter(angle - ANGLE_TOLERANCE, angle + ANGLE_TOLERANCE);
+        for (Character component : components) {
+            for (Neighbor neighbor : component.getNeighbors()) {
+                if (filter.matches(neighbor)) {
+                    histogram.add(neighbor.getDistance());
+                }
+            }
+        }
+
+        histogram.gaussianSmooth(SPACING_HISTOGRAM_SMOOTHING_LENGTH, SPACING_HIST_SMOOTHING_STANDARD_DEVIATION);
+        return histogram.getPeakValue();
+    }
+
+}
@@ -0,0 +1,90 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.DisjointSets;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Line;
+import com.knecon.fforesight.service.layoutparser.processor.services.docstrum.model.Zone;
+
+@Service
+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 = -3.0;
+
+    private static final double MAX_VERTICAL_MERGE_DISTANCE_MULTIPLIER = 0.5;
+
+    private static final double MIN_LINE_SIZE_SCALE = 0.9;
+
+    private static final double MAX_LINE_SIZE_SCALE = 2.5;
+
+    private static final double ANGLE_TOLERANCE = Math.PI / 6;
+
+    public static final int MAX_ZONES = 300;
+
+
+    public List<Zone> buildZones(List<Line> lines, double characterSpacing, double lineSpacing) {
+
+        double minHorizontalDistance = characterSpacing * MIN_HORIZONTAL_DISTANCE_MULTIPLIER;
+        double maxVerticalDistance = lineSpacing * MAX_VERTICAL_DISTANCE_MULTIPLIER;
+        double minHorizontalMergeDistance = characterSpacing * MIN_HORIZONTAL_MERGE_DISTANCE_MULTIPLIER;
+        double maxVerticalMergeDistance = lineSpacing * MAX_VERTICAL_MERGE_DISTANCE_MULTIPLIER;
+
+        DisjointSets<Line> sets = new DisjointSets<>(lines);
+
+        double meanHeight = calculateMeanHeight(lines);
+
+        lines.forEach(outerLine -> //
+                lines.forEach(innerLine -> {
+
+                    double scale = Math.min(outerLine.getHeight(), innerLine.getHeight()) / meanHeight;
+                    scale = Math.max(MIN_LINE_SIZE_SCALE, Math.min(scale, MAX_LINE_SIZE_SCALE));
+
+                    if (!sets.areTogether(outerLine, innerLine) && outerLine.angularDifference(innerLine) <= ANGLE_TOLERANCE) {
+
+                        double horizontalDistance = outerLine.horizontalDistance(innerLine) / scale;
+                        double verticalDistance = outerLine.verticalDistance(innerLine) / scale;
+
+                        if (minHorizontalDistance <= horizontalDistance && verticalDistance <= maxVerticalDistance //
+                                || minHorizontalMergeDistance <= horizontalDistance && verticalDistance <= maxVerticalMergeDistance) {
+                            sets.union(outerLine, innerLine);
+                        }
+                    }
+                }));
+
+        List<Zone> zones = new ArrayList<>();
+        sets.forEach(group -> {
+            zones.add(new Zone(new ArrayList<>(group)));
+        });
+
+        if (zones.size() > MAX_ZONES) {
+            List<Line> oneZoneLines = new ArrayList<>();
+            for (Zone zone : zones) {
+                oneZoneLines.addAll(zone.getLines());
+            }
+            return List.of(new Zone(oneZoneLines));
+        }
+
+        return zones;
+    }
+
+
+    private double calculateMeanHeight(List<Line> lines) {
+
+        double meanHeight = 0.0;
+        double weights = 0.0;
+        for (Line line : lines) {
+            double weight = line.getLength();
+            meanHeight += line.getHeight() * weight;
+            weights += weight;
+        }
+        meanHeight /= weights;
+        return meanHeight;
+    }
+
+}
@@ -0,0 +1,18 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.docstrum.utils;
+
+public class DoubleUtils {
+
+    public static int compareDouble(double d1, double d2, double precision) {
+
+        if (Double.isNaN(d1) || Double.isNaN(d2)) {
+            return Double.compare(d1, d2);
+        }
+        if (precision == 0) {
+            precision = 1;
+        }
+        long i1 = Math.round(d1 / precision);
+        long i2 = Math.round(d2 / precision);
+        return Long.valueOf(i1).compareTo(i2);
+    }
+
+}
@@ -1,12 +1,11 @@
 package com.knecon.fforesight.service.layoutparser.processor.services.visualization;

-import static com.knecon.fforesight.service.layoutparser.processor.services.visualization.ViewerDocumentService.LINE_WIDTH;
-
 import java.awt.Color;
 import java.awt.geom.Line2D;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RectangularShape;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -24,25 +23,59 @@ import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Pa
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.TableCell;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.ColoredLine;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.ColoredRectangle;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.LayoutGrid;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.PlacedText;
 import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
+import com.knecon.fforesight.service.viewerdoc.ContentStreams;
+import com.knecon.fforesight.service.viewerdoc.model.ColoredLine;
+import com.knecon.fforesight.service.viewerdoc.model.ColoredRectangle;
+import com.knecon.fforesight.service.viewerdoc.model.LayoutGrid;
+import com.knecon.fforesight.service.viewerdoc.model.PlacedText;
+import com.knecon.fforesight.service.viewerdoc.model.Standard14EmbeddableFont;
+import com.knecon.fforesight.service.viewerdoc.model.Visualizations;
+import com.knecon.fforesight.service.viewerdoc.service.ViewerDocumentService;
+
+import io.micrometer.observation.annotation.Observed;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;

@Service
+@RequiredArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 public class LayoutGridService {

-    private static final Color INNER_LINES_COLOR = new Color(255, 175, 175);
-    private static final Color PARAGRAPH_COLOR = new Color(70, 130, 180);
-    public static final Color TABLE_COLOR = new Color(102, 205, 170);
-    public static final Color SECTION_COLOR = new Color(50, 50, 50);
-    public static final Color HEADLINE_COLOR = new Color(162, 56, 56);
-    public static final Color HEADER_COLOR = new Color(171, 131, 6);
-    public static final Color IMAGE_COLOR = new Color(253, 63, 146);
+    ViewerDocumentService viewerDocumentService;
+
+    static float FONT_SIZE = 10f;
+    static float LINE_WIDTH = 1f;
+    static Standard14EmbeddableFont FONT = Standard14EmbeddableFont.helvetica();
+
+    static Color INNER_LINES_COLOR = new Color(255, 175, 175);
+    static Color PARAGRAPH_COLOR = new Color(70, 130, 180);
+    static Color TABLE_COLOR = new Color(102, 205, 170);
+    static Color SECTION_COLOR = new Color(50, 50, 50);
+    static Color HEADLINE_COLOR = new Color(162, 56, 56);
+    static Color HEADER_COLOR = new Color(171, 131, 6);
+    static Color IMAGE_COLOR = new Color(253, 63, 146);


-    public LayoutGrid createLayoutGrid(Document document) {
+    @SneakyThrows
+    @Observed(name = "ViewerDocumentService", contextualName = "create-viewer-document")
+    public void addLayoutGrid(File originFile, Document document, File destinationFile, boolean layerVisibilityDefaultValue) {
+
+        LayoutGrid layoutGrid = createLayoutGrid(document);
+
+        viewerDocumentService.addVisualizationsOnPage(originFile,
+                destinationFile,
+                Visualizations.builder()
+                        .layer(ContentStreams.KNECON_LAYOUT)
+                        .visualizationsOnPages(layoutGrid.getVisualizationsPerPages())
+                        .layerVisibilityDefaultValue(layerVisibilityDefaultValue)
+                        .build());
+    }
+
+
+    private LayoutGrid createLayoutGrid(Document document) {

        LayoutGrid layoutGrid = new LayoutGrid(document.getNumberOfPages());
        document.streamAllSubNodes().forEach(semanticNode -> {
@@ -103,11 +136,11 @@ public class LayoutGridService {
            List<ColoredLine> coloredLines = layoutGrid.getVisualizationsPerPages().get(page.getNumber() - 1).getColoredLines();
            xs.forEach(x -> {
                Line2D line = new Line2D.Double(new Point2D.Double(x, tableBBox.getMaxY()), new Point2D.Double(x, tableBBox.getMinY()));
-                coloredLines.add(new ColoredLine(line, INNER_LINES_COLOR));
+                coloredLines.add(new ColoredLine(line, INNER_LINES_COLOR, LINE_WIDTH));
            });
            ys.forEach(y -> {
                Line2D line = new Line2D.Double(new Point2D.Double(tableBBox.getMinX(), y), new Point2D.Double(tableBBox.getMaxX(), y));
-                coloredLines.add(new ColoredLine(line, INNER_LINES_COLOR));
+                coloredLines.add(new ColoredLine(line, INNER_LINES_COLOR, LINE_WIDTH));
            });
        }
    }
@@ -135,9 +168,9 @@ public class LayoutGridService {
            List<Line2D> lines = createLinesFromRectangle(r, firstPage.getRotation());
            // add string to top line
            var firstLine = lines.remove(0);
-            coloredLines.add(new ColoredLine(firstLine, color));
+            coloredLines.add(new ColoredLine(firstLine, color, LINE_WIDTH));
            for (Line2D line : lines) {
-                coloredLines.add(new ColoredLine(line, color));
+                coloredLines.add(new ColoredLine(line, color, LINE_WIDTH));
            }
            return;
        }
@@ -152,6 +185,7 @@ public class LayoutGridService {
    }


+    @SneakyThrows
    private void addPlacedText(Page page, Rectangle2D textBBox, String s, LayoutGrid layoutGrid) {

        Point2D.Float upperLeftCorner = switch (page.getRotation()) {
@@ -161,7 +195,8 @@ public class LayoutGridService {
            default -> new Point2D.Float((float) (textBBox.getMinX()), (float) textBBox.getMaxY());
        };
        var placedTexts = layoutGrid.getVisualizationsPerPages().get(page.getNumber() - 1).getPlacedTexts();
-        placedTexts.add(new PlacedText(s, upperLeftCorner));
+        upperLeftCorner.setLocation(upperLeftCorner.getX() - ((FONT.getStringWidth(s) / 1000) * FONT_SIZE + (2 * LINE_WIDTH) + 4), upperLeftCorner.getY() - FONT_SIZE);
+        placedTexts.add(PlacedText.textFacingUp(s, upperLeftCorner, FONT_SIZE, Color.BLACK, FONT));
    }


@@ -176,9 +211,9 @@ public class LayoutGridService {
        midPageLines.remove(1);
        // add string to left line
        var leftLine = midPageLines.remove(1);
-        coloredLines.add(new ColoredLine(leftLine, color));
+        coloredLines.add(new ColoredLine(leftLine, color, LINE_WIDTH));
        for (Line2D line : midPageLines) {
-            coloredLines.add(new ColoredLine(line, color));
+            coloredLines.add(new ColoredLine(line, color, LINE_WIDTH));
        }
    }

@@ -192,9 +227,9 @@ public class LayoutGridService {
        lastPageLines.remove(0);
        // add string to left line
        var leftLine = lastPageLines.remove(2);
-        coloredLines.add(new ColoredLine(leftLine, color));
+        coloredLines.add(new ColoredLine(leftLine, color, LINE_WIDTH));
        for (Line2D line : lastPageLines) {
-            coloredLines.add(new ColoredLine(line, color));
+            coloredLines.add(new ColoredLine(line, color, LINE_WIDTH));
        }
    }

@@ -208,9 +243,9 @@ public class LayoutGridService {
        firstPageLines.remove(2);
        // add string to top line
        var firstLine = firstPageLines.remove(0);
-        coloredLines.add(new ColoredLine(firstLine, color));
+        coloredLines.add(new ColoredLine(firstLine, color, LINE_WIDTH));
        for (Line2D line : firstPageLines) {
-            coloredLines.add(new ColoredLine(line, color));
+            coloredLines.add(new ColoredLine(line, color, LINE_WIDTH));
        }
    }

@@ -276,7 +311,10 @@ public class LayoutGridService {
    private void addAsRectangle(SemanticNode semanticNode, LayoutGrid layoutGrid, Color color) {

        semanticNode.getBBox()
-                .forEach((page, textBBox) -> layoutGrid.getVisualizationsPerPages().get(page.getNumber() - 1).getColoredRectangles().add(new ColoredRectangle(textBBox, color)));
+                .forEach((page, textBBox) -> layoutGrid.getVisualizationsPerPages()
+                        .get(page.getNumber() - 1)
+                        .getColoredRectangles()
+                        .add(new ColoredRectangle(textBBox, color, LINE_WIDTH)));
    }

 }
@@ -0,0 +1,270 @@
+package com.knecon.fforesight.service.layoutparser.processor.services.visualization;
+
+import java.awt.Color;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
+import org.apache.pdfbox.util.Matrix;
+import org.springframework.core.io.ClassPathResource;
+
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock;
+import com.knecon.fforesight.service.layoutparser.processor.model.table.Ruling;
+import com.knecon.fforesight.service.layoutparser.processor.utils.PdfVisualisationUtility;
+import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class PdfDraw {
+
+    public static void drawRectanglesPerPage(String filename, List<List<Rectangle2D>> rectanglesPerPage, String tmpFileName) throws IOException {
+
+        ClassPathResource pdfResource = new ClassPathResource(filename);
+        try (PDDocument pdDocument = Loader.loadPDF(pdfResource.getFile()); var out = new FileOutputStream(tmpFileName)) {
+            for (int pageNumber = 1; pageNumber < pdDocument.getNumberOfPages() + 1; pageNumber++) {
+                PdfVisualisationUtility.drawRectangle2DList(pdDocument,
+                        pageNumber,
+                        rectanglesPerPage.get(pageNumber - 1),
+                        PdfVisualisationUtility.Options.builder().stroke(true).build());
+            }
+            pdDocument.save(out);
+        }
+
+    }
+
+
+    public static void drawRectanglesPerPageNumberedByLine(String filename, List<List<List<Rectangle2D>>> rectanglesPerPage, String tmpFileName) throws IOException {
+
+        ClassPathResource pdfResource = new ClassPathResource(filename);
+        try (PDDocument pdDocument = Loader.loadPDF(pdfResource.getFile()); var out = new FileOutputStream(tmpFileName)) {
+            for (int pageNumber = 1; pageNumber < pdDocument.getNumberOfPages() + 1; pageNumber++) {
+                var rectanglesOnPage = rectanglesPerPage.get(pageNumber - 1);
+                for (int lineNumber = 0; lineNumber < rectanglesOnPage.size(); lineNumber++) {
+                    var rectanglesInLine = rectanglesOnPage.get(lineNumber);
+                    PdfVisualisationUtility.drawRectangle2DList(pdDocument, pageNumber, rectanglesInLine, PdfVisualisationUtility.Options.builder().stroke(true).build());
+                    double y = Math.min(rectanglesInLine.get(0).getMinY(), rectanglesInLine.get(0).getMaxY());
+                    PdfVisualisationUtility.drawText(String.format("%d", lineNumber),
+                            pdDocument,
+                            new Point2D.Double(rectanglesInLine.get(0).getX() - (5 + (5 * countNumberOfDigits(lineNumber))), y + 2),
+                            pageNumber,
+                            PdfVisualisationUtility.Options.builder().stroke(true).build());
+                }
+            }
+            pdDocument.save(out);
+        }
+
+    }
+
+
+    private static int countNumberOfDigits(int num) {
+
+        int final_num = num;
+        if (final_num == 0) {
+            return 1;
+        }
+        int count = 0;
+        for (; final_num != 0; final_num /= 10) {
+            count++;
+        }
+        return count;
+    }
+
+
+    public static void drawDocumentGraph(PDDocument document, Document documentGraph) {
+
+        documentGraph.getDocumentTree().allEntriesInOrder().forEach(entry -> drawNode(document, entry));
+    }
+
+
+    public static void drawNode(PDDocument document, DocumentTree.Entry entry) {
+
+        Options options = buildStandardOptionsForNodes(entry);
+
+        drawBBoxAndLabelAndNumberOnPage(document, entry, options);
+
+    }
+
+
+    public static void drawTextBlock(PDDocument document, TextBlock textBlock, Options options) {
+
+        textBlock.getAtomicTextBlocks().forEach(atb -> drawAtomicTextBlock(document, atb, options));
+    }
+
+
+    public static void drawAtomicTextBlock(PDDocument document, AtomicTextBlock atomicTextBlock, Options options) {
+
+        drawRectangle2DList(document, atomicTextBlock.getPage().getNumber(), atomicTextBlock.getPositions().stream().toList(), options);
+
+    }
+
+
+    @SneakyThrows
+    private static void drawText(String string, PDDocument document, Point2D location, Integer pageNumber, Options options, boolean rotate) {
+
+        var pdPage = document.getPage(pageNumber - 1);
+        var contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
+
+        contentStream.setNonStrokingColor(options.getStrokeColor());
+        contentStream.setLineWidth(options.getStrokeWidth());
+
+        contentStream.beginText();
+        if (rotate) {
+            contentStream.setTextMatrix(Matrix.getRotateInstance(Math.toRadians(15), (float) location.getX(), (float) location.getY()));
+        } else {
+            contentStream.newLineAtOffset((float) location.getX(), (float) location.getY());
+        }
+        contentStream.setFont(new PDType1Font(Standard14Fonts.FontName.HELVETICA), 10);
+        contentStream.showText(string);
+        contentStream.endText();
+        contentStream.close();
+    }
+
+
+    @SneakyThrows
+    public static void drawRectangle2DList(PDDocument document, int pageNumber, List<Rectangle2D> rectCollection, Options options) {
+
+        var pdPage = document.getPage(pageNumber - 1);
+        drawRectangle2DList(document, rectCollection, options, pdPage);
+    }
+
+
+    private static void drawRectangle2DList(PDDocument document, List<Rectangle2D> rectCollection, Options options, PDPage pdPage) throws IOException {
+
+        var contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
+
+        contentStream.setStrokingColor(options.getStrokeColor());
+        contentStream.setNonStrokingColor(options.getFillColor());
+        contentStream.setLineWidth(options.getStrokeWidth());
+
+        for (var r : rectCollection) {
+            contentStream.addRect((float) r.getMinX(), (float) r.getMinY(), (float) r.getWidth(), (float) r.getHeight());
+
+            if (options.isStroke() && options.isFill()) {
+                contentStream.fillAndStroke();
+            } else if (options.isStroke()) {
+                contentStream.stroke();
+            } else if (options.isFill()) {
+                contentStream.fill();
+            }
+        }
+        contentStream.close();
+    }
+
+
+    @SneakyThrows
+    public static void drawRectanglesAndLinesPerPage(String filename, List<List<Rectangle2D>> list, List<List<Rectangle2D>> rectanglesPerPage, String tmpFileName) {
+
+        ClassPathResource pdfResource = new ClassPathResource(filename);
+        try (PDDocument pdDocument = Loader.loadPDF(pdfResource.getFile()); var out = new FileOutputStream(tmpFileName)) {
+            for (int pageNumber = 1; pageNumber < pdDocument.getNumberOfPages() + 1; pageNumber++) {
+//                PdfVisualisationUtility.drawLine2DList(pdDocument,
+//                        pageNumber,
+//                        list.get(pageNumber - 1),
+//                        PdfVisualisationUtility.Options.builder().stroke(true).build());
+                PdfVisualisationUtility.drawRectangle2DList(pdDocument,
+                        pageNumber,
+                        rectanglesPerPage.get(pageNumber - 1),
+                        PdfVisualisationUtility.Options.builder().stroke(true).build());
+                PdfVisualisationUtility.drawRectangle2DList(pdDocument, pageNumber, list.get(pageNumber - 1), PdfVisualisationUtility.Options.builder().stroke(true).build());
+            }
+            pdDocument.save(out);
+        }
+    }
+
+
+    @SneakyThrows
+    public static void drawLinesPerPage(String filename, List<List<Ruling>> linesPerPage, String tmpFileName) {
+
+        ClassPathResource pdfResource = new ClassPathResource(filename);
+        try (PDDocument pdDocument = Loader.loadPDF(pdfResource.getFile()); var out = new FileOutputStream(tmpFileName)) {
+            for (int pageNumber = 1; pageNumber < pdDocument.getNumberOfPages() + 1; pageNumber++) {
+                PdfVisualisationUtility.drawLine2DList(pdDocument,
+                        pageNumber,
+                        linesPerPage.get(pageNumber - 1),
+                        PdfVisualisationUtility.Options.builder().strokeColor(Color.RED).stroke(true).build());
+            }
+            pdDocument.save(out);
+        }
+    }
+
+
+    @Builder
+    @AllArgsConstructor
+    @Getter
+    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+    public static class Options {
+
+        boolean stroke;
+        @Builder.Default
+        Color strokeColor = Color.BLACK;
+        @Builder.Default
+        float strokeWidth = 1f;
+
+        boolean fill;
+        @Builder.Default
+        Color fillColor = Color.BLACK;
+
+    }
+
+
+    private static Options buildStandardOptionsForNodes(DocumentTree.Entry entry) {
+
+        return Options.builder().stroke(true).strokeColor(switch (entry.getType()) {
+            case DOCUMENT -> Color.LIGHT_GRAY;
+            case HEADER, FOOTER -> Color.GREEN;
+            case PARAGRAPH -> Color.BLUE;
+            case HEADLINE -> Color.RED;
+            case SECTION -> Color.BLACK;
+            case TABLE -> Color.ORANGE;
+            case TABLE_CELL -> Color.GRAY;
+            case IMAGE -> Color.MAGENTA;
+        }).build();
+    }
+
+
+    private static void drawBBoxAndLabelAndNumberOnPage(PDDocument document, DocumentTree.Entry entry, Options options) {
+
+        Map<Page, Rectangle2D> rectanglesPerPage = entry.getNode().getBBox();
+        for (Page page : rectanglesPerPage.keySet()) {
+            Rectangle2D rectangle2D = rectanglesPerPage.get(page);
+            if (entry.getType() == NodeType.SECTION) {
+                rectangle2D = RectangleTransformations.pad(rectangle2D, 10, 10);
+            }
+            drawRectangle2DList(document, page.getNumber(), List.of(rectangle2D), options);
+            drawText(buildString(entry),
+                    document,
+                    new Point2D.Double(rectangle2D.getMinX(), rectangle2D.getMaxY() + 2),
+                    page.getNumber(),
+                    options,
+                    entry.getType() == NodeType.TABLE_CELL);
+        }
+    }
+
+
+    private static String buildString(DocumentTree.Entry entry) {
+
+        return entry.getNode().getNumberOnPage() + ": " + entry.getTreeId() + ": " + entry.getType();
+    }
+
+}
@@ -1,217 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.services.visualization;
-
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-
-import org.apache.pdfbox.Loader;
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.PDResources;
-import org.apache.pdfbox.pdmodel.font.PDFont;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
-import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentGroup;
-import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentProperties;
-import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
-import org.apache.pdfbox.util.Matrix;
-import org.springframework.stereotype.Service;
-
-import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.ColoredLine;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.ColoredRectangle;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.FilledRectangle;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.LayoutGrid;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.PlacedText;
-import com.knecon.fforesight.service.layoutparser.processor.model.visualization.VisualizationsOnPage;
-
-import io.micrometer.observation.Observation;
-import io.micrometer.observation.ObservationRegistry;
-import io.micrometer.observation.annotation.Observed;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class ViewerDocumentService {
-
-    private static final String LAYER_NAME = "Layout grid";
-    private static final int FONT_SIZE = 10;
-    public static final float LINE_WIDTH = 1f;
-
-    private final LayoutGridService layoutGridService;
-    private final ObservationRegistry observationRegistry;
-
-
-    @SneakyThrows
-    @Observed(name = "ViewerDocumentService", contextualName = "create-viewer-document")
-    public void createViewerDocument(File originFile, Document document, File destinationFile, boolean layerVisibilityDefaultValue) {
-
-        Path tmpFile = Files.createTempFile("tmpViewerDocument", ".pdf");
-        PDDocument pdDocument = openPDDocument(originFile);
-        LayoutGrid layoutGrid = layoutGridService.createLayoutGrid(document);
-
-        PDOptionalContentGroup layer = addLayerToDocument(pdDocument, layerVisibilityDefaultValue);
-        PDFont font = new PDType1Font(Standard14Fonts.FontName.HELVETICA);
-
-        for (int pageNumber = 0; pageNumber < pdDocument.getNumberOfPages(); pageNumber++) {
-
-            PDPage pdPage = pdDocument.getPage(pageNumber);
-//
-            AffineTransform textDeRotationMatrix = getTextDeRotationTransform(pdPage);
-            addLayerToPageResources(pdPage);
-
-            // We need to save the graphics state before, such that our appended content cannot be affected by previous content streams with side effects,
-            // e.g. not escaped matrix transformations.
-            escapePreviousContents(pdDocument, pdPage);
-
-            VisualizationsOnPage visualizationsOnPage = layoutGrid.getVisualizationsPerPages().get(pageNumber);
-            assert pageNumber == visualizationsOnPage.getPageNumber();
-            // We need to append to the content stream, otherwise the content could be overlapped by following content.
-            try (var contentStream = new PDPageContentStream(pdDocument, pdPage, PDPageContentStream.AppendMode.APPEND, true)) {
-
-                contentStream.beginMarkedContent(COSName.OC, layer);
-                contentStream.saveGraphicsState();
-
-                contentStream.setLineWidth(LINE_WIDTH);
-                for (ColoredLine coloredLine : visualizationsOnPage.getColoredLines()) {
-                    contentStream.setStrokingColor(coloredLine.color());
-                    contentStream.moveTo((float) coloredLine.line().getX1(), (float) coloredLine.line().getY1());
-                    contentStream.lineTo((float) coloredLine.line().getX2(), (float) coloredLine.line().getY2());
-                    contentStream.stroke();
-                }
-                for (ColoredRectangle coloredRectangle : visualizationsOnPage.getColoredRectangles()) {
-                    contentStream.setStrokingColor(coloredRectangle.color());
-                    Rectangle2D r = coloredRectangle.rectangle2D();
-                    contentStream.addRect((float) r.getX(), (float) r.getY(), (float) r.getWidth(), (float) r.getHeight());
-                    contentStream.stroke();
-                }
-                for (FilledRectangle filledRectangle : visualizationsOnPage.getFilledRectangles()) {
-                    contentStream.setNonStrokingColor(filledRectangle.color());
-                    PDExtendedGraphicsState graphicsState = new PDExtendedGraphicsState();
-                    graphicsState.setNonStrokingAlphaConstant(filledRectangle.alpha());
-                    contentStream.setGraphicsStateParameters(graphicsState);
-                    Rectangle2D r = filledRectangle.rectangle2D();
-                    contentStream.addRect((float) r.getX(), (float) r.getY(), (float) r.getWidth(), (float) r.getHeight());
-                    contentStream.fill();
-                }
-                for (PlacedText placedText : visualizationsOnPage.getPlacedTexts()) {
-                    contentStream.setFont(font, FONT_SIZE);
-                    contentStream.beginText();
-                    Matrix textMatrix = new Matrix((float) textDeRotationMatrix.getScaleX(),
-                            (float) textDeRotationMatrix.getShearX(),
-                            (float) textDeRotationMatrix.getShearY(),
-                            (float) textDeRotationMatrix.getScaleY(),
-                            (float) placedText.lineStart().getX(),
-                            (float) placedText.lineStart().getY());
-                    textMatrix.translate(-((font.getStringWidth(placedText.text()) / 1000) * FONT_SIZE + (2 * LINE_WIDTH) + 4), -FONT_SIZE);
-                    contentStream.setTextMatrix(textMatrix);
-                    contentStream.showText(placedText.text());
-                    contentStream.endText();
-                }
-                contentStream.restoreGraphicsState();
-                contentStream.endMarkedContent();
-            }
-
-            if (pageNumber % 500 == 0 && pageNumber != 0) { // re-open document every once in a while to save on RAM
-                log.info("Incremental save after {} pages", pageNumber);
-                observedIncrementalSave(pdDocument, destinationFile);
-                pdDocument.close();
-                Files.copy(destinationFile.toPath(), tmpFile, StandardCopyOption.REPLACE_EXISTING);
-                pdDocument = openPDDocument(tmpFile.toFile());
-                layer = addLayerToDocument(pdDocument, layerVisibilityDefaultValue);
-            }
-
-        }
-        observedIncrementalSave(pdDocument, destinationFile);
-
-        tmpFile.toFile().delete();
-        pdDocument.close();
-    }
-
-
-    private static PDDocument openPDDocument(File tmpFile) throws IOException {
-
-        PDDocument pdDocument;
-        pdDocument = Loader.loadPDF(tmpFile);
-        pdDocument.setAllSecurityToBeRemoved(true);
-        return pdDocument;
-    }
-
-
-    @SneakyThrows
-    private void observedIncrementalSave(PDDocument pdDocument, File outputFile) {
-
-        Observation.createNotStarted("ViewerDocumentService", observationRegistry).contextualName("incremental-save").observe(() -> {
-            try {
-                pdDocument.save(outputFile);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        });
-
-    }
-
-
-    private static void addLayerToPageResources(PDPage pdPage) {
-
-        PDResources resources = pdPage.getResources();
-        if (resources == null) {
-            resources = new PDResources();
-            pdPage.setResources(resources);
-        }
-    }
-
-
-    private static void escapePreviousContents(PDDocument pdDocument, PDPage pdPage) throws IOException {
-
-        try (var contentStream = new PDPageContentStream(pdDocument, pdPage, PDPageContentStream.AppendMode.PREPEND, false)) {
-            contentStream.saveGraphicsState();
-        }
-        try (var contentStream = new PDPageContentStream(pdDocument, pdPage, PDPageContentStream.AppendMode.APPEND, false)) {
-            contentStream.restoreGraphicsState();
-        }
-    }
-
-
-    private static PDOptionalContentGroup addLayerToDocument(PDDocument pdDocument, boolean layerVisibilityDefaultValue) {
-
-        PDDocumentCatalog catalog = pdDocument.getDocumentCatalog();
-        PDOptionalContentProperties ocprops = catalog.getOCProperties();
-        if (ocprops == null) {
-            ocprops = new PDOptionalContentProperties();
-            catalog.setOCProperties(ocprops);
-        }
-        PDOptionalContentGroup layer = null;
-        if (ocprops.hasGroup(LAYER_NAME)) {
-            layer = ocprops.getGroup(LAYER_NAME);
-        } else {
-            layer = new PDOptionalContentGroup(LAYER_NAME);
-            ocprops.addGroup(layer);
-        }
-        ocprops.setGroupEnabled(layer, layerVisibilityDefaultValue);
-//        dictionariesToUpdate.add(catalog.getCOSObject());
-        return layer;
-    }
-
-
-    private static AffineTransform getTextDeRotationTransform(PDPage page) {
-
-        return AffineTransform.getQuadrantRotateInstance(switch (page.getRotation()) {
-            case 90 -> 3;
-            case 180 -> 2;
-            case 270 -> 1;
-            default -> 0;
-        });
-    }
-
-}
@@ -6,7 +6,7 @@ plugins {
    id("org.springframework.boot") version "3.1.5"
    id("io.spring.dependency-management") version "1.1.3"
    id("org.sonarqube") version "4.3.0.3225"
-    id("io.freefair.lombok") version "8.2.2"
+    id("io.freefair.lombok") version "8.4"
 //    id("org.graalvm.buildtools.native") version "0.9.23"
 }

@@ -30,8 +30,8 @@ dependencies {
    implementation(project(":layoutparser-service-internal-api"))

    implementation("com.iqser.red.commons:storage-commons:2.45.0")
-    implementation("com.knecon.fforesight:tenant-commons:0.19.0")
-    implementation("com.knecon.fforesight:tracing-commons:0.3.0")
+    implementation("com.knecon.fforesight:tenant-commons:0.21.0")
+    implementation("com.knecon.fforesight:tracing-commons:0.5.0")
    implementation("org.springframework.boot:spring-boot-starter-actuator:${springBootStarterVersion}")
    implementation("org.springframework.boot:spring-boot-starter-amqp:${springBootStarterVersion}")
    implementation("com.amazonaws:aws-java-sdk-s3:1.12.536")
@@ -39,6 +39,7 @@ dependencies {
    implementation("net.logstash.logback:logstash-logback-encoder:7.4")

    // for integration testing only
+    testImplementation(project(":viewer-doc-processor"))
    testImplementation(project(":layoutparser-service-internal-api"))

    testImplementation("org.springframework.boot:spring-boot-starter-amqp:${springBootStarterVersion}")
@@ -148,6 +148,7 @@ public class HeadlinesGoldStandardIntegrationTest {
    @EqualsAndHashCode
    @AllArgsConstructor
    @ToString
+    @SuppressWarnings("PMD.AvoidFieldNameMatchingTypeName")
    private class Headline {

        private int page;
@@ -25,7 +25,9 @@ public class LayoutparserEnd2EndTest extends AbstractTest {
    @SneakyThrows
    public void testLayoutParserEndToEnd() {

-        prepareStorage("files/bdr/Wie weiter bei Kristeneinrichtungen.pdf");
+        String s = "（";
+        String s1 = "）";
+        prepareStorage("files/Minimal Examples/WrongOrderPage1.pdf");
        LayoutParsingRequest layoutParsingRequest = buildDefaultLayoutParsingRequest(LayoutParsingType.REDACT_MANAGER);
        LayoutParsingFinishedEvent finishedEvent = layoutParsingPipeline.parseLayoutAndSaveFilesToStorage(layoutParsingRequest);
        Arrays.stream(finishedEvent.message().split("\n")).forEach(log::info);
@@ -3,14 +3,19 @@ package com.knecon.fforesight.service.layoutparser.server.graph;
 import java.io.File;
 import java.nio.file.Path;

+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;

+import com.iqser.red.commons.jackson.ObjectMapperFactory;
 import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
+import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse;
+import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse;
+import com.knecon.fforesight.service.layoutparser.processor.services.factory.DocumentGraphFactory;
 import com.knecon.fforesight.service.layoutparser.processor.services.visualization.LayoutGridService;
-import com.knecon.fforesight.service.layoutparser.processor.services.visualization.ViewerDocumentService;
 import com.knecon.fforesight.service.layoutparser.server.utils.BuildDocumentTest;
+import com.knecon.fforesight.service.viewerdoc.service.ViewerDocumentService;

 import lombok.SneakyThrows;

@@ -20,13 +25,43 @@ public class ViewerDocumentTest extends BuildDocumentTest {
    @SneakyThrows
    public void testViewerDocument() {

-        String fileName = "files/S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf";
+        String fileName = "files/Plenarprotokoll 1 (keine Druchsache!) (1).pdf";
        String tmpFileName = "/tmp/" + Path.of(fileName).getFileName() + "_VIEWER.pdf";
-        LayoutGridService layoutGridService = new LayoutGridService();
-        ViewerDocumentService viewerDocumentService = new ViewerDocumentService(layoutGridService, null);
-        Document document = buildGraph(fileName, LayoutParsingType.REDACT_MANAGER);
+
        var documentFile = new ClassPathResource(fileName).getFile();
-        viewerDocumentService.createViewerDocument(documentFile, document, new File(tmpFileName), true);
+        ViewerDocumentService viewerDocumentService = new ViewerDocumentService(null);
+        LayoutGridService layoutGridService = new LayoutGridService(viewerDocumentService);
+
+        Document document = buildGraph(fileName, LayoutParsingType.REDACT_MANAGER);
+        long start = System.currentTimeMillis();
+        layoutGridService.addLayoutGrid(documentFile, document, new File(tmpFileName), true);
+        System.out.printf("Total time: %.2fs%n", ((float) (System.currentTimeMillis() - start)) / 1000);
+    }
+
+
+    @Test
+    @Disabled
+    @SneakyThrows
+    public void testViewerDocumentWithTables() {
+
+        String fileName = "files/cv_tables/brokenTablesOnOcr_ocred.pdf";
+        String tableFileName = "files/cv_tables/brokenTablesOnOcr_ocred.TABLES.json";
+        String tmpFileName = "/tmp/" + Path.of(fileName).getFileName() + "_VIEWER.pdf";
+
+        var mapper = ObjectMapperFactory.create();
+        var tableResponse = mapper.readValue(new ClassPathResource(tableFileName).getInputStream(), TableServiceResponse.class);
+        var documentFile = new ClassPathResource(fileName).getFile();
+
+        var classificationDocument = layoutParsingPipeline.parseLayout(LayoutParsingType.DOCUMINE,
+                documentFile,
+                new ImageServiceResponse(),
+                tableResponse,
+                Path.of(fileName).getFileName().toFile().toString());
+        ViewerDocumentService viewerDocumentService = new ViewerDocumentService(null);
+        LayoutGridService layoutGridService = new LayoutGridService(viewerDocumentService);
+        Document document = DocumentGraphFactory.buildDocumentGraph(classificationDocument);
+
+        layoutGridService.addLayoutGrid(documentFile, document, new File(tmpFileName), true);
    }

 }
@@ -27,9 +27,9 @@ import com.knecon.fforesight.service.layoutparser.processor.services.factory.Doc
 import com.knecon.fforesight.service.layoutparser.processor.services.mapper.DocumentDataMapper;
 import com.knecon.fforesight.service.layoutparser.processor.services.mapper.PropertiesMapper;
 import com.knecon.fforesight.service.layoutparser.processor.services.visualization.LayoutGridService;
-import com.knecon.fforesight.service.layoutparser.processor.services.visualization.ViewerDocumentService;
 import com.knecon.fforesight.service.layoutparser.server.utils.BuildDocumentTest;
 import com.knecon.fforesight.service.layoutparser.server.utils.visualizations.PdfDraw;
+import com.knecon.fforesight.service.viewerdoc.service.ViewerDocumentService;

 import lombok.SneakyThrows;

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

-        LayoutGridService layoutGridService = new LayoutGridService();
-        ViewerDocumentService viewerDocumentService = new ViewerDocumentService(layoutGridService, null);
+        ViewerDocumentService viewerDocumentService = new ViewerDocumentService(null);
+        LayoutGridService layoutGridService = new LayoutGridService(viewerDocumentService);

        ClassPathResource resource = new ClassPathResource("files");
        List<String> pdfFileNames = Files.walk(resource.getFile().toPath())
@@ -0,0 +1,19 @@
+plugins {
+    id("com.knecon.fforesight.java-conventions")
+    id("io.freefair.lombok") version "8.2.2"
+}
+
+description = "Library for adding/removing layers in the viewer document"
+
+var pdfBoxVersion = "3.0.0"
+
+dependencies {
+    implementation("org.apache.pdfbox:pdfbox:${pdfBoxVersion}")
+    implementation("org.apache.pdfbox:pdfbox-tools:${pdfBoxVersion}")
+    implementation("org.slf4j:slf4j-api:1.7.25")
+    implementation("com.knecon.fforesight:tracing-commons:0.5.0")
+
+    testImplementation("org.apache.logging.log4j:log4j-slf4j-impl:2.22.1")
+    testImplementation("org.junit.jupiter:junit-jupiter")
+    testImplementation platform('org.junit:junit-bom:5.10.0')
+}
@@ -0,0 +1,33 @@
+package com.knecon.fforesight.service.viewerdoc;
+
+import java.util.List;
+
+import org.apache.pdfbox.cos.COSName;
+
+import lombok.AccessLevel;
+import lombok.experimental.FieldDefaults;
+
+@FieldDefaults(makeFinal = true, level = AccessLevel.PUBLIC)
+public class ContentStreams {
+
+    public static Identifier KNECON_LAYOUT = new Identifier("Layout grid", COSName.getPDFName("KNECON_LAYOUT"), true);
+
+    public static Identifier KNECON_OCR = new Identifier("OCR", COSName.getPDFName("KNECON_OCR"), false);
+
+    public static Identifier KNECON_OCR_TEXT_DEBUG = new Identifier("OCR Text", COSName.getPDFName("KNECON_OCR_TEXT_DEBUG"), true);
+
+    public static Identifier KNECON_OCR_BBOX_DEBUG = new Identifier("OCR Boxes", COSName.getPDFName("KNECON_OCR_BBOX_DEBUG"), true);
+
+    public static Identifier OTHER = new Identifier("other", COSName.getPDFName("OTHER"), false);
+
+    public static Identifier ESCAPE_START = new Identifier("escape start", COSName.getPDFName("ESCAPE_START"), false);
+
+    public static Identifier ESCAPE_END = new Identifier("escape start", COSName.getPDFName("ESCAPE_END"), false);
+
+    public static List<Identifier> allContentStreams = List.of(KNECON_LAYOUT, KNECON_OCR, KNECON_OCR_BBOX_DEBUG, KNECON_OCR_TEXT_DEBUG, OTHER, ESCAPE_START, ESCAPE_END);
+
+    public record Identifier(String name, COSName cosName, boolean optionalContent) {
+
+    }
+
+}
@@ -0,0 +1,8 @@
+package com.knecon.fforesight.service.viewerdoc.model;
+
+import java.awt.Color;
+import java.awt.geom.Line2D;
+
+public record ColoredLine(Line2D line, Color color, float lineWidth) {
+
+}
@@ -1,8 +1,8 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.visualization;
+package com.knecon.fforesight.service.viewerdoc.model;

 import java.awt.Color;
 import java.awt.geom.Rectangle2D;

-public record ColoredRectangle(Rectangle2D rectangle2D, Color color) {
+public record ColoredRectangle(Rectangle2D rectangle2D, Color color, float lineWidth) {

 }
@@ -0,0 +1,10 @@
+package com.knecon.fforesight.service.viewerdoc.model;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+
+public interface EmbeddableFont {
+
+    PDFont embed(PDDocument document);
+
+}
@@ -1,4 +1,4 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.visualization;
+package com.knecon.fforesight.service.viewerdoc.model;

 import java.awt.Color;
 import java.awt.geom.Rectangle2D;
@@ -1,7 +1,7 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.visualization;
+package com.knecon.fforesight.service.viewerdoc.model;

-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;

 import lombok.AccessLevel;
 import lombok.Getter;
@@ -12,15 +12,15 @@ import lombok.experimental.FieldDefaults;
 public class LayoutGrid {

    int numberOfPages;
-    List<VisualizationsOnPage> visualizationsPerPages;
+    Map<Integer, VisualizationsOnPage> visualizationsPerPages;


    public LayoutGrid(int numberOfPages) {

        this.numberOfPages = numberOfPages;
-        this.visualizationsPerPages = new ArrayList<>(numberOfPages);
+        this.visualizationsPerPages = new HashMap<>();
        for (int i = 0; i < numberOfPages; i++) {
-            this.visualizationsPerPages.add(VisualizationsOnPage.builder().pageNumber(i).build());
+            this.visualizationsPerPages.put(i, VisualizationsOnPage.builder().build());
        }
    }

@@ -0,0 +1,10 @@
+package com.knecon.fforesight.service.viewerdoc.model;
+
+import java.util.List;
+
+import org.apache.pdfbox.contentstream.operator.Operator;
+import org.apache.pdfbox.cos.COSBase;
+
+public record OperatorWithArguments(Operator operator, List<COSBase> arguments) {
+
+}
@@ -0,0 +1,17 @@
+package com.knecon.fforesight.service.viewerdoc.model;
+
+import java.awt.Color;
+import java.awt.geom.Point2D;
+import java.util.Optional;
+
+import org.apache.pdfbox.pdmodel.graphics.state.RenderingMode;
+import org.apache.pdfbox.util.Matrix;
+
+public record PlacedText(String text, Point2D lineStart, Color color, float fontSize, EmbeddableFont font, Optional<Matrix> textMatrix, Optional<RenderingMode> renderingMode) {
+
+    public static PlacedText textFacingUp(String text, Point2D lineStart, float fontSize, Color color, EmbeddableFont font) {
+
+        return new PlacedText(text, lineStart, color, fontSize, font, Optional.empty(), Optional.empty());
+    }
+
+}
@@ -0,0 +1,37 @@
+package com.knecon.fforesight.service.viewerdoc.model;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
+
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+
+@RequiredArgsConstructor
+public class Standard14EmbeddableFont implements EmbeddableFont {
+
+    private final PDType1Font font;
+
+
+    public static Standard14EmbeddableFont helvetica() {
+
+        return new Standard14EmbeddableFont(new PDType1Font(Standard14Fonts.FontName.HELVETICA));
+    }
+
+
+    @SneakyThrows
+    public float getStringWidth(String text) {
+
+        return font.getStringWidth(text);
+    }
+
+
+    @Override
+    public PDFont embed(PDDocument document) {
+
+        // no need to embed anything
+        return font;
+    }
+
+}
@@ -0,0 +1,23 @@
+package com.knecon.fforesight.service.viewerdoc.model;
+
+import java.util.Map;
+
+import com.knecon.fforesight.service.viewerdoc.ContentStreams;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Builder
+@Getter
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class Visualizations {
+
+    ContentStreams.Identifier layer;
+    Map<Integer, VisualizationsOnPage> visualizationsOnPages;
+    boolean layerVisibilityDefaultValue;
+
+}
@@ -1,4 +1,4 @@
-package com.knecon.fforesight.service.layoutparser.processor.model.visualization;
+package com.knecon.fforesight.service.viewerdoc.model;

 import java.util.LinkedList;
 import java.util.List;
@@ -13,7 +13,7 @@ import lombok.experimental.FieldDefaults;
@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
 public class VisualizationsOnPage {

-    int pageNumber;
+    boolean makePathsInvisible;
    @Builder.Default
    List<PlacedText> placedTexts = new LinkedList<>();
    @Builder.Default
@@ -0,0 +1,7 @@
+package com.knecon.fforesight.service.viewerdoc.pdf;
+
+import com.knecon.fforesight.service.viewerdoc.ContentStreams;
+
+public record ClassifiedContentStream(SinglePDContentStream contentStream, ContentStreams.Identifier classification) {
+
+}
@@ -0,0 +1,61 @@
+package com.knecon.fforesight.service.viewerdoc.pdf;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.pdfbox.contentstream.PDContentStream;
+import org.apache.pdfbox.io.RandomAccessInputStream;
+import org.apache.pdfbox.io.RandomAccessRead;
+import org.apache.pdfbox.pdmodel.PDResources;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.common.PDStream;
+import org.apache.pdfbox.util.Matrix;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class SinglePDContentStream implements PDContentStream {
+
+    PDStream pdStream;
+
+
+    @Override
+    public InputStream getContents() throws IOException {
+
+        return new RandomAccessInputStream(getContentsForRandomAccess());
+    }
+
+
+    @Override
+    public RandomAccessRead getContentsForRandomAccess() throws IOException {
+
+        return pdStream.getCOSObject().createView();
+    }
+
+
+    @Override
+    public PDResources getResources() {
+
+        return null;
+    }
+
+
+    @Override
+    public PDRectangle getBBox() {
+
+        return null;
+    }
+
+
+    @Override
+    public Matrix getMatrix() {
+
+        return null;
+    }
+
+}
@@ -0,0 +1,121 @@
+package com.knecon.fforesight.service.viewerdoc.service;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.pdfbox.contentstream.PDContentStream;
+import org.apache.pdfbox.contentstream.operator.OperatorName;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.pdmodel.PDPage;
+
+import com.knecon.fforesight.service.viewerdoc.ContentStreams;
+import com.knecon.fforesight.service.viewerdoc.model.OperatorWithArguments;
+import com.knecon.fforesight.service.viewerdoc.pdf.ClassifiedContentStream;
+import com.knecon.fforesight.service.viewerdoc.pdf.SinglePDContentStream;
+
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class ContentStreamClassifier {
+
+    public List<ClassifiedContentStream> getClassifiedContentStreams(PDPage page) {
+
+        List<SinglePDContentStream> streams = new LinkedList<>();
+        page.getContentStreams().forEachRemaining(stream -> streams.add(new SinglePDContentStream(stream)));
+        return ContentStreamClassifier.classifySingleContentStreams(page, streams);
+    }
+
+
+    public List<ClassifiedContentStream> classifySingleContentStreams(PDPage page, List<SinglePDContentStream> streams) {
+
+        return streams.stream().map(singlePDContentStream -> classifySingleContentStream(page, singlePDContentStream)).toList();
+    }
+
+
+    private ClassifiedContentStream classifySingleContentStream(PDPage page, SinglePDContentStream singlePDContentStream) {
+
+        ContentStreams.Identifier classification = classifyContentStream(singlePDContentStream, page);
+        return new ClassifiedContentStream(singlePDContentStream, classification);
+    }
+
+
+    /**
+     * We assume all of our layers are written escaped, so only unknown content streams need to be escaped.
+     *
+     * @param classifiers List of all content streams of a page with their classification
+     * @return false, if any content stream with classification other is not prefixed with an ESCAPE_START and suffixed with an ESCAPE_END
+     */
+    public boolean areAllContentStreamsEscaped(List<ClassifiedContentStream> classifiers) {
+
+        int escapeDepth = 0;
+        for (ClassifiedContentStream classifier : classifiers) {
+            if (classifier.classification().equals(ContentStreams.OTHER) && escapeDepth == 0) {
+                return false;
+            }
+            if (classifier.classification().equals(ContentStreams.ESCAPE_START)) {
+                escapeDepth++;
+            }
+            if (classifier.classification().equals(ContentStreams.ESCAPE_END)) {
+                escapeDepth--;
+            }
+        }
+        return escapeDepth == 0;
+    }
+
+
+    @SneakyThrows
+    public ContentStreams.Identifier classifyContentStream(PDContentStream contentStream, PDPage page) {
+
+        List<OperatorWithArguments> operatorsWithArguments = ContentStreamUtility.parseLeadingOperators(contentStream, 2);
+        if (operatorsWithArguments.isEmpty()) {
+            return ContentStreams.OTHER;
+        }
+        OperatorWithArguments firstOperator = operatorsWithArguments.get(0);
+
+        // If we wrap the content streams we append and prepend a content stream with exactly one operator "q" or "Q".
+        if (operatorsWithArguments.size() == 1) {
+            if (firstOperator.operator().getName().equals(OperatorName.SAVE)) {
+                return ContentStreams.ESCAPE_START;
+            }
+            if (firstOperator.operator().getName().equals(OperatorName.RESTORE)) {
+                return ContentStreams.ESCAPE_END;
+            }
+        }
+
+        // In previous versions we did not set a marked content with an explicit name. Instead, we wrote an optional content group (OCG) with the name "Layout grid".
+        // This OCG is then assigned a COSName by PDFBox. Usually its "oc1".
+        // Thus, in order to find this name we need to look in the page resources to find the COSName assigned to the OCG.
+        // This COSName can then be found as an argument for the first operator in the content stream.
+        if (firstOperator.operator().getName().equals(OperatorName.BEGIN_MARKED_CONTENT_SEQ)) {
+            Optional<COSName> layoutGridOCGName = ContentStreamUtility.findLayoutGridOCGName(page);
+            if (layoutGridOCGName.isPresent()) {
+                if (arumentsContainLayoutGridOCG(firstOperator, layoutGridOCGName.get())) {
+                    return ContentStreams.KNECON_LAYOUT;
+                }
+            }
+        }
+
+        if (!firstOperator.operator().getName().equals(OperatorName.BEGIN_MARKED_CONTENT)) {
+            return ContentStreams.OTHER;
+        }
+
+        Optional<COSName> firstCOSNameFromArguments = firstOperator.arguments().stream().filter(c -> c instanceof COSName).map(c -> (COSName) c).findFirst();
+
+        if (firstCOSNameFromArguments.isEmpty()) {
+            return ContentStreams.OTHER;
+        }
+
+        var cosName = firstCOSNameFromArguments.get();
+
+        return ContentStreams.allContentStreams.stream().filter(identifier -> identifier.cosName().equals(cosName)).findAny().orElse(ContentStreams.OTHER);
+    }
+
+
+    private static boolean arumentsContainLayoutGridOCG(OperatorWithArguments operator, COSName layoutGridOCGName) {
+
+        return operator.arguments().stream().filter(c -> c instanceof COSName).map(c -> (COSName) c).anyMatch(cosName -> cosName.equals(layoutGridOCGName));
+    }
+
+}
@@ -0,0 +1,78 @@
+package com.knecon.fforesight.service.viewerdoc.service;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import org.apache.pdfbox.contentstream.PDContentStream;
+import org.apache.pdfbox.contentstream.operator.Operator;
+import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.cos.COSString;
+import org.apache.pdfbox.pdfparser.PDFStreamParser;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDStream;
+
+import com.knecon.fforesight.service.viewerdoc.ContentStreams;
+import com.knecon.fforesight.service.viewerdoc.model.OperatorWithArguments;
+import com.knecon.fforesight.service.viewerdoc.pdf.ClassifiedContentStream;
+import com.knecon.fforesight.service.viewerdoc.pdf.SinglePDContentStream;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class ContentStreamUtility {
+
+    public static List<OperatorWithArguments> parseLeadingOperators(PDContentStream contentStream,
+                                                                    int numberOfOperatorsToRead) throws IOException {
+
+        List<COSBase> arguments = new ArrayList<>();
+        PDFStreamParser parser = new PDFStreamParser(contentStream);
+        List<OperatorWithArguments> operatorsWithArguments = new LinkedList<>();
+        for (int i = 0; i < numberOfOperatorsToRead; ) {
+            Object token = parser.parseNextToken();
+            if (token == null) {
+                break;
+            }
+            if (token instanceof Operator operator) {
+                operatorsWithArguments.add(new OperatorWithArguments(operator, arguments));
+                arguments = new ArrayList<>();
+                i++;
+            } else {
+                arguments.add((COSBase) token);
+            }
+
+        }
+        return operatorsWithArguments;
+    }
+
+
+    public static Optional<COSName> findLayoutGridOCGName(PDPage page) {
+
+        Optional<COSName> layoutGridOCGName = Optional.empty();
+        var resourceIterator = page.getResources().getPropertiesNames();
+        for (COSName cosName : resourceIterator) {
+            COSBase cosBase = page.getResources().getProperties(cosName).getCOSObject().getDictionaryObject(COSName.NAME);
+            if (cosBase instanceof COSString string) {
+                if (ContentStreams.KNECON_LAYOUT.name().equals(string.getString())) {
+                    layoutGridOCGName = Optional.of(cosName);
+                }
+            }
+        }
+        return layoutGridOCGName;
+    }
+
+
+    public static List<PDStream> removeLayerFromContentStreams(Set<ContentStreams.Identifier> layers, List<ClassifiedContentStream> classifiers) {
+
+        return classifiers.stream()
+                .filter(classifiedContentStream -> !layers.contains(classifiedContentStream.classification()))
+                .map(ClassifiedContentStream::contentStream)
+                .map(SinglePDContentStream::getPdStream)
+                .toList();
+    }
+
+}
@@ -0,0 +1,316 @@
+package com.knecon.fforesight.service.viewerdoc.service;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.PDResources;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentGroup;
+import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentProperties;
+import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
+import org.apache.pdfbox.pdmodel.graphics.state.RenderingMode;
+import org.apache.pdfbox.util.Matrix;
+
+import com.knecon.fforesight.service.viewerdoc.ContentStreams;
+import com.knecon.fforesight.service.viewerdoc.model.ColoredLine;
+import com.knecon.fforesight.service.viewerdoc.model.ColoredRectangle;
+import com.knecon.fforesight.service.viewerdoc.model.FilledRectangle;
+import com.knecon.fforesight.service.viewerdoc.model.PlacedText;
+import com.knecon.fforesight.service.viewerdoc.model.Visualizations;
+import com.knecon.fforesight.service.viewerdoc.model.VisualizationsOnPage;
+import com.knecon.fforesight.service.viewerdoc.pdf.ClassifiedContentStream;
+
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.observation.annotation.Observed;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RequiredArgsConstructor
+public class ViewerDocumentService {
+
+    private final ObservationRegistry registry;
+
+
+    public void addVisualizationsOnPage(File originFile, File destinationFile, Visualizations visualizations) {
+
+        addVisualizationsOnPage(originFile, destinationFile, List.of(visualizations));
+    }
+
+
+    @Observed(name = "ViewerDocumentService", contextualName = "add-visualizations")
+    @SneakyThrows
+    public void addVisualizationsOnPage(File originFile, File destinationFile, List<Visualizations> visualizations) {
+
+        // originFile and destinationFile might be the same, so we use a temp file.
+        // Otherwise, saving the document might corrupt the file
+        Path tmpFile = Files.createTempFile("tmpViewerDocument", ".pdf");
+        Files.copy(originFile.toPath(), tmpFile, StandardCopyOption.REPLACE_EXISTING);
+
+        PDDocument pdDocument = openPDDocument(tmpFile.toFile());
+
+        enrichObservation(pdDocument, visualizations.stream().map(Visualizations::getLayer).toList());
+
+        Set<ContentStreams.Identifier> allLayers = visualizations.stream().map(Visualizations::getLayer).collect(Collectors.toUnmodifiableSet());
+
+        Map<ContentStreams.Identifier, PDOptionalContentGroup> optionalContentGroupMap = addLayersToDocument(visualizations, pdDocument);
+
+        for (int pageNumber = 0; pageNumber < pdDocument.getNumberOfPages(); pageNumber++) {
+            PDPage pdPage = pdDocument.getPage(pageNumber);
+            createPageResourcesIfNotPresent(pdPage); // needed for optionalContentGroups
+
+            List<ClassifiedContentStream> classifiers = ContentStreamClassifier.getClassifiedContentStreams(pdPage);
+
+            pdPage.setContents(ContentStreamUtility.removeLayerFromContentStreams(allLayers, classifiers));
+
+            AffineTransform textDeRotationMatrix = getTextDeRotationTransform(pdPage);
+
+            if (!ContentStreamClassifier.areAllContentStreamsEscaped(classifiers)) {
+                // We need to save the graphics state before, such that our appended content cannot be affected by previous content streams with side effects,
+                // e.g. not escaped matrix transformations.
+                wrapContentStreams(pdDocument, pdPage);
+            }
+
+            for (Visualizations visualization : visualizations) {
+                if (!visualization.getVisualizationsOnPages().containsKey(pageNumber)) {
+                    continue;
+                }
+                // We need to append to the content stream, otherwise the content could be overlapped by following content.
+                try (var contentStream = new PDPageContentStream(pdDocument, pdPage, PDPageContentStream.AppendMode.APPEND, true)) {
+
+                    contentStream.beginMarkedContent(visualization.getLayer().cosName());
+
+                    if (optionalContentGroupMap.containsKey(visualization.getLayer())) {
+                        contentStream.beginMarkedContent(COSName.OC, optionalContentGroupMap.get(visualization.getLayer()));
+                    }
+
+                    contentStream.saveGraphicsState();
+
+                    drawVisualizationsToContentStream(pdDocument, visualization.getVisualizationsOnPages().get(pageNumber), contentStream, textDeRotationMatrix);
+
+                    contentStream.restoreGraphicsState();
+
+                    if (optionalContentGroupMap.containsKey(visualization.getLayer())) {
+                        contentStream.endMarkedContent();
+                    }
+
+                    contentStream.endMarkedContent();
+                }
+
+            }
+            if (pageNumber % 500 == 0 && pageNumber != 0) { // re-open document every once in a while to save on RAM
+                log.info("Incremental save after {}/{} pages", pageNumber, pdDocument.getNumberOfPages());
+                observedIncrementalSave(pdDocument, destinationFile);
+                pdDocument.close();
+                Files.copy(destinationFile.toPath(), tmpFile, StandardCopyOption.REPLACE_EXISTING);
+                pdDocument = openPDDocument(tmpFile.toFile());
+            }
+        }
+        observedIncrementalSave(pdDocument, destinationFile);
+
+        pdDocument.close();
+        assert tmpFile.toFile().delete();
+    }
+
+
+    private static Map<ContentStreams.Identifier, PDOptionalContentGroup> addLayersToDocument(List<Visualizations> visualizations, PDDocument pdDocument) {
+
+        Map<ContentStreams.Identifier, PDOptionalContentGroup> optionalContentGroupMap = new HashMap<>();
+        for (Visualizations visualization : visualizations) {
+            addLayerToDocument(visualization.getLayer(), pdDocument, visualization.isLayerVisibilityDefaultValue())//
+                    .ifPresent(ocg -> optionalContentGroupMap.put(visualization.getLayer(), ocg));
+        }
+        return optionalContentGroupMap;
+    }
+
+
+    private static void drawVisualizationsToContentStream(PDDocument pdDocument,
+                                                          VisualizationsOnPage visualizationsOnPage,
+                                                          PDPageContentStream contentStream,
+                                                          AffineTransform textDeRotationMatrix) throws IOException {
+
+        if (visualizationsOnPage.isMakePathsInvisible()) {
+            contentStream.addRect(0, 0, 1, 1);
+            contentStream.clip();
+        }
+
+        for (ColoredLine coloredLine : visualizationsOnPage.getColoredLines()) {
+            contentStream.setLineWidth(coloredLine.lineWidth());
+            contentStream.setStrokingColor(coloredLine.color());
+            contentStream.moveTo((float) coloredLine.line().getX1(), (float) coloredLine.line().getY1());
+            contentStream.lineTo((float) coloredLine.line().getX2(), (float) coloredLine.line().getY2());
+            contentStream.stroke();
+        }
+
+        for (ColoredRectangle coloredRectangle : visualizationsOnPage.getColoredRectangles()) {
+            contentStream.setLineWidth(coloredRectangle.lineWidth());
+            contentStream.setStrokingColor(coloredRectangle.color());
+            Rectangle2D r = coloredRectangle.rectangle2D();
+            contentStream.addRect((float) r.getX(), (float) r.getY(), (float) r.getWidth(), (float) r.getHeight());
+            contentStream.stroke();
+        }
+
+        for (FilledRectangle filledRectangle : visualizationsOnPage.getFilledRectangles()) {
+            contentStream.setNonStrokingColor(filledRectangle.color());
+            PDExtendedGraphicsState graphicsState = new PDExtendedGraphicsState();
+            graphicsState.setNonStrokingAlphaConstant(filledRectangle.alpha());
+            contentStream.setGraphicsStateParameters(graphicsState);
+            Rectangle2D r = filledRectangle.rectangle2D();
+            contentStream.addRect((float) r.getX(), (float) r.getY(), (float) r.getWidth(), (float) r.getHeight());
+            contentStream.fill();
+        }
+
+        for (PlacedText placedText : visualizationsOnPage.getPlacedTexts()) {
+            PDFont font = placedText.font().embed(pdDocument);
+            contentStream.setFont(font, placedText.fontSize());
+            contentStream.beginText();
+            contentStream.setNonStrokingColor(placedText.color());
+            if (placedText.renderingMode().isPresent()) {
+                contentStream.setRenderingMode(placedText.renderingMode().get());
+            } else {
+                contentStream.setRenderingMode(RenderingMode.FILL);
+            }
+            Matrix textMatrix = getTextMatrix(placedText, textDeRotationMatrix);
+            contentStream.setTextMatrix(textMatrix);
+            contentStream.showText(placedText.text());
+            contentStream.endText();
+        }
+    }
+
+
+    private void enrichObservation(PDDocument pdDocument, List<ContentStreams.Identifier> layers) {
+
+        if (registry == null || registry.getCurrentObservation() == null || registry.isNoop()) {
+            return;
+        }
+        registry.getCurrentObservation().highCardinalityKeyValue("numberOfPages", String.valueOf(pdDocument.getNumberOfPages()));
+        for (int i = 0; i < layers.size(); i++) {
+            ContentStreams.Identifier layer = layers.get(i);
+
+            registry.getCurrentObservation().highCardinalityKeyValue("layer_" + i, String.valueOf(layer.name()));
+        }
+    }
+
+
+    private static void wrapContentStreams(PDDocument pdDocument, PDPage pdPage) throws IOException {
+
+        try (var contentStream = new PDPageContentStream(pdDocument, pdPage, PDPageContentStream.AppendMode.PREPEND, false)) {
+            contentStream.saveGraphicsState();
+        }
+        try (var contentStream = new PDPageContentStream(pdDocument, pdPage, PDPageContentStream.AppendMode.APPEND, false)) {
+            contentStream.restoreGraphicsState();
+        }
+    }
+
+
+    private static Matrix getTextMatrix(PlacedText placedText, AffineTransform textDeRotationMatrix) {
+
+        Matrix textMatrix;
+        if (placedText.textMatrix().isEmpty()) {
+            textMatrix = new Matrix((float) textDeRotationMatrix.getScaleX(),
+                    (float) textDeRotationMatrix.getShearX(),
+                    (float) textDeRotationMatrix.getShearY(),
+                    (float) textDeRotationMatrix.getScaleY(),
+                    (float) placedText.lineStart().getX(),
+                    (float) placedText.lineStart().getY());
+        } else {
+            textMatrix = placedText.textMatrix().get();
+        }
+        return textMatrix;
+    }
+
+
+    private static Optional<PDOptionalContentGroup> addLayerToDocument(ContentStreams.Identifier layer, PDDocument pdDocument, boolean layerVisibilityDefaultValue) {
+
+        if (layer.optionalContent()) {
+            return Optional.of(addLayerToDocument(pdDocument, layer.name(), layerVisibilityDefaultValue));
+
+        }
+        return Optional.empty();
+
+    }
+
+
+    private static PDOptionalContentGroup addLayerToDocument(PDDocument pdDocument, String layerName, boolean layerVisibilityDefaultValue) {
+
+        PDDocumentCatalog catalog = pdDocument.getDocumentCatalog();
+        PDOptionalContentProperties ocprops = catalog.getOCProperties();
+        if (ocprops == null) {
+            ocprops = new PDOptionalContentProperties();
+            catalog.setOCProperties(ocprops);
+        }
+        PDOptionalContentGroup layer = null;
+        if (ocprops.hasGroup(layerName)) {
+            layer = ocprops.getGroup(layerName);
+        } else {
+            layer = new PDOptionalContentGroup(layerName);
+            ocprops.addGroup(layer);
+        }
+        ocprops.setGroupEnabled(layer, layerVisibilityDefaultValue);
+        return layer;
+    }
+
+
+    private static PDDocument openPDDocument(File tmpFile) throws IOException {
+
+        PDDocument pdDocument;
+        pdDocument = Loader.loadPDF(tmpFile);
+        pdDocument.setAllSecurityToBeRemoved(true);
+        return pdDocument;
+    }
+
+
+    @SneakyThrows
+    private void observedIncrementalSave(PDDocument pdDocument, File outputFile) {
+
+        Observation.createNotStarted("ViewerDocumentService", registry).contextualName("incremental-save").observe(() -> {
+            try (var out = new FileOutputStream(outputFile)) {
+                pdDocument.save(out);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+    }
+
+
+    private static void createPageResourcesIfNotPresent(PDPage pdPage) {
+
+        PDResources resources = pdPage.getResources();
+        if (resources == null) {
+            resources = new PDResources();
+            pdPage.setResources(resources);
+        }
+    }
+
+
+    private static AffineTransform getTextDeRotationTransform(PDPage page) {
+
+        return AffineTransform.getQuadrantRotateInstance(switch (page.getRotation()) {
+            case 90 -> 3;
+            case 180 -> 2;
+            case 270 -> 1;
+            default -> 0;
+        });
+    }
+
+}
@@ -0,0 +1,124 @@
+package com.knecon.fforesight.service.viewerdoc.service;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.junit.jupiter.api.Test;
+
+import com.knecon.fforesight.service.viewerdoc.ContentStreams;
+import com.knecon.fforesight.service.viewerdoc.pdf.ClassifiedContentStream;
+
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class ContentStreamClassifierTest {
+
+    @Test
+    @SneakyThrows
+    public void testClassification() {
+
+        File pdfFile = new File(Thread.currentThread().getContextClassLoader().getResource("viewerDocLayers.pdf").getFile());
+
+        try (PDDocument document = Loader.loadPDF(pdfFile)) {
+
+            PDPage page = document.getPage(0);
+
+            List<ClassifiedContentStream> classifieds = ContentStreamClassifier.getClassifiedContentStreams(page);
+
+            logContentStreamClassifications(classifieds);
+
+            assertEquals(11, classifieds.size());
+            assertEquals(ContentStreams.ESCAPE_START, classifieds.get(0).classification());
+            for (int i = 1; i < 9; i++) {
+                assertEquals(ContentStreams.OTHER, classifieds.get(i).classification());
+            }
+            assertEquals(ContentStreams.ESCAPE_END, classifieds.get(9).classification());
+            assertEquals(ContentStreams.KNECON_LAYOUT, classifieds.get(10).classification());
+            assertTrue(ContentStreamClassifier.areAllContentStreamsEscaped(classifieds));
+        }
+    }
+
+
+    @Test
+    @SneakyThrows
+    public void testRemoveLayoutLayer() {
+
+        File pdfFile = new File(Thread.currentThread().getContextClassLoader().getResource("viewerDocLayers.pdf").getFile());
+        File tmpFile = Files.createTempFile("removedLayout", ".pdf").toFile();
+
+        try (PDDocument document = Loader.loadPDF(pdfFile)) {
+
+            PDPage page = document.getPage(0);
+
+            List<ClassifiedContentStream> classifieds = ContentStreamClassifier.getClassifiedContentStreams(page);
+            page.setContents(ContentStreamUtility.removeLayerFromContentStreams(Set.of(ContentStreams.KNECON_LAYOUT), classifieds));
+
+            document.save(tmpFile);
+        }
+        try (PDDocument document2 = Loader.loadPDF(tmpFile)) {
+
+            PDPage page2 = document2.getPage(0);
+
+            List<ClassifiedContentStream> classifieds2 = ContentStreamClassifier.getClassifiedContentStreams(page2);
+
+            logContentStreamClassifications(classifieds2);
+
+            assertEquals(10, classifieds2.size());
+            assertEquals(ContentStreams.ESCAPE_START, classifieds2.get(0).classification());
+            for (int i = 1; i < 9; i++) {
+                assertEquals(ContentStreams.OTHER, classifieds2.get(i).classification());
+            }
+            assertEquals(ContentStreams.ESCAPE_END, classifieds2.get(9).classification());
+            assertTrue(ContentStreamClassifier.areAllContentStreamsEscaped(classifieds2));
+        }
+        assert tmpFile.delete();
+    }
+
+
+    @Test
+    @SneakyThrows
+    public void testClassificationForOldLayers() {
+
+        File pdfFile = new File(Thread.currentThread().getContextClassLoader().getResource("oldViewerDocLayers.pdf").getFile());
+        try (PDDocument document = Loader.loadPDF(pdfFile)) {
+
+            PDPage page = document.getPage(0);
+
+            List<ClassifiedContentStream> classifieds = ContentStreamClassifier.getClassifiedContentStreams(page);
+
+            logContentStreamClassifications(classifieds);
+
+            assertEquals(11, classifieds.size());
+            assertEquals(ContentStreams.ESCAPE_START, classifieds.get(0).classification());
+            for (int i = 1; i < 9; i++) {
+                assertEquals(ContentStreams.OTHER, classifieds.get(i).classification());
+            }
+            assertEquals(ContentStreams.ESCAPE_END, classifieds.get(9).classification());
+            assertEquals(ContentStreams.KNECON_LAYOUT, classifieds.get(10).classification());
+            assertTrue(ContentStreamClassifier.areAllContentStreamsEscaped(classifieds));
+        }
+    }
+
+
+    private static void logContentStreamClassifications(List<ClassifiedContentStream> classifieds) {
+
+        log.info("number of content streams: {}", classifieds.size());
+        log.info("Classifications: {}", classifieds.stream()//
+                .map(ClassifiedContentStream::classification)//
+                .map(ContentStreams.Identifier::cosName)//
+                .map(COSName::getName)//
+                .collect(Collectors.joining(", ")));
+    }
+
+}
@@ -0,0 +1,16 @@
+<Configuration>
+
+    <Appenders>
+        <Console name="CONSOLE" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+        </Console>
+    </Appenders>
+
+    <Loggers>
+        <Root level="warn">
+            <AppenderRef ref="CONSOLE"/>
+        </Root>
+        <Logger name="com.knecon" level="info"/>
+    </Loggers>
+
+</Configuration>
@@ -1,13 +1,9 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * This project uses @Incubating APIs which are subject to change.
- */
-
 rootProject.name = "layoutparser"
 include(":layoutparser-service-server")
 include(":layoutparser-service-processor")
 include(":layoutparser-service-internal-api")
+include("viewer-doc-processor")
 project(":layoutparser-service-server").projectDir = file("layoutparser-service/layoutparser-service-server")
 project(":layoutparser-service-processor").projectDir = file("layoutparser-service/layoutparser-service-processor")
 project(":layoutparser-service-internal-api").projectDir = file("layoutparser-service/layoutparser-service-internal-api")
+project(":viewer-doc-processor").projectDir = file("layoutparser-service/viewer-doc-processor")
Author	SHA1	Message	Date
Dominique Eifländer	08e994d904	More refactoring	2024-02-20 14:04:28 +01:00
Dominique Eifländer	0c8c727303	Reading Order	2024-02-20 11:56:43 +01:00
Dominique Eifländer	72202f63dc	More	2024-02-16 14:51:26 +01:00
Dominique Eifländer	e14d953b04	More	2024-02-16 14:50:31 +01:00
Dominique Eifländer	9e5778d4b2	More	2024-02-16 14:08:59 +01:00
Dominique Eifländer	e394f2fa7c	More refactoring	2024-02-16 13:48:03 +01:00
Dominique Eifländer	b2fb6829cb	More refactoring	2024-02-16 11:15:44 +01:00
Dominique Eifländer	4871e55f2d	More refactoring	2024-02-15 16:54:07 +01:00
Dominique Eifländer	4de6c12aec	REmove more	2024-02-15 10:29:39 +01:00
Dominique Eifländer	4afa8daafa	First working docstrum	2024-02-14 13:39:27 +01:00
Kilian Schüttler	3c9049dc8a	Merge branch 'RED-8156' into 'main' RED-8156: refactor ViewerDocumentService as a dependency for ocr-service See merge request fforesight/layout-parser!99	2024-02-07 10:42:21 +01:00
Kilian Schuettler	015984891f	RED-8156: refactor ViewerDocumentService as a dependency for ocr-service * fix pmd	2024-02-06 17:17:26 +01:00
Kilian Schuettler	66fcb62833	RED-8156: refactor ViewerDocumentService as a dependency for ocr-service * fix pmd	2024-02-06 17:09:21 +01:00
Kilian Schuettler	48824f56a8	RED-8156: refactor ViewerDocumentService as a dependency for ocr-service * fix pmd	2024-02-06 17:06:53 +01:00
Kilian Schuettler	785628537f	RED-8156: refactor ViewerDocumentService as a dependency for ocr-service * various improvements to experimental parsing steps * added embed fonts functionality to viewer doc * fix checkstyle	2024-02-06 17:03:38 +01:00
Kilian Schuettler	23eb0c40a3	RED-8156: refactor ViewerDocumentService as a dependency for ocr-service * various improvements to experimental parsing steps * added embed fonts functionality to viewer doc	2024-02-06 16:59:51 +01:00
Dominique Eifländer	1b4aaf4454	Merge branch 'RED-8171' into 'main' RED-8171: Traces do not stop at @Async See merge request fforesight/layout-parser!98	2024-02-02 13:34:44 +01:00
Dominique Eifländer	e4f3557b36	RED-8171: Traces do not stop at @Async	2024-02-02 13:22:57 +01:00
Timo Bejan	9be3c86297	Merge branch 'RED-8085' into 'main' Red 8085 See merge request fforesight/layout-parser!96	2024-01-29 10:31:36 +01:00
Timo Bejan	88855de2da	Red 8085	2024-01-29 10:31:36 +01:00
Dominique Eifländer	368a75e985	Merge branch 'RED-8106' into 'main' RED-8106: Make documentdata serializable See merge request fforesight/layout-parser!95	2023-12-22 13:33:02 +01:00
Dominique Eifländer	12344d57b2	RED-8106: Make documentdata serializable	2023-12-21 13:42:25 +01:00