onroute-policy-engine 1.4.0 → 1.5.0

package/dist/helper/bridge-calculation.helper.js

@@ -28,42 +28,43 @@ function runBridgeFormula(axleConfig, policy) {
         // Do not process once we reach the last axle unit
         // in the configuration, as they have all been calculated
         // by then.
-        if (index < axleConfig.length - 1) {
+        if (index <= axleConfig.length) {
             // Initialize the variables for our start axle
             const firstAxle = index + 1;
             let nextAxle = firstAxle + 1;
             if (!axle.numberOfAxles || axle.numberOfAxles < 0) {
                 throw new Error(`Invalid or missing number of axles for axle unit number ${firstAxle}`);
             }
-            if (!axle.weight || axle.weight < 0) {
+            if (!axle.axleUnitWeight || axle.axleUnitWeight < 0) {
                 throw new Error(`Invalid or missing weight for axle unit number ${firstAxle}`);
             }
-            let totalWeight = axle.weight;
+            let totalWeight = axle.axleUnitWeight;
             // Spread may be zero or undefined if the axle unit
             // is a single axle. Spacing to next will be zero or
             // undefined for the final axle unit in the configuration.
-            if (axle.numberOfAxles > 1 && (!axle.spread || axle.spread < 0)) {
+            if (axle.numberOfAxles > 1 && (!axle.axleSpread || axle.axleSpread < 0)) {
                 throw new Error(`Invalid or missing axle spread for axle unit number ${firstAxle}`);
             }
-            if (axle.numberOfAxles == 1 && axle.spread && axle.spread < 0) {
+            if (axle.numberOfAxles == 1 && axle.axleSpread && axle.axleSpread < 0) {
                 throw new Error(`Invalid axle spread for single axle unit, cannot be a negative number`);
             }
-            if (!axle.spacingToNext || axle.spacingToNext < 0) {
-                throw new Error(`Invalid or missing axle spacing between axle units ${firstAxle} and ${firstAxle + 1}`);
-            }
-            let wheelbase = ((_a = axle.spread) !== null && _a !== void 0 ? _a : 0) + axle.spacingToNext;
+            let wheelbase = (_a = axle.axleSpread) !== null && _a !== void 0 ? _a : 0;
             // Now loop through all of the next axles, building up a group
             // for each.
             axleConfig.slice(firstAxle).forEach((axleN) => {
-                var _a, _b;
-                if (!axleN.weight || axleN.weight < 0) {
+                var _a;
+                if (!axleN.axleUnitWeight || axleN.axleUnitWeight < 0) {
                     throw new Error(`Invalid or missing weight for axle unit number ${nextAxle}`);
                 }
-                totalWeight += axleN.weight;
-                if (axleN.numberOfAxles > 1 && (!axleN.spread || axleN.spread < 0)) {
+                totalWeight += axleN.axleUnitWeight;
+                if (axleN.numberOfAxles > 1 &&
+                    (!axleN.axleSpread || axleN.axleSpread < 0)) {
                     throw new Error(`Invalid or missing axle spread for axle unit number ${nextAxle}`);
                 }
-                wheelbase += (_a = axleN.spread) !== null && _a !== void 0 ? _a : 0;
+                if (!axleN.interaxleSpacing || axleN.interaxleSpacing < 0) {
+                    throw new Error(`Invalid or missing axle spacing between axle units ${firstAxle} and ${nextAxle}`);
+                }
+                wheelbase += ((_a = axleN.axleSpread) !== null && _a !== void 0 ? _a : 0) + axleN.interaxleSpacing;
                 // The magic is in the next line
                 const maxBridge = BRIDGE_MULTIPLIER * wheelbase + BRIDGE_MIN_WEIGHT;
                 // Push the axle group result to the results array, including
@@ -75,14 +76,6 @@ function runBridgeFormula(axleConfig, policy) {
                     actualWeight: totalWeight,
                     success: totalWeight <= maxBridge,
                 });
-                // Add the wheelbase only if this end axle unit is not the
-                // final one in the configuration
-                if (nextAxle < axleConfig.length) {
-                    if (!axleN.spacingToNext || axleN.spacingToNext < 0) {
-                        throw new Error(`Invalid or missing axle spacing between axle units ${nextAxle} and ${nextAxle + 1}`);
-                    }
-                    wheelbase += (_b = axleN.spacingToNext) !== null && _b !== void 0 ? _b : 0;
-                }
                 nextAxle++;
             });
         }

package/dist/policy-engine.d.ts

@@ -68,7 +68,7 @@ export declare class Policy {
      * other keyed on 'trailers'. Each map consists of a string id for the
      * vehicle, and a string common name for the vehicle.
      */
-    getPermittableVehicleTypes(permitTypeId: string, commodityId?: string): Map<string, Map<string, string>>;
+    getPermittableVehicleTypes(permitTypeId: string, commodityId?: string | null): Map<string, Map<string, string>>;
     /**
      * Gets a list of all allowable power unit types for the given permit type
      * and commodity.

package/dist/policy-engine.js

@@ -719,6 +719,7 @@ class Policy {
      * @param permitType Permit type definition
      */
     getAllowedVehicles(permitType) {
+        var _a;
         if (permitType.commodityRequired) {
             // If commodity is required, this method cannot be used since it
             // requires a fixed set of allowed vehicle types, not commodity-based
@@ -728,8 +729,7 @@ class Policy {
         if (!allowedVehicles) {
             return new Map();
         }
-        if (!this.specialAuthorizations ||
-            !this.specialAuthorizations.isLcvAllowed) {
+        if (!((_a = this.specialAuthorizations) === null || _a === void 0 ? void 0 : _a.isLcvAllowed)) {
             allowedVehicles = this.filterOutLongCombinationVehicles(allowedVehicles);
         }
         const allowedVehicleMap = new Map();

package/dist/types/axle-configuration.d.ts

@@ -1,8 +1,8 @@
 export type AxleConfiguration = {
     numberOfAxles: number;
-    spread?: number;
-    spacingToNext?: number;
-    weight: number;
+    axleSpread?: number;
+    interaxleSpacing?: number;
+    axleUnitWeight: number;
     numberOfTires?: number;
     tireSize?: number;
 };

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "v1.4.0";
+export declare const version = "v1.5.0";

package/dist/version.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // Generated by genversion.
-exports.version = 'v1.4.0';
+exports.version = 'v1.5.0';

package/package.json

@@ -89,5 +89,5 @@
     ],
     "testEnvironment": "node"
   },
-  "version": "v1.4.0"
+  "version": "v1.5.0"
 }