diff --git a/artifacts/junctions/svg/conventional-shared-right-turn-left-turn.svg b/artifacts/junctions/svg/conventional-shared-right-turn-left-turn.svg
index 7e37662..d8ca094 100644
--- a/artifacts/junctions/svg/conventional-shared-right-turn-left-turn.svg
+++ b/artifacts/junctions/svg/conventional-shared-right-turn-left-turn.svg
@@ -7,10 +7,10 @@
-
+
662
-
+
0.41
V / C
Zone 5
diff --git a/artifacts/junctions/svg/conventional.svg b/artifacts/junctions/svg/conventional.svg
index db6d77c..d9ccdfb 100644
--- a/artifacts/junctions/svg/conventional.svg
+++ b/artifacts/junctions/svg/conventional.svg
@@ -7,10 +7,10 @@
-
+
662
-
+
0.41
V / C
Zone 5
diff --git a/artifacts/junctions/svg/full-displaced-left-turn-intersection.svg b/artifacts/junctions/svg/full-displaced-left-turn-intersection.svg
index 43a14f1..46841aa 100644
--- a/artifacts/junctions/svg/full-displaced-left-turn-intersection.svg
+++ b/artifacts/junctions/svg/full-displaced-left-turn-intersection.svg
@@ -16,46 +16,46 @@
-
+
662
-
+
0.41
V / C
Zone 3
-
+
662
-
+
0.41
V / C
Zone 4
-
+
662
-
+
0.41
V / C
Zone 5
-
+
662
-
+
0.41
V / C
Zone 2
-
+
662
-
+
0.41
V / C
Zone 1
diff --git a/artifacts/junctions/svg/median-uturn-intersection-east-west.svg b/artifacts/junctions/svg/median-uturn-intersection-east-west.svg
index cbb898a..06c4993 100644
--- a/artifacts/junctions/svg/median-uturn-intersection-east-west.svg
+++ b/artifacts/junctions/svg/median-uturn-intersection-east-west.svg
@@ -12,28 +12,28 @@
-
+
662
-
+
0.41
V / C
Zone 3
-
+
662
-
+
0.41
V / C
Zone 4
-
+
662
-
+
0.41
V / C
Zone 5
diff --git a/artifacts/junctions/svg/median-uturn-intersection-north-south.svg b/artifacts/junctions/svg/median-uturn-intersection-north-south.svg
index c9957d5..dd9fc88 100644
--- a/artifacts/junctions/svg/median-uturn-intersection-north-south.svg
+++ b/artifacts/junctions/svg/median-uturn-intersection-north-south.svg
@@ -12,28 +12,28 @@
-
+
662
-
+
0.41
V / C
Zone 5
-
+
662
-
+
0.41
V / C
Zone 2
-
+
662
-
+
0.41
V / C
Zone 1
diff --git a/artifacts/junctions/svg/partial-displaced-left-turn-intersection-east-west.svg b/artifacts/junctions/svg/partial-displaced-left-turn-intersection-east-west.svg
index bde6513..b92eae8 100644
--- a/artifacts/junctions/svg/partial-displaced-left-turn-intersection-east-west.svg
+++ b/artifacts/junctions/svg/partial-displaced-left-turn-intersection-east-west.svg
@@ -19,28 +19,28 @@
-
+
662
-
+
0.41
V / C
Zone 3
-
+
662
-
+
0.41
V / C
Zone 4
-
+
662
-
+
0.41
V / C
Zone 5
diff --git a/artifacts/junctions/svg/partial-displaced-left-turn-intersection-north-south.svg b/artifacts/junctions/svg/partial-displaced-left-turn-intersection-north-south.svg
index ca15253..a591133 100644
--- a/artifacts/junctions/svg/partial-displaced-left-turn-intersection-north-south.svg
+++ b/artifacts/junctions/svg/partial-displaced-left-turn-intersection-north-south.svg
@@ -19,28 +19,28 @@
-
+
662
-
+
0.41
V / C
Zone 2
-
+
662
-
+
0.41
V / C
Zone 1
-
+
662
-
+
0.41
V / C
Zone 5
diff --git a/artifacts/junctions/svg/partial-median-uturn-intersection-east-west.svg b/artifacts/junctions/svg/partial-median-uturn-intersection-east-west.svg
index 6fc0494..689e5a1 100644
--- a/artifacts/junctions/svg/partial-median-uturn-intersection-east-west.svg
+++ b/artifacts/junctions/svg/partial-median-uturn-intersection-east-west.svg
@@ -12,28 +12,28 @@
-
+
662
-
+
0.41
V / C
Zone 3
-
+
662
-
+
0.41
V / C
Zone 4
-
+
662
-
+
0.41
V / C
Zone 5
diff --git a/artifacts/junctions/svg/partial-median-uturn-intersection-north-south.svg b/artifacts/junctions/svg/partial-median-uturn-intersection-north-south.svg
index 0cc60fc..ab27c4b 100644
--- a/artifacts/junctions/svg/partial-median-uturn-intersection-north-south.svg
+++ b/artifacts/junctions/svg/partial-median-uturn-intersection-north-south.svg
@@ -12,28 +12,28 @@
-
+
662
-
+
0.41
V / C
Zone 5
-
+
662
-
+
0.41
V / C
Zone 2
-
+
662
-
+
0.41
V / C
Zone 1
diff --git a/artifacts/junctions/svg/quadrant-roadway-intersection-north-east.svg b/artifacts/junctions/svg/quadrant-roadway-intersection-north-east.svg
index dd0e277..4bcd8c2 100644
--- a/artifacts/junctions/svg/quadrant-roadway-intersection-north-east.svg
+++ b/artifacts/junctions/svg/quadrant-roadway-intersection-north-east.svg
@@ -12,28 +12,28 @@
-
+
662
-
+
0.41
V / C
Zone 5
-
+
662
-
+
0.41
V / C
Zone 1
-
+
662
-
+
0.41
V / C
Zone 3
diff --git a/artifacts/junctions/svg/quadrant-roadway-intersection-north-west.svg b/artifacts/junctions/svg/quadrant-roadway-intersection-north-west.svg
index 4c1305f..c85f064 100644
--- a/artifacts/junctions/svg/quadrant-roadway-intersection-north-west.svg
+++ b/artifacts/junctions/svg/quadrant-roadway-intersection-north-west.svg
@@ -19,28 +19,28 @@
-
+
662
-
+
0.41
V / C
Zone 1
-
+
662
-
+
0.41
V / C
Zone 4
-
+
662
-
+
0.41
V / C
Zone 5
diff --git a/artifacts/junctions/svg/quadrant-roadway-intersection-south-east.svg b/artifacts/junctions/svg/quadrant-roadway-intersection-south-east.svg
index c7f696f..575130c 100644
--- a/artifacts/junctions/svg/quadrant-roadway-intersection-south-east.svg
+++ b/artifacts/junctions/svg/quadrant-roadway-intersection-south-east.svg
@@ -19,28 +19,28 @@
-
+
662
-
+
0.41
V / C
Zone 2
-
+
662
-
+
0.41
V / C
Zone 5
-
+
662
-
+
0.41
V / C
Zone 3
diff --git a/artifacts/junctions/svg/quadrant-roadway-intersection-south-west.svg b/artifacts/junctions/svg/quadrant-roadway-intersection-south-west.svg
index a515558..8e96d45 100644
--- a/artifacts/junctions/svg/quadrant-roadway-intersection-south-west.svg
+++ b/artifacts/junctions/svg/quadrant-roadway-intersection-south-west.svg
@@ -12,28 +12,28 @@
-
+
662
-
+
0.41
V / C
Zone 2
-
+
662
-
+
0.41
V / C
Zone 4
-
+
662
-
+
0.41
V / C
Zone 5
diff --git a/artifacts/junctions/svg/restricted-crossing-uturn-intersection-east-west.svg b/artifacts/junctions/svg/restricted-crossing-uturn-intersection-east-west.svg
index 41ae25c..575c951 100644
--- a/artifacts/junctions/svg/restricted-crossing-uturn-intersection-east-west.svg
+++ b/artifacts/junctions/svg/restricted-crossing-uturn-intersection-east-west.svg
@@ -14,37 +14,37 @@
-
+
662
-
+
0.41
V / C
Zone 3
-
+
662
-
+
0.41
V / C
Zone 4
-
+
662
-
+
0.41
V / C
Zone 2
-
+
662
-
+
0.41
V / C
Zone 1
diff --git a/artifacts/junctions/svg/restricted-crossing-uturn-intersection-north-south.svg b/artifacts/junctions/svg/restricted-crossing-uturn-intersection-north-south.svg
index c0e8243..768bb50 100644
--- a/artifacts/junctions/svg/restricted-crossing-uturn-intersection-north-south.svg
+++ b/artifacts/junctions/svg/restricted-crossing-uturn-intersection-north-south.svg
@@ -14,37 +14,37 @@
-
+
662
-
+
0.41
V / C
Zone 3
-
+
662
-
+
0.41
V / C
Zone 4
-
+
662
-
+
0.41
V / C
Zone 2
-
+
662
-
+
0.41
V / C
Zone 1
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 006dcc5..3e370f1 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
@@ -8,11 +8,11 @@
-
- 662
+
+ {{(capxStateService.state.get(junctions.ConventionalSharedRTLN).intersectionResult | async).zone5_center_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.ConventionalSharedRTLN).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.ts 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.ts
index 9b3f022..af1666e 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.ts
+++ 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.ts
@@ -1,4 +1,6 @@
+import { CapxStateService } from './../../../../../services/capx-state.service';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Junctions } from './../../../../../services/models/junctions';
@Component({
selector: 'capx-conventional-shared-right-turn-left-turn-design',
@@ -8,7 +10,8 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
})
export class ConventionalSharedRightTurnLeftTurnDesignComponent implements OnInit {
- constructor() { }
+ junctions = Junctions;
+ constructor(public capxStateService: CapxStateService) { }
ngOnInit(): void {
}
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 d91660d..f17de82 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
@@ -17,47 +17,47 @@
-
- 662
+
+ {{(capxStateService.state.get(junctions.FullDisplacedLeftTurnIntersection).intersectionResult | async).zone3_east_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.FullDisplacedLeftTurnIntersection).intersectionResult | async).zone3_east_vc}}
V / C
Zone 3
-
- 662
+
+ {{(capxStateService.state.get(junctions.FullDisplacedLeftTurnIntersection).intersectionResult | async).zone4_west_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.FullDisplacedLeftTurnIntersection).intersectionResult | async).zone4_west_vc}}
V / C
Zone 4
-
- 662
+
+ {{(capxStateService.state.get(junctions.FullDisplacedLeftTurnIntersection).intersectionResult | async).zone5_center_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.FullDisplacedLeftTurnIntersection).intersectionResult | async).zone5_center_vc}}
V / C
Zone 5
-
- 662
+
+ {{(capxStateService.state.get(junctions.FullDisplacedLeftTurnIntersection).intersectionResult | async).zone2_south_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.FullDisplacedLeftTurnIntersection).intersectionResult | async).zone2_south_vc}}
V / C
Zone 2
-
- 662
+
+ {{(capxStateService.state.get(junctions.FullDisplacedLeftTurnIntersection).intersectionResult | async).zone1_north_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.FullDisplacedLeftTurnIntersection).intersectionResult | async).zone1_north_vc}}
V / C
Zone 1
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.ts b/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/design/full-displaced-left-turn-intersection-design.component.ts
index aeebdd2..dd873f3 100644
--- a/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/design/full-displaced-left-turn-intersection-design.component.ts
+++ b/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/design/full-displaced-left-turn-intersection-design.component.ts
@@ -1,4 +1,6 @@
+import { CapxStateService } from './../../../../../services/capx-state.service';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Junctions } from './../../../../../services/models/junctions';
@Component({
selector: 'capx-full-displaced-left-turn-intersection-design',
@@ -8,7 +10,8 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
})
export class FullDisplacedLeftTurnIntersectionDesignComponent implements OnInit {
- constructor() { }
+ junctions = Junctions;
+ constructor(public capxStateService: CapxStateService) { }
ngOnInit(): void {
}
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 b7038e0..ea49ff1 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
@@ -13,29 +13,29 @@
-
- 662
+
+ {{(capxStateService.state.get(junctions.MedianUTurnIntersectionEastWest).intersectionResult | async).zone3_east_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.MedianUTurnIntersectionEastWest).intersectionResult | async).zone3_east_vc}}
V / C
Zone 3
-
- 662
+
+ {{(capxStateService.state.get(junctions.MedianUTurnIntersectionEastWest).intersectionResult | async).zone4_west_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.MedianUTurnIntersectionEastWest).intersectionResult | async).zone4_west_vc}}
V / C
Zone 4
-
- 662
+
+ {{(capxStateService.state.get(junctions.MedianUTurnIntersectionEastWest).intersectionResult | async).zone5_center_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.MedianUTurnIntersectionEastWest).intersectionResult | async).zone5_center_vc}}
V / C
Zone 5
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.ts b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component.ts
index c424c5a..2b95e30 100644
--- a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component.ts
+++ b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component.ts
@@ -1,13 +1,18 @@
-import { Component, OnInit } from '@angular/core';
+import { CapxStateService } from './../../../../../services/capx-state.service';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Junctions } from './../../../../../services/models/junctions';
@Component({
selector: 'capx-median-uturn-intersection-east-west-design',
templateUrl: './median-uturn-intersection-east-west-design.component.html',
- styleUrls: ['./median-uturn-intersection-east-west-design.component.scss']
+ styleUrls: ['./median-uturn-intersection-east-west-design.component.scss'],
+ changeDetection: ChangeDetectionStrategy.OnPush
})
export class MedianUTurnIntersectionEastWestDesignComponent implements OnInit {
- constructor() { }
+ junctions = Junctions;
+ constructor(public capxStateService: CapxStateService) { }
+
ngOnInit(): void {
}
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 ce5d9ed..993ee25 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
@@ -13,29 +13,29 @@
-
- 662
+
+ {{(capxStateService.state.get(junctions.MedianUTurnIntersectionNorthSouth).intersectionResult | async).zone5_center_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.MedianUTurnIntersectionNorthSouth).intersectionResult | async).zone5_center_vc}}
V / C
Zone 5
-
- 662
+
+ {{(capxStateService.state.get(junctions.MedianUTurnIntersectionNorthSouth).intersectionResult | async).zone2_south_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.MedianUTurnIntersectionNorthSouth).intersectionResult | async).zone2_south_vc}}
V / C
Zone 2
-
- 662
+
+ {{(capxStateService.state.get(junctions.MedianUTurnIntersectionNorthSouth).intersectionResult | async).zone1_north_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.MedianUTurnIntersectionNorthSouth).intersectionResult | async).zone1_north_vc}}
V / C
Zone 1
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.ts b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/design/median-uturn-intersection-north-south-design.component.ts
index 4f69c57..f445c77 100644
--- a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/design/median-uturn-intersection-north-south-design.component.ts
+++ b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/design/median-uturn-intersection-north-south-design.component.ts
@@ -1,4 +1,6 @@
+import { CapxStateService } from './../../../../../services/capx-state.service';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Junctions } from './../../../../../services/models/junctions';
@Component({
selector: 'capx-median-uturn-intersection-north-south-design',
@@ -8,7 +10,9 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
})
export class MedianUTurnIntersectionNorthSouthDesignComponent implements OnInit {
- constructor() { }
+ junctions = Junctions;
+ constructor(public capxStateService: CapxStateService) { }
+
ngOnInit(): void {
}
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 1634617..fbdac20 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
@@ -20,29 +20,29 @@
-
- 662
+
+ {{(capxStateService.state.get(junctions.PartialDisplacedLeftTurnIntersectionEastWest).intersectionResult | async).zone3_east_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.PartialDisplacedLeftTurnIntersectionEastWest).intersectionResult | async).zone3_east_vc}}
V / C
Zone 3
-
- 662
+
+ {{(capxStateService.state.get(junctions.PartialDisplacedLeftTurnIntersectionEastWest).intersectionResult | async).zone4_west_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.PartialDisplacedLeftTurnIntersectionEastWest).intersectionResult | async).zone4_west_vc}}
V / C
Zone 4
-
- 662
+
+ {{(capxStateService.state.get(junctions.PartialDisplacedLeftTurnIntersectionEastWest).intersectionResult | async).zone5_center_clv}}
-
- 0.41
+
+ {{(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-east-west-junction/design/partial-displaced-left-turn-intersection-east-west-design.component.ts 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.ts
index 8aae93a..fdaa1f9 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.ts
+++ 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.ts
@@ -1,4 +1,6 @@
+import { CapxStateService } from './../../../../../services/capx-state.service';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Junctions } from './../../../../../services/models/junctions';
@Component({
selector: 'capx-partial-displaced-left-turn-intersection-east-west-design',
@@ -8,7 +10,8 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
})
export class PartialDisplacedLeftTurnIntersectionEastWestDesignComponent implements OnInit {
- constructor() { }
+ junctions = Junctions;
+ constructor(public capxStateService: CapxStateService) { }
ngOnInit(): void {
}
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 e7afae2..b44cd30 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
@@ -13,29 +13,29 @@
-
- 662
+
+ {{(capxStateService.state.get(junctions.PartialMedianUTurnIntersectionEastWest).intersectionResult | async).zone3_east_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.PartialMedianUTurnIntersectionEastWest).intersectionResult | async).zone3_east_vc}}
V / C
Zone 3
-
- 662
+
+ {{(capxStateService.state.get(junctions.PartialMedianUTurnIntersectionEastWest).intersectionResult | async).zone4_west_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.PartialMedianUTurnIntersectionEastWest).intersectionResult | async).zone4_west_vc}}
V / C
Zone 4
-
- 662
+
+ {{(capxStateService.state.get(junctions.PartialMedianUTurnIntersectionEastWest).intersectionResult | async).zone5_center_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.PartialMedianUTurnIntersectionEastWest).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.ts 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.ts
index 1b27c43..4cef781 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.ts
+++ 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.ts
@@ -1,4 +1,6 @@
+import { CapxStateService } from './../../../../../services/capx-state.service';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Junctions } from './../../../../../services/models/junctions';
@Component({
selector: 'capx-partial-median-uturn-intersection-east-west-design',
@@ -8,7 +10,9 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
})
export class PartialMedianUTurnIntersectionEastWestDesignComponent implements OnInit {
- constructor() { }
+ junctions = Junctions;
+ constructor(public capxStateService: CapxStateService) { }
+
ngOnInit(): void {
}
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 f8807c2..8ddf8fe 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
@@ -13,29 +13,29 @@
-
- 662
+
+ {{(capxStateService.state.get(junctions.PartialMedianUTurnIntersectionNorthSouth).intersectionResult | async).zone5_center_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.PartialMedianUTurnIntersectionNorthSouth).intersectionResult | async).zone5_center_vc}}
V / C
Zone 5
-
- 662
+
+ {{(capxStateService.state.get(junctions.PartialMedianUTurnIntersectionNorthSouth).intersectionResult | async).zone2_south_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.PartialMedianUTurnIntersectionNorthSouth).intersectionResult | async).zone2_south_vc}}
V / C
Zone 2
-
- 662
+
+ {{(capxStateService.state.get(junctions.PartialMedianUTurnIntersectionNorthSouth).intersectionResult | async).zone1_north_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.PartialMedianUTurnIntersectionNorthSouth).intersectionResult | async).zone1_north_vc}}
V / C
Zone 1
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.ts 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.ts
index b30d6e5..66f1286 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.ts
+++ 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.ts
@@ -1,4 +1,6 @@
+import { CapxStateService } from './../../../../../services/capx-state.service';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Junctions } from './../../../../../services/models/junctions';
@Component({
selector: 'capx-partial-median-uturn-intersection-north-south-design',
@@ -8,7 +10,9 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
})
export class PartialMedianUTurnIntersectionNorthSouthDesignComponent implements OnInit {
- constructor() { }
+ junctions = Junctions;
+ constructor(public capxStateService: CapxStateService) { }
+
ngOnInit(): void {
}
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 0c2cf8a..50e7c18 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
@@ -13,29 +13,29 @@
-
- 662
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionNorthEast).intersectionResult | async).zone5_center_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionNorthEast).intersectionResult | async).zone5_center_vc}}
V / C
Zone 5
-
- 662
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionNorthEast).intersectionResult | async).zone1_north_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionNorthEast).intersectionResult | async).zone1_north_vc}}
V / C
Zone 1
-
- 662
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionNorthEast).intersectionResult | async).zone3_east_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionNorthEast).intersectionResult | async).zone3_east_vc}}
V / C
Zone 3
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.ts b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/design/quadrant-roadway-intersection-north-east-design.component.ts
index f3773cb..f5613eb 100644
--- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/design/quadrant-roadway-intersection-north-east-design.component.ts
+++ b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/design/quadrant-roadway-intersection-north-east-design.component.ts
@@ -1,4 +1,6 @@
+import { CapxStateService } from './../../../../../services/capx-state.service';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Junctions } from './../../../../../services/models/junctions';
@Component({
selector: 'capx-quadrant-roadway-intersection-north-east-design',
@@ -8,7 +10,9 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
})
export class QuadrantRoadwayIntersectionNorthEastDesignComponent implements OnInit {
- constructor() { }
+ junctions = Junctions;
+ constructor(public capxStateService: CapxStateService) { }
+
ngOnInit(): void {
}
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 c8a4538..f537f6e 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
@@ -20,29 +20,29 @@
-
- 662
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionNorthWest).intersectionResult | async).zone2_south_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionNorthWest).intersectionResult | async).zone2_south_vc}}
V / C
Zone 2
-
- 662
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionNorthWest).intersectionResult | async).zone5_center_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionNorthWest).intersectionResult | async).zone5_center_vc}}
V / C
Zone 5
-
- 662
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionNorthWest).intersectionResult | async).zone3_east_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionNorthWest).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.ts b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/design/quadrant-roadway-intersection-north-west-design.component.ts
index 1ca25c2..9aa5194 100644
--- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/design/quadrant-roadway-intersection-north-west-design.component.ts
+++ b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/design/quadrant-roadway-intersection-north-west-design.component.ts
@@ -1,4 +1,6 @@
+import { CapxStateService } from './../../../../../services/capx-state.service';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Junctions } from './../../../../../services/models/junctions';
@Component({
selector: 'capx-quadrant-roadway-intersection-north-west-design',
@@ -8,7 +10,9 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
})
export class QuadrantRoadwayIntersectionNorthWestDesignComponent implements OnInit {
- constructor() { }
+ junctions = Junctions;
+ constructor(public capxStateService: CapxStateService) { }
+
ngOnInit(): void {
}
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 ae80e4f..28679e7 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
@@ -20,29 +20,29 @@
-
- 662
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionSouthEast).intersectionResult | async).zone2_south_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionSouthEast).intersectionResult | async).zone2_south_vc}}
V / C
Zone 2
-
- 662
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionSouthEast).intersectionResult | async).zone5_center_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionSouthEast).intersectionResult | async).zone5_center_vc}}
V / C
Zone 5
-
- 662
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionSouthEast).intersectionResult | async).zone3_east_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionSouthEast).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.ts b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/design/quadrant-roadway-intersection-south-east-design.component.ts
index 57278d5..ed6bcef 100644
--- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/design/quadrant-roadway-intersection-south-east-design.component.ts
+++ b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/design/quadrant-roadway-intersection-south-east-design.component.ts
@@ -1,4 +1,6 @@
+import { CapxStateService } from './../../../../../services/capx-state.service';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Junctions } from './../../../../../services/models/junctions';
@Component({
selector: 'capx-quadrant-roadway-intersection-south-east-design',
@@ -8,7 +10,9 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
})
export class QuadrantRoadwayIntersectionSouthEastDesignComponent implements OnInit {
- constructor() { }
+ junctions = Junctions;
+ constructor(public capxStateService: CapxStateService) { }
+
ngOnInit(): void {
}
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 8ad4c28..ba008fb 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
@@ -13,29 +13,29 @@
-
- 662
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionSouthWest).intersectionResult | async).zone2_south_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionSouthWest).intersectionResult | async).zone2_south_vc}}
V / C
Zone 2
-
- 662
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionSouthWest).intersectionResult | async).zone4_west_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionSouthWest).intersectionResult | async).zone4_west_vc}}
V / C
Zone 4
-
- 662
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionSouthWest).intersectionResult | async).zone5_center_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.QuadrantRoadwayIntersectionSouthWest).intersectionResult | async).zone5_center_vc}}
V / C
Zone 5
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.ts b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/design/quadrant-roadway-intersection-south-west-design.component.ts
index a7f82ff..48c9547 100644
--- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/design/quadrant-roadway-intersection-south-west-design.component.ts
+++ b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/design/quadrant-roadway-intersection-south-west-design.component.ts
@@ -1,4 +1,6 @@
+import { CapxStateService } from './../../../../../services/capx-state.service';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Junctions } from './../../../../../services/models/junctions';
@Component({
selector: 'capx-quadrant-roadway-intersection-south-west-design',
@@ -8,7 +10,9 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
})
export class QuadrantRoadwayIntersectionSouthWestDesignComponent implements OnInit {
- constructor() { }
+ junctions = Junctions;
+ constructor(public capxStateService: CapxStateService) { }
+
ngOnInit(): void {
}
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 c1bcb86..56a644e 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
@@ -15,38 +15,38 @@
-
- 662
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionEastWest).intersectionResult | async).zone3_east_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionEastWest).intersectionResult | async).zone3_east_vc}}
V / C
Zone 3
-
- 662
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionEastWest).intersectionResult | async).zone4_west_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionEastWest).intersectionResult | async).zone4_west_vc}}
V / C
Zone 4
-
- 662
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionEastWest).intersectionResult | async).zone2_south_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionEastWest).intersectionResult | async).zone2_south_vc}}
V / C
Zone 2
-
- 662
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionEastWest).intersectionResult | async).zone1_north_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionEastWest).intersectionResult | async).zone1_north_vc}}
V / C
Zone 1
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.ts 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.ts
index 40fc105..3fb72af 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.ts
+++ 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.ts
@@ -1,4 +1,6 @@
+import { CapxStateService } from './../../../../../services/capx-state.service';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Junctions } from './../../../../../services/models/junctions';
@Component({
selector: 'capx-restricted-crossing-uturn-intersection-east-west-design',
@@ -8,7 +10,9 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
})
export class RestrictedCrossingUTurnIntersectionEastWestDesignComponent implements OnInit {
- constructor() { }
+ junctions = Junctions;
+ constructor(public capxStateService: CapxStateService) { }
+
ngOnInit(): void {
}
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 7b23630..f4618a8 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
@@ -15,38 +15,38 @@
-
- 662
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionNorthSouth).intersectionResult | async).zone3_east_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionNorthSouth).intersectionResult | async).zone3_east_vc}}
V / C
Zone 3
-
- 662
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionNorthSouth).intersectionResult | async).zone4_west_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionNorthSouth).intersectionResult | async).zone4_west_vc}}
V / C
Zone 4
-
- 662
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionNorthSouth).intersectionResult | async).zone2_south_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionNorthSouth).intersectionResult | async).zone2_south_vc}}
V / C
Zone 2
-
- 662
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionNorthSouth).intersectionResult | async).zone1_north_clv}}
-
- 0.41
+
+ {{(capxStateService.state.get(junctions.RestrictedCrossingUTurnIntersectionNorthSouth).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.ts 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.ts
index eb29a09..d7a4eb5 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.ts
+++ 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.ts
@@ -1,4 +1,6 @@
+import { CapxStateService } from './../../../../../services/capx-state.service';
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { Junctions } from './../../../../../services/models/junctions';
@Component({
selector: 'capx-restricted-crossing-uturn-intersection-north-south-design',
@@ -8,7 +10,9 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
})
export class RestrictedCrossingUTurnIntersectionNorthSouthDesignComponent implements OnInit {
- constructor() { }
+ junctions = Junctions;
+ constructor(public capxStateService: CapxStateService) { }
+
ngOnInit(): void {
}