@trafficgroup/knex-rel 0.1.27 → 0.1.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/dao/report-configuration/report-configuration.dao.d.ts +1 -1
  2. package/dist/dao/report-configuration/report-configuration.dao.js +12 -26
  3. package/dist/dao/report-configuration/report-configuration.dao.js.map +1 -1
  4. package/package.json +1 -1
  5. package/src/dao/report-configuration/report-configuration.dao.ts +12 -31
package/dist/dao/report-configuration/report-configuration.dao.d.ts CHANGED
@@ -36,7 +36,7 @@ export declare class ReportConfigurationDAO implements IBaseDAO<IReportConfigura
36
36
  * Validate a report configuration
37
37
  *
38
38
  * Rules:
39
- * - Minimum 2, maximum 7 custom classes
39
+ * - Minimum 2, maximum 13 custom classes
40
40
  * - Custom class names must be 1-30 characters
41
41
  * - FHWA classes must be in range 1-13
42
42
  * - Each FHWA class can only be mapped to one custom class (no duplicates)
package/dist/dao/report-configuration/report-configuration.dao.js CHANGED
@@ -20,12 +20,12 @@ const KnexConnection_1 = __importDefault(require("../../KnexConnection"));
20
20
  * FHWA Classes:
21
21
  * - Class 1: Motorcycles
22
22
  * - Class 2: Cars (passenger cars)
23
- * - Class 3: Pickup trucks, vans, work vans (4-tire vehicles)
23
+ * - Class 3: Pickup trucks, vans
24
24
  * - Class 4: Buses
25
- * - Class 5: 2-axle, 6-tire single unit trucks (dual rear tires)
26
- * - Classes 6-7: 3+ axle single unit trucks
25
+ * - Class 5: Work vans (2-axle, 6-tire single units)
26
+ * - Classes 6-7: Single unit trucks
27
27
  * - Class 8: Four or fewer axle single-trailer trucks
28
- * - Classes 9-10: 5+ axle articulated trucks (single-trailer)
28
+ * - Classes 9-10: Articulated trucks (single-trailer)
29
29
  * - Classes 11-13: Multi-articulated trucks (multi-trailer)
30
30
  *
31
31
  * Non-motorized vehicles (pedestrian, bicycle, non_motorized_vehicle) are EXCLUDED
@@ -37,24 +37,10 @@ const DETECTION_LABEL_TO_FHWA = {
37
37
  'pickup_truck': [3],
38
38
  'motorized_vehicle': [2], // Maps to Class 2 (cars) - ambiguous vehicles counted as cars
39
39
  'bus': [4],
40
- 'work_van': [3], // Class 3 - most work vans are 4-tire vehicles
41
- // Generic truck labels (used when axle detection unavailable - maps to FHWA range)
42
- 'single_unit_truck': [5, 6, 7], // Classes 5-7 (single unit, 2+ axles with dual rear)
43
- 'articulated_truck': [8, 9, 10], // Classes 8-10 (single-trailer)
44
- 'multi_articulated_truck': [11, 12, 13], // Classes 11-13 (multi-trailer)
45
- // FHWA-specific truck labels (used when axle detection available)
46
- // Single unit trucks (Classes 5-7)
47
- 'single_unit_truck_fhwa5': [5], // 2-axle, 6-tire single unit
48
- 'single_unit_truck_fhwa6': [6], // 3-axle single unit
49
- 'single_unit_truck_fhwa7': [7], // 4+ axle single unit
50
- // Articulated trucks (Classes 8-10)
51
- 'articulated_truck_fhwa8': [8], // 4 or fewer axle single-trailer
52
- 'articulated_truck_fhwa9': [9], // 5-axle single-trailer (classic 18-wheeler)
53
- 'articulated_truck_fhwa10': [10], // 6+ axle single-trailer
54
- // Multi-articulated trucks (Classes 11-13)
55
- 'multi_articulated_truck_fhwa11': [11], // 5 or fewer axle multi-trailer
56
- 'multi_articulated_truck_fhwa12': [12], // 6-axle multi-trailer
57
- 'multi_articulated_truck_fhwa13': [13] // 7+ axle multi-trailer
40
+ 'work_van': [5],
41
+ 'single_unit_truck': [6, 7, 8], // Classes 6-8
42
+ 'articulated_truck': [9, 10], // Classes 9-10 (single-trailer)
43
+ 'multi_articulated_truck': [11, 12, 13] // Classes 11-13 (multi-trailer)
58
44
  // pedestrian, bicycle, non_motorized_vehicle are EXCLUDED from FHWA
59
45
  };
60
46
  /**
@@ -184,7 +170,7 @@ class ReportConfigurationDAO {
184
170
  * Validate a report configuration
185
171
  *
186
172
  * Rules:
187
- * - Minimum 2, maximum 7 custom classes
173
+ * - Minimum 2, maximum 13 custom classes
188
174
  * - Custom class names must be 1-30 characters
189
175
  * - FHWA classes must be in range 1-13
190
176
  * - Each FHWA class can only be mapped to one custom class (no duplicates)
@@ -201,12 +187,12 @@ class ReportConfigurationDAO {
201
187
  errors.push('customClasses must be an array');
202
188
  return { valid: false, errors };
203
189
  }
204
- // Min 2, max 7 custom classes
190
+ // Min 2, max 13 custom classes
205
191
  if (config.customClasses.length < 2) {
206
192
  errors.push('Minimum 2 custom classes required');
207
193
  }
208
- if (config.customClasses.length > 7) {
209
- errors.push('Maximum 7 custom classes allowed');
194
+ if (config.customClasses.length > 13) {
195
+ errors.push('Maximum 13 custom classes allowed');
210
196
  }
211
197
  // Check name length (max 30 chars) and FHWA classes validity
212
198
  const allFhwaClasses = [];
package/dist/dao/report-configuration/report-configuration.dao.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"report-configuration.dao.js","sourceRoot":"","sources":["../../../src/dao/report-configuration/report-configuration.dao.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"report-configuration.dao.js","sourceRoot":"","sources":["../../../src/dao/report-configuration/report-configuration.dao.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trafficgroup/knex-rel",
3
- "version": "0.1.27",
3
+ "version": "0.1.28",
4
4
  "description": "Knex Module",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
package/src/dao/report-configuration/report-configuration.dao.ts CHANGED
@@ -14,12 +14,12 @@ import KnexManager from "../../KnexConnection";
14
14
  * FHWA Classes:
15
15
  * - Class 1: Motorcycles
16
16
  * - Class 2: Cars (passenger cars)
17
- * - Class 3: Pickup trucks, vans, work vans (4-tire vehicles)
17
+ * - Class 3: Pickup trucks, vans
18
18
  * - Class 4: Buses
19
- * - Class 5: 2-axle, 6-tire single unit trucks (dual rear tires)
20
- * - Classes 6-7: 3+ axle single unit trucks
19
+ * - Class 5: Work vans (2-axle, 6-tire single units)
20
+ * - Classes 6-7: Single unit trucks
21
21
  * - Class 8: Four or fewer axle single-trailer trucks
22
- * - Classes 9-10: 5+ axle articulated trucks (single-trailer)
22
+ * - Classes 9-10: Articulated trucks (single-trailer)
23
23
  * - Classes 11-13: Multi-articulated trucks (multi-trailer)
24
24
  *
25
25
  * Non-motorized vehicles (pedestrian, bicycle, non_motorized_vehicle) are EXCLUDED
@@ -31,29 +31,10 @@ const DETECTION_LABEL_TO_FHWA: Record<string, number[]> = {
31
31
  'pickup_truck': [3],
32
32
  'motorized_vehicle': [2], // Maps to Class 2 (cars) - ambiguous vehicles counted as cars
33
33
  'bus': [4],
34
- 'work_van': [3], // Class 3 - most work vans are 4-tire vehicles
35
-
36
- // Generic truck labels (used when axle detection unavailable - maps to FHWA range)
37
- 'single_unit_truck': [5, 6, 7], // Classes 5-7 (single unit, 2+ axles with dual rear)
38
- 'articulated_truck': [8, 9, 10], // Classes 8-10 (single-trailer)
39
- 'multi_articulated_truck': [11, 12, 13], // Classes 11-13 (multi-trailer)
40
-
41
- // FHWA-specific truck labels (used when axle detection available)
42
- // Single unit trucks (Classes 5-7)
43
- 'single_unit_truck_fhwa5': [5], // 2-axle, 6-tire single unit
44
- 'single_unit_truck_fhwa6': [6], // 3-axle single unit
45
- 'single_unit_truck_fhwa7': [7], // 4+ axle single unit
46
-
47
- // Articulated trucks (Classes 8-10)
48
- 'articulated_truck_fhwa8': [8], // 4 or fewer axle single-trailer
49
- 'articulated_truck_fhwa9': [9], // 5-axle single-trailer (classic 18-wheeler)
50
- 'articulated_truck_fhwa10': [10], // 6+ axle single-trailer
51
-
52
- // Multi-articulated trucks (Classes 11-13)
53
- 'multi_articulated_truck_fhwa11': [11], // 5 or fewer axle multi-trailer
54
- 'multi_articulated_truck_fhwa12': [12], // 6-axle multi-trailer
55
- 'multi_articulated_truck_fhwa13': [13] // 7+ axle multi-trailer
56
-
34
+ 'work_van': [5],
35
+ 'single_unit_truck': [6, 7, 8], // Classes 6-8
36
+ 'articulated_truck': [9, 10], // Classes 9-10 (single-trailer)
37
+ 'multi_articulated_truck': [11, 12, 13] // Classes 11-13 (multi-trailer)
57
38
  // pedestrian, bicycle, non_motorized_vehicle are EXCLUDED from FHWA
58
39
  };
59
40
 
@@ -183,7 +164,7 @@ export class ReportConfigurationDAO implements IBaseDAO<IReportConfiguration> {
183
164
  * Validate a report configuration
184
165
  *
185
166
  * Rules:
186
- * - Minimum 2, maximum 7 custom classes
167
+ * - Minimum 2, maximum 13 custom classes
187
168
  * - Custom class names must be 1-30 characters
188
169
  * - FHWA classes must be in range 1-13
189
170
  * - Each FHWA class can only be mapped to one custom class (no duplicates)
@@ -203,12 +184,12 @@ export class ReportConfigurationDAO implements IBaseDAO<IReportConfiguration> {
203
184
  return { valid: false, errors };
204
185
  }
205
186
 
206
- // Min 2, max 7 custom classes
187
+ // Min 2, max 13 custom classes
207
188
  if (config.customClasses.length < 2) {
208
189
  errors.push('Minimum 2 custom classes required');
209
190
  }
210
- if (config.customClasses.length > 7) {
211
- errors.push('Maximum 7 custom classes allowed');
191
+ if (config.customClasses.length > 13) {
192
+ errors.push('Maximum 13 custom classes allowed');
212
193
  }
213
194
 
214
195
  // Check name length (max 30 chars) and FHWA classes validity