Skip to content

Commit 6be45ef

Browse files
memo33memo33
committed
define more IDs for GLR to identify bad orientations
1 parent 98d735b commit 6be45ef

3 files changed

Lines changed: 9 additions & 78 deletions

File tree

‎Controller/RUL2/10_GLR/Sec10a_GLR1.txt‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@
5656
; > GLRxdiagRoad
5757
; > GLRxdiagOneWayRoad
5858
; > GLRxdiagRHW-2
59-
0x5f880200,0,0,0x57007720,3,0=0x5f880200,0,0,0x57007700,1,0
60-
0x5f880200,0,0,0x57007720,1,1=0x5f880200,0,0,0x57007700,3,1
61-
0x5f880200,3,0,0x57007720,3,0=0x5f880200,3,0,0x57007700,1,0
62-
0x5f880200,3,0,0x57007720,1,1=0x5f880200,3,0,0x57007700,3,1
6359
; > GLRxdiagRail
6460
; > GLRxdiagAvenue
6561
;
@@ -110,12 +106,6 @@
110106
; > GLRxdiagRoad
111107
; > GLRxdiagOneWayRoad
112108
; > GLRxdiagRHW-2
113-
0x5f881200,0,0,0x57007720,3,0=0x5f881200,0,0,0x57007700,1,0
114-
0x5f881200,0,0,0x57007720,1,1=0x5f881200,0,0,0x57007700,3,1
115-
0x5f881200,1,0,0x57007720,3,0=0x5f881200,1,0,0x57007700,1,0
116-
0x5f881200,1,0,0x57007720,1,1=0x5f881200,1,0,0x57007700,3,1
117-
0x5f881200,3,0,0x57007720,3,0=0x5f881200,3,0,0x57007700,1,0
118-
0x5f881200,3,0,0x57007720,1,1=0x5f881200,3,0,0x57007700,3,1
119109
; > GLRxdiagRail
120110
; > GLRxdiagAvenue
121111
;
@@ -162,14 +152,6 @@
162152
; > GLRxdiagRoad
163153
; > GLRxdiagOneWayRoad
164154
; > GLRxdiagRHW-2
165-
0x5f881100,0,0,0x57007720,3,0=0x5f881100,0,0,0x57007700,1,0
166-
0x5f881100,0,0,0x57007720,1,1=0x5f881100,0,0,0x57007700,3,1
167-
0x5f881100,1,0,0x57007720,3,0=0x5f881100,1,0,0x57007700,1,0
168-
0x5f881100,1,0,0x57007720,1,1=0x5f881100,1,0,0x57007700,3,1
169-
0x5f881100,2,0,0x57007720,3,0=0x5f881100,2,0,0x57007700,1,0
170-
0x5f881100,2,0,0x57007720,1,1=0x5f881100,2,0,0x57007700,3,1
171-
0x5f881100,3,0,0x57007720,3,0=0x5f881100,3,0,0x57007700,1,0
172-
0x5f881100,3,0,0x57007720,1,1=0x5f881100,3,0,0x57007700,3,1
173155
; > GLRxdiagRail
174156
; > GLRxdiagAvenue
175157
;
@@ -210,10 +192,6 @@
210192
; > GLRxdiagRoad
211193
; > GLRxdiagOneWayRoad
212194
; > GLRxdiagRHW-2
213-
0x5f880500,1,1,0x57007720,3,0=0x5f880500,1,1,0x57007700,1,0
214-
0x5f880500,1,1,0x57007720,1,1=0x5f880500,1,1,0x57007700,3,1
215-
0x5f880500,3,0,0x57007720,3,0=0x5f880500,3,0,0x57007700,1,0
216-
0x5f880500,3,0,0x57007720,1,1=0x5f880500,3,0,0x57007700,3,1
217195
; > GLRxdiagRail
218196
; > GLRxdiagAvenue
219197
;
@@ -387,8 +365,6 @@
387365
; > diagGLRxdiagRoad
388366
; > diagGLRxdiagOneWayRoad
389367
; > diagGLRxdiagRHW-2
390-
0x5f880400,0,0,0x5700A720,2,0=0x5f880400,0,0,0x5700A700,0,1
391-
0x5f880400,2,1,0x5700A720,0,1=0x5f880400,2,1,0x5700A700,2,0
392368
; > diagGLRxdiagRail
393369
; > diagGLRxdiagAvenue
394370
;
@@ -872,10 +848,6 @@
872848
; > GLRxdiagRoad
873849
; > GLRxdiagOneWayRoad
874850
; > GLRxdiagRHW-2
875-
0x5f880300,1,0,0x57007720,3,0=0x5f880300,1,0,0x57007700,1,0
876-
0x5f880300,1,0,0x57007720,1,1=0x5f880300,1,0,0x57007700,3,1
877-
0x5f880300,3,0,0x57007720,3,0=0x5f880300,3,0,0x57007700,1,0
878-
0x5f880300,3,0,0x57007720,1,1=0x5f880300,3,0,0x57007700,3,1
879851
; > GLRxdiagRail
880852
; > GLRxdiagAvenue
881853
;
@@ -912,10 +884,6 @@
912884
; > GLRxdiagRoad
913885
; > GLRxdiagOneWayRoad
914886
; > GLRxdiagRHW-2
915-
0x5f880d00,1,0,0x57007720,3,0=0x5f880d00,1,0,0x57007700,1,0
916-
0x5f880d00,1,0,0x57007720,1,1=0x5f880d00,1,0,0x57007700,3,1
917-
0x5f880d00,3,0,0x57007720,3,0=0x5f880d00,3,0,0x57007700,1,0
918-
0x5f880d00,3,0,0x57007720,1,1=0x5f880d00,3,0,0x57007700,3,1
919887
; > GLRxdiagRail
920888
; > GLRxdiagAvenue
921889
;
@@ -952,10 +920,6 @@
952920
; > GLRxdiagRoad
953921
; > GLRxdiagOneWayRoad
954922
; > GLRxdiagRHW-2
955-
0x5f880e00,1,0,0x57007720,3,0=0x5f880e00,1,0,0x57007700,1,0
956-
0x5f880e00,1,0,0x57007720,1,1=0x5f880e00,1,0,0x57007700,3,1
957-
0x5f880e00,3,0,0x57007720,3,0=0x5f880e00,3,0,0x57007700,1,0
958-
0x5f880e00,3,0,0x57007720,1,1=0x5f880e00,3,0,0x57007700,3,1
959923
; > GLRxdiagRail
960924
; > GLRxdiagAvenue
961925
;
@@ -992,10 +956,6 @@
992956
; > GLRxdiagRoad
993957
; > GLRxdiagOneWayRoad
994958
; > GLRxdiagRHW-2
995-
0x5f881000,1,0,0x57007720,3,0=0x5f881000,1,0,0x57007700,1,0
996-
0x5f881000,1,0,0x57007720,1,1=0x5f881000,1,0,0x57007700,3,1
997-
0x5f881000,3,0,0x57007720,3,0=0x5f881000,3,0,0x57007700,1,0
998-
0x5f881000,3,0,0x57007720,1,1=0x5f881000,3,0,0x57007700,3,1
999959
; > GLRxdiagRail
1000960
; > GLRxdiagAvenue
1001961
;
@@ -1066,10 +1026,6 @@
10661026
; > GLRxdiagRoad
10671027
; > GLRxdiagOneWayRoad
10681028
; > GLRxdiagRHW-2
1069-
0x57001700,0,0,0x57007720,3,0=0x57001700,0,0,0x57007700,1,0
1070-
0x57001700,0,0,0x57007720,1,1=0x57001700,0,0,0x57007700,3,1
1071-
0x57001700,2,0,0x57007720,3,0=0x57001700,2,0,0x57007700,1,0
1072-
0x57001700,2,0,0x57007720,1,1=0x57001700,2,0,0x57007700,3,1
10731029
; > GLRxdiagRail
10741030
; > GLRxdiagAvenue
10751031
;
@@ -1105,10 +1061,6 @@
11051061
; > GLRxdiagRoad
11061062
; > GLRxdiagOneWayRoad
11071063
; > GLRxdiagRHW-2
1108-
0x57101700,0,0,0x57007720,3,0=0x57101700,0,0,0x57007700,1,0
1109-
0x57101700,0,0,0x57007720,1,1=0x57101700,0,0,0x57007700,3,1
1110-
0x57101700,2,0,0x57007720,3,0=0x57101700,2,0,0x57007700,1,0
1111-
0x57101700,2,0,0x57007720,1,1=0x57101700,2,0,0x57007700,3,1
11121064
; > GLRxdiagRail
11131065
; > GLRxdiagAvenue
11141066
;GLRxRHW-2 - 0x57001720 > 0x57001700
@@ -1310,10 +1262,6 @@
13101262
; > GLRxdiagRoad
13111263
; > GLRxdiagOneWayRoad
13121264
; > GLRxdiagRHW-2
1313-
0x5f881900,3,0,0x57007720,3,0=0x5f881900,3,0,0x57007700,1,0
1314-
0x5f881900,3,0,0x57007720,1,1=0x5f881900,3,0,0x57007700,3,1
1315-
0x5f881900,1,1,0x57007720,3,0=0x5f881900,1,1,0x57007700,1,0
1316-
0x5f881900,1,1,0x57007720,1,1=0x5f881900,1,1,0x57007700,3,1
13171265
; > GLRxdiagRail
13181266
; > GLRxdiagAvenue
13191267
;
@@ -1352,10 +1300,6 @@
13521300
; > GLRxdiagRoad
13531301
; > GLRxdiagOneWayRoad
13541302
; > GLRxdiagRHW-2
1355-
0x5f881a00,3,0,0x57007720,3,0=0x5f881a00,3,0,0x57007700,1,0
1356-
0x5f881a00,3,0,0x57007720,1,1=0x5f881a00,3,0,0x57007700,3,1
1357-
0x5f881a00,1,1,0x57007720,3,0=0x5f881a00,1,1,0x57007700,1,0
1358-
0x5f881a00,1,1,0x57007720,1,1=0x5f881a00,1,1,0x57007700,3,1
13591303
; > GLRxdiagRail
13601304
; > GLRxdiagAvenue
13611305
;
@@ -1402,10 +1346,6 @@
14021346
; > GLRxdiagRoad
14031347
; > GLRxdiagOneWayRoad
14041348
; > GLRxdiagRHW-2
1405-
0x5f881b00,1,0,0x57007720,3,0=0x5f881b00,1,0,0x57007700,1,0
1406-
0x5f881b00,1,0,0x57007720,1,1=0x5f881b00,1,0,0x57007700,3,1
1407-
0x5f881b00,3,1,0x57007720,3,0=0x5f881b00,3,1,0x57007700,1,0
1408-
0x5f881b00,3,1,0x57007720,1,1=0x5f881b00,3,1,0x57007700,3,1
14091349
; > GLRxdiagRail
14101350
; > GLRxdiagAvenue
14111351
;
@@ -1578,8 +1518,6 @@
15781518
; > diagGLRxdiagRoad
15791519
; > diagGLRxdiagOneWayRoad
15801520
; > diagGLRxdiagRoad
1581-
0x5f881d00,2,1,0x5700A720,2,0=0x5f881d00,2,1,0x5700A700,0,1
1582-
0x5f881d00,0,0,0x5700A720,0,1=0x5f881d00,0,0,0x5700A700,2,0
15831521
; > diagGLRxdiagRail
15841522
; > diagGLRxdiagAvenue
15851523
;
@@ -1623,8 +1561,6 @@
16231561
; > diagGLRxdiagRoad
16241562
; > diagGLRxdiagOneWayRoad
16251563
; > diagGLRxdiagRHW-2
1626-
0x5f881e00,2,1,0x5700A720,2,0=0x5f881e00,2,1,0x5700A700,0,1
1627-
0x5f881e00,0,0,0x5700A720,0,1=0x5f881e00,0,0,0x5700A700,2,0
16281564
; > diagGLRxdiagRail
16291565
; > diagGLRxdiagAvenue
16301566
;
@@ -1655,8 +1591,6 @@
16551591
; > diagGLRxdiagRoad
16561592
; > diagGLRxdiagOneWayRoad
16571593
; > diagGLRxdiagRoad
1658-
0x5f881f00,2,1,0x5700A720,2,0=0x5f881f00,2,1,0x5700A700,0,1
1659-
0x5f881f00,0,0,0x5700A720,0,1=0x5f881f00,0,0,0x5700A700,2,0
16601594
; > diagGLRxdiagRail
16611595
; > diagGLRxdiagAvenue
16621596
;
@@ -1692,8 +1626,6 @@
16921626
; > diagGLRxdiagRoad
16931627
; > diagGLRxdiagOneWayRoad
16941628
; > diagGLRxdiagRHW-2
1695-
0x5f882000,2,1,0x5700A720,2,0=0x5f882000,2,1,0x5700A700,2,0
1696-
0x5f882000,0,0,0x5700A720,0,1=0x5f882000,0,0,0x5700A700,0,1
16971629
; > diagGLRxdiagRail
16981630
; > diagGLRxdiagAvenue
16991631
;
@@ -1848,8 +1780,6 @@
18481780
; > diagGLRxdiagRoad
18491781
; > diagGLRxdiagOneWayRoad
18501782
; > diagGLRxdiagRoad
1851-
0x5f882200,2,1,0x5700A720,2,0=0x5f882200,2,1,0x5700A700,0,1
1852-
0x5f882200,0,0,0x5700A720,0,1=0x5f882200,0,0,0x5700A700,2,0
18531783
; > diagGLRxdiagRail
18541784
; > diagGLRxdiagAvenue
18551785
;
@@ -1893,8 +1823,6 @@
18931823
; > diagGLRxdiagRoad
18941824
; > diagGLRxdiagOneWayRoad
18951825
; > diagGLRxdiagRHW-2
1896-
0x5f882300,2,1,0x5700A720,2,0=0x5f882300,2,1,0x5700A700,0,1
1897-
0x5f882300,0,0,0x5700A720,0,1=0x5f882300,0,0,0x5700A700,2,0
18981826
; > diagGLRxdiagRail
18991827
; > diagGLRxdiagAvenue
19001828
;
@@ -1925,8 +1853,6 @@
19251853
; > diagGLRxdiagRoad
19261854
; > diagGLRxdiagOneWayRoad
19271855
; > diagGLRxdiagRoad
1928-
0x5f882400,2,1,0x5700A720,2,0=0x5f882400,2,1,0x5700A700,0,1
1929-
0x5f882400,0,0,0x5700A720,0,1=0x5f882400,0,0,0x5700A700,2,0
19301856
; > diagGLRxdiagRail
19311857
; > diagGLRxdiagAvenue
19321858
;
@@ -1960,8 +1886,6 @@
19601886
; > diagGLRxdiagRoad
19611887
; > diagGLRxdiagOneWayRoad
19621888
; > diagGLRxdiagRoad
1963-
0x5f882500,1,0,0x5700A720,2,0=0x5f882500,1,0,0x5700A700,0,1
1964-
0x5f882500,3,1,0x5700A720,0,1=0x5f882500,3,1,0x5700A700,2,0
19651889
; > diagGLRxdiagRail
19661890
; > diagGLRxdiagAvenue
19671891
;

‎src/main/scala/module/MiscResolver.scala‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,15 @@ class MiscResolver extends IdResolver {
526526
}
527527
}
528528

529-
// GLR + intersections
529+
// GLR crossings
530530
for ((glr, offset) <- Seq(Glr1, Glr2, Glr3, Glr4).zip(Seq(0, 0x4000, 0x8000, 0xc000))) {
531+
add(0x5f880200 + offset, glr~(0,0,2,2))
532+
add(0x5f880500 + offset, glr~(0,13,0,2))
533+
add(0x5f880400 + offset, glr~(0,0,1,13))
534+
add(0x5f881100 + offset, glr~(2,2,2,2))
535+
add(0x5f881100 + offset, glr~NS & glr~WE)
536+
add(0x5f881200 + offset, glr~(0,2,2,2))
537+
add(0x5f881200 + offset, glr~NS & glr~CE)
531538
// O×O
532539
add(0x5f880300 + offset, glr~NS & Road~WE)
533540
add(0x5f880d00 + offset, glr~NS & Street~WE)

‎src/main/scala/module/NetworkProperties.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ object NetworkProperties {
7272
else if (rhw.height != 0) false
7373
else if (any > rhw && any.isRhw) rhwIntersectionAllowed(any, rhw)
7474
else {
75-
rhw == Dirtroad && any == Dirtroad ||
75+
rhw == Dirtroad && (any == Dirtroad || GlrNetworks.contains(any)) ||
7676
rhw == Rhw3 && any == Dirtroad ||
7777
rhw == Mis && (any == Dirtroad || any == Rhw3) ||
7878
rhw == Rhw4 && any == Dirtroad ||

0 commit comments

Comments
 (0)