Merge pull request #174 from cocoatype/173-use-new-matching-for-detec…

…tions

Use new matching for detections

Modules/Capabilities/Observations/Sources/Observations/CharacterObservation.swift

@@ -29,4 +29,16 @@ public struct CharacterObservation: TextObservation, Hashable, RedactableObserva
         guard let associatedString, let range else { return nil }
         return String(associatedString[range])
     }
+
+    public func union(with other: CharacterObservation) -> CharacterObservation {
+        let combiningObservations = [self, other]
+        guard let associatedString,
+              let startIndex = combiningObservations.compactMap(\.range?.lowerBound).min(),
+              let endIndex = combiningObservations.compactMap(\.range?.upperBound).max(),
+              textObservationUUID == other.textObservationUUID
+        else { return self }
+
+        let range = startIndex..<endIndex
+        return CharacterObservation(bounds: bounds, textObservationUUID: textObservationUUID, associatedString: associatedString, range: range)
+    }
 }

Modules/Capabilities/Observations/Sources/Observations/CombinedCharacterObservation.swift

@@ -0,0 +1,31 @@
+//  Created by Geoff Pado on 6/25/24.
+//  Copyright © 2024 Cocoatype, LLC. All rights reserved.
+
+import Foundation
+
+public struct CombinedCharacterObservation {
+    public let textObservationUUID: UUID
+    private let characterObservations: [CharacterObservation]
+    public let associatedString: String
+
+    public init?(characterObservations: [CharacterObservation]) {
+        guard let firstUUID = characterObservations.first?.textObservationUUID,
+              characterObservations.allSatisfy({ $0.textObservationUUID == firstUUID }),
+              let firstString = characterObservations.first?.associatedString
+        else { return nil }
+
+        self.textObservationUUID = firstUUID
+        self.characterObservations = characterObservations
+        self.associatedString = firstString
+    }
+
+    public func characterObservations(with substrings: [Substring]) -> [CharacterObservation] {
+        characterObservations.filter { observation in
+            guard let observationRange = observation.range else { return false }
+            return substrings.contains { substring in
+                let substringRange = substring.startIndex ..< substring.endIndex
+                return observationRange.overlaps(substringRange)
+            }
+        }
+    }
+}

Modules/Capabilities/Observations/Sources/Observations/RecognizedTextObservation.swift

@@ -31,14 +31,7 @@ public struct RecognizedTextObservation: TextObservation, RedactableObservation
                 return CharacterObservation(bounds: shape, textObservationUUID: recognizedText.uuid, associatedString: visionText.string, range: characterRange)
             }.reduce(into: [Shape: CharacterObservation]()) { uniqueObservations, observation in
                 if let existingObservation = uniqueObservations[observation.bounds] {
-                    let combiningObservations = [existingObservation, observation]
-                    guard let associatedString = existingObservation.associatedString,
-                          let startIndex = combiningObservations.compactMap(\.range?.lowerBound).min(),
-                          let endIndex = combiningObservations.compactMap(\.range?.upperBound).max()
-                    else { return }
-                    let range = startIndex..<endIndex
-                    let combinedObservation = CharacterObservation(bounds: observation.bounds, textObservationUUID: observation.textObservationUUID, associatedString: associatedString, range: range)
-                    uniqueObservations[observation.bounds] = combinedObservation
+                    uniqueObservations[observation.bounds] = existingObservation.union(with: observation)
                 } else {
                     uniqueObservations[observation.bounds] = observation
                 }

Modules/Legacy/Editing/Sources/Editing View/Observation View/PhotoEditingObservationCalculator.swift

@@ -82,19 +82,6 @@ actor PhotoEditingObservationCalculator {
     }
 
     var calculatedObservationsByUUID: [UUID: [CharacterObservation]] {
-        return calculatedObservations.reduce([UUID: [CharacterObservation]]()) { dictionary, observation in
-            var observationsByUUID: [CharacterObservation]
-            if let existing = dictionary[observation.textObservationUUID] {
-                observationsByUUID = existing
-            } else {
-                observationsByUUID = []
-            }
-
-            observationsByUUID.append(observation)
-
-            var newDictionary = dictionary
-            newDictionary[observation.textObservationUUID] = observationsByUUID
-            return newDictionary
-        }
+        return calculatedObservations.byUUID
     }
 }

Modules/Legacy/Editing/Sources/Editing View/PhotoEditingCharacterObservationMatcher.swift

@@ -1,6 +1,7 @@
 //  Created by Geoff Pado on 6/25/24.
 //  Copyright © 2024 Cocoatype, LLC. All rights reserved.
 
+import Foundation
 import Observations
 
 extension [CharacterObservation] {
@@ -13,4 +14,21 @@ extension [CharacterObservation] {
             return trimmedAssociatedWord.compare(trimmedText, options: [.caseInsensitive, .diacriticInsensitive]) == .orderedSame
         }
     }
+
+    var byUUID: [UUID: [CharacterObservation]] {
+        reduce([UUID: [CharacterObservation]]()) { dictionary, observation in
+            var observationsByUUID: [CharacterObservation]
+            if let existing = dictionary[observation.textObservationUUID] {
+                observationsByUUID = existing
+            } else {
+                observationsByUUID = []
+            }
+
+            observationsByUUID.append(observation)
+
+            var newDictionary = dictionary
+            newDictionary[observation.textObservationUUID] = observationsByUUID
+            return newDictionary
+        }
+    }
 }

Modules/Legacy/Editing/Sources/Editing View/PhotoEditingViewController.swift

@@ -7,6 +7,7 @@ import Defaults
 import Detections
 import ErrorHandling
 import Exporting
+import Geometry
 import Observations
 import Photos
 import PurchaseMarketing
@@ -404,12 +405,20 @@ public class PhotoEditingViewController: UIViewController, UIScrollViewDelegate,
             taggingFunctions.append( Category.phoneNumbers.getFuncyInSwizzleTown)
         }
 
-        let textObservations = photoEditingView.recognizedTextObservations ?? []
-        let categoryObservations = textObservations.flatMap { text in
-            taggingFunctions
-                .flatMap { function in function(text.string) }
-                .compactMap { text.wordObservation(for: $0) }
-        }
+        let combinedObservations = photoEditingView.redactableCharacterObservations.byUUID
+
+        let categoryObservations = combinedObservations
+            .values
+            .compactMap(CombinedCharacterObservation.init)
+            .flatMap { combinedObservation in
+                taggingFunctions
+                    .map { function in function(combinedObservation.associatedString) }
+                    .map {
+                        let matchingObservations = combinedObservation.characterObservations(with: $0)
+                        let combinedShape = MinimumAreaShapeFinder.minimumAreaShape(for: matchingObservations.map(\.bounds))
+                        return CharacterObservation(bounds: combinedShape, textObservationUUID: combinedObservation.textObservationUUID)
+                    }
+            }
 
         return wordObservations + categoryObservations
     }