Merge pull request #848 from psrcek/master

Added additional properties to MLKitDetectFacesResultFace and MLKitScanBarcodesResultBarcode

Author: EddyVerbruggen

src/mlkit/barcodescanning/index.android.ts

@@ -1,5 +1,5 @@
 import { ImageSource } from "tns-core-modules/image-source";
-import { MLKitScanBarcodesOnDeviceOptions, MLKitScanBarcodesOnDeviceResult } from "./";
+import { MLKitScanBarcodesOnDeviceOptions, MLKitScanBarcodesOnDeviceResult, MLKitScanBarcodesResultBounds } from "./";
 import { MLKitVisionOptions } from "../index";
 import { BarcodeFormat, MLKitBarcodeScanner as MLKitBarcodeScannerBase } from "./barcodescanning-common";
 
@@ -34,7 +34,8 @@ export class MLKitBarcodeScanner extends MLKitBarcodeScannerBase {
             result.barcodes.push({
               value: barcode.getRawValue(),
               format: BarcodeFormat[barcode.getFormat()],
-              android: barcode
+              android: barcode,
+              bounds: boundingBoxToBounds(barcode.getBoundingBox())
             });
           }
         }
@@ -49,6 +50,19 @@ export class MLKitBarcodeScanner extends MLKitBarcodeScannerBase {
   }
 }
 
+function boundingBoxToBounds(rect: any): MLKitScanBarcodesResultBounds {
+  return {
+    origin: {
+      x: rect.left,
+      y: rect.top
+    },
+    size: {
+      width: rect.width(),
+      height: rect.height()
+    }
+  }
+}
+
 function getBarcodeDetector(formats?: Array<BarcodeFormat>): any {
   if (formats && formats.length > 0) {
     const firebaseVisionBarcodeDetectorOptions =
@@ -79,7 +93,8 @@ export function scanBarcodesOnDevice(options: MLKitScanBarcodesOnDeviceOptions):
               result.barcodes.push({
                 value: barcode.getRawValue(),
                 format: BarcodeFormat[barcode.getFormat()],
-                android: barcode
+                android: barcode,
+                bounds: boundingBoxToBounds(barcode.getBoundingBox())
               });
             }
           }

src/mlkit/barcodescanning/index.d.ts

@@ -3,11 +3,23 @@ import { BarcodeFormat } from "./barcodescanning-common";
 
 export { BarcodeFormat };
 
+export interface MLKitScanBarcodesResultBounds {
+  origin: {
+    x: number;
+    y: number;
+  },
+  size: {
+    width: number;
+    height: number;
+  }
+}
+
 export interface MLKitScanBarcodesResultBarcode {
   value: string;
   format: string;
   ios?: any;
   android?: any;
+  bounds?: MLKitScanBarcodesResultBounds;
   // TODO details
 }
 

src/mlkit/barcodescanning/index.ios.ts

@@ -32,7 +32,8 @@ export class MLKitBarcodeScanner extends MLKitBarcodeScannerBase {
           result.barcodes.push({
             value: barcode.rawValue,
             format: BarcodeFormat[barcode.format],
-            ios: barcode
+            ios: barcode,
+            bounds: barcode.frame
           });
         }
 
@@ -79,7 +80,8 @@ export function scanBarcodesOnDevice(options: MLKitScanBarcodesOnDeviceOptions):
             result.barcodes.push({
               value: barcode.rawValue,
               format: BarcodeFormat[barcode.format],
-              ios: barcode
+              ios: barcode,
+              bounds: barcode.frame
             });
           }
           resolve(result);

src/mlkit/facedetection/index.android.ts

@@ -1,6 +1,6 @@
 import { ImageSource } from "tns-core-modules/image-source";
+import { MLKitDetectFacesOnDeviceOptions, MLKitDetectFacesOnDeviceResult, MLKitDetectFacesResultBounds } from "./";
 import { MLKitVisionOptions } from "../";
-import { MLKitDetectFacesOnDeviceOptions, MLKitDetectFacesOnDeviceResult } from "./";
 import { MLKitFaceDetection as MLKitFaceDetectionBase } from "./facedetection-common";
 
 const gmsTasks = (<any>com.google.android.gms).tasks;
@@ -33,10 +33,13 @@ export class MLKitFaceDetection extends MLKitFaceDetectionBase {
         for (let i = 0; i < faces.size(); i++) {
           const face = faces.get(i);
           result.faces.push({
+            bounds: boundingBoxToBounds(face.getBoundingBox()),
             smilingProbability: face.getSmilingProbability() !== com.google.firebase.ml.vision.face.FirebaseVisionFace.UNCOMPUTED_PROBABILITY ? face.getSmilingProbability() : undefined,
             leftEyeOpenProbability: face.getLeftEyeOpenProbability() !== com.google.firebase.ml.vision.face.FirebaseVisionFace.UNCOMPUTED_PROBABILITY ? face.getLeftEyeOpenProbability() : undefined,
             rightEyeOpenProbability: face.getRightEyeOpenProbability() !== com.google.firebase.ml.vision.face.FirebaseVisionFace.UNCOMPUTED_PROBABILITY ? face.getRightEyeOpenProbability() : undefined,
-            trackingId: face.getTrackingId() !== com.google.firebase.ml.vision.face.FirebaseVisionFace.INVALID_ID ? face.getTrackingId() : undefined
+            trackingId: face.getTrackingId() !== com.google.firebase.ml.vision.face.FirebaseVisionFace.INVALID_ID ? face.getTrackingId() : undefined,
+            headEulerAngleY: face.getHeadEulerAngleY(),
+            headEulerAngleZ: face.getHeadEulerAngleZ()
           });
         }
 
@@ -64,6 +67,19 @@ function getFaceDetector(options: MLKitDetectFacesOnDeviceOptions): any {
   return com.google.firebase.ml.vision.FirebaseVision.getInstance().getVisionFaceDetector(builder.build());
 }
 
+function boundingBoxToBounds(rect: any): MLKitDetectFacesResultBounds {
+  return {
+    origin: {
+      x: rect.left,
+      y: rect.top
+    },
+    size: {
+      width: rect.width(),
+      height: rect.height()
+    }
+  }
+}
+
 export function detectFacesOnDevice(options: MLKitDetectFacesOnDeviceOptions): Promise<MLKitDetectFacesOnDeviceResult> {
   return new Promise((resolve, reject) => {
     try {
@@ -81,10 +97,13 @@ export function detectFacesOnDevice(options: MLKitDetectFacesOnDeviceOptions): P
             for (let i = 0; i < faces.size(); i++) {
               const face = faces.get(i);
               result.faces.push({
+                bounds: boundingBoxToBounds(face.getBoundingBox()),
                 smilingProbability: face.getSmilingProbability() !== com.google.firebase.ml.vision.face.FirebaseVisionFace.UNCOMPUTED_PROBABILITY ? face.getSmilingProbability() : undefined,
                 leftEyeOpenProbability: face.getLeftEyeOpenProbability() !== com.google.firebase.ml.vision.face.FirebaseVisionFace.UNCOMPUTED_PROBABILITY ? face.getLeftEyeOpenProbability() : undefined,
                 rightEyeOpenProbability: face.getRightEyeOpenProbability() !== com.google.firebase.ml.vision.face.FirebaseVisionFace.UNCOMPUTED_PROBABILITY ? face.getRightEyeOpenProbability() : undefined,
-                trackingId: face.getTrackingId() !== com.google.firebase.ml.vision.face.FirebaseVisionFace.INVALID_ID ? face.getTrackingId() : undefined
+                trackingId: face.getTrackingId() !== com.google.firebase.ml.vision.face.FirebaseVisionFace.INVALID_ID ? face.getTrackingId() : undefined,
+                headEulerAngleY: face.getHeadEulerAngleY(),
+                headEulerAngleZ: face.getHeadEulerAngleZ()
               });
             }
           }

src/mlkit/facedetection/index.d.ts

@@ -1,12 +1,26 @@
 import { MLKitCameraView, MLKitVisionOptions, MLKitVisionResult } from "../";
 
+export interface MLKitDetectFacesResultBounds {
+  origin: {
+    x: number;
+    y: number;
+  },
+  size: {
+    width: number;
+    height: number;
+  }
+}
+
 export interface MLKitDetectFacesResultFace {
   smilingProbability?: number;
   leftEyeOpenProbability?: number;
   rightEyeOpenProbability?: number;
   trackingId?: number;
   ios?: any;
   android?: any;
+  bounds?: MLKitDetectFacesResultBounds;
+  headEulerAngleZ?: number;
+  headEulerAngleY?: number;
 }
 
 export interface MLKitDetectFacesOnDeviceResult extends MLKitVisionResult {

src/mlkit/facedetection/index.ios.ts

@@ -30,7 +30,10 @@ export class MLKitFaceDetection extends MLKitFaceDetectionBase {
             smilingProbability: face.hasSmilingProbability ? face.smilingProbability : undefined,
             leftEyeOpenProbability: face.hasLeftEyeOpenProbability ? face.leftEyeOpenProbability : undefined,
             rightEyeOpenProbability: face.hasRightEyeOpenProbability ? face.rightEyeOpenProbability : undefined,
-            trackingId: face.hasTrackingID ? face.trackingID : undefined
+            trackingId: face.hasTrackingID ? face.trackingID : undefined,
+            bounds: face.frame,
+            headEulerAngleY: face.headEulerAngleY,
+            headEulerAngleZ: face.headEulerAngleZ
           });
         }
 
@@ -86,7 +89,10 @@ export function detectFacesOnDevice(options: MLKitDetectFacesOnDeviceOptions): P
               smilingProbability: face.hasSmilingProbability ? face.smilingProbability : undefined,
               leftEyeOpenProbability: face.hasLeftEyeOpenProbability ? face.leftEyeOpenProbability : undefined,
               rightEyeOpenProbability: face.hasRightEyeOpenProbability ? face.rightEyeOpenProbability : undefined,
-              trackingId: face.hasTrackingID ? face.trackingID : undefined
+              trackingId: face.hasTrackingID ? face.trackingID : undefined,
+              bounds: face.frame,
+              headEulerAngleY: face.headEulerAngleY,
+              headEulerAngleZ: face.headEulerAngleZ
             });
           }
           resolve(result);