bette use of value objects

src/modules/geography/core/application/queries/get-route/get-route.query.ts

@@ -1,6 +1,6 @@
 import { QueryBase } from '@mobicoop/ddd-library';
-import { Waypoint } from '@modules/geography/core/domain/route.types';
 import { GeorouterSettings } from '../../types/georouter-settings.type';
+import { Waypoint } from '@modules/geography/core/domain/route.types';
 
 export class GetRouteQuery extends QueryBase {
   readonly waypoints: Waypoint[];

src/modules/geography/core/domain/route.types.ts

@@ -20,6 +20,7 @@ export interface CreateRouteProps {
   georouterSettings: GeorouterSettings;
 }
 
+// Types used outside the domain
 export type Route = {
   distance: number;
   duration: number;

src/modules/geography/core/domain/value-objects/step.value-object.ts

@@ -1,30 +1,17 @@
-import {
-  ArgumentInvalidException,
-  ArgumentOutOfRangeException,
-  ValueObject,
-} from '@mobicoop/ddd-library';
+import { ArgumentInvalidException, ValueObject } from '@mobicoop/ddd-library';
+import { PointProps } from './point.value-object';
 
 /** Note:
  * Value Objects with multiple properties can contain
  * other Value Objects inside if needed.
  * */
 
-export interface StepProps {
-  lon: number;
-  lat: number;
+export interface StepProps extends PointProps {
   duration: number;
   distance: number;
 }
 
 export class Step extends ValueObject<StepProps> {
-  get lon(): number {
-    return this.props.lon;
-  }
-
-  get lat(): number {
-    return this.props.lat;
-  }
-
   get duration(): number {
     return this.props.duration;
   }
@@ -33,6 +20,14 @@ export class Step extends ValueObject<StepProps> {
     return this.props.distance;
   }
 
+  get lon(): number {
+    return this.props.lon;
+  }
+
+  get lat(): number {
+    return this.props.lat;
+  }
+
   protected validate(props: StepProps): void {
     if (props.duration < 0)
       throw new ArgumentInvalidException(
@@ -42,9 +37,5 @@ export class Step extends ValueObject<StepProps> {
       throw new ArgumentInvalidException(
         'distance must be greater than or equal to 0',
       );
-    if (props.lon > 180 || props.lon < -180)
-      throw new ArgumentOutOfRangeException('lon must be between -180 and 180');
-    if (props.lat > 90 || props.lat < -90)
-      throw new ArgumentOutOfRangeException('lat must be between -90 and 90');
   }
 }

src/modules/geography/core/domain/value-objects/waypoint.value-object.ts

@@ -1,18 +1,13 @@
-import {
-  ArgumentInvalidException,
-  ArgumentOutOfRangeException,
-  ValueObject,
-} from '@mobicoop/ddd-library';
+import { ArgumentInvalidException, ValueObject } from '@mobicoop/ddd-library';
+import { PointProps } from './point.value-object';
 
 /** Note:
  * Value Objects with multiple properties can contain
  * other Value Objects inside if needed.
  * */
 
-export interface WaypointProps {
+export interface WaypointProps extends PointProps {
   position: number;
-  lon: number;
-  lat: number;
 }
 
 export class Waypoint extends ValueObject<WaypointProps> {
@@ -33,9 +28,5 @@ export class Waypoint extends ValueObject<WaypointProps> {
       throw new ArgumentInvalidException(
         'position must be greater than or equal to 0',
       );
-    if (props.lon > 180 || props.lon < -180)
-      throw new ArgumentOutOfRangeException('lon must be between -180 and 180');
-    if (props.lat > 90 || props.lat < -90)
-      throw new ArgumentOutOfRangeException('lat must be between -90 and 90');
   }
 }