onroute-policy-engine 2.20.0 → 2.20.2

package/dist/helper/dimensions.helper.js

@@ -68,7 +68,8 @@ function getSizeDimensionHelper(policy, permitTypeId, commodityId, configuration
                 }
                 const valueOverrides = [];
                 regions === null || regions === void 0 ? void 0 : regions.forEach((r) => {
-                    var _a, _b, _c, _d;
+                    var _a;
+                    var _b, _c, _d;
                     let valueOverride;
                     // Check to see if this region has specific size dimensions
                     const regionOverride = (_a = sizeDimensionConfigured.regions) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.region == r);
@@ -396,6 +397,9 @@ function selectCorrectWeightDimensionHelper(policy, weightDimensions, configurat
                         isMatch =
                             matcher ==
                                 (isTypeMatch ? relatives.nextType : relatives.nextCategory);
+                        if (!isMatch) {
+                            break;
+                        }
                         if (isMatch && m.axles) {
                             isMatch =
                                 m.axles == axleConfiguration[axleIndex + 1].numberOfAxles;
@@ -444,7 +448,8 @@ function selectCorrectWeightDimensionHelper(policy, weightDimensions, configurat
  * @returns VehicleRelatives for the axle at the indicated axleIndex
  */
 function getVehicleRelatives(policy, configuration, axleIndex, axleUnitVehicleIndexes) {
-    var _a, _b, _c;
+    var _a, _b;
+    var _c;
     if (!configuration || configuration.length === 0) {
         throw new Error('Cannot get relatives with an empty configuration');
     }
@@ -459,7 +464,7 @@ function getVehicleRelatives(policy, configuration, axleIndex, axleUnitVehicleIn
         firstCategory: firstVehicle === null || firstVehicle === void 0 ? void 0 : firstVehicle.category,
         lastCategory: lastVehicle === null || lastVehicle === void 0 ? void 0 : lastVehicle.category,
     };
-    const vehicleIndex = (_a = axleUnitVehicleIndexes === null || axleUnitVehicleIndexes === void 0 ? void 0 : axleUnitVehicleIndexes[axleIndex]) !== null && _a !== void 0 ? _a : axleIndex - 1;
+    const vehicleIndex = (_c = axleUnitVehicleIndexes === null || axleUnitVehicleIndexes === void 0 ? void 0 : axleUnitVehicleIndexes[axleIndex]) !== null && _c !== void 0 ? _c : axleIndex - 1;
     if (vehicleIndex <= 0) {
         // First two axles are for the power unit which has no
         // previous type (it is first in the configuration always)
@@ -469,7 +474,7 @@ function getVehicleRelatives(policy, configuration, axleIndex, axleUnitVehicleIn
     else {
         const prevVehicleType = walk(policy, configuration, vehicleIndex - 1, -1);
         vehicleRelatives.prevType = prevVehicleType === null || prevVehicleType === void 0 ? void 0 : prevVehicleType.id;
-        vehicleRelatives.prevCategory = (_b = policy.getVehicleDefinition(vehicleRelatives.prevType)) === null || _b === void 0 ? void 0 : _b.category;
+        vehicleRelatives.prevCategory = (_a = policy.getVehicleDefinition(vehicleRelatives.prevType)) === null || _a === void 0 ? void 0 : _a.category;
     }
     if (configuration.length === 1 || vehicleIndex >= configuration.length - 1) {
         // The axleIndex is for the last vehicle in the configuration,
@@ -482,7 +487,7 @@ function getVehicleRelatives(policy, configuration, axleIndex, axleUnitVehicleIn
         // pseudo vehicle in the line.
         const nextVehicleType = walk(policy, configuration, vehicleIndex + 1, 1);
         vehicleRelatives.nextType = nextVehicleType === null || nextVehicleType === void 0 ? void 0 : nextVehicleType.id;
-        vehicleRelatives.nextCategory = (_c = policy.getVehicleDefinition(vehicleRelatives.nextType)) === null || _c === void 0 ? void 0 : _c.category;
+        vehicleRelatives.nextCategory = (_b = policy.getVehicleDefinition(vehicleRelatives.nextType)) === null || _b === void 0 ? void 0 : _b.category;
     }
     return vehicleRelatives;
 }

package/dist/helper/policy-check.helper.d.ts

@@ -212,7 +212,7 @@ export declare function CheckPickerTruckTractorWeightRestrictions(policy: Policy
  * @see PolicyCheck
  * @see AxleGroupPolicyCheckResult
  */
-export declare function CheckMinDriveAxleWeight(_policy: Policy, _vehicleConfiguration: Array<string>, axleConfiguration: Array<AxleConfiguration>): Array<PolicyCheckResult>;
+export declare function CheckMinDriveAxleWeight(_policy: Policy, vehicleConfiguration: Array<string>, axleConfiguration: Array<AxleConfiguration>): Array<PolicyCheckResult>;
 /**
  * Validates maximum tire load capacity for each axle unit based on tire size and count.
  *

package/dist/helper/policy-check.helper.js

@@ -618,22 +618,29 @@ function CheckPickerTruckTractorWeightRestrictions(policy, vehicleConfiguration,
  * @see PolicyCheck
  * @see AxleGroupPolicyCheckResult
  */
-// TODO this evaluation should only be applied to certain vehicle subtypes, await spec update
-function CheckMinDriveAxleWeight(_policy, _vehicleConfiguration, axleConfiguration) {
+function CheckMinDriveAxleWeight(_policy, vehicleConfiguration, axleConfiguration) {
     const policyCheckResults = new Array();
     const policyId = enum_1.PolicyCheckId.MinDriveAxleWeight;
     const gvcw = axleConfiguration.reduce((w, curr) => w + curr.axleUnitWeight, 0);
     let message, result;
-    if (axleConfiguration[1].numberOfAxles === 2 ||
-        axleConfiguration[1].numberOfAxles === 3) {
+    const powerUnitSubtype = vehicleConfiguration[0];
+    const driveAxle = axleConfiguration[1];
+    const isTandemDrive = driveAxle.numberOfAxles === 2;
+    const isTridemDrive = driveAxle.numberOfAxles === 3;
+    // TODO we need to add Truck with PME and Truck Tractor with PME when ready
+    const isSupportedVehicleSubtype = (value) => {
+        return value === 'REGTRCK' || value === 'TRKTRAC' || value === 'PICKRTT';
+    };
+    if ((isTandemDrive || isTridemDrive) &&
+        isSupportedVehicleSubtype(powerUnitSubtype)) {
         let targetMinWeight = gvcw * 0.2;
-        if (axleConfiguration[1].numberOfAxles === 2) {
+        if (isTandemDrive) {
             targetMinWeight = Math.min(targetMinWeight, 23000);
         }
-        else if (axleConfiguration[1].numberOfAxles === 3) {
+        else if (isTridemDrive) {
             targetMinWeight = Math.min(targetMinWeight, 28000);
         }
-        if (axleConfiguration[1].axleUnitWeight >= targetMinWeight) {
+        if (driveAxle.axleUnitWeight >= targetMinWeight) {
             message = 'Drive axle meets minimum weight requirements';
             result = enum_1.PolicyCheckResultType.Pass;
         }
@@ -643,7 +650,7 @@ function CheckMinDriveAxleWeight(_policy, _vehicleConfiguration, axleConfigurati
         }
     }
     else {
-        // This policy check is only for tandem or tridem drive power units
+        // This policy check is only for tandem or tridem drive power units with supported vehicle sub-type
         message = 'Policy check does not apply to this configuration';
         result = enum_1.PolicyCheckResultType.Pass;
     }
@@ -651,9 +658,8 @@ function CheckMinDriveAxleWeight(_policy, _vehicleConfiguration, axleConfigurati
         id: policyId,
         message: message,
         result: result,
-        // TODO both start and end axle units should be the drive axle, is this always the second axle unit in the configuration? Or is it the last axle unit of the power unit configuration?
         startAxleUnit: 1,
-        endAxleUnit: axleConfiguration.length,
+        endAxleUnit: 1,
     });
     return policyCheckResults;
 }

package/dist/helper/vehicles.helper.js

@@ -129,9 +129,6 @@ function getSimplifiedVehicleConfigurationHelper(vehicleDetails, vehicleConfigur
  */
 function combineAxleConfigurationsHelper(powerUnitAxleConfiguration, trailers) {
     const powerUnitAxles = powerUnitAxleConfiguration.map((axle) => (Object.assign(Object.assign({}, axle), { vehicleIndex: 0 })));
-    const trailerAxles = trailers.flatMap((trailer, trailerIndex) => {
-        var _a;
-        return ((_a = trailer.axleConfiguration) !== null && _a !== void 0 ? _a : []).map((axle) => (Object.assign(Object.assign({}, axle), { vehicleIndex: trailerIndex + 1 })));
-    });
+    const trailerAxles = trailers.flatMap((trailer, trailerIndex) => { var _a; return ((_a = trailer.axleConfiguration) !== null && _a !== void 0 ? _a : []).map((axle) => (Object.assign(Object.assign({}, axle), { vehicleIndex: trailerIndex + 1 }))); });
     return [...powerUnitAxles, ...trailerAxles];
 }

package/dist/validation-results.js

@@ -36,14 +36,15 @@ class ValidationResults {
         this.cost = [];
         if (engineResult) {
             engineResult.events.forEach((e) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h;
-                const message = (_b = (_a = e.params) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : `Unknown message: params=${JSON.stringify(e.params)}`;
-                const code = (_d = (_c = e.params) === null || _c === void 0 ? void 0 : _c.code) !== null && _d !== void 0 ? _d : validation_result_code_1.ValidationResultCode.GeneralResult;
-                const type = (_e = e.type) !== null && _e !== void 0 ? _e : validation_result_type_1.ValidationResultType.Violation.toString();
+                var _a, _b, _c, _d, _e;
+                var _f, _g, _h;
+                const message = (_f = (_a = e.params) === null || _a === void 0 ? void 0 : _a.message) !== null && _f !== void 0 ? _f : `Unknown message: params=${JSON.stringify(e.params)}`;
+                const code = (_g = (_b = e.params) === null || _b === void 0 ? void 0 : _b.code) !== null && _g !== void 0 ? _g : validation_result_code_1.ValidationResultCode.GeneralResult;
+                const type = (_h = e.type) !== null && _h !== void 0 ? _h : validation_result_type_1.ValidationResultType.Violation.toString();
                 const result = new validation_result_1.ValidationResult(type, code, message);
-                result.fieldReference = (_f = e.params) === null || _f === void 0 ? void 0 : _f.fieldReference;
-                result.cost = (_g = e.params) === null || _g === void 0 ? void 0 : _g.cost;
-                result.details = (_h = e.params) === null || _h === void 0 ? void 0 : _h.details;
+                result.fieldReference = (_c = e.params) === null || _c === void 0 ? void 0 : _c.fieldReference;
+                result.cost = (_d = e.params) === null || _d === void 0 ? void 0 : _d.cost;
+                result.details = (_e = e.params) === null || _e === void 0 ? void 0 : _e.details;
                 switch (type) {
                     case validation_result_type_1.ValidationResultType.Violation:
                         this.violations.push(result);

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "v2.20.0";
+export declare const version = "v2.20.2";

package/dist/version.js

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

package/package.json

@@ -91,5 +91,5 @@
     ],
     "testEnvironment": "node"
   },
-  "version": "v2.20.0"
+  "version": "v2.20.2"
 }