add metarules for SAM x Avenue DxO short Ts

Author: jflann

src/main/scala/module/MiscResolver.scala

@@ -432,7 +432,7 @@ class MiscResolver extends IdResolver {
     add(0x092d1700, Onewayroad~SW & Monorail~ES)
     add(0x092d0200, Onewayroad~EW & Monorail~NS)
 
-    // Avenue + intersections
+    // Avenue intersections
     add(0x04002100, Avenue~ES & Rail~NE)
     add(0x04004300, Avenue~SharedDiagRight & Rail~SW)
     builder.addOne((Avenue~SN).projectLeft  & Rail~NE, IdTile(0x04001600, R0F0, nonMirroredOnly))
@@ -463,6 +463,7 @@ class MiscResolver extends IdResolver {
     add(0x5f503300, Avenue~SharedDiagLeft & Street~ES)
     add(0x04004400, Avenue~SN & Street~CE)
     add(0x04008600, Avenue~SN & Street~WC)
+    add(0x5f502f00, Avenue~SN & Street~CSE)
     add(0x04005600, Avenue~NC & Street~WE)
     add(0x04009600, Avenue~NC & Street~(2,0,2,2))
     add(0x04009700, Avenue~NC & Street~(0,0,0,2))

src/main/scala/module/SamResolver.scala

@@ -243,8 +243,9 @@ class SamResolver extends IdResolver {
       //DxO Intersections
       add(0x5e582000 + offset, sam~SE & Road~NS)        // SAM x Road
       add(0x5e58c000 + offset, sam~SE & Onewayroad~NS)  // SAM x Onewayroad
-      add(0x5e587000 + offset, sam~SE & Avenue~SN)      // SAM x Avenue 1
-      add(0x5e588000 + offset, sam~NW & Avenue~SN)      // SAM x Avenue 2
+      add(0x5e586000 + offset, sam~CSE & Avenue~SN)     // SAM x Avenue DxO short T
+      add(0x5e587000 + offset, sam~SE & Avenue~SN)      // SAM x Avenue DxO + (1)
+      add(0x5e588000 + offset, sam~NW & Avenue~SN)      // SAM x Avenue DxO + (2)
       add(0x5e53d000 + offset, sam~SE & Highway~NS)     // SAM x Highway 1
       add(0x5e53d080 + offset, sam~WN & Highway~NS)     // SAM x Highway 2
       add(0x5e514000 + offset, sam~NW & Rail~NS)        // SAM-Rail

src/main/scala/module/SamRuleGenerator.scala

@@ -732,6 +732,9 @@ class SamRuleGenerator(var context: RuleTransducer.Context) extends RuleGenerato
             Rules += sam~WE & minor~WN | (Street ~> sam)~WE                           // OxD continue
 
             // DxO
+            // DxO short T
+            Rules += sam~(0,0,11,3) | (Street ~> sam~CNW) & minor~NS    // DxO short T
+            // DxO +
             Rules += sam~ES | (Street ~> sam)~NW & minor~NS             // DxO start
             Rules += sam~EN & minor~EW | (Street ~> sam)~SW & minor~EW  // DxO middle 1
             Rules += sam~ES & minor~NS | (Street ~> sam)~NW & minor~SN  // DxO middle 2