Resolution: add validation and move to utils/

src/core/gizmos.ts

@@ -27,7 +27,7 @@ import { SpeedySize } from 'speedy-vision/types/core/speedy-size';
 import { SpeedyMatrix } from 'speedy-vision/types/core/speedy-matrix';
 import { SpeedyKeypoint, SpeedyMatchedKeypoint } from 'speedy-vision/types/core/speedy-keypoint';
 import { SpeedyPromise } from 'speedy-vision/types/core/speedy-promise';
-import { Resolution } from './resolution';
+import { Resolution } from '../utils/resolution';
 import { Nullable, Utils } from '../utils/utils';
 import { IllegalArgumentError, IllegalOperationError, TrackingError } from '../utils/errors';
 import { Viewport } from './viewport';

src/sources/camera-source.ts

@@ -24,7 +24,7 @@ import Speedy from 'speedy-vision';
 import { SpeedyMedia } from 'speedy-vision/types/core/speedy-media';
 import { SpeedyPromise } from 'speedy-vision/types/core/speedy-promise';
 import { Utils } from '../utils/utils';
-import { Resolution } from '../core/resolution';
+import { Resolution } from '../utils/resolution';
 import { NotSupportedError, AccessDeniedError, IllegalOperationError } from '../utils/errors';
 import { VideoSource } from './video-source';
 

src/trackers/image-tracker/image-tracker.ts

@@ -34,7 +34,7 @@ import { SpeedyKeypoint } from 'speedy-vision/types/core/speedy-keypoint';
 import { Tracker, TrackerOutput, TrackerResult, Trackable } from '../tracker';
 import { Session } from '../../core/session';
 import { IllegalOperationError, IllegalArgumentError } from '../../utils/errors';
-import { Resolution } from '../../core/resolution';
+import { Resolution } from '../../utils/resolution';
 import { ReferenceImage } from './reference-image';
 import { ReferenceImageDatabase } from './reference-image-database';
 import { ImageTrackerState } from './states/state';

src/trackers/image-tracker/states/training.ts

@@ -29,7 +29,7 @@ import { SpeedyPipelineNodeImageSource } from 'speedy-vision/types/core/pipeline
 import { SpeedyPipelineNodeResize } from 'speedy-vision/types/core/pipeline/nodes/transforms/resize';
 import { SpeedyPipelineNodeKeypointTransformer } from 'speedy-vision/types/core/pipeline/nodes/keypoints/transformer';
 import { SpeedyKeypoint } from 'speedy-vision/types/core/speedy-keypoint';
-import { Resolution } from '../../../core/resolution';
+import { Resolution } from '../../../utils/resolution';
 import { ImageTracker, ImageTrackerOutput, ImageTrackerStateName } from '../image-tracker';
 import { ImageTrackerState, ImageTrackerStateOutput } from './state';
 import { ReferenceImage } from '../reference-image';

src/core/resolution.ts → src/utils/resolution.ts

@@ -22,6 +22,7 @@
 
 import Speedy from 'speedy-vision';
 import { SpeedySize } from 'speedy-vision/types/core/speedy-size';
+import { IllegalArgumentError } from './errors';
 
 /** Resolution type */
 export type Resolution = 'xs' | 'xs+' | 'sm' | 'sm+' | 'md' | 'md+' | 'lg' | 'lg+';
@@ -49,6 +50,11 @@ export function computeResolution(resolution: Resolution, aspectRatio: number):
     const referenceHeight = REFERENCE_HEIGHT[resolution];
     let width = 0, height = 0;
 
+    if(referenceHeight === undefined)
+        throw new IllegalArgumentError('Invalid resolution: ' + resolution);
+    else if(aspectRatio <= 0)
+        throw new IllegalArgumentError('Invalid aspect ratio: ' + aspectRatio);
+
     if(aspectRatio >= 1) {
         // landscape
         height = referenceHeight;

src/utils/utils.ts

@@ -23,7 +23,7 @@
 import Speedy from 'speedy-vision';
 import { SpeedySize } from 'speedy-vision/types/core/speedy-size';
 import { AssertionError, IllegalArgumentError } from './errors';
-import { Resolution, computeResolution } from '../core/resolution';
+import { Resolution, computeResolution } from './resolution';
 
 /**
  * Nullable type