From ec8bc2108759aba895a5e5235edfbed39521963d Mon Sep 17 00:00:00 2001 From: Yogesh Dhanapal Date: Fri, 2 Oct 2020 15:20:06 -0400 Subject: [PATCH] removed unwanted components --- development.md | 4 +- .../capx/src/app/capx/capx-routing.module.ts | 71 +----- projects/capx/src/app/capx/capx.module.ts | 70 +----- ...tion-analysis-score-results.component.html | 64 +++--- ...erchange-east-west-junction.component.html | 25 --- ...nterchange-east-west-junction.component.ts | 16 -- ...change-north-south-junction.component.html | 26 --- ...erchange-north-south-junction.component.ts | 16 -- ...erchange-east-west-junction.component.html | 25 --- ...erchange-east-west-junction.component.scss | 0 ...nterchange-east-west-junction.component.ts | 16 -- ...change-north-south-junction.component.html | 25 --- ...change-north-south-junction.component.scss | 0 ...erchange-north-south-junction.component.ts | 16 -- ...overleaf-east-west-junction.component.html | 25 --- ...overleaf-east-west-junction.component.scss | 0 ...cloverleaf-east-west-junction.component.ts | 16 -- ...erleaf-north-south-junction.component.html | 25 --- ...erleaf-north-south-junction.component.scss | 0 ...overleaf-north-south-junction.component.ts | 16 -- ...erchange-east-west-junction.component.html | 26 --- ...erchange-east-west-junction.component.scss | 0 ...nterchange-east-west-junction.component.ts | 16 -- ...change-north-south-junction.component.html | 25 --- ...change-north-south-junction.component.scss | 0 ...erchange-north-south-junction.component.ts | 16 -- ...-diamond-east-west-junction.component.html | 25 --- ...-diamond-east-west-junction.component.scss | 0 ...al-diamond-east-west-junction.component.ts | 16 -- ...iamond-north-south-junction.component.html | 25 --- ...iamond-north-south-junction.component.scss | 0 ...-diamond-north-south-junction.component.ts | 16 -- .../conventional-junction.component.html | 26 --- .../conventional-junction.component.scss | 6 - .../conventional-junction.component.ts | 17 -- ...ght-turn-left-turn-junction.component.html | 23 -- ...ght-turn-left-turn-junction.component.scss | 0 ...right-turn-left-turn-junction.component.ts | 16 -- ...-turn-intersection-junction.component.html | 25 --- ...-turn-intersection-junction.component.scss | 0 ...ft-turn-intersection-junction.component.ts | 16 -- ...-intersection-configuration.component.html | 1 - ...-intersection-configuration.component.scss | 0 ...rn-intersection-configuration.component.ts | 16 -- ...ion-east-west-configuration.component.html | 1 + ...on-east-west-configuration.component.scss} | 0 ...ction-east-west-configuration.component.ts | 15 ++ ...ft-turn-intersection-design.component.html | 1 - ...ft-turn-intersection-design.component.scss | 0 ...left-turn-intersection-design.component.ts | 16 -- ...tersection-east-west-design.component.html | 1 + ...ersection-east-west-design.component.scss} | 0 ...intersection-east-west-design.component.ts | 15 ++ ...rsection-east-west-junction.component.html | 25 --- ...rsection-east-west-junction.component.scss | 0 ...tersection-east-west-junction.component.ts | 16 -- ...ection-north-south-junction.component.html | 25 --- ...ection-north-south-junction.component.scss | 0 ...rsection-north-south-junction.component.ts | 16 -- ...rsection-east-west-junction.component.html | 25 --- ...rsection-east-west-junction.component.scss | 0 ...tersection-east-west-junction.component.ts | 16 -- ...ection-north-south-junction.component.html | 25 --- ...ection-north-south-junction.component.scss | 0 ...rsection-north-south-junction.component.ts | 16 -- ...rsection-east-west-junction.component.html | 25 --- ...rsection-east-west-junction.component.scss | 0 ...tersection-east-west-junction.component.ts | 16 -- ...ection-north-south-junction.component.html | 25 --- ...ection-north-south-junction.component.scss | 0 ...rsection-north-south-junction.component.ts | 16 -- ...section-north-east-junction.component.html | 25 --- ...section-north-east-junction.component.scss | 0 ...ersection-north-east-junction.component.ts | 16 -- ...section-north-west-junction.component.html | 25 --- ...section-north-west-junction.component.scss | 0 ...ersection-north-west-junction.component.ts | 16 -- ...section-south-east-junction.component.html | 25 --- ...section-south-east-junction.component.scss | 0 ...ersection-south-east-junction.component.ts | 16 -- ...section-south-west-junction.component.html | 25 --- ...section-south-west-junction.component.scss | 0 ...ersection-south-west-junction.component.ts | 16 -- ...rsection-east-west-junction.component.html | 25 --- ...rsection-east-west-junction.component.scss | 0 ...tersection-east-west-junction.component.ts | 16 -- ...ection-north-south-junction.component.html | 25 --- ...ection-north-south-junction.component.scss | 0 ...rsection-north-south-junction.component.ts | 16 -- .../junctions/junction.component.ts | 203 +++++++++++++++++- ...icdmini-roundabout-junction.component.html | 25 --- ...icdmini-roundabout-junction.component.scss | 0 ...y-icdmini-roundabout-junction.component.ts | 16 -- ...st-west-roundabout-junction.component.html | 25 --- ...st-west-roundabout-junction.component.scss | 0 ...east-west-roundabout-junction.component.ts | 16 -- ...st-lane-roundabout-junction.component.html | 25 --- ...st-lane-roundabout-junction.component.scss | 0 ...west-lane-roundabout-junction.component.ts | 16 -- ...icdmini-roundabout-junction.component.html | 25 --- ...icdmini-roundabout-junction.component.scss | 0 ...e-icdmini-roundabout-junction.component.ts | 16 -- ...st-lane-roundabout-junction.component.html | 25 --- ...st-lane-roundabout-junction.component.scss | 0 ...west-lane-roundabout-junction.component.ts | 16 -- ...st-lane-roundabout-junction.component.html | 25 --- ...st-lane-roundabout-junction.component.scss | 0 ...west-lane-roundabout-junction.component.ts | 16 -- ...st-lane-roundabout-junction.component.html | 25 --- ...st-lane-roundabout-junction.component.scss | 0 ...west-lane-roundabout-junction.component.ts | 16 -- 111 files changed, 272 insertions(+), 1526 deletions(-) delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-east-west-junction/displaced-left-turn-interchange-east-west-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-east-west-junction/displaced-left-turn-interchange-east-west-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-north-south-junction/displaced-left-turn-interchange-north-south-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-north-south-junction/displaced-left-turn-interchange-north-south-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-east-west-junction/double-crossover-diamond-interchange-east-west-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-east-west-junction/double-crossover-diamond-interchange-east-west-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-east-west-junction/double-crossover-diamond-interchange-east-west-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-north-south-junction/double-crossover-diamond-interchange-north-south-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-north-south-junction/double-crossover-diamond-interchange-north-south-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-north-south-junction/double-crossover-diamond-interchange-north-south-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-east-west-junction/partial-cloverleaf-east-west-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-east-west-junction/partial-cloverleaf-east-west-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-east-west-junction/partial-cloverleaf-east-west-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-north-south-junction/partial-cloverleaf-north-south-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-north-south-junction/partial-cloverleaf-north-south-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-north-south-junction/partial-cloverleaf-north-south-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-east-west-junction/single-point-interchange-east-west-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-east-west-junction/single-point-interchange-east-west-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-east-west-junction/single-point-interchange-east-west-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-north-south-junction/single-point-interchange-north-south-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-north-south-junction/single-point-interchange-north-south-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-north-south-junction/single-point-interchange-north-south-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-east-west-junction/traditional-diamond-east-west-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-east-west-junction/traditional-diamond-east-west-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-east-west-junction/traditional-diamond-east-west-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-north-south-junction/traditional-diamond-north-south-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-north-south-junction/traditional-diamond-north-south-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-north-south-junction/traditional-diamond-north-south-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/conventional-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/conventional-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/conventional-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/conventional-shared-right-turn-left-turn-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/conventional-shared-right-turn-left-turn-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/conventional-shared-right-turn-left-turn-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/full-displaced-left-turn-intersection-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/full-displaced-left-turn-intersection-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/full-displaced-left-turn-intersection-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/full-displaced-left-turn-intersection-configuration.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/full-displaced-left-turn-intersection-configuration.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/full-displaced-left-turn-intersection-configuration.component.ts create mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/median-uturn-intersection-east-west-configuration.component.html rename projects/capx/src/app/capx/components/junctions/{interchanges/displaced-left-turn-interchange-east-west-junction/displaced-left-turn-interchange-east-west-junction.component.scss => intersections/median-uturn-intersection-east-west-junction/configuration/median-uturn-intersection-east-west-configuration.component.scss} (100%) create mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/median-uturn-intersection-east-west-configuration.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/full-displaced-left-turn-intersection-design.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/full-displaced-left-turn-intersection-design.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/full-displaced-left-turn-intersection-design.component.ts create mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component.html rename projects/capx/src/app/capx/components/junctions/{interchanges/displaced-left-turn-interchange-north-south-junction/displaced-left-turn-interchange-north-south-junction.component.scss => intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component.scss} (100%) create mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/median-uturn-intersection-east-west-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/median-uturn-intersection-east-west-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/median-uturn-intersection-east-west-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/median-uturn-intersection-north-south-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/median-uturn-intersection-north-south-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/median-uturn-intersection-north-south-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/partial-displaced-left-turn-intersection-east-west-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/partial-displaced-left-turn-intersection-east-west-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/partial-displaced-left-turn-intersection-east-west-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/partial-displaced-left-turn-intersection-north-south-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/partial-displaced-left-turn-intersection-north-south-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/partial-displaced-left-turn-intersection-north-south-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/partial-median-uturn-intersection-east-west-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/partial-median-uturn-intersection-east-west-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/partial-median-uturn-intersection-east-west-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/partial-median-uturn-intersection-north-south-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/partial-median-uturn-intersection-north-south-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/partial-median-uturn-intersection-north-south-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/quadrant-roadway-intersection-north-east-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/quadrant-roadway-intersection-north-east-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/quadrant-roadway-intersection-north-east-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/quadrant-roadway-intersection-north-west-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/quadrant-roadway-intersection-north-west-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/quadrant-roadway-intersection-north-west-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/quadrant-roadway-intersection-south-east-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/quadrant-roadway-intersection-south-east-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/quadrant-roadway-intersection-south-east-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/quadrant-roadway-intersection-south-west-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/quadrant-roadway-intersection-south-west-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/quadrant-roadway-intersection-south-west-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/restricted-crossing-uturn-intersection-east-west-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/restricted-crossing-uturn-intersection-east-west-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/restricted-crossing-uturn-intersection-east-west-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/restricted-crossing-uturn-intersection-north-south-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/restricted-crossing-uturn-intersection-north-south-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/restricted-crossing-uturn-intersection-north-south-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/fifty-icdmini-roundabout-junction/fifty-icdmini-roundabout-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/fifty-icdmini-roundabout-junction/fifty-icdmini-roundabout-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/fifty-icdmini-roundabout-junction/fifty-icdmini-roundabout-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-one-east-west-roundabout-junction/one-north-southx-one-east-west-roundabout-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-one-east-west-roundabout-junction/one-north-southx-one-east-west-roundabout-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-one-east-west-roundabout-junction/one-north-southx-one-east-west-roundabout-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/one-north-southx-two-east-west-lane-roundabout-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/one-north-southx-two-east-west-lane-roundabout-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/one-north-southx-two-east-west-lane-roundabout-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/seventy-five-icdmini-roundabout-junction/seventy-five-icdmini-roundabout-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/seventy-five-icdmini-roundabout-junction/seventy-five-icdmini-roundabout-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/seventy-five-icdmini-roundabout-junction/seventy-five-icdmini-roundabout-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/three-north-southx-three-east-west-lane-roundabout-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/three-north-southx-three-east-west-lane-roundabout-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/three-north-southx-three-east-west-lane-roundabout-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/two-north-southx-one-east-west-lane-roundabout-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/two-north-southx-one-east-west-lane-roundabout-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/two-north-southx-one-east-west-lane-roundabout-junction.component.ts delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/two-north-southx-two-east-west-lane-roundabout-junction.component.html delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/two-north-southx-two-east-west-lane-roundabout-junction.component.scss delete mode 100644 projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/two-north-southx-two-east-west-lane-roundabout-junction.component.ts diff --git a/development.md b/development.md index cf295f6..f5c867f 100644 --- a/development.md +++ b/development.md @@ -74,7 +74,7 @@ ng generate component capx/components/junctions/intersections/conventional-share ng generate component capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/design/FullDisplacedLeftTurnIntersectionDesign --prefix=capx --module=Capx -ng generate component capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/FullDisplacedLeftTurnIntersectionDesign --prefix=capx --module=Capx +ng generate component capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/MedianUTurnIntersectionEastWestDesign --prefix=capx --module=Capx ng generate component capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/design/MedianUTurnIntersectionNorthSouthDesign --prefix=capx --module=Capx @@ -149,7 +149,7 @@ ng generate component capx/components/junctions/intersections/conventional-share ng generate component capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/configuration/FullDisplacedLeftTurnIntersectionConfiguration --prefix=capx --module=Capx --flat -ng generate component capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/FullDisplacedLeftTurnIntersectionConfiguration --prefix=capx --module=Capx --flat +ng generate component capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/MedianUTurnIntersectionEastWestConfiguration --prefix=capx --module=Capx --flat ng generate component capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/configuration/MedianUTurnIntersectionNorthSouthConfiguration --prefix=capx --module=Capx --flat diff --git a/projects/capx/src/app/capx/capx-routing.module.ts b/projects/capx/src/app/capx/capx-routing.module.ts index 306748a..aa75c47 100644 --- a/projects/capx/src/app/capx/capx-routing.module.ts +++ b/projects/capx/src/app/capx/capx-routing.module.ts @@ -1,42 +1,10 @@ import { JunctionComponent } from './components/junctions/junction.component'; import { CreditsComponent } from './components/credits/credits.component'; -import { DisplacedLeftTurnInterchangeNorthSouthJunctionComponent } from './components/junctions/interchanges/displaced-left-turn-interchange-north-south-junction/displaced-left-turn-interchange-north-south-junction.component'; -import { PartialMedianUTurnIntersectionNorthSouthJunctionComponent } from './components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/partial-median-uturn-intersection-north-south-junction.component'; -import { MedianUTurnIntersectionNorthSouthJunctionComponent } from './components/junctions/intersections/median-uturn-intersection-north-south-junction/median-uturn-intersection-north-south-junction.component'; -import { RestrictedCrossingUTurnIntersectionNorthSouthJunctionComponent } from './components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/restricted-crossing-uturn-intersection-north-south-junction.component'; -import { FullDisplacedLeftTurnIntersectionJunctionComponent } from './components/junctions/intersections/full-displaced-left-turn-intersection-junction/full-displaced-left-turn-intersection-junction.component'; -// tslint:disable: max-line-length -import { PartialDisplacedLeftTurnIntersectionNorthSouthJunctionComponent } from './components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/partial-displaced-left-turn-intersection-north-south-junction.component'; import { JunctionAnalysisScoreResultsComponent } from './components/junction-analysis-score-results/junction-analysis-score-results.component'; import { JunctionAnalysisParametersComponent } from './components/junction-analysis-parameters/junction-analysis-parameters.component'; import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { AnalysisComponent } from '../capx/components/analysis.component'; -import { ConventionalJunctionComponent } from './components/junctions/intersections/conventional-junction/conventional-junction.component'; -import { ConventionalSharedRightTurnLeftTurnJunctionComponent } from './components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/conventional-shared-right-turn-left-turn-junction.component'; -import { QuadrantRoadwayIntersectionNorthEastJunctionComponent } from './components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/quadrant-roadway-intersection-north-east-junction.component'; -import { QuadrantRoadwayIntersectionSouthWestJunctionComponent } from './components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/quadrant-roadway-intersection-south-west-junction.component'; -import { QuadrantRoadwayIntersectionSouthEastJunctionComponent } from './components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/quadrant-roadway-intersection-south-east-junction.component'; -import { QuadrantRoadwayIntersectionNorthWestJunctionComponent } from './components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/quadrant-roadway-intersection-north-west-junction.component'; -import { PartialDisplacedLeftTurnIntersectionEastWestJunctionComponent } from './components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/partial-displaced-left-turn-intersection-east-west-junction.component'; -import { RestrictedCrossingUTurnIntersectionEastWestJunctionComponent } from './components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/restricted-crossing-uturn-intersection-east-west-junction.component'; -import { MedianUTurnIntersectionEastWestJunctionComponent } from './components/junctions/intersections/median-uturn-intersection-east-west-junction/median-uturn-intersection-east-west-junction.component'; -import { PartialMedianUTurnIntersectionEastWestJunctionComponent } from './components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/partial-median-uturn-intersection-east-west-junction.component'; -import { FiftyICDMiniRoundaboutJunctionComponent } from './components/junctions/roundabouts/fifty-icdmini-roundabout-junction/fifty-icdmini-roundabout-junction.component'; -import { SeventyFiveICDMiniRoundaboutJunctionComponent } from './components/junctions/roundabouts/seventy-five-icdmini-roundabout-junction/seventy-five-icdmini-roundabout-junction.component'; -import { OneNorthSouthxOneEastWestRoundaboutJunctionComponent } from './components/junctions/roundabouts/one-north-southx-one-east-west-roundabout-junction/one-north-southx-one-east-west-roundabout-junction.component'; -import { OneNorthSouthxTwoEastWestLaneRoundaboutJunctionComponent } from './components/junctions/roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/one-north-southx-two-east-west-lane-roundabout-junction.component'; -import { TwoNorthSouthxOneEastWestLaneRoundaboutJunctionComponent } from './components/junctions/roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/two-north-southx-one-east-west-lane-roundabout-junction.component'; -import { TwoNorthSouthxTwoEastWestLaneRoundaboutJunctionComponent } from './components/junctions/roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/two-north-southx-two-east-west-lane-roundabout-junction.component'; -import { ThreeNorthSouthxThreeEastWestLaneRoundaboutJunctionComponent } from './components/junctions/roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/three-north-southx-three-east-west-lane-roundabout-junction.component'; -import { TraditionalDiamondNorthSouthJunctionComponent } from './components/junctions/interchanges/traditional-diamond-north-south-junction/traditional-diamond-north-south-junction.component'; -import { PartialCloverleafEastWestJunctionComponent } from './components/junctions/interchanges/partial-cloverleaf-east-west-junction/partial-cloverleaf-east-west-junction.component'; -import { PartialCloverleafNorthSouthJunctionComponent } from './components/junctions/interchanges/partial-cloverleaf-north-south-junction/partial-cloverleaf-north-south-junction.component'; -import { DisplacedLeftTurnInterchangeEastWestJunctionComponent } from './components/junctions/interchanges/displaced-left-turn-interchange-east-west-junction/displaced-left-turn-interchange-east-west-junction.component'; -import { DoubleCrossoverDiamondInterchangeEastWestJunctionComponent } from './components/junctions/interchanges/double-crossover-diamond-interchange-east-west-junction/double-crossover-diamond-interchange-east-west-junction.component'; -import { DoubleCrossoverDiamondInterchangeNorthSouthJunctionComponent } from './components/junctions/interchanges/double-crossover-diamond-interchange-north-south-junction/double-crossover-diamond-interchange-north-south-junction.component'; -import { SinglePointInterchangeNorthSouthJunctionComponent } from './components/junctions/interchanges/single-point-interchange-north-south-junction/single-point-interchange-north-south-junction.component'; -import { SinglePointInterchangeEastWestJunctionComponent } from './components/junctions/interchanges/single-point-interchange-east-west-junction/single-point-interchange-east-west-junction.component'; const routes: Routes = [ @@ -50,44 +18,7 @@ const routes: Routes = [ { path: 'junctions/:id', component: JunctionComponent - }, - { path: 'conventional', component: ConventionalJunctionComponent }, - { path: 'conventional-shared-right-turn-left-turn', component: ConventionalSharedRightTurnLeftTurnJunctionComponent }, - { path: 'quadrant-roadway-intersection-south-west', component: QuadrantRoadwayIntersectionSouthWestJunctionComponent }, - { path: 'quadrant-roadway-intersection-north-east', component: QuadrantRoadwayIntersectionNorthEastJunctionComponent }, - { path: 'quadrant-roadway-intersection-south-east', component: QuadrantRoadwayIntersectionSouthEastJunctionComponent }, - { path: 'quadrant-roadway-intersection-north-west', component: QuadrantRoadwayIntersectionNorthWestJunctionComponent }, - { path: 'partial-displaced-left-turn-intersection-north-south', component: PartialDisplacedLeftTurnIntersectionNorthSouthJunctionComponent }, - { path: 'partial-displaced-left-turn-intersection-east-west', component: PartialDisplacedLeftTurnIntersectionEastWestJunctionComponent }, - { path: 'full-displaced-left-turn-intersection', component: FullDisplacedLeftTurnIntersectionJunctionComponent }, - { path: 'restricted-crossing-uturn-intersection-north-south', component: RestrictedCrossingUTurnIntersectionNorthSouthJunctionComponent }, - { path: 'restricted-crossing-uturn-intersection-east-west', component: RestrictedCrossingUTurnIntersectionEastWestJunctionComponent }, - { path: 'median-uturn-intersection-north-south', component: MedianUTurnIntersectionNorthSouthJunctionComponent }, - { path: 'median-uturn-intersection-east-west', component: MedianUTurnIntersectionEastWestJunctionComponent }, - { path: 'partial-median-uturn-intersection-north-south', component: PartialMedianUTurnIntersectionNorthSouthJunctionComponent }, - { path: 'partial-median-uturn-intersection-east-west', component: PartialMedianUTurnIntersectionEastWestJunctionComponent }, - - - { path: 'fifty-icdmini-roundabout', component: FiftyICDMiniRoundaboutJunctionComponent }, - { path: 'seventy-five-icdmini-roundabout', component: SeventyFiveICDMiniRoundaboutJunctionComponent }, - { path: 'one-north-southx-one-east-west-roundabout', component: OneNorthSouthxOneEastWestRoundaboutJunctionComponent }, - { path: 'one-north-southx-two-east-west-lane-roundabout', component: OneNorthSouthxTwoEastWestLaneRoundaboutJunctionComponent }, - { path: 'two-north-southx-one-east-west-lane-roundabout', component: TwoNorthSouthxOneEastWestLaneRoundaboutJunctionComponent }, - { path: 'two-north-southx-two-east-west-lane-roundabout', component: TwoNorthSouthxTwoEastWestLaneRoundaboutJunctionComponent }, - { path: 'three-north-southx-three-east-west-lane-roundabout', component: ThreeNorthSouthxThreeEastWestLaneRoundaboutJunctionComponent }, - - - { path: 'traditional-diamond-north-south', component: TraditionalDiamondNorthSouthJunctionComponent }, - { path: 'traditional-diamond-east-west', component: TraditionalDiamondNorthSouthJunctionComponent }, - { path: 'partial-cloverleaf-north-south', component: PartialCloverleafNorthSouthJunctionComponent }, - { path: 'partial-cloverleaf-east-west', component: PartialCloverleafEastWestJunctionComponent }, - { path: 'displaced-left-turn-interchange-north-south', component: DisplacedLeftTurnInterchangeNorthSouthJunctionComponent }, - { path: 'displaced-left-turn-interchange-east-west', component: DisplacedLeftTurnInterchangeEastWestJunctionComponent }, - { path: 'double-crossover-diamond-interchange-north-south', component: DoubleCrossoverDiamondInterchangeNorthSouthJunctionComponent }, - { path: 'double-crossover-diamond-interchange-east-west', component: DoubleCrossoverDiamondInterchangeEastWestJunctionComponent }, - { path: 'single-point-interchange-north-south', component: SinglePointInterchangeNorthSouthJunctionComponent }, - { path: 'single-point-interchange-east-west', component: SinglePointInterchangeEastWestJunctionComponent }, - ] + }] } ]; diff --git a/projects/capx/src/app/capx/capx.module.ts b/projects/capx/src/app/capx/capx.module.ts index fbb8b5f..8259c67 100644 --- a/projects/capx/src/app/capx/capx.module.ts +++ b/projects/capx/src/app/capx/capx.module.ts @@ -5,38 +5,6 @@ import { CapxRoutingModule } from './capx-routing.module'; import { AnalysisComponent } from './components/analysis.component'; import { JunctionAnalysisParametersComponent } from './components/junction-analysis-parameters/junction-analysis-parameters.component'; import { JunctionAnalysisScoreResultsComponent } from './components/junction-analysis-score-results/junction-analysis-score-results.component'; -import { ConventionalJunctionComponent } from './components/junctions/intersections/conventional-junction/conventional-junction.component'; -import { ConventionalSharedRightTurnLeftTurnJunctionComponent } from './components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/conventional-shared-right-turn-left-turn-junction.component'; -import { QuadrantRoadwayIntersectionSouthWestJunctionComponent } from './components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/quadrant-roadway-intersection-south-west-junction.component'; -import { QuadrantRoadwayIntersectionNorthEastJunctionComponent } from './components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/quadrant-roadway-intersection-north-east-junction.component'; -import { QuadrantRoadwayIntersectionSouthEastJunctionComponent } from './components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/quadrant-roadway-intersection-south-east-junction.component'; -import { QuadrantRoadwayIntersectionNorthWestJunctionComponent } from './components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/quadrant-roadway-intersection-north-west-junction.component'; -import { PartialDisplacedLeftTurnIntersectionNorthSouthJunctionComponent } from './components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/partial-displaced-left-turn-intersection-north-south-junction.component'; -import { PartialDisplacedLeftTurnIntersectionEastWestJunctionComponent } from './components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/partial-displaced-left-turn-intersection-east-west-junction.component'; -import { FullDisplacedLeftTurnIntersectionJunctionComponent } from './components/junctions/intersections/full-displaced-left-turn-intersection-junction/full-displaced-left-turn-intersection-junction.component'; -import { RestrictedCrossingUTurnIntersectionNorthSouthJunctionComponent } from './components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/restricted-crossing-uturn-intersection-north-south-junction.component'; -import { RestrictedCrossingUTurnIntersectionEastWestJunctionComponent } from './components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/restricted-crossing-uturn-intersection-east-west-junction.component'; -import { MedianUTurnIntersectionNorthSouthJunctionComponent } from './components/junctions/intersections/median-uturn-intersection-north-south-junction/median-uturn-intersection-north-south-junction.component'; -import { MedianUTurnIntersectionEastWestJunctionComponent } from './components/junctions/intersections/median-uturn-intersection-east-west-junction/median-uturn-intersection-east-west-junction.component'; -import { PartialMedianUTurnIntersectionNorthSouthJunctionComponent } from './components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/partial-median-uturn-intersection-north-south-junction.component'; -import { PartialMedianUTurnIntersectionEastWestJunctionComponent } from './components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/partial-median-uturn-intersection-east-west-junction.component'; -import { FiftyICDMiniRoundaboutJunctionComponent } from './components/junctions/roundabouts/fifty-icdmini-roundabout-junction/fifty-icdmini-roundabout-junction.component'; -import { SeventyFiveICDMiniRoundaboutJunctionComponent } from './components/junctions/roundabouts/seventy-five-icdmini-roundabout-junction/seventy-five-icdmini-roundabout-junction.component'; -import { OneNorthSouthxOneEastWestRoundaboutJunctionComponent } from './components/junctions/roundabouts/one-north-southx-one-east-west-roundabout-junction/one-north-southx-one-east-west-roundabout-junction.component'; -import { OneNorthSouthxTwoEastWestLaneRoundaboutJunctionComponent } from './components/junctions/roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/one-north-southx-two-east-west-lane-roundabout-junction.component'; -import { TwoNorthSouthxOneEastWestLaneRoundaboutJunctionComponent } from './components/junctions/roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/two-north-southx-one-east-west-lane-roundabout-junction.component'; -import { TwoNorthSouthxTwoEastWestLaneRoundaboutJunctionComponent } from './components/junctions/roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/two-north-southx-two-east-west-lane-roundabout-junction.component'; -import { ThreeNorthSouthxThreeEastWestLaneRoundaboutJunctionComponent } from './components/junctions/roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/three-north-southx-three-east-west-lane-roundabout-junction.component'; -import { TraditionalDiamondNorthSouthJunctionComponent } from './components/junctions/interchanges/traditional-diamond-north-south-junction/traditional-diamond-north-south-junction.component'; -import { TraditionalDiamondEastWestJunctionComponent } from './components/junctions/interchanges/traditional-diamond-east-west-junction/traditional-diamond-east-west-junction.component'; -import { PartialCloverleafNorthSouthJunctionComponent } from './components/junctions/interchanges/partial-cloverleaf-north-south-junction/partial-cloverleaf-north-south-junction.component'; -import { PartialCloverleafEastWestJunctionComponent } from './components/junctions/interchanges/partial-cloverleaf-east-west-junction/partial-cloverleaf-east-west-junction.component'; -import { DisplacedLeftTurnInterchangeNorthSouthJunctionComponent } from './components/junctions/interchanges/displaced-left-turn-interchange-north-south-junction/displaced-left-turn-interchange-north-south-junction.component'; -import { DisplacedLeftTurnInterchangeEastWestJunctionComponent } from './components/junctions/interchanges/displaced-left-turn-interchange-east-west-junction/displaced-left-turn-interchange-east-west-junction.component'; -import { DoubleCrossoverDiamondInterchangeNorthSouthJunctionComponent } from './components/junctions/interchanges/double-crossover-diamond-interchange-north-south-junction/double-crossover-diamond-interchange-north-south-junction.component'; -import { DoubleCrossoverDiamondInterchangeEastWestJunctionComponent } from './components/junctions/interchanges/double-crossover-diamond-interchange-east-west-junction/double-crossover-diamond-interchange-east-west-junction.component'; -import { SinglePointInterchangeNorthSouthJunctionComponent } from './components/junctions/interchanges/single-point-interchange-north-south-junction/single-point-interchange-north-south-junction.component'; -import { SinglePointInterchangeEastWestJunctionComponent } from './components/junctions/interchanges/single-point-interchange-east-west-junction/single-point-interchange-east-west-junction.component'; import { CriticalLaneVolumeSumComponent } from './components/common/critical-lane-volume-sum/critical-lane-volume-sum.component'; import { FlexLayoutModule } from '@angular/flex-layout'; import { ConventionalDesignComponent } from './components/junctions/intersections/conventional-junction/design/conventional-design.component'; @@ -110,44 +78,14 @@ import { TwoNorthSouthxOneEastWestLaneRoundaboutConfigurationComponent } from '. import { TwoNorthSouthxTwoEastWestLaneRoundaboutJunctionConfigurationComponent } from '../capx/components/junctions/roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/configuration/two-north-southx-two-east-west-lane-roundabout-junction-configuration.component'; import { JunctionComponent } from '../capx/components/junctions/junction.component'; import {PortalModule} from '@angular/cdk/portal'; +import { MedianUTurnIntersectionEastWestDesignComponent } from '../capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component'; +import { MedianUTurnIntersectionEastWestConfigurationComponent } from '../capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/median-uturn-intersection-east-west-configuration.component'; @NgModule({ declarations: [ AnalysisComponent, JunctionAnalysisParametersComponent, JunctionAnalysisScoreResultsComponent, - ConventionalJunctionComponent, - ConventionalSharedRightTurnLeftTurnJunctionComponent, - QuadrantRoadwayIntersectionSouthWestJunctionComponent, - QuadrantRoadwayIntersectionNorthEastJunctionComponent, - QuadrantRoadwayIntersectionSouthEastJunctionComponent, - QuadrantRoadwayIntersectionNorthWestJunctionComponent, - PartialDisplacedLeftTurnIntersectionNorthSouthJunctionComponent, - PartialDisplacedLeftTurnIntersectionEastWestJunctionComponent, - FullDisplacedLeftTurnIntersectionJunctionComponent, - RestrictedCrossingUTurnIntersectionNorthSouthJunctionComponent, - RestrictedCrossingUTurnIntersectionEastWestJunctionComponent, - MedianUTurnIntersectionNorthSouthJunctionComponent, - MedianUTurnIntersectionEastWestJunctionComponent, - PartialMedianUTurnIntersectionNorthSouthJunctionComponent, - PartialMedianUTurnIntersectionEastWestJunctionComponent, - FiftyICDMiniRoundaboutJunctionComponent, - SeventyFiveICDMiniRoundaboutJunctionComponent, - OneNorthSouthxOneEastWestRoundaboutJunctionComponent, - OneNorthSouthxTwoEastWestLaneRoundaboutJunctionComponent, - TwoNorthSouthxOneEastWestLaneRoundaboutJunctionComponent, - TwoNorthSouthxTwoEastWestLaneRoundaboutJunctionComponent, - ThreeNorthSouthxThreeEastWestLaneRoundaboutJunctionComponent, - TraditionalDiamondNorthSouthJunctionComponent, - TraditionalDiamondEastWestJunctionComponent, - PartialCloverleafNorthSouthJunctionComponent, - PartialCloverleafEastWestJunctionComponent, - DisplacedLeftTurnInterchangeNorthSouthJunctionComponent, - DisplacedLeftTurnInterchangeEastWestJunctionComponent, - DoubleCrossoverDiamondInterchangeNorthSouthJunctionComponent, - DoubleCrossoverDiamondInterchangeEastWestJunctionComponent, - SinglePointInterchangeNorthSouthJunctionComponent, - SinglePointInterchangeEastWestJunctionComponent, CriticalLaneVolumeSumComponent, ConventionalDesignComponent, HandleNullValuePipe, @@ -216,7 +154,9 @@ import {PortalModule} from '@angular/cdk/portal'; ThreeNorthSouthxThreeEastWestLaneRoundaboutConfigurationComponent, TwoNorthSouthxOneEastWestLaneRoundaboutConfigurationComponent, TwoNorthSouthxTwoEastWestLaneRoundaboutJunctionConfigurationComponent, - JunctionComponent], + JunctionComponent, + MedianUTurnIntersectionEastWestDesignComponent, + MedianUTurnIntersectionEastWestConfigurationComponent], imports: [ CommonModule, CapxRoutingModule, diff --git a/projects/capx/src/app/capx/components/junction-analysis-score-results/junction-analysis-score-results.component.html b/projects/capx/src/app/capx/components/junction-analysis-score-results/junction-analysis-score-results.component.html index da32ff2..6ac0670 100644 --- a/projects/capx/src/app/capx/components/junction-analysis-score-results/junction-analysis-score-results.component.html +++ b/projects/capx/src/app/capx/components/junction-analysis-score-results/junction-analysis-score-results.component.html @@ -34,7 +34,7 @@ 1 Conventional - FULL + FULL {{(capxStateService.conventionalJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.conventionalJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.conventionalJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -53,7 +53,7 @@ 2 Conventional Shared RT LN - CSRL + CSRL {{(capxStateService.conventionalSharedRightTurnLeftTurnJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.conventionalSharedRightTurnLeftTurnJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.conventionalSharedRightTurnLeftTurnJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -72,7 +72,7 @@ 3.1 Quadrant Roadway - S-W + S-W {{(capxStateService.quadrantRoadwayIntersectionSouthWestJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.quadrantRoadwayIntersectionSouthWestJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.quadrantRoadwayIntersectionSouthWestJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -90,7 +90,7 @@ 3.2 - N-E + N-E {{(capxStateService.quadrantRoadwayIntersectionNorthEastJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.quadrantRoadwayIntersectionNorthEastJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.quadrantRoadwayIntersectionNorthEastJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -108,7 +108,7 @@ 3.3 - S-E + S-E {{(capxStateService.quadrantRoadwayIntersectionSouthEastJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.quadrantRoadwayIntersectionSouthEastJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.quadrantRoadwayIntersectionSouthEastJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -126,7 +126,7 @@ 3.4 - N-W + N-W {{(capxStateService.quadrantRoadwayIntersectionNorthWestJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.quadrantRoadwayIntersectionNorthWestJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.quadrantRoadwayIntersectionNorthWestJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -145,7 +145,7 @@ 4.1 Partial Displaced Left Turn - N-S + N-S {{(capxStateService.partialDisplacedLeftTurnIntersectionNorthSouthJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.partialDisplacedLeftTurnIntersectionNorthSouthJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.partialDisplacedLeftTurnIntersectionNorthSouthJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -163,7 +163,7 @@ 4.2 - E-W + E-W {{(capxStateService.partialDisplacedLeftTurnIntersectionEastWestJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.partialDisplacedLeftTurnIntersectionEastWestJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.partialDisplacedLeftTurnIntersectionEastWestJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -182,7 +182,7 @@ 5 Displaced Left Turn - FULL + FULL {{(capxStateService.fullDisplacedLeftTurnIntersectionJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.fullDisplacedLeftTurnIntersectionJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.fullDisplacedLeftTurnIntersectionJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -202,7 +202,7 @@ 6.1 Restricted Crossing U-Turn - N-S + N-S {{(capxStateService.restrictedCrossingUTurnIntersectionNorthSouthJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.restrictedCrossingUTurnIntersectionNorthSouthJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.restrictedCrossingUTurnIntersectionNorthSouthJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -221,7 +221,7 @@ 6.2 - E-W + E-W {{(capxStateService.restrictedCrossingUTurnIntersectionEastWestJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.restrictedCrossingUTurnIntersectionEastWestJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.restrictedCrossingUTurnIntersectionEastWestJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -241,7 +241,7 @@ 7.1 Median U-Turn - N-S + N-S {{(capxStateService.medianUTurnIntersectionNorthSouthJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.medianUTurnIntersectionNorthSouthJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.medianUTurnIntersectionNorthSouthJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -260,7 +260,7 @@ 7.2 - E-W + E-W {{(capxStateService.medianUTurnIntersectionEastWestJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.medianUTurnIntersectionEastWestJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.medianUTurnIntersectionEastWestJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -280,7 +280,7 @@ 8.1 Partial Median U-Turn - N-S + N-S {{(capxStateService.partialMedianUTurnIntersectionNorthSouthJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.partialMedianUTurnIntersectionNorthSouthJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.partialMedianUTurnIntersectionNorthSouthJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -299,7 +299,7 @@ 8.2 - E-W + E-W {{(capxStateService.partialMedianUTurnIntersectionEastWestJunctionResult$ | async)!.zone1_north_clv | handleNullValue}} {{(capxStateService.partialMedianUTurnIntersectionEastWestJunctionResult$ | async)!.zone1_north_vc | handleNullValue}} {{(capxStateService.partialMedianUTurnIntersectionEastWestJunctionResult$ | async)!.zone2_south_clv | handleNullValue}} @@ -349,7 +349,7 @@ 9.1 - 50 ICD + 50 ICD {{(capxStateService.fiftyICDMiniRoundaboutJunctionResult$ | async)!.zone1_north_lane1 | handleNullValue}} {{(capxStateService.fiftyICDMiniRoundaboutJunctionResult$ | async)!.zone1_north_lane2 | handleNullValue}} {{(capxStateService.fiftyICDMiniRoundaboutJunctionResult$ | async)!.zone1_north_lane3 | handleNullValue}} @@ -369,7 +369,7 @@ 9.2 - 75 ICD + 75 ICD {{(capxStateService.seventyFiveICDMiniRoundaboutJunctionResult$ | async)!.zone1_north_lane1 | handleNullValue}} {{(capxStateService.seventyFiveICDMiniRoundaboutJunctionResult$ | async)!.zone1_north_lane2 | handleNullValue}} {{(capxStateService.seventyFiveICDMiniRoundaboutJunctionResult$ | async)!.zone1_north_lane3 | handleNullValue}} @@ -389,7 +389,7 @@ 9.3 - 1 X 1 + 1 X 1 {{(capxStateService.oneNorthSouthxOneEastWestRoundaboutJunctionnResult$ | async)!.zone1_north_lane1 | handleNullValue}} {{(capxStateService.oneNorthSouthxOneEastWestRoundaboutJunctionnResult$ | async)!.zone1_north_lane2 | handleNullValue}} {{(capxStateService.oneNorthSouthxOneEastWestRoundaboutJunctionnResult$ | async)!.zone1_north_lane3 | handleNullValue}} @@ -409,7 +409,7 @@ 9.4 - 1 X 2 + 1 X 2 {{(capxStateService.oneNorthSouthxTwoEastWestLaneRoundaboutJunctionResult$ | async)!.zone1_north_lane1 | handleNullValue}} {{(capxStateService.oneNorthSouthxTwoEastWestLaneRoundaboutJunctionResult$ | async)!.zone1_north_lane2 | handleNullValue}} {{(capxStateService.oneNorthSouthxTwoEastWestLaneRoundaboutJunctionResult$ | async)!.zone1_north_lane3 | handleNullValue}} @@ -429,7 +429,7 @@ 9.5 - 2 X 1 + 2 X 1 {{(capxStateService.twoNorthSouthxOneEastWestLaneRoundaboutJunctionResult$ | async)!.zone1_north_lane1 | handleNullValue}} {{(capxStateService.twoNorthSouthxOneEastWestLaneRoundaboutJunctionResult$ | async)!.zone1_north_lane2 | handleNullValue}} {{(capxStateService.twoNorthSouthxOneEastWestLaneRoundaboutJunctionResult$ | async)!.zone1_north_lane3 | handleNullValue}} @@ -449,7 +449,7 @@ 9.6 - 2 X 2 + 2 X 2 {{(capxStateService.twoNorthSouthxTwoEastWestLaneRoundaboutJunctionResult$ | async)!.zone1_north_lane1 | handleNullValue}} {{(capxStateService.twoNorthSouthxTwoEastWestLaneRoundaboutJunctionResult$ | async)!.zone1_north_lane2 | handleNullValue}} {{(capxStateService.twoNorthSouthxTwoEastWestLaneRoundaboutJunctionResult$ | async)!.zone1_north_lane3 | handleNullValue}} @@ -469,7 +469,7 @@ 9.7 - 3 X 3 + 3 X 3 {{(capxStateService.threeNorthSouthxThreeEastWestLaneRoundaboutJunctionResult$ | async)!.zone1_north_lane1 | handleNullValue}} {{(capxStateService.threeNorthSouthxThreeEastWestLaneRoundaboutJunctionResult$ | async)!.zone1_north_lane2 | handleNullValue}} {{(capxStateService.threeNorthSouthxThreeEastWestLaneRoundaboutJunctionResult$ | async)!.zone1_north_lane3 | handleNullValue}} @@ -524,7 +524,7 @@ 10.1 Diamond - N-S + N-S {{(capxStateService.traditionalDiamondNorthSouthJunctionResult$ | async)!.zone1_right_merge_clv | handleNullValue}} {{(capxStateService.traditionalDiamondNorthSouthJunctionResult$ | async)!.zone1_right_merge_vc | handleNullValue}} {{(capxStateService.traditionalDiamondNorthSouthJunctionResult$ | async)!.zone2_left_merge_clv | handleNullValue}} @@ -544,7 +544,7 @@ 10.2 - E-W + E-W {{(capxStateService.traditionalDiamondEastWestJunctionResult$ | async)!.zone1_right_merge_clv | handleNullValue}} {{(capxStateService.traditionalDiamondEastWestJunctionResult$ | async)!.zone1_right_merge_vc | handleNullValue}} {{(capxStateService.traditionalDiamondEastWestJunctionResult$ | async)!.zone2_left_merge_clv | handleNullValue}} @@ -565,7 +565,7 @@ 11.1 Partial Cloverleaf - N-S + N-S {{(capxStateService.partialCloverleafNorthSouthJunctionResult$ | async)!.zone1_right_merge_clv | handleNullValue}} {{(capxStateService.partialCloverleafNorthSouthJunctionResult$ | async)!.zone1_right_merge_vc | handleNullValue}} {{(capxStateService.partialCloverleafNorthSouthJunctionResult$ | async)!.zone2_left_merge_clv | handleNullValue}} @@ -585,7 +585,7 @@ 11.2 - E-W + E-W {{(capxStateService.partialCloverleafEastWestJunctionResult$ | async)!.zone1_right_merge_clv | handleNullValue}} {{(capxStateService.partialCloverleafEastWestJunctionResult$ | async)!.zone1_right_merge_vc | handleNullValue}} {{(capxStateService.partialCloverleafEastWestJunctionResult$ | async)!.zone2_left_merge_clv | handleNullValue}} @@ -606,7 +606,7 @@ 13.1 Displaced Left Turn - N-S + N-S {{(capxStateService.displacedLeftTurnInterchangeNorthSouthJunctionResult$ | async)!.zone1_right_merge_clv | handleNullValue}} {{(capxStateService.displacedLeftTurnInterchangeNorthSouthJunctionResult$ | async)!.zone1_right_merge_vc | handleNullValue}} {{(capxStateService.displacedLeftTurnInterchangeNorthSouthJunctionResult$ | async)!.zone2_left_merge_clv | handleNullValue}} @@ -626,7 +626,7 @@ 13.2 - E-W + E-W {{(capxStateService.displacedLeftTurnInterchangeEastWestJunctionResult$ | async)!.zone1_right_merge_clv | handleNullValue}} {{(capxStateService.displacedLeftTurnInterchangeEastWestJunctionResult$ | async)!.zone1_right_merge_vc | handleNullValue}} {{(capxStateService.displacedLeftTurnInterchangeEastWestJunctionResult$ | async)!.zone2_left_merge_clv | handleNullValue}} @@ -647,7 +647,7 @@ 14.1 Double Crossover Diamond - N-S + N-S {{(capxStateService.doubleCrossoverDiamondInterchangeNorthSouthJunctionResult$ | async)!.zone1_right_merge_clv | handleNullValue}} {{(capxStateService.doubleCrossoverDiamondInterchangeNorthSouthJunctionResult$ | async)!.zone1_right_merge_vc | handleNullValue}} {{(capxStateService.doubleCrossoverDiamondInterchangeNorthSouthJunctionResult$ | async)!.zone2_left_merge_clv | handleNullValue}} @@ -667,7 +667,7 @@ 14.2 - E-W + E-W {{(capxStateService.doubleCrossoverDiamondInterchangeEastWestJunctionResult$ | async)!.zone1_right_merge_clv | handleNullValue}} {{(capxStateService.doubleCrossoverDiamondInterchangeEastWestJunctionResult$ | async)!.zone1_right_merge_vc | handleNullValue}} {{(capxStateService.doubleCrossoverDiamondInterchangeEastWestJunctionResult$ | async)!.zone2_left_merge_clv | handleNullValue}} @@ -688,7 +688,7 @@ 15.1 Single Point - N-S + N-S {{(capxStateService.singlePointInterchangeNorthSouthJunctionResult$ | async)!.zone1_right_merge_clv | handleNullValue}} {{(capxStateService.singlePointInterchangeNorthSouthJunctionResult$ | async)!.zone1_right_merge_vc | handleNullValue}} {{(capxStateService.singlePointInterchangeNorthSouthJunctionResult$ | async)!.zone2_left_merge_clv | handleNullValue}} @@ -708,7 +708,7 @@ 15.2 - E-W + E-W {{(capxStateService.singlePointInterchangeEastWestJunctionResult$ | async)!.zone1_right_merge_clv | handleNullValue}} {{(capxStateService.singlePointInterchangeEastWestJunctionResult$ | async)!.zone1_right_merge_vc | handleNullValue}} {{(capxStateService.singlePointInterchangeEastWestJunctionResult$ | async)!.zone2_left_merge_clv | handleNullValue}} diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-east-west-junction/displaced-left-turn-interchange-east-west-junction.component.html b/projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-east-west-junction/displaced-left-turn-interchange-east-west-junction.component.html deleted file mode 100644 index 9156a92..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-east-west-junction/displaced-left-turn-interchange-east-west-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Displaced Left Turn Interchange (E-W) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-east-west-junction/displaced-left-turn-interchange-east-west-junction.component.ts b/projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-east-west-junction/displaced-left-turn-interchange-east-west-junction.component.ts deleted file mode 100644 index 81bffb6..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-east-west-junction/displaced-left-turn-interchange-east-west-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-displaced-left-turn-interchange-east-west-junction', - templateUrl: './displaced-left-turn-interchange-east-west-junction.component.html', - styleUrls: ['./displaced-left-turn-interchange-east-west-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class DisplacedLeftTurnInterchangeEastWestJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-north-south-junction/displaced-left-turn-interchange-north-south-junction.component.html b/projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-north-south-junction/displaced-left-turn-interchange-north-south-junction.component.html deleted file mode 100644 index f079951..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-north-south-junction/displaced-left-turn-interchange-north-south-junction.component.html +++ /dev/null @@ -1,26 +0,0 @@ - - -
-
- - Back to Results - Displaced Left Turn Interchange (N-S) -
- - - - -
- -
- - - - - - Configuration - - - -
- diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-north-south-junction/displaced-left-turn-interchange-north-south-junction.component.ts b/projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-north-south-junction/displaced-left-turn-interchange-north-south-junction.component.ts deleted file mode 100644 index 9e02ce6..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-north-south-junction/displaced-left-turn-interchange-north-south-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-displaced-left-turn-interchange-north-south-junction', - templateUrl: './displaced-left-turn-interchange-north-south-junction.component.html', - styleUrls: ['./displaced-left-turn-interchange-north-south-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class DisplacedLeftTurnInterchangeNorthSouthJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-east-west-junction/double-crossover-diamond-interchange-east-west-junction.component.html b/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-east-west-junction/double-crossover-diamond-interchange-east-west-junction.component.html deleted file mode 100644 index 811528a..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-east-west-junction/double-crossover-diamond-interchange-east-west-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Double Crossover Diamond Interchange (E-W) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-east-west-junction/double-crossover-diamond-interchange-east-west-junction.component.scss b/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-east-west-junction/double-crossover-diamond-interchange-east-west-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-east-west-junction/double-crossover-diamond-interchange-east-west-junction.component.ts b/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-east-west-junction/double-crossover-diamond-interchange-east-west-junction.component.ts deleted file mode 100644 index 8ae2f84..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-east-west-junction/double-crossover-diamond-interchange-east-west-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-double-crossover-diamond-interchange-east-west-junction', - templateUrl: './double-crossover-diamond-interchange-east-west-junction.component.html', - styleUrls: ['./double-crossover-diamond-interchange-east-west-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class DoubleCrossoverDiamondInterchangeEastWestJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-north-south-junction/double-crossover-diamond-interchange-north-south-junction.component.html b/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-north-south-junction/double-crossover-diamond-interchange-north-south-junction.component.html deleted file mode 100644 index 5223dab..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-north-south-junction/double-crossover-diamond-interchange-north-south-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Double Crossover Diamond Interchange (N-S) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-north-south-junction/double-crossover-diamond-interchange-north-south-junction.component.scss b/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-north-south-junction/double-crossover-diamond-interchange-north-south-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-north-south-junction/double-crossover-diamond-interchange-north-south-junction.component.ts b/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-north-south-junction/double-crossover-diamond-interchange-north-south-junction.component.ts deleted file mode 100644 index fcc2d55..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/double-crossover-diamond-interchange-north-south-junction/double-crossover-diamond-interchange-north-south-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-double-crossover-diamond-interchange-north-south-junction', - templateUrl: './double-crossover-diamond-interchange-north-south-junction.component.html', - styleUrls: ['./double-crossover-diamond-interchange-north-south-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class DoubleCrossoverDiamondInterchangeNorthSouthJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-east-west-junction/partial-cloverleaf-east-west-junction.component.html b/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-east-west-junction/partial-cloverleaf-east-west-junction.component.html deleted file mode 100644 index 282d764..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-east-west-junction/partial-cloverleaf-east-west-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Partial Cloverleaf (E-W) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-east-west-junction/partial-cloverleaf-east-west-junction.component.scss b/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-east-west-junction/partial-cloverleaf-east-west-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-east-west-junction/partial-cloverleaf-east-west-junction.component.ts b/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-east-west-junction/partial-cloverleaf-east-west-junction.component.ts deleted file mode 100644 index 9a5659e..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-east-west-junction/partial-cloverleaf-east-west-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-partial-cloverleaf-east-west-junction', - templateUrl: './partial-cloverleaf-east-west-junction.component.html', - styleUrls: ['./partial-cloverleaf-east-west-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class PartialCloverleafEastWestJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-north-south-junction/partial-cloverleaf-north-south-junction.component.html b/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-north-south-junction/partial-cloverleaf-north-south-junction.component.html deleted file mode 100644 index 9df7774..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-north-south-junction/partial-cloverleaf-north-south-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Partial Cloverleaf (N-S) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-north-south-junction/partial-cloverleaf-north-south-junction.component.scss b/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-north-south-junction/partial-cloverleaf-north-south-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-north-south-junction/partial-cloverleaf-north-south-junction.component.ts b/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-north-south-junction/partial-cloverleaf-north-south-junction.component.ts deleted file mode 100644 index 4b44d80..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/partial-cloverleaf-north-south-junction/partial-cloverleaf-north-south-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-partial-cloverleaf-north-south-junction', - templateUrl: './partial-cloverleaf-north-south-junction.component.html', - styleUrls: ['./partial-cloverleaf-north-south-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class PartialCloverleafNorthSouthJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-east-west-junction/single-point-interchange-east-west-junction.component.html b/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-east-west-junction/single-point-interchange-east-west-junction.component.html deleted file mode 100644 index 0ce1a54..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-east-west-junction/single-point-interchange-east-west-junction.component.html +++ /dev/null @@ -1,26 +0,0 @@ - - -
-
- - Back to Results - Single Point Interchange (E-W) -
- - - - -
- -
- - - - - - Configuration - - - -
- diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-east-west-junction/single-point-interchange-east-west-junction.component.scss b/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-east-west-junction/single-point-interchange-east-west-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-east-west-junction/single-point-interchange-east-west-junction.component.ts b/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-east-west-junction/single-point-interchange-east-west-junction.component.ts deleted file mode 100644 index a25804e..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-east-west-junction/single-point-interchange-east-west-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-single-point-interchange-east-west-junction', - templateUrl: './single-point-interchange-east-west-junction.component.html', - styleUrls: ['./single-point-interchange-east-west-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class SinglePointInterchangeEastWestJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-north-south-junction/single-point-interchange-north-south-junction.component.html b/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-north-south-junction/single-point-interchange-north-south-junction.component.html deleted file mode 100644 index 108428e..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-north-south-junction/single-point-interchange-north-south-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Single Point Interchange (N-S) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-north-south-junction/single-point-interchange-north-south-junction.component.scss b/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-north-south-junction/single-point-interchange-north-south-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-north-south-junction/single-point-interchange-north-south-junction.component.ts b/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-north-south-junction/single-point-interchange-north-south-junction.component.ts deleted file mode 100644 index ea02647..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/single-point-interchange-north-south-junction/single-point-interchange-north-south-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-single-point-interchange-north-south-junction', - templateUrl: './single-point-interchange-north-south-junction.component.html', - styleUrls: ['./single-point-interchange-north-south-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class SinglePointInterchangeNorthSouthJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-east-west-junction/traditional-diamond-east-west-junction.component.html b/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-east-west-junction/traditional-diamond-east-west-junction.component.html deleted file mode 100644 index 381417b..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-east-west-junction/traditional-diamond-east-west-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Traditional Diamond (E-W) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-east-west-junction/traditional-diamond-east-west-junction.component.scss b/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-east-west-junction/traditional-diamond-east-west-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-east-west-junction/traditional-diamond-east-west-junction.component.ts b/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-east-west-junction/traditional-diamond-east-west-junction.component.ts deleted file mode 100644 index 4ea1503..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-east-west-junction/traditional-diamond-east-west-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-traditional-diamond-east-west-junction', - templateUrl: './traditional-diamond-east-west-junction.component.html', - styleUrls: ['./traditional-diamond-east-west-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class TraditionalDiamondEastWestJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-north-south-junction/traditional-diamond-north-south-junction.component.html b/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-north-south-junction/traditional-diamond-north-south-junction.component.html deleted file mode 100644 index 6434c5c..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-north-south-junction/traditional-diamond-north-south-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Traditional Diamond (N-S) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-north-south-junction/traditional-diamond-north-south-junction.component.scss b/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-north-south-junction/traditional-diamond-north-south-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-north-south-junction/traditional-diamond-north-south-junction.component.ts b/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-north-south-junction/traditional-diamond-north-south-junction.component.ts deleted file mode 100644 index 1e37aa7..0000000 --- a/projects/capx/src/app/capx/components/junctions/interchanges/traditional-diamond-north-south-junction/traditional-diamond-north-south-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core'; - -@Component({ - selector: 'capx-traditional-diamond-north-south-junction', - templateUrl: './traditional-diamond-north-south-junction.component.html', - styleUrls: ['./traditional-diamond-north-south-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class TraditionalDiamondNorthSouthJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/conventional-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/conventional-junction.component.html deleted file mode 100644 index e405294..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/conventional-junction.component.html +++ /dev/null @@ -1,26 +0,0 @@ - - -
-
- Back to Results Conventional Intersection -
- - - - -
- -
- - - - - -
- -
- - - -
- diff --git a/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/conventional-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/conventional-junction.component.scss deleted file mode 100644 index 3184cc0..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/conventional-junction.component.scss +++ /dev/null @@ -1,6 +0,0 @@ -:host -{ - width: 100%; - height: 100%; - display: flow-root; -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/conventional-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/conventional-junction.component.ts deleted file mode 100644 index b0d58d3..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/conventional-junction/conventional-junction.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { CapxStateService } from './../../../../services/capx-state.service'; -import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core'; - -@Component({ - selector: 'capx-conventional-junction', - templateUrl: './conventional-junction.component.html', - styleUrls: ['./conventional-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class ConventionalJunctionComponent implements OnInit { - - constructor(public capxStateService: CapxStateService) { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/conventional-shared-right-turn-left-turn-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/conventional-shared-right-turn-left-turn-junction.component.html deleted file mode 100644 index 0da4078..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/conventional-shared-right-turn-left-turn-junction.component.html +++ /dev/null @@ -1,23 +0,0 @@ - -
-
- Back to Results Conventional Shared RT LN -
- - - - -
- -
- - - - - - Configuration - - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/conventional-shared-right-turn-left-turn-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/conventional-shared-right-turn-left-turn-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/conventional-shared-right-turn-left-turn-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/conventional-shared-right-turn-left-turn-junction.component.ts deleted file mode 100644 index 49997e1..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/conventional-shared-right-turn-left-turn-junction/conventional-shared-right-turn-left-turn-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-conventional-shared-right-turn-left-turn-junction', - templateUrl: './conventional-shared-right-turn-left-turn-junction.component.html', - styleUrls: ['./conventional-shared-right-turn-left-turn-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class ConventionalSharedRightTurnLeftTurnJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/full-displaced-left-turn-intersection-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/full-displaced-left-turn-intersection-junction.component.html deleted file mode 100644 index 08b8e84..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/full-displaced-left-turn-intersection-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- Back to Results Full Displaced Left Turn Intersection -
- - - - -
- -
- - - - - - Configuration - - - -
- - diff --git a/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/full-displaced-left-turn-intersection-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/full-displaced-left-turn-intersection-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/full-displaced-left-turn-intersection-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/full-displaced-left-turn-intersection-junction.component.ts deleted file mode 100644 index a10f22c..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/full-displaced-left-turn-intersection-junction/full-displaced-left-turn-intersection-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-full-displaced-left-turn-intersection-junction', - templateUrl: './full-displaced-left-turn-intersection-junction.component.html', - styleUrls: ['./full-displaced-left-turn-intersection-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class FullDisplacedLeftTurnIntersectionJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/full-displaced-left-turn-intersection-configuration.component.html b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/full-displaced-left-turn-intersection-configuration.component.html deleted file mode 100644 index 56a83d9..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/full-displaced-left-turn-intersection-configuration.component.html +++ /dev/null @@ -1 +0,0 @@ -

full-displaced-left-turn-intersection-configuration works!

diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/full-displaced-left-turn-intersection-configuration.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/full-displaced-left-turn-intersection-configuration.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/full-displaced-left-turn-intersection-configuration.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/full-displaced-left-turn-intersection-configuration.component.ts deleted file mode 100644 index 8f29a94..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/full-displaced-left-turn-intersection-configuration.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-full-displaced-left-turn-intersection-configuration', - templateUrl: './full-displaced-left-turn-intersection-configuration.component.html', - styleUrls: ['./full-displaced-left-turn-intersection-configuration.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class FullDisplacedLeftTurnIntersectionConfigurationComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/median-uturn-intersection-east-west-configuration.component.html b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/median-uturn-intersection-east-west-configuration.component.html new file mode 100644 index 0000000..8c5378d --- /dev/null +++ b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/median-uturn-intersection-east-west-configuration.component.html @@ -0,0 +1 @@ +

median-uturn-intersection-east-west-configuration works!

diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-east-west-junction/displaced-left-turn-interchange-east-west-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/median-uturn-intersection-east-west-configuration.component.scss similarity index 100% rename from projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-east-west-junction/displaced-left-turn-interchange-east-west-junction.component.scss rename to projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/median-uturn-intersection-east-west-configuration.component.scss diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/median-uturn-intersection-east-west-configuration.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/median-uturn-intersection-east-west-configuration.component.ts new file mode 100644 index 0000000..3674af9 --- /dev/null +++ b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/configuration/median-uturn-intersection-east-west-configuration.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'capx-median-uturn-intersection-east-west-configuration', + templateUrl: './median-uturn-intersection-east-west-configuration.component.html', + styleUrls: ['./median-uturn-intersection-east-west-configuration.component.scss'] +}) +export class MedianUTurnIntersectionEastWestConfigurationComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/full-displaced-left-turn-intersection-design.component.html b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/full-displaced-left-turn-intersection-design.component.html deleted file mode 100644 index 3b324fd..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/full-displaced-left-turn-intersection-design.component.html +++ /dev/null @@ -1 +0,0 @@ -

full-displaced-left-turn-intersection-design works!

diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/full-displaced-left-turn-intersection-design.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/full-displaced-left-turn-intersection-design.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/full-displaced-left-turn-intersection-design.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/full-displaced-left-turn-intersection-design.component.ts deleted file mode 100644 index aeebdd2..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/full-displaced-left-turn-intersection-design.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-full-displaced-left-turn-intersection-design', - templateUrl: './full-displaced-left-turn-intersection-design.component.html', - styleUrls: ['./full-displaced-left-turn-intersection-design.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class FullDisplacedLeftTurnIntersectionDesignComponent implements OnInit { - - constructor() { } - - 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 new file mode 100644 index 0000000..691a78e --- /dev/null +++ b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component.html @@ -0,0 +1 @@ +

median-uturn-intersection-east-west-design works!

diff --git a/projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-north-south-junction/displaced-left-turn-interchange-north-south-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component.scss similarity index 100% rename from projects/capx/src/app/capx/components/junctions/interchanges/displaced-left-turn-interchange-north-south-junction/displaced-left-turn-interchange-north-south-junction.component.scss rename to projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component.scss 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 new file mode 100644 index 0000000..c424c5a --- /dev/null +++ b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@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'] +}) +export class MedianUTurnIntersectionEastWestDesignComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/median-uturn-intersection-east-west-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/median-uturn-intersection-east-west-junction.component.html deleted file mode 100644 index 27467ef..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/median-uturn-intersection-east-west-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Median U-Turn Intersection (E-W) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/median-uturn-intersection-east-west-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/median-uturn-intersection-east-west-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/median-uturn-intersection-east-west-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/median-uturn-intersection-east-west-junction.component.ts deleted file mode 100644 index 860fd4d..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-east-west-junction/median-uturn-intersection-east-west-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core'; - -@Component({ - selector: 'capx-median-uturn-intersection-east-west-junction', - templateUrl: './median-uturn-intersection-east-west-junction.component.html', - styleUrls: ['./median-uturn-intersection-east-west-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class MedianUTurnIntersectionEastWestJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/median-uturn-intersection-north-south-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/median-uturn-intersection-north-south-junction.component.html deleted file mode 100644 index aec2603..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/median-uturn-intersection-north-south-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Median U-Turn Intersection (N-S) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/median-uturn-intersection-north-south-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/median-uturn-intersection-north-south-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/median-uturn-intersection-north-south-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/median-uturn-intersection-north-south-junction.component.ts deleted file mode 100644 index ef6ed27..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/median-uturn-intersection-north-south-junction/median-uturn-intersection-north-south-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-median-uturn-intersection-north-south-junction', - templateUrl: './median-uturn-intersection-north-south-junction.component.html', - styleUrls: ['./median-uturn-intersection-north-south-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class MedianUTurnIntersectionNorthSouthJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/partial-displaced-left-turn-intersection-east-west-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/partial-displaced-left-turn-intersection-east-west-junction.component.html deleted file mode 100644 index 9137305..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/partial-displaced-left-turn-intersection-east-west-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Partial Displaced Left Turn Intersection (E-W) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/partial-displaced-left-turn-intersection-east-west-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/partial-displaced-left-turn-intersection-east-west-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/partial-displaced-left-turn-intersection-east-west-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/partial-displaced-left-turn-intersection-east-west-junction.component.ts deleted file mode 100644 index 25498e2..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-east-west-junction/partial-displaced-left-turn-intersection-east-west-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-partial-displaced-left-turn-intersection-east-west-junction', - templateUrl: './partial-displaced-left-turn-intersection-east-west-junction.component.html', - styleUrls: ['./partial-displaced-left-turn-intersection-east-west-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class PartialDisplacedLeftTurnIntersectionEastWestJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/partial-displaced-left-turn-intersection-north-south-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/partial-displaced-left-turn-intersection-north-south-junction.component.html deleted file mode 100644 index 279409e..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/partial-displaced-left-turn-intersection-north-south-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Partial Displaced Left Turn Intersection (N-S) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/partial-displaced-left-turn-intersection-north-south-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/partial-displaced-left-turn-intersection-north-south-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/partial-displaced-left-turn-intersection-north-south-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/partial-displaced-left-turn-intersection-north-south-junction.component.ts deleted file mode 100644 index 585d6c3..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/partial-displaced-left-turn-intersection-north-south-junction/partial-displaced-left-turn-intersection-north-south-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-partial-displaced-left-turn-intersection-north-south-junction', - templateUrl: './partial-displaced-left-turn-intersection-north-south-junction.component.html', - styleUrls: ['./partial-displaced-left-turn-intersection-north-south-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class PartialDisplacedLeftTurnIntersectionNorthSouthJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/partial-median-uturn-intersection-east-west-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/partial-median-uturn-intersection-east-west-junction.component.html deleted file mode 100644 index 3ec81cf..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/partial-median-uturn-intersection-east-west-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Partial Median U-Turn Intersection (E-W) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/partial-median-uturn-intersection-east-west-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/partial-median-uturn-intersection-east-west-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/partial-median-uturn-intersection-east-west-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/partial-median-uturn-intersection-east-west-junction.component.ts deleted file mode 100644 index 6cb0686..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-east-west-junction/partial-median-uturn-intersection-east-west-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-partial-median-uturn-intersection-east-west-junction', - templateUrl: './partial-median-uturn-intersection-east-west-junction.component.html', - styleUrls: ['./partial-median-uturn-intersection-east-west-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class PartialMedianUTurnIntersectionEastWestJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/partial-median-uturn-intersection-north-south-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/partial-median-uturn-intersection-north-south-junction.component.html deleted file mode 100644 index 1a4ca4a..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/partial-median-uturn-intersection-north-south-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Partial Median U-Turn Intersection (N-S) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/partial-median-uturn-intersection-north-south-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/partial-median-uturn-intersection-north-south-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/partial-median-uturn-intersection-north-south-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/partial-median-uturn-intersection-north-south-junction.component.ts deleted file mode 100644 index b1cece9..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/partial-median-uturn-intersection-north-south-junction/partial-median-uturn-intersection-north-south-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-partial-median-uturn-intersection-north-south-junction', - templateUrl: './partial-median-uturn-intersection-north-south-junction.component.html', - styleUrls: ['./partial-median-uturn-intersection-north-south-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class PartialMedianUTurnIntersectionNorthSouthJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/quadrant-roadway-intersection-north-east-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/quadrant-roadway-intersection-north-east-junction.component.html deleted file mode 100644 index a88932f..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/quadrant-roadway-intersection-north-east-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Quadrant Roadway Intersection (N-E) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/quadrant-roadway-intersection-north-east-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/quadrant-roadway-intersection-north-east-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/quadrant-roadway-intersection-north-east-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/quadrant-roadway-intersection-north-east-junction.component.ts deleted file mode 100644 index 259e456..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-east-junction/quadrant-roadway-intersection-north-east-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-quadrant-roadway-intersection-north-east-junction', - templateUrl: './quadrant-roadway-intersection-north-east-junction.component.html', - styleUrls: ['./quadrant-roadway-intersection-north-east-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class QuadrantRoadwayIntersectionNorthEastJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/quadrant-roadway-intersection-north-west-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/quadrant-roadway-intersection-north-west-junction.component.html deleted file mode 100644 index 3eda96f..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/quadrant-roadway-intersection-north-west-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Quadrant Roadway Intersection (N-W) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/quadrant-roadway-intersection-north-west-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/quadrant-roadway-intersection-north-west-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/quadrant-roadway-intersection-north-west-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/quadrant-roadway-intersection-north-west-junction.component.ts deleted file mode 100644 index b731b68..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-north-west-junction/quadrant-roadway-intersection-north-west-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-quadrant-roadway-intersection-north-west-junction', - templateUrl: './quadrant-roadway-intersection-north-west-junction.component.html', - styleUrls: ['./quadrant-roadway-intersection-north-west-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class QuadrantRoadwayIntersectionNorthWestJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/quadrant-roadway-intersection-south-east-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/quadrant-roadway-intersection-south-east-junction.component.html deleted file mode 100644 index 57b64bb..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/quadrant-roadway-intersection-south-east-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Quadrant Roadway Intersection (S-E) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/quadrant-roadway-intersection-south-east-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/quadrant-roadway-intersection-south-east-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/quadrant-roadway-intersection-south-east-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/quadrant-roadway-intersection-south-east-junction.component.ts deleted file mode 100644 index f7bf3d0..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-east-junction/quadrant-roadway-intersection-south-east-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-quadrant-roadway-intersection-south-east-junction', - templateUrl: './quadrant-roadway-intersection-south-east-junction.component.html', - styleUrls: ['./quadrant-roadway-intersection-south-east-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class QuadrantRoadwayIntersectionSouthEastJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/quadrant-roadway-intersection-south-west-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/quadrant-roadway-intersection-south-west-junction.component.html deleted file mode 100644 index e810b3e..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/quadrant-roadway-intersection-south-west-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Quadrant Roadway Intersection (S-W) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/quadrant-roadway-intersection-south-west-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/quadrant-roadway-intersection-south-west-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/quadrant-roadway-intersection-south-west-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/quadrant-roadway-intersection-south-west-junction.component.ts deleted file mode 100644 index 9f0aeca..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/quadrant-roadway-intersection-south-west-junction/quadrant-roadway-intersection-south-west-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-quadrant-roadway-intersection-south-west-junction', - templateUrl: './quadrant-roadway-intersection-south-west-junction.component.html', - styleUrls: ['./quadrant-roadway-intersection-south-west-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class QuadrantRoadwayIntersectionSouthWestJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/restricted-crossing-uturn-intersection-east-west-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/restricted-crossing-uturn-intersection-east-west-junction.component.html deleted file mode 100644 index 3f0519f..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/restricted-crossing-uturn-intersection-east-west-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Restricted Crossing U-Turn Intersection (E-W) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/restricted-crossing-uturn-intersection-east-west-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/restricted-crossing-uturn-intersection-east-west-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/restricted-crossing-uturn-intersection-east-west-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/restricted-crossing-uturn-intersection-east-west-junction.component.ts deleted file mode 100644 index 20ccf9e..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-east-west-junction/restricted-crossing-uturn-intersection-east-west-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-restricted-crossing-uturn-intersection-east-west-junction', - templateUrl: './restricted-crossing-uturn-intersection-east-west-junction.component.html', - styleUrls: ['./restricted-crossing-uturn-intersection-east-west-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class RestrictedCrossingUTurnIntersectionEastWestJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/restricted-crossing-uturn-intersection-north-south-junction.component.html b/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/restricted-crossing-uturn-intersection-north-south-junction.component.html deleted file mode 100644 index 0a7bf2f..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/restricted-crossing-uturn-intersection-north-south-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - Restricted Crossing U-Turn Intersection (N-S) -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/restricted-crossing-uturn-intersection-north-south-junction.component.scss b/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/restricted-crossing-uturn-intersection-north-south-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/restricted-crossing-uturn-intersection-north-south-junction.component.ts b/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/restricted-crossing-uturn-intersection-north-south-junction.component.ts deleted file mode 100644 index 2e26be2..0000000 --- a/projects/capx/src/app/capx/components/junctions/intersections/restricted-crossing-uturn-intersection-north-south-junction/restricted-crossing-uturn-intersection-north-south-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-restricted-crossing-uturn-intersection-north-south-junction', - templateUrl: './restricted-crossing-uturn-intersection-north-south-junction.component.html', - styleUrls: ['./restricted-crossing-uturn-intersection-north-south-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class RestrictedCrossingUTurnIntersectionNorthSouthJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/junction.component.ts b/projects/capx/src/app/capx/components/junctions/junction.component.ts index e6901b5..7e4321c 100644 --- a/projects/capx/src/app/capx/components/junctions/junction.component.ts +++ b/projects/capx/src/app/capx/components/junctions/junction.component.ts @@ -1,3 +1,32 @@ +import { SinglePointInterchangeNorthSouthDesignComponent } from './interchanges/single-point-interchange-north-south-junction/design/single-point-interchange-north-south-design.component'; +import { DoubleCrossoverDiamondInterchangeNorthSouthDesignComponent } from './interchanges/double-crossover-diamond-interchange-north-south-junction/design/double-crossover-diamond-interchange-north-south-design.component'; +import { DisplacedLeftTurnInterchangeNorthSouthConfigurationComponent } from './interchanges/displaced-left-turn-interchange-north-south-junction/configuration/displaced-left-turn-interchange-north-south-configuration.component'; +import { DisplacedLeftTurnInterchangeNorthSouthDesignComponent } from './interchanges/displaced-left-turn-interchange-north-south-junction/design/displaced-left-turn-interchange-north-south-design.component'; +import { PartialCloverleafNorthSouthDesignComponent } from './interchanges/partial-cloverleaf-north-south-junction/design/partial-cloverleaf-north-south-design.component'; +import { TraditionalDiamondNorthSouthConfigurationComponent } from './interchanges/traditional-diamond-north-south-junction/configuration/traditional-diamond-north-south-configuration.component'; +import { TraditionalDiamondNorthSouthDesignComponent } from './interchanges/traditional-diamond-north-south-junction/design/traditional-diamond-north-south-design.component'; +import { ThreeNorthSouthxThreeEastWestLaneRoundaboutConfigurationComponent } from './roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/configuration/three-north-southx-three-east-west-lane-roundabout-configuration.component'; +import { ThreeNorthSouthxThreeEastWestLaneRoundaboutDesignComponent } from './roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/design/three-north-southx-three-east-west-lane-roundabout-design.component'; +import { TwoNorthSouthxTwoEastWestLaneRoundaboutJunctionConfigurationComponent } from './roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/configuration/two-north-southx-two-east-west-lane-roundabout-junction-configuration.component'; +import { TwoNorthSouthxTwoEastWestLaneRoundaboutJunctionDesignComponent } from './roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/design/two-north-southx-two-east-west-lane-roundabout-junction-design.component'; +import { TwoNorthSouthxOneEastWestLaneRoundaboutConfigurationComponent } from './roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/configuration/two-north-southx-one-east-west-lane-roundabout-configuration.component'; +import { OneNorthSouthxTwoEastWestLaneRoundaboutConfigurationComponent } from './roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/configuration/one-north-southx-two-east-west-lane-roundabout-configuration.component'; +import { OneNorthSouthxTwoEastWestLaneRoundaboutDesignComponent } from './roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/design/one-north-southx-two-east-west-lane-roundabout-design.component'; +import { OneNorthSouthxOneEastWestRoundaboutConfigurationComponent } from './roundabouts/one-north-southx-one-east-west-roundabout-junction/configuration/one-north-southx-one-east-west-roundabout-configuration.component'; +import { OneNorthSouthxOneEastWestRoundaboutDesignComponent } from './roundabouts/one-north-southx-one-east-west-roundabout-junction/design/one-north-southx-one-east-west-roundabout-design.component'; +import { SeventyFiveICDMiniRoundaboutConfigurationComponent } from './roundabouts/seventy-five-icdmini-roundabout-junction/configuration/seventy-five-icdmini-roundabout-configuration.component'; +import { SeventyFiveICDMiniRoundaboutDesignComponent } from './roundabouts/seventy-five-icdmini-roundabout-junction/design/seventy-five-icdmini-roundabout-design.component'; +import { FiftyICDMiniRoundaboutConfigurationComponent } from './roundabouts/fifty-icdmini-roundabout-junction/configuration/fifty-icdmini-roundabout-configuration.component'; +import { FiftyICDMiniRoundaboutDesignComponent } from './roundabouts/fifty-icdmini-roundabout-junction/design/fifty-icdmini-roundabout-design.component'; +import { PartialMedianUTurnIntersectionNorthSouthConfigurationComponent } from './intersections/partial-median-uturn-intersection-north-south-junction/configuration/partial-median-uturn-intersection-north-south-configuration.component'; +import { PartialMedianUTurnIntersectionNorthSouthDesignComponent } from './intersections/partial-median-uturn-intersection-north-south-junction/design/partial-median-uturn-intersection-north-south-design.component'; +import { MedianUTurnIntersectionNorthSouthConfigurationComponent } from './intersections/median-uturn-intersection-north-south-junction/configuration/median-uturn-intersection-north-south-configuration.component'; +import { RestrictedCrossingUTurnIntersectionNorthSouthDesignComponent } from './intersections/restricted-crossing-uturn-intersection-north-south-junction/design/restricted-crossing-uturn-intersection-north-south-design.component'; +import { FullDisplacedLeftTurnIntersectionConfigurationComponent } from './intersections/full-displaced-left-turn-intersection-junction/configuration/full-displaced-left-turn-intersection-configuration.component'; +import { PartialDisplacedLeftTurnIntersectionNorthSouthConfigurationComponent } from './intersections/partial-displaced-left-turn-intersection-north-south-junction/configuration/partial-displaced-left-turn-intersection-north-south-configuration.component'; +import { PartialDisplacedLeftTurnIntersectionNorthSouthDesignComponent } from './intersections/partial-displaced-left-turn-intersection-north-south-junction/design/partial-displaced-left-turn-intersection-north-south-design.component'; +import { QuadrantRoadwayIntersectionNorthEastDesignComponent } from './intersections/quadrant-roadway-intersection-north-east-junction/design/quadrant-roadway-intersection-north-east-design.component'; +import { ConventionalSharedRightTurnLeftTurnDesignComponent } from './intersections/conventional-shared-right-turn-left-turn-junction/design/conventional-shared-right-turn-left-turn-design.component'; import { BehaviorSubject } from 'rxjs'; import { ChangeDetectionStrategy, Component, OnInit, OnDestroy } from '@angular/core'; import { CapxStateService } from '../../services/capx-state.service'; @@ -6,6 +35,39 @@ import { ConventionalDesignComponent } from './intersections/conventional-juncti import { ConventionalConfigurationComponent } from './intersections/conventional-junction/configuration/conventional-configuration.component'; import { ActivatedRoute, Router } from '@angular/router'; import { Junction } from '../../services/models/junction-capacity-analyser'; +import { ConventionalSharedRightTurnLeftTurnConfigurationComponent } from './intersections/conventional-shared-right-turn-left-turn-junction/configuration/conventional-shared-right-turn-left-turn-configuration.component'; +import { QuadrantRoadwayIntersectionSouthWestDesignComponent } from './intersections/quadrant-roadway-intersection-south-west-junction/design/quadrant-roadway-intersection-south-west-design.component'; +import { QuadrantRoadwayIntersectionSouthWestConfigurationComponent } from './intersections/quadrant-roadway-intersection-south-west-junction/configuration/quadrant-roadway-intersection-south-west-configuration.component'; +import { QuadrantRoadwayIntersectionNorthEastConfigurationComponent } from './intersections/quadrant-roadway-intersection-north-east-junction/configuration/quadrant-roadway-intersection-north-east-configuration.component'; +import { QuadrantRoadwayIntersectionSouthEastConfigurationComponent } from './intersections/quadrant-roadway-intersection-south-east-junction/configuration/quadrant-roadway-intersection-south-east-configuration.component'; +import { QuadrantRoadwayIntersectionSouthEastDesignComponent } from './intersections/quadrant-roadway-intersection-south-east-junction/design/quadrant-roadway-intersection-south-east-design.component'; +import { QuadrantRoadwayIntersectionNorthWestDesignComponent } from './intersections/quadrant-roadway-intersection-north-west-junction/design/quadrant-roadway-intersection-north-west-design.component'; +import { QuadrantRoadwayIntersectionNorthWestConfigurationComponent } from './intersections/quadrant-roadway-intersection-north-west-junction/configuration/quadrant-roadway-intersection-north-west-configuration.component'; +import { PartialDisplacedLeftTurnIntersectionEastWestConfigurationComponent } from './intersections/partial-displaced-left-turn-intersection-east-west-junction/configuration/partial-displaced-left-turn-intersection-east-west-configuration.component'; +import { PartialDisplacedLeftTurnIntersectionEastWestDesignComponent } from './intersections/partial-displaced-left-turn-intersection-east-west-junction/design/partial-displaced-left-turn-intersection-east-west-design.component'; +import { FullDisplacedLeftTurnIntersectionDesignComponent } from './intersections/full-displaced-left-turn-intersection-junction/design/full-displaced-left-turn-intersection-design.component'; +import { RestrictedCrossingUTurnIntersectionNorthSouthConfigurationComponent } from './intersections/restricted-crossing-uturn-intersection-north-south-junction/configuration/restricted-crossing-uturn-intersection-north-south-configuration.component'; +import { RestrictedCrossingUTurnIntersectionEastWestConfigurationComponent } from './intersections/restricted-crossing-uturn-intersection-east-west-junction/configuration/restricted-crossing-uturn-intersection-east-west-configuration.component'; +import { RestrictedCrossingUTurnIntersectionEastWestDesignComponent } from './intersections/restricted-crossing-uturn-intersection-east-west-junction/design/restricted-crossing-uturn-intersection-east-west-design.component'; +import { MedianUTurnIntersectionNorthSouthDesignComponent } from './intersections/median-uturn-intersection-north-south-junction/design/median-uturn-intersection-north-south-design.component'; +import { MedianUTurnIntersectionEastWestDesignComponent } from './intersections/median-uturn-intersection-east-west-junction/design/median-uturn-intersection-east-west-design.component'; +import { MedianUTurnIntersectionEastWestConfigurationComponent } from './intersections/median-uturn-intersection-east-west-junction/configuration/median-uturn-intersection-east-west-configuration.component'; +import { PartialMedianUTurnIntersectionEastWestConfigurationComponent } from './intersections/partial-median-uturn-intersection-east-west-junction/configuration/partial-median-uturn-intersection-east-west-configuration.component'; +import { PartialMedianUTurnIntersectionEastWestDesignComponent } from './intersections/partial-median-uturn-intersection-east-west-junction/design/partial-median-uturn-intersection-east-west-design.component'; +import { TwoNorthSouthxOneEastWestLaneRoundaboutDesignComponent } from './roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/design/two-north-southx-one-east-west-lane-roundabout-design.component'; +import { TraditionalDiamondEastWestDesignComponent } from './interchanges/traditional-diamond-east-west-junction/design/traditional-diamond-east-west-design.component'; +import { TraditionalDiamondEastWestConfigurationComponent } from './interchanges/traditional-diamond-east-west-junction/configuration/traditional-diamond-east-west-configuration.component'; +import { PartialCloverleafEastWestConfigurationComponent } from './interchanges/partial-cloverleaf-east-west-junction/configuration/partial-cloverleaf-east-west-configuration.component'; +import { PartialCloverleafEastWestDesignComponent } from './interchanges/partial-cloverleaf-east-west-junction/design/partial-cloverleaf-east-west-design.component'; +import { PartialCloverleafNorthSouthConfigurationComponent } from './interchanges/partial-cloverleaf-north-south-junction/configuration/partial-cloverleaf-north-south-configuration.component'; +import { DisplacedLeftTurnInterchangeEastWestConfigurationComponent } from './interchanges/displaced-left-turn-interchange-east-west-junction/configuration/displaced-left-turn-interchange-east-west-configuration.component'; +import { DisplacedLeftTurnInterchangeEastWestDesignComponent } from './interchanges/displaced-left-turn-interchange-east-west-junction/design/displaced-left-turn-interchange-east-west-design.component'; +import { DoubleCrossoverDiamondInterchangeNorthSouthConfigurationComponent } from './interchanges/double-crossover-diamond-interchange-north-south-junction/configuration/double-crossover-diamond-interchange-north-south-configuration.component'; +import { DoubleCrossoverDiamondInterchangeEastWestDesignComponent } from './interchanges/double-crossover-diamond-interchange-east-west-junction/design/double-crossover-diamond-interchange-east-west-design.component'; +import { DoubleCrossoverDiamondInterchangeEastWestConfigurationComponent } from './interchanges/double-crossover-diamond-interchange-east-west-junction/configuration/double-crossover-diamond-interchange-east-west-configuration.component'; +import { SinglePointInterchangeNorthSouthConfigurationComponent } from './interchanges/single-point-interchange-north-south-junction/configuration/single-point-interchange-north-south-configuration.component'; +import { SinglePointInterchangeEastWestConfigurationComponent } from './interchanges/single-point-interchange-east-west-junction/configuration/single-point-interchange-east-west-configuration.component'; +import { SinglePointInterchangeEastWestDesignComponent } from './interchanges/single-point-interchange-east-west-junction/design/single-point-interchange-east-west-design.component'; @Component({ selector: 'capx-junction', @@ -30,10 +92,12 @@ export class JunctionComponent implements OnInit, OnDestroy { if (junctionName !== null && this.capxStateService.state.has(junctionName)) { const junction = this.capxStateService.state.get(junctionName) as Junction; this.title$.next(junction.title); + this.setPortalComponent(junctionName); + } else { + this.title$.next('unknown'); + this.design$.next(null); + this.configuration$.next(null); } - - this.design$.next(new ComponentPortal(ConventionalDesignComponent)); - this.configuration$.next(new ComponentPortal(ConventionalConfigurationComponent)); } ngOnDestroy(): void { @@ -41,4 +105,137 @@ export class JunctionComponent implements OnInit, OnDestroy { this.configuration$.complete(); this.title$.complete(); } + + setPortalComponent(junctionName: string): void { + switch (junctionName) { + case 'conventional': + this.design$.next(new ComponentPortal(ConventionalDesignComponent)); + this.configuration$.next(new ComponentPortal(ConventionalConfigurationComponent)); + return; + case 'conventional-shared-right-turn-left-turn': + this.design$.next(new ComponentPortal(ConventionalSharedRightTurnLeftTurnDesignComponent)); + this.configuration$.next(new ComponentPortal(ConventionalSharedRightTurnLeftTurnConfigurationComponent)); + return; + case 'quadrant-roadway-intersection-south-west': + this.design$.next(new ComponentPortal(QuadrantRoadwayIntersectionSouthWestDesignComponent)); + this.configuration$.next(new ComponentPortal(QuadrantRoadwayIntersectionSouthWestConfigurationComponent)); + return; + case 'quadrant-roadway-intersection-north-east': + this.design$.next(new ComponentPortal(QuadrantRoadwayIntersectionNorthEastDesignComponent)); + this.configuration$.next(new ComponentPortal(QuadrantRoadwayIntersectionNorthEastConfigurationComponent)); + return; + case 'quadrant-roadway-intersection-south-east': + this.design$.next(new ComponentPortal(QuadrantRoadwayIntersectionSouthEastDesignComponent)); + this.configuration$.next(new ComponentPortal(QuadrantRoadwayIntersectionSouthEastConfigurationComponent)); + return; + case 'quadrant-roadway-intersection-north-west': + this.design$.next(new ComponentPortal(QuadrantRoadwayIntersectionNorthWestDesignComponent)); + this.configuration$.next(new ComponentPortal(QuadrantRoadwayIntersectionNorthWestConfigurationComponent)); + return; + case 'partial-displaced-left-turn-intersection-north-south': + this.design$.next(new ComponentPortal(PartialDisplacedLeftTurnIntersectionNorthSouthDesignComponent)); + this.configuration$.next(new ComponentPortal(PartialDisplacedLeftTurnIntersectionNorthSouthConfigurationComponent)); + return; + case 'partial-displaced-left-turn-intersection-east-west': + this.design$.next(new ComponentPortal(PartialDisplacedLeftTurnIntersectionEastWestDesignComponent)); + this.configuration$.next(new ComponentPortal(PartialDisplacedLeftTurnIntersectionEastWestConfigurationComponent)); + return; + case 'full-displaced-left-turn-intersection': + this.design$.next(new ComponentPortal(FullDisplacedLeftTurnIntersectionDesignComponent)); + this.configuration$.next(new ComponentPortal(FullDisplacedLeftTurnIntersectionConfigurationComponent)); + return; + case 'restricted-crossing-uturn-intersection-north-south': + this.design$.next(new ComponentPortal(RestrictedCrossingUTurnIntersectionNorthSouthDesignComponent)); + this.configuration$.next(new ComponentPortal(RestrictedCrossingUTurnIntersectionNorthSouthConfigurationComponent)); + return; + case 'restricted-crossing-uturn-intersection-east-west': + this.design$.next(new ComponentPortal(RestrictedCrossingUTurnIntersectionEastWestDesignComponent)); + this.configuration$.next(new ComponentPortal(RestrictedCrossingUTurnIntersectionEastWestConfigurationComponent)); + return; + case 'median-uturn-intersection-north-south': + this.design$.next(new ComponentPortal(MedianUTurnIntersectionNorthSouthDesignComponent)); + this.configuration$.next(new ComponentPortal(MedianUTurnIntersectionNorthSouthConfigurationComponent)); + return; + case 'median-uturn-intersection-east-west': + this.design$.next(new ComponentPortal(MedianUTurnIntersectionEastWestDesignComponent)); + this.configuration$.next(new ComponentPortal(MedianUTurnIntersectionEastWestConfigurationComponent)); + return; + case 'partial-median-uturn-intersection-north-south': + this.design$.next(new ComponentPortal(PartialMedianUTurnIntersectionNorthSouthDesignComponent)); + this.configuration$.next(new ComponentPortal(PartialMedianUTurnIntersectionNorthSouthConfigurationComponent)); + return; + case 'partial-median-uturn-intersection-east-west': + this.design$.next(new ComponentPortal(PartialMedianUTurnIntersectionEastWestDesignComponent)); + this.configuration$.next(new ComponentPortal(PartialMedianUTurnIntersectionEastWestConfigurationComponent)); + return; + case 'fifty-icdmini-roundabout': + this.design$.next(new ComponentPortal(FiftyICDMiniRoundaboutDesignComponent)); + this.configuration$.next(new ComponentPortal(FiftyICDMiniRoundaboutConfigurationComponent)); + return; + case 'seventy-five-icdmini-roundabout': + this.design$.next(new ComponentPortal(SeventyFiveICDMiniRoundaboutDesignComponent)); + this.configuration$.next(new ComponentPortal(SeventyFiveICDMiniRoundaboutConfigurationComponent)); + return; + case 'one-north-southx-one-east-west-roundabout': + this.design$.next(new ComponentPortal(OneNorthSouthxOneEastWestRoundaboutDesignComponent)); + this.configuration$.next(new ComponentPortal(OneNorthSouthxOneEastWestRoundaboutConfigurationComponent)); + return; + case 'one-north-southx-two-east-west-lane-roundabout': + this.design$.next(new ComponentPortal(OneNorthSouthxTwoEastWestLaneRoundaboutDesignComponent)); + this.configuration$.next(new ComponentPortal(OneNorthSouthxTwoEastWestLaneRoundaboutConfigurationComponent)); + return; + case 'two-north-southx-one-east-west-lane-roundabout': + this.design$.next(new ComponentPortal(TwoNorthSouthxOneEastWestLaneRoundaboutDesignComponent)); + this.configuration$.next(new ComponentPortal(TwoNorthSouthxOneEastWestLaneRoundaboutConfigurationComponent)); + return; + case 'two-north-southx-two-east-west-lane-roundabout': + this.design$.next(new ComponentPortal(TwoNorthSouthxTwoEastWestLaneRoundaboutJunctionDesignComponent)); + this.configuration$.next(new ComponentPortal(TwoNorthSouthxTwoEastWestLaneRoundaboutJunctionConfigurationComponent)); + return; + case 'three-north-southx-three-east-west-lane-roundabout': + this.design$.next(new ComponentPortal(ThreeNorthSouthxThreeEastWestLaneRoundaboutDesignComponent)); + this.configuration$.next(new ComponentPortal(ThreeNorthSouthxThreeEastWestLaneRoundaboutConfigurationComponent)); + return; + case 'traditional-diamond-north-south': + this.design$.next(new ComponentPortal(TraditionalDiamondNorthSouthDesignComponent)); + this.configuration$.next(new ComponentPortal(TraditionalDiamondNorthSouthConfigurationComponent)); + return; + case 'traditional-diamond-east-west': + this.design$.next(new ComponentPortal(TraditionalDiamondEastWestDesignComponent)); + this.configuration$.next(new ComponentPortal(TraditionalDiamondEastWestConfigurationComponent)); + return; + case 'partial-cloverleaf-north-south': + this.design$.next(new ComponentPortal(PartialCloverleafNorthSouthDesignComponent)); + this.configuration$.next(new ComponentPortal(PartialCloverleafNorthSouthConfigurationComponent)); + return; + case 'partial-cloverleaf-east-west': + this.design$.next(new ComponentPortal(PartialCloverleafEastWestDesignComponent)); + this.configuration$.next(new ComponentPortal(PartialCloverleafEastWestConfigurationComponent)); + return; + case 'displaced-left-turn-interchange-north-south': + this.design$.next(new ComponentPortal(DisplacedLeftTurnInterchangeNorthSouthDesignComponent)); + this.configuration$.next(new ComponentPortal(DisplacedLeftTurnInterchangeNorthSouthConfigurationComponent)); + return; + case 'displaced-left-turn-interchange-east-west': + this.design$.next(new ComponentPortal(DisplacedLeftTurnInterchangeEastWestDesignComponent)); + this.configuration$.next(new ComponentPortal(DisplacedLeftTurnInterchangeEastWestConfigurationComponent)); + return; + case 'double-crossover-diamond-interchange-north-south': + this.design$.next(new ComponentPortal(DoubleCrossoverDiamondInterchangeNorthSouthDesignComponent)); + this.configuration$.next(new ComponentPortal(DoubleCrossoverDiamondInterchangeNorthSouthConfigurationComponent)); + return; + case 'double-crossover-diamond-interchange-east-west': + this.design$.next(new ComponentPortal(DoubleCrossoverDiamondInterchangeEastWestDesignComponent)); + this.configuration$.next(new ComponentPortal(DoubleCrossoverDiamondInterchangeEastWestConfigurationComponent)); + return; + case 'single-point-interchange-north-south': + this.design$.next(new ComponentPortal(SinglePointInterchangeNorthSouthDesignComponent)); + this.configuration$.next(new ComponentPortal(SinglePointInterchangeNorthSouthConfigurationComponent)); + return; + case 'single-point-interchange-east-west': + this.design$.next(new ComponentPortal(SinglePointInterchangeEastWestDesignComponent)); + this.configuration$.next(new ComponentPortal(SinglePointInterchangeEastWestConfigurationComponent)); + return; + } + } } diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/fifty-icdmini-roundabout-junction/fifty-icdmini-roundabout-junction.component.html b/projects/capx/src/app/capx/components/junctions/roundabouts/fifty-icdmini-roundabout-junction/fifty-icdmini-roundabout-junction.component.html deleted file mode 100644 index 6bff34c..0000000 --- a/projects/capx/src/app/capx/components/junctions/roundabouts/fifty-icdmini-roundabout-junction/fifty-icdmini-roundabout-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - 50' ICD Mini-Roundabout -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/fifty-icdmini-roundabout-junction/fifty-icdmini-roundabout-junction.component.scss b/projects/capx/src/app/capx/components/junctions/roundabouts/fifty-icdmini-roundabout-junction/fifty-icdmini-roundabout-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/fifty-icdmini-roundabout-junction/fifty-icdmini-roundabout-junction.component.ts b/projects/capx/src/app/capx/components/junctions/roundabouts/fifty-icdmini-roundabout-junction/fifty-icdmini-roundabout-junction.component.ts deleted file mode 100644 index 56de9a3..0000000 --- a/projects/capx/src/app/capx/components/junctions/roundabouts/fifty-icdmini-roundabout-junction/fifty-icdmini-roundabout-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-fifty-icdmini-roundabout-junction', - templateUrl: './fifty-icdmini-roundabout-junction.component.html', - styleUrls: ['./fifty-icdmini-roundabout-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class FiftyICDMiniRoundaboutJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-one-east-west-roundabout-junction/one-north-southx-one-east-west-roundabout-junction.component.html b/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-one-east-west-roundabout-junction/one-north-southx-one-east-west-roundabout-junction.component.html deleted file mode 100644 index 980b1d3..0000000 --- a/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-one-east-west-roundabout-junction/one-north-southx-one-east-west-roundabout-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - 1 NS x 1 EW Roundabout -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-one-east-west-roundabout-junction/one-north-southx-one-east-west-roundabout-junction.component.scss b/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-one-east-west-roundabout-junction/one-north-southx-one-east-west-roundabout-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-one-east-west-roundabout-junction/one-north-southx-one-east-west-roundabout-junction.component.ts b/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-one-east-west-roundabout-junction/one-north-southx-one-east-west-roundabout-junction.component.ts deleted file mode 100644 index 163a6ff..0000000 --- a/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-one-east-west-roundabout-junction/one-north-southx-one-east-west-roundabout-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-one-north-southx-one-east-west-roundabout-junction', - templateUrl: './one-north-southx-one-east-west-roundabout-junction.component.html', - styleUrls: ['./one-north-southx-one-east-west-roundabout-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class OneNorthSouthxOneEastWestRoundaboutJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/one-north-southx-two-east-west-lane-roundabout-junction.component.html b/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/one-north-southx-two-east-west-lane-roundabout-junction.component.html deleted file mode 100644 index a0706ea..0000000 --- a/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/one-north-southx-two-east-west-lane-roundabout-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - 1 NS x 2 EW Lane Roundabout -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/one-north-southx-two-east-west-lane-roundabout-junction.component.scss b/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/one-north-southx-two-east-west-lane-roundabout-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/one-north-southx-two-east-west-lane-roundabout-junction.component.ts b/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/one-north-southx-two-east-west-lane-roundabout-junction.component.ts deleted file mode 100644 index d3c6ab5..0000000 --- a/projects/capx/src/app/capx/components/junctions/roundabouts/one-north-southx-two-east-west-lane-roundabout-junction/one-north-southx-two-east-west-lane-roundabout-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-one-north-southx-two-east-west-lane-roundabout-junction', - templateUrl: './one-north-southx-two-east-west-lane-roundabout-junction.component.html', - styleUrls: ['./one-north-southx-two-east-west-lane-roundabout-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class OneNorthSouthxTwoEastWestLaneRoundaboutJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/seventy-five-icdmini-roundabout-junction/seventy-five-icdmini-roundabout-junction.component.html b/projects/capx/src/app/capx/components/junctions/roundabouts/seventy-five-icdmini-roundabout-junction/seventy-five-icdmini-roundabout-junction.component.html deleted file mode 100644 index e58d69e..0000000 --- a/projects/capx/src/app/capx/components/junctions/roundabouts/seventy-five-icdmini-roundabout-junction/seventy-five-icdmini-roundabout-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - 75' ICD Mini-Roundabout -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/seventy-five-icdmini-roundabout-junction/seventy-five-icdmini-roundabout-junction.component.scss b/projects/capx/src/app/capx/components/junctions/roundabouts/seventy-five-icdmini-roundabout-junction/seventy-five-icdmini-roundabout-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/seventy-five-icdmini-roundabout-junction/seventy-five-icdmini-roundabout-junction.component.ts b/projects/capx/src/app/capx/components/junctions/roundabouts/seventy-five-icdmini-roundabout-junction/seventy-five-icdmini-roundabout-junction.component.ts deleted file mode 100644 index 525b1e3..0000000 --- a/projects/capx/src/app/capx/components/junctions/roundabouts/seventy-five-icdmini-roundabout-junction/seventy-five-icdmini-roundabout-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-seventy-five-icdmini-roundabout-junction', - templateUrl: './seventy-five-icdmini-roundabout-junction.component.html', - styleUrls: ['./seventy-five-icdmini-roundabout-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class SeventyFiveICDMiniRoundaboutJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/three-north-southx-three-east-west-lane-roundabout-junction.component.html b/projects/capx/src/app/capx/components/junctions/roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/three-north-southx-three-east-west-lane-roundabout-junction.component.html deleted file mode 100644 index 88b4080..0000000 --- a/projects/capx/src/app/capx/components/junctions/roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/three-north-southx-three-east-west-lane-roundabout-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - 3 NS x 3 EW Lane Roundabout -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/three-north-southx-three-east-west-lane-roundabout-junction.component.scss b/projects/capx/src/app/capx/components/junctions/roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/three-north-southx-three-east-west-lane-roundabout-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/three-north-southx-three-east-west-lane-roundabout-junction.component.ts b/projects/capx/src/app/capx/components/junctions/roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/three-north-southx-three-east-west-lane-roundabout-junction.component.ts deleted file mode 100644 index 249a3f8..0000000 --- a/projects/capx/src/app/capx/components/junctions/roundabouts/three-north-southx-three-east-west-lane-roundabout-junction/three-north-southx-three-east-west-lane-roundabout-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-three-north-southx-three-east-west-lane-roundabout-junction', - templateUrl: './three-north-southx-three-east-west-lane-roundabout-junction.component.html', - styleUrls: ['./three-north-southx-three-east-west-lane-roundabout-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class ThreeNorthSouthxThreeEastWestLaneRoundaboutJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/two-north-southx-one-east-west-lane-roundabout-junction.component.html b/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/two-north-southx-one-east-west-lane-roundabout-junction.component.html deleted file mode 100644 index 6396a3b..0000000 --- a/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/two-north-southx-one-east-west-lane-roundabout-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - 2 NS x 1 EW Lane Roundabout -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/two-north-southx-one-east-west-lane-roundabout-junction.component.scss b/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/two-north-southx-one-east-west-lane-roundabout-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/two-north-southx-one-east-west-lane-roundabout-junction.component.ts b/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/two-north-southx-one-east-west-lane-roundabout-junction.component.ts deleted file mode 100644 index 1e8ac0f..0000000 --- a/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-one-east-west-lane-roundabout-junction/two-north-southx-one-east-west-lane-roundabout-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-two-north-southx-one-east-west-lane-roundabout-junction', - templateUrl: './two-north-southx-one-east-west-lane-roundabout-junction.component.html', - styleUrls: ['./two-north-southx-one-east-west-lane-roundabout-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class TwoNorthSouthxOneEastWestLaneRoundaboutJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/two-north-southx-two-east-west-lane-roundabout-junction.component.html b/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/two-north-southx-two-east-west-lane-roundabout-junction.component.html deleted file mode 100644 index 53c0e98..0000000 --- a/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/two-north-southx-two-east-west-lane-roundabout-junction.component.html +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- - Back to Results - 2 NS x 2 EW Lane Roundabout -
- - - - -
- -
- - - - - - Configuration - - - -
diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/two-north-southx-two-east-west-lane-roundabout-junction.component.scss b/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/two-north-southx-two-east-west-lane-roundabout-junction.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/two-north-southx-two-east-west-lane-roundabout-junction.component.ts b/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/two-north-southx-two-east-west-lane-roundabout-junction.component.ts deleted file mode 100644 index 27037cc..0000000 --- a/projects/capx/src/app/capx/components/junctions/roundabouts/two-north-southx-two-east-west-lane-roundabout-junction/two-north-southx-two-east-west-lane-roundabout-junction.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'capx-two-north-southx-two-east-west-lane-roundabout-junction', - templateUrl: './two-north-southx-two-east-west-lane-roundabout-junction.component.html', - styleUrls: ['./two-north-southx-two-east-west-lane-roundabout-junction.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class TwoNorthSouthxTwoEastWestLaneRoundaboutJunctionComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -}