Skip to content

Commit e5fd1c8

Browse files
committed
Enables base 90° curves on L1/L2 Road Viaducts.
1 parent c4f6543 commit e5fd1c8

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/main/scala/module/Curve45Generator.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ trait Curve45Generator extends Stability { this: RuleGenerator =>
8989
}
9090

9191
def hasSharpCurve(n: Network, inside: Boolean): Boolean = {
92-
n >= L1Rhw2 && n <= L4Rhw6s || n >= Tla3 && n <= Nrd4 || n == Tla5 || n == Rd6 || n == Owr5 ||
92+
n >= L1Rhw2 && n <= L4Rhw6s || n >= Tla3 && n <= Nrd4 || n == Tla5 || n == Rd6 || n == Owr5 || n == L1Road || n == L2Road || n == L1Onewayroad || n == L2Onewayroad ||
9393
inside && (n == Ave6 || n == Ave8)
9494
}
9595

@@ -104,11 +104,11 @@ trait Curve45Generator extends Stability { this: RuleGenerator =>
104104

105105
def hasMisStyle90Curve(n: Network, inside: Boolean): Boolean = {
106106
(n >= Mis && n <= L4Mis) ||
107-
!inside && (n == Tla5 || n == Rd4 || n.isOwr4Like)
107+
!inside && (n == Tla5 || n == Rd4 || n.isOwr4Like || n == L1Avenue || n == L2Avenue)
108108
}
109109

110110
def has90Curve(n: Network, inside: Boolean): Boolean = {
111-
n.isNwm && (isSingleTile(n) || inside && (n == Tla5 || n == Rd4 || n.isOwr4Like))
111+
(n.isNwm || n.isViaduct) && (isSingleTile(n) || inside && (n == Tla5 || n == Rd4 || n.isOwr4Like))
112112
}
113113

114114
def createCurve45Rules(main: Network): Unit = {

0 commit comments

Comments
 (0)