Merge pull request #708 from psrcek/issue699-mlkit-support

Created better text recognition interfaces + implemented them on android

Author: EddyVerbruggen

src/mlkit/textrecognition/index.android.ts

@@ -5,7 +5,10 @@ import { MLKitTextRecognition as MLKitTextRecognitionBase } from "./textrecognit
 import {
   MLKitRecognizeTextCloudOptions,
   MLKitRecognizeTextCloudResult,
-  MLKitRecognizeTextResultFeature
+  MLKitRecognizeTextResultBlock,
+  MLKitRecognizeTextResultLine,
+  MLKitRecognizeTextResultElement,
+  MLKitRecognizeTextResultBounds
 } from "./index";
 
 declare const com: any;
@@ -31,45 +34,56 @@ export class MLKitTextRecognition extends MLKitTextRecognitionBase {
   }
 }
 
-function getOnDeviceResult(blocks: any): MLKitRecognizeTextOnDeviceResult {
-  const result = <MLKitRecognizeTextOnDeviceResult>{
-    features: []
-  };
+function boundingBoxToBounds(rect: any): MLKitRecognizeTextResultBounds {
+  return {
+    x: rect.left,
+    y: rect.top,
+    width: rect.width(),
+    height: rect.height()
+  }
+}
 
-  // see https://github.com/firebase/quickstart-android/blob/0f4c86877fc5f771cac95797dffa8bd026dd9dc7/mlkit/app/src/main/java/com/google/firebase/samples/apps/mlkit/textrecognition/TextRecognitionProcessor.java#L62
+// see https://github.com/firebase/quickstart-android/blob/0f4c86877fc5f771cac95797dffa8bd026dd9dc7/mlkit/app/src/main/java/com/google/firebase/samples/apps/mlkit/textrecognition/TextRecognitionProcessor.java#L62
+function getOnDeviceResult(blocks: any): MLKitRecognizeTextOnDeviceResult {
+  const blks: MLKitRecognizeTextResultBlock[] = [];
+  
   for (let i = 0; i < blocks.size(); i++) {
-    const textBlock = blocks.get(i);
-    const blockResult = <MLKitRecognizeTextResultFeature>{
-      text: textBlock.getText(),
-      elements: []
-    };
+    const block = blocks.get(i);
+    const lines = block.getLines();
+
+    const lns:  MLKitRecognizeTextResultLine[] = [];
 
-    const lines = textBlock.getLines();
     for (let j = 0; j < lines.size(); j++) {
-      const elements = lines.get(j).getElements();
+      const line = lines.get(j);
+      const elements = line.getElements();
+
+      const elms: MLKitRecognizeTextResultElement[] = [];
+
       for (let k = 0; k < elements.size(); k++) {
         const element = elements.get(k);
-        const rect = element.getBoundingBox();
-        const blockElement = {
+        elms.push({
           text: element.getText(),
-          bounds: {
-            origin: {
-              x: rect.left,
-              y: rect.top
-            },
-            size: {
-              width: rect.width(),
-              height: rect.height()
-            }
-          }
-        };
-        blockResult.elements.push(blockElement);
+          bounds: boundingBoxToBounds(element.getBoundingBox())
+        });
       }
+
+      lns.push({
+        text: line.getText(),
+        bounds: boundingBoxToBounds(line.getBoundingBox()),
+        elements: elms
+      });
     }
 
-    result.features.push(blockResult);
+    blks.push({
+      text: block.getText(),
+      bounds: boundingBoxToBounds(block.getBoundingBox()),
+      lines: lns
+    });
   }
-  return result;
+
+  return {
+    blocks: blks
+  };
 }
 
 export function recognizeTextOnDevice(options: MLKitRecognizeTextOnDeviceOptions): Promise<MLKitRecognizeTextOnDeviceResult> {

src/mlkit/textrecognition/index.d.ts

@@ -1,24 +1,31 @@
 import { MLKitCameraView, MLKitCloudOptions, MLKitOptions, MLKitResult } from "../index";
 
-export interface MLKitRecognizeTextResultFeature {
-  text: string;
-  elements: Array<{
-    text: string;
-    bounds: {
-      origin: {
-        x: number;
-        y: number;
-      },
-      size: {
-        width: number;
-        height: number;
-      }
-    };
-  }>
+export interface MLKitRecognizeTextResultBounds {
+	x: number;
+	y: number;
+	width: number;
+	height: number;
+}
+
+export interface MLKitRecognizeTextResultElement {
+	text: string;
+	bounds: MLKitRecognizeTextResultBounds;
+}
+
+export interface MLKitRecognizeTextResultLine {
+	text: string;
+	bounds: MLKitRecognizeTextResultBounds;
+	elements: MLKitRecognizeTextResultElement[];
+}
+
+export interface MLKitRecognizeTextResultBlock {
+	text: string;
+	bounds: MLKitRecognizeTextResultBounds;
+	lines: MLKitRecognizeTextResultLine[];
 }
 
 export interface MLKitRecognizeTextOnDeviceResult extends MLKitResult {
-  features: Array<MLKitRecognizeTextResultFeature>;
+	blocks: MLKitRecognizeTextResultBlock[];
 }
 
 export interface MLKitRecognizeTextCloudResult extends MLKitResult {