1 files changed, 14 insertions, 8 deletions

diff --git a/src/client/cognitive_services/CognitiveServices.ts b/src/client/cognitive_services/CognitiveServices.ts
index 02eff3b25..62308f056 100644
--- a/src/client/cognitive_services/CognitiveServices.ts
+++ b/src/client/cognitive_services/CognitiveServices.ts
@@ -47,7 +47,8 @@ export namespace CognitiveServices {
         let results: any;
         try {
             results = await manager.requester(apiKey, manager.converter(data), service).then(json => JSON.parse(json));
-        } catch {
+        } catch (e) {
+            throw e;
             results = undefined;
         }
         return results;
@@ -137,7 +138,7 @@ export namespace CognitiveServices {
                 let id = 0;
                 const strokes: AzureStrokeData[] = inkData.map(points => ({
                     id: id++,
-                    points: points.map(({ x, y }) => `${x},${y}`).join(","),
+                    points: points.map(({ X: x, Y: y }) => `${x},${y}`).join(","),
                     language: "en-US"
                 }));
                 return JSON.stringify({
@@ -153,7 +154,7 @@ export namespace CognitiveServices {
                 const serverAddress = "https://api.cognitive.microsoft.com";
                 const endpoint = serverAddress + "/inkrecognizer/v1.0-preview/recognize";
 
-                const promisified = (resolve: any, reject: any) => {
+                return new Promise<string>((resolve, reject) => {
                     xhttp.onreadystatechange = function () {
                         if (this.readyState === 4) {
                             const result = xhttp.responseText;
@@ -171,11 +172,8 @@ export namespace CognitiveServices {
                     xhttp.setRequestHeader('Ocp-Apim-Subscription-Key', apiKey);
                     xhttp.setRequestHeader('Content-Type', 'application/json');
                     xhttp.send(body);
-                };
-
-                return new Promise<any>(promisified);
+                });
             },
-
         };
 
         export namespace Appliers {
@@ -188,13 +186,21 @@ export namespace CognitiveServices {
                     results.recognitionUnits && (results = results.recognitionUnits);
                     target[keys[0]] = Docs.Get.DocumentHierarchyFromJson(results, "Ink Analysis");
                     const recognizedText = results.map((item: any) => item.recognizedText);
+                    const recognizedObjects = results.map((item: any) => item.recognizedObject);
                     const individualWords = recognizedText.filter((text: string) => text && text.split(" ").length === 1);
-                    target[keys[1]] = individualWords.join(" ");
+                    target[keys[1]] = individualWords.length ? individualWords.join(" ") : recognizedObjects.join(", ");
                 }
 
                 batch.end();
             };
 
+            export const InterpretStrokes = async (strokes: InkData[]) => {
+                let results = await ExecuteQuery(Service.Handwriting, Manager, strokes);
+                if (results) {
+                    results.recognitionUnits && (results = results.recognitionUnits);
+                }
+                return results;
+            }
         }
 
         export interface AzureStrokeData {