@dnv-plant/typescriptpws 1.0.86 → 1.0.88

package/src/calculations/dispersionView.ts

@@ -6,12 +6,10 @@
 * Editing it may lead to inconsistent results and limit DNV's ability to provide support.
 * Please contact DNV if you believe changes are required.
 *
-* Version:   1.0.86
-* Date/time: 10 Jul 2025 09:49:06
+* Version:   1.0.89
+* Date/time: 29 Jul 2025 17:59:11
 * Template:  templates/typescriptpws/calculations.razor.
- ***********************************************************************/
-
-
+***********************************************************************/
 
 import * as Enums from "../enums";
 import * as Entities from "../entities";
@@ -36,12 +34,17 @@ class CalculationBase {
   messages: string[] = [];
   calculationElapsedTime?: number = 0.0;
   operationId?: string = "";
+  controller?: AbortController;
+
+  constructor(controller?: AbortController) {
+    this.controller = controller;
+  }
 
   /**
    * Post JSON to URL and time the call
    */
   async postRequest(url: string, data: string): Promise<AxiosResponse> {
-    return postRequest(url, data);
+    return postRequest(url, data, this.controller);
   }
 
   /**
@@ -177,16 +180,8 @@ class ConcentrationAtPointCalculationRequest extends CalculationRequestBase {
   /**
    * ConcentrationAtPoint calculation request class.
    *
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion results.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords - Array of dispersion record.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig} dispersionOutputConfig -  a dispersion output config entity.
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
    */
-  constructor(
+  constructor(data: {
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
     dispersionRecords: Entities.DispersionRecord[],
@@ -195,16 +190,16 @@ class ConcentrationAtPointCalculationRequest extends CalculationRequestBase {
     dispersionOutputConfig: Entities.DispersionOutputConfig,
     material: Entities.Material,
     dispersionParameters: Entities.DispersionParameters
-  ) {
+  }) {
     super();
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfig = dispersionOutputConfig;
-    this.material = material;
-    this.dispersionParameters = dispersionParameters;
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfig = data.dispersionOutputConfig;
+    this.material = data.material;
+    this.dispersionParameters = data.dispersionParameters;
   }
 }
 
@@ -248,16 +243,7 @@ export class ConcentrationAtPointCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: ConcentrationAtPointCalculationRequestSchemaData): ConcentrationAtPointCalculationRequest {
-    return new ConcentrationAtPointCalculationRequest(
-      data.scalarUdmOutputs,
-      data.weather,
-      data.dispersionRecords,
-      data.dispersionRecordCount,
-      data.substrate,
-      data.dispersionOutputConfig,
-      data.material,
-      data.dispersionParameters
-    );
+    return new ConcentrationAtPointCalculationRequest(data);
   }
 }
 
@@ -275,16 +261,8 @@ export class ConcentrationAtPointCalculation extends CalculationBase {
   /**
    * Calculates the concentration at a particular distance downwind and crosswind position at the current effect height and averaging time.
    *
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion results.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords - Array of dispersion record.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig} dispersionOutputConfig -  a dispersion output config entity.
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
    */
-  constructor(
+  constructor(data: {
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
     dispersionRecords: Entities.DispersionRecord[],
@@ -293,30 +271,31 @@ export class ConcentrationAtPointCalculation extends CalculationBase {
     dispersionOutputConfig: Entities.DispersionOutputConfig,
     material: Entities.Material,
     dispersionParameters: Entities.DispersionParameters
-  ) {
-    super();
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfig = dispersionOutputConfig;
-    this.material = material;
-    this.dispersionParameters = dispersionParameters;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfig = data.dispersionOutputConfig;
+    this.material = data.material;
+    this.dispersionParameters = data.dispersionParameters;
   }
 
   async run() {
     try {
-      const request = new ConcentrationAtPointCalculationRequest(
-        this.scalarUdmOutputs,
-        this.weather,
-        this.dispersionRecords,
-        this.dispersionRecordCount,
-        this.substrate,
-        this.dispersionOutputConfig,
-        this.material,
-        this.dispersionParameters
-      );
+      const request = new ConcentrationAtPointCalculationRequest({
+        scalarUdmOutputs: this.scalarUdmOutputs,
+        weather: this.weather,
+        dispersionRecords: this.dispersionRecords,
+        dispersionRecordCount: this.dispersionRecordCount,
+        substrate: this.substrate,
+        dispersionOutputConfig: this.dispersionOutputConfig,
+        material: this.material,
+        dispersionParameters: this.dispersionParameters
+      });
 
       const schema = new ConcentrationAtPointCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -375,21 +354,20 @@ export class ConcentrationAtPointCalculationResponse extends CalculationResponse
   /**
    * ConcentrationAtPoint calculation response class.
    *
-   * @param {number} concentration - Concentration at a position of interest.
    */
-  constructor(
+  constructor(data: {
     concentration: number,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.concentration = concentration;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.concentration = data.concentration;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -450,13 +428,7 @@ export class ConcentrationAtPointCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: ConcentrationAtPointCalculationResponseSchemaData): ConcentrationAtPointCalculationResponse {
-    return new ConcentrationAtPointCalculationResponse(
-      data.concentration,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new ConcentrationAtPointCalculationResponse(data);
   }
 }
 
@@ -486,17 +458,8 @@ class DistancesAndFootprintsToConcentrationLevelsCalculationRequest extends Calc
   /**
    * DistancesAndFootprintsToConcentrationLevels calculation request class.
    *
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion results.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords -  an array of dispersion records.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig[]} dispersionOutputConfigs -  an array of dispersion output configs.
-   * @param {number} dispersionOutputConfigCount - Number of dispersion output configs.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
    */
-  constructor(
+  constructor(data: {
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
     dispersionRecords: Entities.DispersionRecord[],
@@ -506,17 +469,17 @@ class DistancesAndFootprintsToConcentrationLevelsCalculationRequest extends Calc
     dispersionOutputConfigCount: number,
     dispersionParameters: Entities.DispersionParameters,
     material: Entities.Material
-  ) {
+  }) {
     super();
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfigs = dispersionOutputConfigs;
-    this.dispersionOutputConfigCount = dispersionOutputConfigCount;
-    this.dispersionParameters = dispersionParameters;
-    this.material = material;
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfigs = data.dispersionOutputConfigs;
+    this.dispersionOutputConfigCount = data.dispersionOutputConfigCount;
+    this.dispersionParameters = data.dispersionParameters;
+    this.material = data.material;
   }
 }
 
@@ -562,17 +525,7 @@ export class DistancesAndFootprintsToConcentrationLevelsCalculationRequestSchema
   }
 
   makeCalculationRequest(data: DistancesAndFootprintsToConcentrationLevelsCalculationRequestSchemaData): DistancesAndFootprintsToConcentrationLevelsCalculationRequest {
-    return new DistancesAndFootprintsToConcentrationLevelsCalculationRequest(
-      data.scalarUdmOutputs,
-      data.weather,
-      data.dispersionRecords,
-      data.dispersionRecordCount,
-      data.substrate,
-      data.dispersionOutputConfigs,
-      data.dispersionOutputConfigCount,
-      data.dispersionParameters,
-      data.material
-    );
+    return new DistancesAndFootprintsToConcentrationLevelsCalculationRequest(data);
   }
 }
 
@@ -595,17 +548,8 @@ export class DistancesAndFootprintsToConcentrationLevelsCalculation extends Calc
   /**
    * Calculates the distances and maximum footprints to specified concentration of interest levels for the dispersion modelling.
    *
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion results.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords -  an array of dispersion records.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig[]} dispersionOutputConfigs -  an array of dispersion output configs.
-   * @param {number} dispersionOutputConfigCount - Number of dispersion output configs.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
    */
-  constructor(
+  constructor(data: {
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
     dispersionRecords: Entities.DispersionRecord[],
@@ -615,32 +559,33 @@ export class DistancesAndFootprintsToConcentrationLevelsCalculation extends Calc
     dispersionOutputConfigCount: number,
     dispersionParameters: Entities.DispersionParameters,
     material: Entities.Material
-  ) {
-    super();
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfigs = dispersionOutputConfigs;
-    this.dispersionOutputConfigCount = dispersionOutputConfigCount;
-    this.dispersionParameters = dispersionParameters;
-    this.material = material;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfigs = data.dispersionOutputConfigs;
+    this.dispersionOutputConfigCount = data.dispersionOutputConfigCount;
+    this.dispersionParameters = data.dispersionParameters;
+    this.material = data.material;
   }
 
   async run() {
     try {
-      const request = new DistancesAndFootprintsToConcentrationLevelsCalculationRequest(
-        this.scalarUdmOutputs,
-        this.weather,
-        this.dispersionRecords,
-        this.dispersionRecordCount,
-        this.substrate,
-        this.dispersionOutputConfigs,
-        this.dispersionOutputConfigCount,
-        this.dispersionParameters,
-        this.material
-      );
+      const request = new DistancesAndFootprintsToConcentrationLevelsCalculationRequest({
+        scalarUdmOutputs: this.scalarUdmOutputs,
+        weather: this.weather,
+        dispersionRecords: this.dispersionRecords,
+        dispersionRecordCount: this.dispersionRecordCount,
+        substrate: this.substrate,
+        dispersionOutputConfigs: this.dispersionOutputConfigs,
+        dispersionOutputConfigCount: this.dispersionOutputConfigCount,
+        dispersionParameters: this.dispersionParameters,
+        material: this.material
+      });
 
       const schema = new DistancesAndFootprintsToConcentrationLevelsCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -736,13 +681,8 @@ export class DistancesAndFootprintsToConcentrationLevelsCalculationResponse exte
   /**
    * DistancesAndFootprintsToConcentrationLevels calculation response class.
    *
-   * @param {number[]} concsUsed -  an array of concentrations of interest, corresponding to the dispersion output configs.
-   * @param {number[]} nContourPoints -  an array of the number of contour points, corresponding to the dispersion output configs.
-   * @param {number[]} areasContour -  an array of areas of footprint contours, corresponding to the dispersion output configs.
-   * @param {number[]} distancesConcentration -  an array of the maximum distances downwind, corresponding to the dispersion output configs.
-   * @param {Entities.LocalPosition[]} contourPoints - Contour points of maximum footprints to concentration level.
    */
-  constructor(
+  constructor(data: {
     concsUsed: number[],
     nContourPoints: number[],
     areasContour: number[],
@@ -752,17 +692,17 @@ export class DistancesAndFootprintsToConcentrationLevelsCalculationResponse exte
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.concsUsed = concsUsed;
-    this.nContourPoints = nContourPoints;
-    this.areasContour = areasContour;
-    this.distancesConcentration = distancesConcentration;
-    this.contourPoints = contourPoints;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.concsUsed = data.concsUsed;
+    this.nContourPoints = data.nContourPoints;
+    this.areasContour = data.areasContour;
+    this.distancesConcentration = data.distancesConcentration;
+    this.contourPoints = data.contourPoints;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -853,17 +793,7 @@ export class DistancesAndFootprintsToConcentrationLevelsCalculationResponseSchem
   }
 
   makeCalculationResponse(data: DistancesAndFootprintsToConcentrationLevelsCalculationResponseSchemaData): DistancesAndFootprintsToConcentrationLevelsCalculationResponse {
-    return new DistancesAndFootprintsToConcentrationLevelsCalculationResponse(
-      data.concsUsed,
-      data.nContourPoints,
-      data.areasContour,
-      data.distancesConcentration,
-      data.contourPoints,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new DistancesAndFootprintsToConcentrationLevelsCalculationResponse(data);
   }
 }
 
@@ -893,17 +823,8 @@ class DistancesToConcLevelsCalculationRequest extends CalculationRequestBase {
   /**
    * DistancesToConcLevels calculation request class.
    *
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion results.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords -  an array of dispersion records.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig[]} dispersionOutputConfigs -  an array of dispersion output configs.
-   * @param {number} dispersionOutputConfigCount - Number of dispersion output configs.
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
    */
-  constructor(
+  constructor(data: {
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
     dispersionRecords: Entities.DispersionRecord[],
@@ -913,17 +834,17 @@ class DistancesToConcLevelsCalculationRequest extends CalculationRequestBase {
     dispersionOutputConfigCount: number,
     material: Entities.Material,
     dispersionParameters: Entities.DispersionParameters
-  ) {
+  }) {
     super();
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfigs = dispersionOutputConfigs;
-    this.dispersionOutputConfigCount = dispersionOutputConfigCount;
-    this.material = material;
-    this.dispersionParameters = dispersionParameters;
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfigs = data.dispersionOutputConfigs;
+    this.dispersionOutputConfigCount = data.dispersionOutputConfigCount;
+    this.material = data.material;
+    this.dispersionParameters = data.dispersionParameters;
   }
 }
 
@@ -969,17 +890,7 @@ export class DistancesToConcLevelsCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: DistancesToConcLevelsCalculationRequestSchemaData): DistancesToConcLevelsCalculationRequest {
-    return new DistancesToConcLevelsCalculationRequest(
-      data.scalarUdmOutputs,
-      data.weather,
-      data.dispersionRecords,
-      data.dispersionRecordCount,
-      data.substrate,
-      data.dispersionOutputConfigs,
-      data.dispersionOutputConfigCount,
-      data.material,
-      data.dispersionParameters
-    );
+    return new DistancesToConcLevelsCalculationRequest(data);
   }
 }
 
@@ -999,17 +910,8 @@ export class DistancesToConcLevelsCalculation extends CalculationBase {
   /**
    * Calculates the maximum downwind distance to a number of concentration level in the direction of the wind, at the effect height and averaging time.
    *
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion results.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords -  an array of dispersion records.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig[]} dispersionOutputConfigs -  an array of dispersion output configs.
-   * @param {number} dispersionOutputConfigCount - Number of dispersion output configs.
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
    */
-  constructor(
+  constructor(data: {
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
     dispersionRecords: Entities.DispersionRecord[],
@@ -1019,32 +921,33 @@ export class DistancesToConcLevelsCalculation extends CalculationBase {
     dispersionOutputConfigCount: number,
     material: Entities.Material,
     dispersionParameters: Entities.DispersionParameters
-  ) {
-    super();
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfigs = dispersionOutputConfigs;
-    this.dispersionOutputConfigCount = dispersionOutputConfigCount;
-    this.material = material;
-    this.dispersionParameters = dispersionParameters;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfigs = data.dispersionOutputConfigs;
+    this.dispersionOutputConfigCount = data.dispersionOutputConfigCount;
+    this.material = data.material;
+    this.dispersionParameters = data.dispersionParameters;
   }
 
   async run() {
     try {
-      const request = new DistancesToConcLevelsCalculationRequest(
-        this.scalarUdmOutputs,
-        this.weather,
-        this.dispersionRecords,
-        this.dispersionRecordCount,
-        this.substrate,
-        this.dispersionOutputConfigs,
-        this.dispersionOutputConfigCount,
-        this.material,
-        this.dispersionParameters
-      );
+      const request = new DistancesToConcLevelsCalculationRequest({
+        scalarUdmOutputs: this.scalarUdmOutputs,
+        weather: this.weather,
+        dispersionRecords: this.dispersionRecords,
+        dispersionRecordCount: this.dispersionRecordCount,
+        substrate: this.substrate,
+        dispersionOutputConfigs: this.dispersionOutputConfigs,
+        dispersionOutputConfigCount: this.dispersionOutputConfigCount,
+        material: this.material,
+        dispersionParameters: this.dispersionParameters
+      });
 
       const schema = new DistancesToConcLevelsCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -1116,24 +1019,22 @@ export class DistancesToConcLevelsCalculationResponse extends CalculationRespons
   /**
    * DistancesToConcLevels calculation response class.
    *
-   * @param {number[]} concUsed -  an array of concentrations of interest, corresponding to the dispersion output configs.
-   * @param {number[]} distances -  an array of the distances to concentration of interest, corresponding to the dispersion output configs.
    */
-  constructor(
+  constructor(data: {
     concUsed: number[],
     distances: number[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.concUsed = concUsed;
-    this.distances = distances;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.concUsed = data.concUsed;
+    this.distances = data.distances;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -1200,14 +1101,7 @@ export class DistancesToConcLevelsCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: DistancesToConcLevelsCalculationResponseSchemaData): DistancesToConcLevelsCalculationResponse {
-    return new DistancesToConcLevelsCalculationResponse(
-      data.concUsed,
-      data.distances,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new DistancesToConcLevelsCalculationResponse(data);
   }
 }
 
@@ -1235,16 +1129,8 @@ class MaxConcDistanceCalculationRequest extends CalculationRequestBase {
   /**
    * MaxConcDistance calculation request class.
    *
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion results.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords -  an array of dispersion records.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig} dispersionOutputConfig -  a dispersion output config entity.
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
    */
-  constructor(
+  constructor(data: {
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
     dispersionRecords: Entities.DispersionRecord[],
@@ -1253,16 +1139,16 @@ class MaxConcDistanceCalculationRequest extends CalculationRequestBase {
     dispersionOutputConfig: Entities.DispersionOutputConfig,
     material: Entities.Material,
     dispersionParameters: Entities.DispersionParameters
-  ) {
+  }) {
     super();
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfig = dispersionOutputConfig;
-    this.material = material;
-    this.dispersionParameters = dispersionParameters;
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfig = data.dispersionOutputConfig;
+    this.material = data.material;
+    this.dispersionParameters = data.dispersionParameters;
   }
 }
 
@@ -1306,16 +1192,7 @@ export class MaxConcDistanceCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: MaxConcDistanceCalculationRequestSchemaData): MaxConcDistanceCalculationRequest {
-    return new MaxConcDistanceCalculationRequest(
-      data.scalarUdmOutputs,
-      data.weather,
-      data.dispersionRecords,
-      data.dispersionRecordCount,
-      data.substrate,
-      data.dispersionOutputConfig,
-      data.material,
-      data.dispersionParameters
-    );
+    return new MaxConcDistanceCalculationRequest(data);
   }
 }
 
@@ -1334,16 +1211,8 @@ export class MaxConcDistanceCalculation extends CalculationBase {
   /**
    * Calculate the maximum concentration vs distance, i.e. the maximum concentration reached at points downwind out to the minimum concentration of interest.  Dispersion results produced from a successful dispersion calculation are required as input.  Include the effects of along-wind diffusion (AWD).
    *
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion results.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords -  an array of dispersion records.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig} dispersionOutputConfig -  a dispersion output config entity.
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
    */
-  constructor(
+  constructor(data: {
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
     dispersionRecords: Entities.DispersionRecord[],
@@ -1352,30 +1221,31 @@ export class MaxConcDistanceCalculation extends CalculationBase {
     dispersionOutputConfig: Entities.DispersionOutputConfig,
     material: Entities.Material,
     dispersionParameters: Entities.DispersionParameters
-  ) {
-    super();
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfig = dispersionOutputConfig;
-    this.material = material;
-    this.dispersionParameters = dispersionParameters;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfig = data.dispersionOutputConfig;
+    this.material = data.material;
+    this.dispersionParameters = data.dispersionParameters;
   }
 
   async run() {
     try {
-      const request = new MaxConcDistanceCalculationRequest(
-        this.scalarUdmOutputs,
-        this.weather,
-        this.dispersionRecords,
-        this.dispersionRecordCount,
-        this.substrate,
-        this.dispersionOutputConfig,
-        this.material,
-        this.dispersionParameters
-      );
+      const request = new MaxConcDistanceCalculationRequest({
+        scalarUdmOutputs: this.scalarUdmOutputs,
+        weather: this.weather,
+        dispersionRecords: this.dispersionRecords,
+        dispersionRecordCount: this.dispersionRecordCount,
+        substrate: this.substrate,
+        dispersionOutputConfig: this.dispersionOutputConfig,
+        material: this.material,
+        dispersionParameters: this.dispersionParameters
+      });
 
       const schema = new MaxConcDistanceCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -1442,24 +1312,22 @@ export class MaxConcDistanceCalculationResponse extends CalculationResponseBase
   /**
    * MaxConcDistance calculation response class.
    *
-   * @param {number} concUsed - Concentration of interest.
-   * @param {Entities.ConcentrationRecord[]} concentrationRecords -  an array of maximum concentration at x, y, z coordinates.
    */
-  constructor(
+  constructor(data: {
     concUsed: number,
     concentrationRecords: Entities.ConcentrationRecord[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.concUsed = concUsed;
-    this.concentrationRecords = concentrationRecords;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.concUsed = data.concUsed;
+    this.concentrationRecords = data.concentrationRecords;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -1532,14 +1400,7 @@ export class MaxConcDistanceCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: MaxConcDistanceCalculationResponseSchemaData): MaxConcDistanceCalculationResponse {
-    return new MaxConcDistanceCalculationResponse(
-      data.concUsed,
-      data.concentrationRecords,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new MaxConcDistanceCalculationResponse(data);
   }
 }
 
@@ -1567,16 +1428,8 @@ class MaxConcFootprintCalculationRequest extends CalculationRequestBase {
   /**
    * MaxConcFootprint calculation request class.
    *
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion results.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords -  an array of dispersion records.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig} dispersionOutputConfig -  a dispersion output config entity.
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
    */
-  constructor(
+  constructor(data: {
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
     dispersionRecords: Entities.DispersionRecord[],
@@ -1585,16 +1438,16 @@ class MaxConcFootprintCalculationRequest extends CalculationRequestBase {
     dispersionOutputConfig: Entities.DispersionOutputConfig,
     material: Entities.Material,
     dispersionParameters: Entities.DispersionParameters
-  ) {
+  }) {
     super();
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfig = dispersionOutputConfig;
-    this.material = material;
-    this.dispersionParameters = dispersionParameters;
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfig = data.dispersionOutputConfig;
+    this.material = data.material;
+    this.dispersionParameters = data.dispersionParameters;
   }
 }
 
@@ -1638,16 +1491,7 @@ export class MaxConcFootprintCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: MaxConcFootprintCalculationRequestSchemaData): MaxConcFootprintCalculationRequest {
-    return new MaxConcFootprintCalculationRequest(
-      data.scalarUdmOutputs,
-      data.weather,
-      data.dispersionRecords,
-      data.dispersionRecordCount,
-      data.substrate,
-      data.dispersionOutputConfig,
-      data.material,
-      data.dispersionParameters
-    );
+    return new MaxConcFootprintCalculationRequest(data);
   }
 }
 
@@ -1666,16 +1510,8 @@ export class MaxConcFootprintCalculation extends CalculationBase {
   /**
    * Calculate the maximum footprint of the cloud for a given concentration level.  The output is a contour line defined by a set of x,y values.
    *
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion results.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords -  an array of dispersion records.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig} dispersionOutputConfig -  a dispersion output config entity.
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
    */
-  constructor(
+  constructor(data: {
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
     dispersionRecords: Entities.DispersionRecord[],
@@ -1684,30 +1520,31 @@ export class MaxConcFootprintCalculation extends CalculationBase {
     dispersionOutputConfig: Entities.DispersionOutputConfig,
     material: Entities.Material,
     dispersionParameters: Entities.DispersionParameters
-  ) {
-    super();
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfig = dispersionOutputConfig;
-    this.material = material;
-    this.dispersionParameters = dispersionParameters;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfig = data.dispersionOutputConfig;
+    this.material = data.material;
+    this.dispersionParameters = data.dispersionParameters;
   }
 
   async run() {
     try {
-      const request = new MaxConcFootprintCalculationRequest(
-        this.scalarUdmOutputs,
-        this.weather,
-        this.dispersionRecords,
-        this.dispersionRecordCount,
-        this.substrate,
-        this.dispersionOutputConfig,
-        this.material,
-        this.dispersionParameters
-      );
+      const request = new MaxConcFootprintCalculationRequest({
+        scalarUdmOutputs: this.scalarUdmOutputs,
+        weather: this.weather,
+        dispersionRecords: this.dispersionRecords,
+        dispersionRecordCount: this.dispersionRecordCount,
+        substrate: this.substrate,
+        dispersionOutputConfig: this.dispersionOutputConfig,
+        material: this.material,
+        dispersionParameters: this.dispersionParameters
+      });
 
       const schema = new MaxConcFootprintCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -1774,24 +1611,22 @@ export class MaxConcFootprintCalculationResponse extends CalculationResponseBase
   /**
    * MaxConcFootprint calculation response class.
    *
-   * @param {number} concUsed - Concentration of interest.
-   * @param {Entities.LocalPosition[]} contourPoints -  an array of points along the footprint contour.
    */
-  constructor(
+  constructor(data: {
     concUsed: number,
     contourPoints: Entities.LocalPosition[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.concUsed = concUsed;
-    this.contourPoints = contourPoints;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.concUsed = data.concUsed;
+    this.contourPoints = data.contourPoints;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -1864,14 +1699,7 @@ export class MaxConcFootprintCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: MaxConcFootprintCalculationResponseSchemaData): MaxConcFootprintCalculationResponse {
-    return new MaxConcFootprintCalculationResponse(
-      data.concUsed,
-      data.contourPoints,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new MaxConcFootprintCalculationResponse(data);
   }
 }
 
@@ -1899,16 +1727,8 @@ class MaxDistanceToConcCalculationRequest extends CalculationRequestBase {
   /**
    * MaxDistanceToConc calculation request class.
    *
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion results.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords -  an array of dispersion records.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig} dispersionOutputConfig -  a dispersion output config entity.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
    */
-  constructor(
+  constructor(data: {
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
     dispersionRecords: Entities.DispersionRecord[],
@@ -1917,16 +1737,16 @@ class MaxDistanceToConcCalculationRequest extends CalculationRequestBase {
     dispersionOutputConfig: Entities.DispersionOutputConfig,
     dispersionParameters: Entities.DispersionParameters,
     material: Entities.Material
-  ) {
+  }) {
     super();
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfig = dispersionOutputConfig;
-    this.dispersionParameters = dispersionParameters;
-    this.material = material;
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfig = data.dispersionOutputConfig;
+    this.dispersionParameters = data.dispersionParameters;
+    this.material = data.material;
   }
 }
 
@@ -1970,16 +1790,7 @@ export class MaxDistanceToConcCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: MaxDistanceToConcCalculationRequestSchemaData): MaxDistanceToConcCalculationRequest {
-    return new MaxDistanceToConcCalculationRequest(
-      data.scalarUdmOutputs,
-      data.weather,
-      data.dispersionRecords,
-      data.dispersionRecordCount,
-      data.substrate,
-      data.dispersionOutputConfig,
-      data.dispersionParameters,
-      data.material
-    );
+    return new MaxDistanceToConcCalculationRequest(data);
   }
 }
 
@@ -1998,16 +1809,8 @@ export class MaxDistanceToConcCalculation extends CalculationBase {
   /**
    * Calculates the maximum downwind distance to a concentration level in the direction of the wind, at the current effect height and averaging time.
    *
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion results.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords -  an array of dispersion records.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig} dispersionOutputConfig -  a dispersion output config entity.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
    */
-  constructor(
+  constructor(data: {
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
     dispersionRecords: Entities.DispersionRecord[],
@@ -2016,30 +1819,31 @@ export class MaxDistanceToConcCalculation extends CalculationBase {
     dispersionOutputConfig: Entities.DispersionOutputConfig,
     dispersionParameters: Entities.DispersionParameters,
     material: Entities.Material
-  ) {
-    super();
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfig = dispersionOutputConfig;
-    this.dispersionParameters = dispersionParameters;
-    this.material = material;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfig = data.dispersionOutputConfig;
+    this.dispersionParameters = data.dispersionParameters;
+    this.material = data.material;
   }
 
   async run() {
     try {
-      const request = new MaxDistanceToConcCalculationRequest(
-        this.scalarUdmOutputs,
-        this.weather,
-        this.dispersionRecords,
-        this.dispersionRecordCount,
-        this.substrate,
-        this.dispersionOutputConfig,
-        this.dispersionParameters,
-        this.material
-      );
+      const request = new MaxDistanceToConcCalculationRequest({
+        scalarUdmOutputs: this.scalarUdmOutputs,
+        weather: this.weather,
+        dispersionRecords: this.dispersionRecords,
+        dispersionRecordCount: this.dispersionRecordCount,
+        substrate: this.substrate,
+        dispersionOutputConfig: this.dispersionOutputConfig,
+        dispersionParameters: this.dispersionParameters,
+        material: this.material
+      });
 
       const schema = new MaxDistanceToConcCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -2101,24 +1905,22 @@ export class MaxDistanceToConcCalculationResponse extends CalculationResponseBas
   /**
    * MaxDistanceToConc calculation response class.
    *
-   * @param {number} concUsed - Concentration of interest.
-   * @param {number} distance - Maximum distance to concentration of interest.
    */
-  constructor(
+  constructor(data: {
     concUsed: number,
     distance: number,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.concUsed = concUsed;
-    this.distance = distance;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.concUsed = data.concUsed;
+    this.distance = data.distance;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -2185,14 +1987,7 @@ export class MaxDistanceToConcCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: MaxDistanceToConcCalculationResponseSchemaData): MaxDistanceToConcCalculationResponse {
-    return new MaxDistanceToConcCalculationResponse(
-      data.concUsed,
-      data.distance,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new MaxDistanceToConcCalculationResponse(data);
   }
 }
 
@@ -2220,16 +2015,8 @@ class SideviewAtTimeCalculationRequest extends CalculationRequestBase {
   /**
    * SideviewAtTime calculation request class.
    *
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion outputs.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords -  an array of dispersion records.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig} dispersionOutputConfig -  a dispersion output config entity.
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
    */
-  constructor(
+  constructor(data: {
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
     dispersionRecords: Entities.DispersionRecord[],
@@ -2238,16 +2025,16 @@ class SideviewAtTimeCalculationRequest extends CalculationRequestBase {
     dispersionOutputConfig: Entities.DispersionOutputConfig,
     material: Entities.Material,
     dispersionParameters: Entities.DispersionParameters
-  ) {
+  }) {
     super();
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfig = dispersionOutputConfig;
-    this.material = material;
-    this.dispersionParameters = dispersionParameters;
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfig = data.dispersionOutputConfig;
+    this.material = data.material;
+    this.dispersionParameters = data.dispersionParameters;
   }
 }
 
@@ -2291,16 +2078,7 @@ export class SideviewAtTimeCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: SideviewAtTimeCalculationRequestSchemaData): SideviewAtTimeCalculationRequest {
-    return new SideviewAtTimeCalculationRequest(
-      data.scalarUdmOutputs,
-      data.weather,
-      data.dispersionRecords,
-      data.dispersionRecordCount,
-      data.substrate,
-      data.dispersionOutputConfig,
-      data.material,
-      data.dispersionParameters
-    );
+    return new SideviewAtTimeCalculationRequest(data);
   }
 }
 
@@ -2319,16 +2097,8 @@ export class SideviewAtTimeCalculation extends CalculationBase {
   /**
    * Calculates the sideview of the cloud downwind from the release point and at the current averaging time.
    *
-   * @param {Entities.ScalarUdmOutputs} scalarUdmOutputs - Scalar dispersion outputs.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.DispersionRecord[]} dispersionRecords -  an array of dispersion records.
-   * @param {number} dispersionRecordCount - Number of dispersion records.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.DispersionOutputConfig} dispersionOutputConfig -  a dispersion output config entity.
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.DispersionParameters} dispersionParameters -  a dispersion parameters entity.
    */
-  constructor(
+  constructor(data: {
     scalarUdmOutputs: Entities.ScalarUdmOutputs,
     weather: Entities.Weather,
     dispersionRecords: Entities.DispersionRecord[],
@@ -2337,30 +2107,31 @@ export class SideviewAtTimeCalculation extends CalculationBase {
     dispersionOutputConfig: Entities.DispersionOutputConfig,
     material: Entities.Material,
     dispersionParameters: Entities.DispersionParameters
-  ) {
-    super();
-    this.scalarUdmOutputs = scalarUdmOutputs;
-    this.weather = weather;
-    this.dispersionRecords = dispersionRecords;
-    this.dispersionRecordCount = dispersionRecordCount;
-    this.substrate = substrate;
-    this.dispersionOutputConfig = dispersionOutputConfig;
-    this.material = material;
-    this.dispersionParameters = dispersionParameters;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.scalarUdmOutputs = data.scalarUdmOutputs;
+    this.weather = data.weather;
+    this.dispersionRecords = data.dispersionRecords;
+    this.dispersionRecordCount = data.dispersionRecordCount;
+    this.substrate = data.substrate;
+    this.dispersionOutputConfig = data.dispersionOutputConfig;
+    this.material = data.material;
+    this.dispersionParameters = data.dispersionParameters;
   }
 
   async run() {
     try {
-      const request = new SideviewAtTimeCalculationRequest(
-        this.scalarUdmOutputs,
-        this.weather,
-        this.dispersionRecords,
-        this.dispersionRecordCount,
-        this.substrate,
-        this.dispersionOutputConfig,
-        this.material,
-        this.dispersionParameters
-      );
+      const request = new SideviewAtTimeCalculationRequest({
+        scalarUdmOutputs: this.scalarUdmOutputs,
+        weather: this.weather,
+        dispersionRecords: this.dispersionRecords,
+        dispersionRecordCount: this.dispersionRecordCount,
+        substrate: this.substrate,
+        dispersionOutputConfig: this.dispersionOutputConfig,
+        material: this.material,
+        dispersionParameters: this.dispersionParameters
+      });
 
       const schema = new SideviewAtTimeCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -2427,24 +2198,22 @@ export class SideviewAtTimeCalculationResponse extends CalculationResponseBase {
   /**
    * SideviewAtTime calculation response class.
    *
-   * @param {number} concUsed - Concentration of interest.
-   * @param {Entities.LocalPosition[]} contourPoints -  an array of points along the sideview contour.
    */
-  constructor(
+  constructor(data: {
     concUsed: number,
     contourPoints: Entities.LocalPosition[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.concUsed = concUsed;
-    this.contourPoints = contourPoints;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.concUsed = data.concUsed;
+    this.contourPoints = data.contourPoints;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -2517,13 +2286,6 @@ export class SideviewAtTimeCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: SideviewAtTimeCalculationResponseSchemaData): SideviewAtTimeCalculationResponse {
-    return new SideviewAtTimeCalculationResponse(
-      data.concUsed,
-      data.contourPoints,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new SideviewAtTimeCalculationResponse(data);
   }
 }