diff --git a/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/design/conventional-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/design/conventional-design.component.html index 5f2fe21..69723eb 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/design/conventional-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/design/conventional-design.component.html @@ -11,7 +11,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_vc}} V / C Zone 5 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/design/conventional-shared-right-turn-left-turn-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/design/conventional-shared-right-turn-left-turn-design.component.html index 69619c1..b4323ec 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/design/conventional-shared-right-turn-left-turn-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/design/conventional-shared-right-turn-left-turn-design.component.html @@ -11,7 +11,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_vc}} V / C Zone 5 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/design/full-displaced-left-turn-intersection-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/design/full-displaced-left-turn-intersection-design.component.html index f081a09..fee136c 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/design/full-displaced-left-turn-intersection-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/design/full-displaced-left-turn-intersection-design.component.html @@ -20,7 +20,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_vc}} V / C Zone 3 @@ -29,7 +29,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone4_west_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone4_west_vc}} V / C Zone 4 @@ -38,7 +38,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_vc}} V / C Zone 5 @@ -47,7 +47,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_vc}} V / C Zone 2 @@ -56,7 +56,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone1_north_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone1_north_vc}} V / C Zone 1 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component.html index aee74bf..a585ed6 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component.html @@ -16,7 +16,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_vc}} V / C Zone 3 @@ -25,7 +25,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone4_west_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone4_west_vc}} V / C Zone 4 @@ -34,7 +34,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_vc}} V / C Zone 5 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/design/median-uturn-intersection-north-south-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/design/median-uturn-intersection-north-south-design.component.html index e5e1938..558e558 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/design/median-uturn-intersection-north-south-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/design/median-uturn-intersection-north-south-design.component.html @@ -16,7 +16,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_vc}} V / C Zone 5 @@ -25,7 +25,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_vc}} V / C Zone 2 @@ -34,7 +34,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone1_north_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone1_north_vc}} V / C Zone 1 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/design/partial-displaced-left-turn-intersection-east-west-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/design/partial-displaced-left-turn-intersection-east-west-design.component.html index fbdac20..d6124c7 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/design/partial-displaced-left-turn-intersection-east-west-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/design/partial-displaced-left-turn-intersection-east-west-design.component.html @@ -23,7 +23,7 @@ {{(capxStateService.state.get(junctions.PartialDisplacedLeftTurnIntersectionEastWest).intersectionResult | async).zone3_east_clv}} - + {{(capxStateService.state.get(junctions.PartialDisplacedLeftTurnIntersectionEastWest).intersectionResult | async).zone3_east_vc}} V / C Zone 3 @@ -32,7 +32,7 @@ {{(capxStateService.state.get(junctions.PartialDisplacedLeftTurnIntersectionEastWest).intersectionResult | async).zone4_west_clv}} - + {{(capxStateService.state.get(junctions.PartialDisplacedLeftTurnIntersectionEastWest).intersectionResult | async).zone4_west_vc}} V / C Zone 4 @@ -41,7 +41,7 @@ {{(capxStateService.state.get(junctions.PartialDisplacedLeftTurnIntersectionEastWest).intersectionResult | async).zone5_center_clv}} - + {{(capxStateService.state.get(junctions.PartialDisplacedLeftTurnIntersectionEastWest).intersectionResult | async).zone5_center_vc}} V / C Zone 5 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/design/partial-displaced-left-turn-intersection-north-south-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/design/partial-displaced-left-turn-intersection-north-south-design.component.html index 167feed..e5e2a5c 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/design/partial-displaced-left-turn-intersection-north-south-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/design/partial-displaced-left-turn-intersection-north-south-design.component.html @@ -23,7 +23,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_vc}} V / C Zone 2 @@ -32,7 +32,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone1_north_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone1_north_vc}} V / C Zone 1 @@ -41,7 +41,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_vc}} V / C Zone 5 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/design/partial-median-uturn-intersection-east-west-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/design/partial-median-uturn-intersection-east-west-design.component.html index 1a65af2..83f25a0 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/design/partial-median-uturn-intersection-east-west-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/design/partial-median-uturn-intersection-east-west-design.component.html @@ -16,7 +16,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_vc}} V / C Zone 3 @@ -25,7 +25,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone4_west_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone4_west_vc}} V / C Zone 4 @@ -34,7 +34,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_vc}} V / C Zone 5 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/design/partial-median-uturn-intersection-north-south-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/design/partial-median-uturn-intersection-north-south-design.component.html index 9502c70..159ecaf 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/design/partial-median-uturn-intersection-north-south-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/design/partial-median-uturn-intersection-north-south-design.component.html @@ -16,7 +16,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_vc}} V / C Zone 5 @@ -25,7 +25,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_vc}} V / C Zone 2 @@ -34,7 +34,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone1_north_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone1_north_vc}} V / C Zone 1 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/design/quadrant-roadway-intersection-north-east-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/design/quadrant-roadway-intersection-north-east-design.component.html index 94c5faf..2d5000b 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/design/quadrant-roadway-intersection-north-east-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/design/quadrant-roadway-intersection-north-east-design.component.html @@ -16,7 +16,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_vc}} V / C Zone 5 @@ -25,7 +25,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone1_north_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone1_north_vc}} V / C Zone 1 @@ -34,7 +34,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_vc}} V / C Zone 3 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/design/quadrant-roadway-intersection-north-west-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/design/quadrant-roadway-intersection-north-west-design.component.html index 5e0b357..8af590b 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/design/quadrant-roadway-intersection-north-west-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/design/quadrant-roadway-intersection-north-west-design.component.html @@ -23,7 +23,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_vc}} V / C Zone 2 @@ -32,7 +32,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_vc}} V / C Zone 5 @@ -41,7 +41,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_vc}} V / C Zone 3 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/design/quadrant-roadway-intersection-south-east-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/design/quadrant-roadway-intersection-south-east-design.component.html index 30035fb..0cac1fc 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/design/quadrant-roadway-intersection-south-east-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/design/quadrant-roadway-intersection-south-east-design.component.html @@ -23,7 +23,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_vc}} V / C Zone 2 @@ -32,7 +32,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_vc}} V / C Zone 5 @@ -41,7 +41,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_vc}} V / C Zone 3 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/design/quadrant-roadway-intersection-south-west-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/design/quadrant-roadway-intersection-south-west-design.component.html index 1eef98b..f5d5f48 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/design/quadrant-roadway-intersection-south-west-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/design/quadrant-roadway-intersection-south-west-design.component.html @@ -16,7 +16,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_vc}} V / C Zone 2 @@ -25,7 +25,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone4_west_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone4_west_vc}} V / C Zone 4 @@ -34,7 +34,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone5_center_vc}} V / C Zone 5 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/design/restricted-crossing-uturn-intersection-east-west-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/design/restricted-crossing-uturn-intersection-east-west-design.component.html index b9c80c2..93d7553 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/design/restricted-crossing-uturn-intersection-east-west-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/design/restricted-crossing-uturn-intersection-east-west-design.component.html @@ -18,7 +18,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_vc}} V / C Zone 3 @@ -27,7 +27,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone4_west_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone4_west_vc}} V / C Zone 4 @@ -36,7 +36,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_vc}} V / C Zone 2 @@ -45,7 +45,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone1_north_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone1_north_vc}} V / C Zone 1 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/design/restricted-crossing-uturn-intersection-north-south-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/design/restricted-crossing-uturn-intersection-north-south-design.component.html index 317b8ba..da012a4 100644 --- a/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/design/restricted-crossing-uturn-intersection-north-south-design.component.html +++ b/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/design/restricted-crossing-uturn-intersection-north-south-design.component.html @@ -18,7 +18,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone3_east_vc}} V / C Zone 3 @@ -27,7 +27,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone4_west_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone4_west_vc}} V / C Zone 4 @@ -36,7 +36,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone2_south_vc}} V / C Zone 2 @@ -45,7 +45,7 @@ {{(capxStateService.state.get(junctionName).intersectionResult | async).zone1_north_clv}} - + {{(capxStateService.state.get(junctionName).intersectionResult | async).zone1_north_vc}} V / C Zone 1 diff --git a/projects/capx/src/app/capx/pipes/vc-style.pipe.ts b/projects/capx/src/app/capx/pipes/vc-style.pipe.ts index 1734228..0ce3251 100644 --- a/projects/capx/src/app/capx/pipes/vc-style.pipe.ts +++ b/projects/capx/src/app/capx/pipes/vc-style.pipe.ts @@ -5,8 +5,20 @@ import { Pipe, PipeTransform } from '@angular/core'; }) export class VcStylePipe implements PipeTransform { - transform(value: unknown, ...args: unknown[]): unknown { - return null; + transform(cv: number): string { + let color = '#666'; + if (cv !== null) { + if (cv < 0.75) { + color = '#00FF00'; + } else if (cv >= 0.75 && cv < 0.875) { + color = '#FFFF00'; + } else if (cv >= 0.875 && cv < 1) { + color = '#FFA500'; + } else if (cv > 1) { + color = '#FF0000'; + } + } + return color; } } diff --git a/projects/capx/src/app/capx/services/capx-state.service.ts b/projects/capx/src/app/capx/services/capx-state.service.ts index 08e452d..9c8d578 100644 --- a/projects/capx/src/app/capx/services/capx-state.service.ts +++ b/projects/capx/src/app/capx/services/capx-state.service.ts @@ -831,6 +831,7 @@ export class CapxStateService { } } + public getCurrentClvRange(zone_all_clv: string | number | null): number | null { // update range text console.log(zone_all_clv);