Skip to content

Commit f257de2

Browse files
committed
Slight change to OWR-3 treatment of diag Ts that do not require mirroring.
1 parent c6b3e99 commit f257de2

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

src/main/scala/module/NwmResolver.scala

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,13 +428,18 @@ class NwmResolver extends IdResolver {
428428
add(nwmRangeId(n) + 0xCF89, n~NW & Nrd4~CEN, when = n != Owr1) // Nrd4 2
429429
}
430430

431+
//OWR-3-specific situations
432+
for (n <- Seq(Owr3)) {
433+
//OxD
434+
add(nwmRangeId(n) + 0xA000, n~NS & Street~CSE) // Street
435+
add(nwmRangeId(n) + 0xA100, n~NS & Road~CSE) // Road
436+
}
437+
431438
//projected networks
432439
builder.addOne((Tla3~NS).projectLeft & Street~CSE, IdTile(0x5100A000, R0F0, nonMirroredOnly)) // Street
433440
builder.addOne((Tla3~NS).projectRight & Street~CSE, IdTile(0x7100A000, R0F0, mirroredOnly)) // Street
434-
builder.addOne(Owr3~NS & Street~CSE, IdTile(0x5104A000, R0F0)) // Street
435441
builder.addOne((Tla3~NS).projectLeft & Road~CSE, IdTile(0x5100A100, R0F0, nonMirroredOnly)) // Road
436442
builder.addOne((Tla3~NS).projectRight & Road~CSE, IdTile(0x7100A100, R0F0, mirroredOnly)) // Road
437-
builder.addOne(Owr3~NS & Road~CSE, IdTile(0x5104A100, R0F0)) // Street
438443
builder.addOne((Tla3~NS).projectLeft & Onewayroad~CSE, IdTile(0x5100A200, R0F0, nonMirroredOnly)) // Onewayroad
439444
builder.addOne((Tla3~NS).projectRight & Onewayroad~CSE, IdTile(0x7100A200, R0F0, mirroredOnly)) // Onewayroad
440445
builder.addOne((Owr3~NS).projectLeft & Onewayroad~CSE, IdTile(0x5104A200, R0F0, nonMirroredOnly)) // Onewayroad

0 commit comments

Comments
 (0)