Merge pull request #52 from regulaforensics/develop

Added rect for text-data
regulaforensics · Apr 25, 2024 · e3b71f0 · e3b71f0
2 parents 47f0fb1 + 3cadde7
commit e3b71f0
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.0.52",
+  "version": "0.0.53",
   "author": "Regula Forensics, Inc.",
   "name": "@regulaforensics/document-reader-recipes",
   "description": "Document Reader Recipes",

diff --git a/...mbers/children/location/children/index.ts → src/common-models/index.ts b/...mbers/children/location/children/index.ts → src/common-models/index.ts
diff --git a/.../children/location/children/rect/index.ts → src/common-models/rect/index.ts b/.../children/location/children/rect/index.ts → src/common-models/rect/index.ts
diff --git a/...dren/location/children/rect/rect.model.ts → src/common-models/rect/rect.model.ts b/...dren/location/children/rect/rect.model.ts → src/common-models/rect/rect.model.ts
diff --git a/...y-check-list-item/children/authenticity-check/members/children/location/location.model.ts b/...y-check-list-item/children/authenticity-check/members/children/location/location.model.ts
@@ -1,8 +1,8 @@
-import { IsDefined, IsEnum, IsNumber, IsOptional, ValidateNested } from 'class-validator'
+import { IsDefined, IsEnum, IsOptional, ValidateNested } from 'class-validator'
 import { Expose, Type } from 'class-transformer'
 import { eLights } from '@regulaforensics/document-reader-typings'
 
-import { iRRect, RRect } from './children'
+import { iRRect, RRect } from '@/common-models'
 
 
 /**

diff --git a/src/recipes/text/text-data/get-text-data.recipe.ts b/src/recipes/text/text-data/get-text-data.recipe.ts
@@ -21,6 +21,7 @@ export const getTextData = (input: ProcessResponse): RTextData[] => {
       current.value = field.value
       current.lcid = field.lcid
       current.checkResult = field.status
+
       current.comparisonList = field.comparisonList?.map((i) => {
         const current =  new RTextDataComparison()
 
@@ -40,6 +41,7 @@ export const getTextData = (input: ProcessResponse): RTextData[] => {
 
         currentSource.checkResult = validity?.status ?? eCheckResult.WAS_NOT_DONE
         currentSource.source = source
+        currentSource.rect = currentSourceValue?.fieldRect
         currentSource.value = currentSourceValue?.value ?? ''
         currentSource.pageIndex = currentSourceValue?.pageIndex ?? 0
         currentSource.probability = currentSourceValue?.probability ?? 0

diff --git a/src/recipes/text/text-data/models/text-data-source.model.ts b/src/recipes/text/text-data/models/text-data-source.model.ts
@@ -1,7 +1,9 @@
-import { IsDefined, IsEnum, IsString } from 'class-validator'
+import { IsDefined, IsEnum, IsOptional, IsString, ValidateNested } from 'class-validator'
 import { eCheckResult, eSource } from '@regulaforensics/document-reader-typings'
 
 import { Default } from '@/decorators'
+import { iRRect, RRect } from '@/common-models'
+import { Expose, Type } from 'class-transformer'
 
 
 /**
@@ -30,13 +32,19 @@ export interface iRTextDataSource {
   * Field recognition probability
   * @type {number}
   */
-  probability: number;
+  probability: number
 
   /**
   * Page index
   * @type {number}
   */
-  pageIndex: number;
+  pageIndex: number
+
+  /**
+  * Rect
+  * @type {RRect|undefined}
+  */
+  rect?: iRRect
 }
 
 /**
@@ -74,13 +82,23 @@ export class RTextDataSource implements iRTextDataSource {
   */
   @IsDefined()
   @Default(0)
-  probability: number;
+  probability: number
 
   /**
   * Page index
   * @type {number}
   */
   @IsDefined()
   @Default(0)
-  pageIndex: number;
+  pageIndex: number
+
+  /**
+  * Rect
+  * @type {RRect|undefined}
+  */
+  @Expose()
+  @IsOptional()
+  @Type(() => RRect)
+  @ValidateNested()
+  rect?: RRect
 }