@@ -151,31 +151,43 @@ class ViaductResolver extends IdResolver {
151151 }
152152 }
153153
154- // T intersections
155- for (n <- Viaducts ) {
156- val id = ViaductResolver .viaductRangeId(n)
157- if (n.height == 1 ) {
158- add(id + 0x3110 , n~ SN & L1Road ~ CE , when = n.isSymm)
159- add(id + 0x3110 , n~ SN & L1Road ~ CE , when = ! n.isSymm)
160- add(id + 0x3115 , n~ SN & L1Road ~ WC , when = ! n.isSymm)
161- add(id + 0x3210 , n~ SN & L1Onewayroad ~ CE , when = n.isSymm)
162- add(id + 0x3210 , n~ SN & L1Onewayroad ~ CE , when = ! n.isSymm)
163- add(id + 0x3215 , n~ SN & L1Onewayroad ~ WC , when = ! n.isSymm)
164- add(id + 0x3310 , n~ WE & L1Avenue ~ NC , when = n.isSymm)
165- add(id + 0x3315 , n~ WE & L1Avenue ~ NC , when = ! n.isSymm)
166- }
167- if (n.height == 2 ) {
168- add(id + 0x3120 , n~ SN & L2Road ~ CE , when = n.isSymm)
169- add(id + 0x3120 , n~ SN & L2Road ~ CE , when = ! n.isSymm)
170- add(id + 0x3125 , n~ SN & L2Road ~ WC , when = ! n.isSymm)
171- add(id + 0x3220 , n~ SN & L2Onewayroad ~ CE , when = n.isSymm)
172- add(id + 0x3220 , n~ SN & L2Onewayroad ~ CE , when = ! n.isSymm)
173- add(id + 0x3225 , n~ SN & L2Onewayroad ~ WC , when = ! n.isSymm)
174- add(id + 0x3320 , n~ WE & L2Avenue ~ NC , when = n.isSymm)
175- add(id + 0x3325 , n~ WE & L2Avenue ~ NC , when = ! n.isSymm)
176- }
177- }
178-
154+ // At-Grade intersections
155+ // add(0x5C001110, L1Road~NS & L1Road~WE)
156+ add(0x5C003110 , L1Road ~ NS & L1Road ~ CE )
157+ add(0x5C003210 , L1Road ~ NS & L1Onewayroad ~ CE )
158+ add(0x5C003310 , L1Road ~ WE & L1Avenue ~ NC )
159+ // add(0x5C011110, L1Onewayroad~NS & L1Road~WE)
160+ // add(0x5C011210, L1Onewayroad~NS & L1Onewayroad~WE)
161+ add(0x5C013110 , L1Onewayroad ~ NS & L1Road ~ CE )
162+ add(0x5C013210 , L1Onewayroad ~ NS & L1Onewayroad ~ CE )
163+ add(0x5C013310 , L1Onewayroad ~ WE & L1Avenue ~ NC )
164+ // add(0x5C021110, L1Avenue~NS & L1Road~WE)
165+ // add(0x5C021210, L1Avenue~NS & L1Onewayroad~WE)
166+ // add(0x5C021310, L1Avenue~NS & L1Avenue~EW)
167+ add(0x5C023110 , L1Avenue ~ SN & L1Road ~ CE )
168+ add(0x5C023115 , L1Avenue ~ SN & L1Road ~ WC )
169+ add(0x5C023210 , L1Avenue ~ SN & L1Onewayroad ~ CE )
170+ add(0x5C023215 , L1Avenue ~ SN & L1Onewayroad ~ WC )
171+ // add(0x5C023310, L1Avenue~WE & L1Avenue~NC)
172+ add(0x5C023315 , L1Avenue ~ WE & L1Avenue ~ NC )
173+ // add(0x5C031120, L2Road~NS & L2Road~WE)
174+ add(0x5C033120 , L2Road ~ NS & L2Road ~ CE )
175+ add(0x5C033220 , L2Road ~ NS & L2Onewayroad ~ CE )
176+ add(0x5C033320 , L2Road ~ WE & L2Avenue ~ NC )
177+ // add(0x5C041120, L2Onewayroad~NS & L2Road~WE)
178+ // add(0x5C041220, L2Onewayroad~NS & L2Onewayroad~WE)
179+ add(0x5C043120 , L2Onewayroad ~ NS & L2Road ~ CE )
180+ add(0x5C043220 , L2Onewayroad ~ NS & L2Onewayroad ~ CE )
181+ add(0x5C043320 , L2Onewayroad ~ WE & L2Avenue ~ NC )
182+ // add(0x5C051120, L2Avenue~NS & L2Road~WE)
183+ // add(0x5C051220, L2Avenue~NS & L2Onewayroad~WE)
184+ // add(0x5C051320, L2Avenue~NS & L2Avenue~EW)
185+ add(0x5C053120 , L2Avenue ~ SN & L2Road ~ CE )
186+ add(0x5C053125 , L2Avenue ~ SN & L2Road ~ WC )
187+ add(0x5C053220 , L2Avenue ~ SN & L2Onewayroad ~ CE )
188+ add(0x5C053225 , L2Avenue ~ SN & L2Onewayroad ~ WC )
189+ // add(0x5C053310, L2Avenue~WE & L2Avenue~NC)
190+ add(0x5C053315 , L2Avenue ~ WE & L2Avenue ~ NC )
179191 // Onslope transitions
180192 add(0x5c060000 , L1Road ~ NC & Road ~ CS )
181193 add(0x5c060010 , L2Road ~ NC & L1Road ~ CS )
0 commit comments