Skip to content

Commit 1afc93c

Browse files
committed
Adds differentiation between definitions for L1/L2 Avenue Short-Ts and Road/OWR Ts in ViaductResolver.
1 parent 33f859a commit 1afc93c

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

src/main/scala/module/ViaductResolver.scala

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,18 +128,22 @@ class ViaductResolver extends IdResolver {
128128
for (n <- Viaducts) {
129129
val id = ViaductResolver.viaductRangeId(n)
130130
if (n.height == 1) {
131-
add(id + 0x3110, n~SN & L1Road~CE)
131+
add(id + 0x3110, n~SN & L1Road~CE, when = n.isSymm)
132+
add(id + 0x3110, n~NS & L1Road~WC, when = !n.isSymm)
132133
add(id + 0x3115, n~SN & L1Road~WC, when = !n.isSymm)
133-
add(id + 0x3210, n~SN & L1Onewayroad~CE)
134+
add(id + 0x3210, n~SN & L1Onewayroad~CE, when = n.isSymm)
135+
add(id + 0x3210, n~NS & L1Onewayroad~WC, when = !n.isSymm)
134136
add(id + 0x3215, n~SN & L1Onewayroad~WC, when = !n.isSymm)
135137
add(id + 0x3310, n~WE & L1Avenue~NC, when = n.isSymm)
136138
add(id + 0x3315, n~WE & L1Avenue~NC, when = !n.isSymm)
137139
}
138140
if (n.height == 2) {
139-
add(id + 0x3120, n~SN & L2Road~CE)
140-
add(id + 0x3125, n~SN & L2Road~WC, when = !n.isSymm)
141-
add(id + 0x3220, n~SN & L2Onewayroad~CE)
142-
add(id + 0x3225, n~SN & L2Onewayroad~WC, when = !n.isSymm)
141+
add(id + 0x3120, n~SN & L1Road~CE, when = n.isSymm)
142+
add(id + 0x3120, n~NS & L1Road~WC, when = !n.isSymm)
143+
add(id + 0x3125, n~SN & L1Road~WC, when = !n.isSymm)
144+
add(id + 0x3220, n~SN & L1Onewayroad~CE, when = n.isSymm)
145+
add(id + 0x3220, n~NS & L1Onewayroad~WC, when = !n.isSymm)
146+
add(id + 0x3225, n~SN & L1Onewayroad~WC, when = !n.isSymm)
143147
add(id + 0x3320, n~WE & L2Avenue~NC, when = n.isSymm)
144148
add(id + 0x3325, n~WE & L2Avenue~NC, when = !n.isSymm)
145149
}

0 commit comments

Comments
 (0)