From b0fc3c3d71baf2e88af7e7a93f1a176752af3b83 Mon Sep 17 00:00:00 2001
From: deiflaender <dominique.eiflaender@iqser.com>
Date: Mon, 28 Nov 2022 09:25:15 +0100
Subject: [PATCH] RSS-265: Fixed problem in sorting positions across pages

---
 .../redaction/v1/server/redaction/model/SearchableText.java | 6 +-----
 .../redaction/utils/TextPositionSequenceComparator.java     | 5 +++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java
index 614d4c9c..5c251f19 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java
@@ -222,14 +222,10 @@ public class SearchableText {
         var quickSorted = new ArrayList<>(sequences);
         QuickSort.sort(quickSorted, new TextPositionSequenceComparator());
 
-        var sorted = quickSorted.stream()
-                .sorted(Comparator.comparing(a -> a.getPage()))
-                .collect(Collectors.toList());
-
         StringBuilder sb = new StringBuilder();
 
         TextPositionSequence previous = null;
-        for (TextPositionSequence word : sorted) {
+        for (TextPositionSequence word : quickSorted) {
 
             if (previous != null) {
                 if (Math.abs(previous.getMaxYDirAdj() - word.getMaxYDirAdj()) > word.getTextHeight()) {
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/TextPositionSequenceComparator.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/TextPositionSequenceComparator.java
index 1502863e..a9172bf8 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/TextPositionSequenceComparator.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/TextPositionSequenceComparator.java
@@ -14,6 +14,11 @@ public class TextPositionSequenceComparator implements Comparator<TextPositionSe
             return cmp1;
         }
 
+        int page = Integer.compare(pos1.getPage(), pos2.getPage());
+        if (page != 0){
+            return page;
+        }
+
         // get the text direction adjusted coordinates
         float x1 = pos1.getMinXDirAdj();
         float x2 = pos2.getMinXDirAdj();