Merge pull request #5 from magauran/salangin/fixes

Remarkable fixes
appintheair · Sep 28, 2021 · aad052b · aad052b
2 parents 002964a + 1947c83
commit aad052b
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 30 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/appintheair/MRZParser.git",
         "state": {
           "branch": null,
-          "revision": "d3f92ce2bc9ab1db6925839626600f31198b5946",
-          "version": "1.1.1"
+          "revision": "98ef7d43a98991b0296e993f76562ebd29038595",
+          "version": "1.1.2"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/appintheair/MRZParser.git", .upToNextMajor(from: "1.1.1"))
+        .package(url: "https://github.com/appintheair/MRZParser.git", .upToNextMajor(from: "1.1.2"))
     ],
     targets: [
         .target(

diff --git a/Sources/MRZScanner/Private/Scanner/DefaultScanner.swift b/Sources/MRZScanner/Private/Scanner/DefaultScanner.swift
@@ -42,14 +42,12 @@ struct DefaultScanner: Scanner {
             orientation: orientation,
             regionOfInterest: regionOfInterest,
             minimumTextHeight: minimumTextHeight,
-            recognitionLevel: .fast
+            recognitionLevel: recognitionLevel
         ) {
             switch $0 {
             case .success(let results):
-                if scanningType == .live {
-                    DispatchQueue.main.async {
-                        foundBoundingRectsHandler?(results.map { $0.boundingRect })
-                    }
+                DispatchQueue.main.async {
+                    foundBoundingRectsHandler?(results.map { $0.boundingRect })
                 }
 
                 let validatedResult = validator.getValidatedResults(from: results.map { $0.results })
@@ -85,16 +83,19 @@ struct DefaultScanner: Scanner {
         from results: [TextRecognizerResult],
         validLines: ValidatedResults
     ) -> ScannedBoundingRects {
-        let allBoundingRects = results.map { $0.boundingRect }
-        let validRectIndexes = validLines.map { $0.index }
-        let validRects = allBoundingRects.enumerated()
-            .filter { validRectIndexes.contains($0.offset) }
-            .map { $0.element }
-        let invalidRects = allBoundingRects.enumerated()
-            .filter { !validRectIndexes.contains($0.offset) }
-            .map { $0.element }
+        let allBoundingRects = results.map(\.boundingRect)
+        let validRectIndexes = Set(validLines.map(\.index))
+
+        var scannedBoundingRects: ScannedBoundingRects = ([], [])
+        allBoundingRects.enumerated().forEach {
+            if validRectIndexes.contains($0.offset) {
+                scannedBoundingRects.valid.append($0.element)
+            } else {
+                scannedBoundingRects.invalid.append($0.element)
+            }
+        }
 
-        return (validRects, invalidRects)
+        return scannedBoundingRects
     }
 }
 
diff --git a/Sources/MRZScanner/Private/TextRecognizers/VisionRecognizer.swift b/Sources/MRZScanner/Private/TextRecognizers/VisionRecognizer.swift
@@ -57,12 +57,3 @@ struct VisionTextRecognizer: TextRecognizer {
         }
     }
 }
-
-extension CGRect: Hashable {
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(origin.x)
-        hasher.combine(origin.y)
-        hasher.combine(size.width)
-        hasher.combine(size.height)
-    }
-}
diff --git a/Sources/MRZScanner/Private/Validators/MRZValidator.swift b/Sources/MRZScanner/Private/Validators/MRZValidator.swift
@@ -15,9 +15,9 @@ struct MRZValidator: Validator {
             guard validLines.count < validMRZCode.linesCount else { break }
             for (index, lines) in possibleLines.enumerated() {
                 guard validLines.count < validMRZCode.linesCount else { break }
-                let spaceFreeLines = lines.map { $0.filter { $0 != " " } }
+                let spaceFreeLines = lines.lazy.map { $0.filter { !$0.isWhitespace } }
                 guard let mostLikelyLine = spaceFreeLines.first(where: {
-                    $0.count == validMRZCode.lineLenth
+                    $0.count == validMRZCode.lineLength
                 }) else { continue }
                 validLines.append(.init(result: mostLikelyLine, index: index))
             }

diff --git a/Sources/MRZScanner/Private/Validators/Validator.swift b/Sources/MRZScanner/Private/Validators/Validator.swift
@@ -9,7 +9,7 @@ typealias ValidatedResults = [ValidatedResult]
 struct ValidatedResult {
     /// MRZLine
     let result: String
-    /// MRZLine bouningRect index
+    /// MRZLine boundingRect index
     let index: Int
 }
 

diff --git a/Sources/MRZScanner/Public/MRZScanner/ImageMRZScanner.swift b/Sources/MRZScanner/Public/MRZScanner/ImageMRZScanner.swift
@@ -8,7 +8,7 @@
 import CoreImage
 
 public struct ImageMRZScanner: ScannerService {
-    var scanner: DefaultScanner
+    let scanner: DefaultScanner
 
     public init() {
         scanner = DefaultScanner(
@@ -32,6 +32,7 @@ public struct ImageMRZScanner: ScannerService {
         regionOfInterest: CGRect? = nil,
         minimumTextHeight: Float? = nil,
         recognitionLevel: RecognitionLevel = .accurate,
+        foundBoundingRectsHandler: (([CGRect]) -> Void)? = nil,
         completionHandler: @escaping (Result<DocumentScanningResult<ParsedResult>, Error>) -> Void
     ) {
         scanner.scan(
@@ -41,6 +42,7 @@ public struct ImageMRZScanner: ScannerService {
             regionOfInterest: regionOfInterest,
             minimumTextHeight: minimumTextHeight,
             recognitionLevel: recognitionLevel,
+            foundBoundingRectsHandler: foundBoundingRectsHandler,
             completionHandler: completionHandler
         )
     }