Add rule to convert base Street short T intersections to SAM long T

Author: clarencechen

Controller/RUL2/09_SAM/Sec9_SAM_MetaGenerated.txt

@@ -1971,6 +1971,8 @@
 0x5E583200,0,0,0x5F500200,0,1=0x5E583200,0,0,0x5E572200,0,1
 0x5E572200,0,0,0x5F502500,3,0=0x5E572200,0,0,0x5E585200,3,0
 0x5E572200,3,0,0x5F502500,1,1=0x5E572200,3,0,0x5E585200,1,1
+0x5E572200,0,0,0x5F502500,0,1=0x5E572200,0,0,0x5E585200,0,1
+0x5E572200,3,0,0x5F502500,2,0=0x5E572200,3,0,0x5E585200,2,0
 0x5E585200,0,0,0x5F500200,0,1=0x5E585200,0,0,0x5E585280,0,0
 0x5E585200,0,0,0x5F500200,1,0=0x5E585200,0,0,0x5E585280,0,0
 0x5E585200,0,0,0x5E572200,0,1=0x5E585200,0,0,0x5E585280,0,0
@@ -2007,6 +2009,8 @@
 0x5E58D200,0,0,0x5F500200,0,1=0x5E58D200,0,0,0x5E572200,0,1
 0x5E572200,0,0,0x5F503800,3,0=0x5E572200,0,0,0x5E58F200,3,0
 0x5E572200,3,0,0x5F503800,1,1=0x5E572200,3,0,0x5E58F200,1,1
+0x5E572200,0,0,0x5F503800,0,1=0x5E572200,0,0,0x5E58F200,0,1
+0x5E572200,3,0,0x5F503800,2,0=0x5E572200,3,0,0x5E58F200,2,0
 0x5E58F200,0,0,0x5F500200,0,1=0x5E58F200,0,0,0x5E58F280,0,0
 0x5E58F200,0,0,0x5F500200,1,0=0x5E58F200,0,0,0x5E58F280,0,0
 0x5E58F200,0,0,0x5E572200,0,1=0x5E58F200,0,0,0x5E58F280,0,0
@@ -3425,6 +3429,8 @@
 0x5E583300,0,0,0x5F500200,0,1=0x5E583300,0,0,0x5E572300,0,1
 0x5E572300,0,0,0x5F502500,3,0=0x5E572300,0,0,0x5E585300,3,0
 0x5E572300,3,0,0x5F502500,1,1=0x5E572300,3,0,0x5E585300,1,1
+0x5E572300,0,0,0x5F502500,0,1=0x5E572300,0,0,0x5E585300,0,1
+0x5E572300,3,0,0x5F502500,2,0=0x5E572300,3,0,0x5E585300,2,0
 0x5E585300,0,0,0x5F500200,0,1=0x5E585300,0,0,0x5E585380,0,0
 0x5E585300,0,0,0x5F500200,1,0=0x5E585300,0,0,0x5E585380,0,0
 0x5E585300,0,0,0x5E572300,0,1=0x5E585300,0,0,0x5E585380,0,0
@@ -3461,6 +3467,8 @@
 0x5E58D300,0,0,0x5F500200,0,1=0x5E58D300,0,0,0x5E572300,0,1
 0x5E572300,0,0,0x5F503800,3,0=0x5E572300,0,0,0x5E58F300,3,0
 0x5E572300,3,0,0x5F503800,1,1=0x5E572300,3,0,0x5E58F300,1,1
+0x5E572300,0,0,0x5F503800,0,1=0x5E572300,0,0,0x5E58F300,0,1
+0x5E572300,3,0,0x5F503800,2,0=0x5E572300,3,0,0x5E58F300,2,0
 0x5E58F300,0,0,0x5F500200,0,1=0x5E58F300,0,0,0x5E58F380,0,0
 0x5E58F300,0,0,0x5F500200,1,0=0x5E58F300,0,0,0x5E58F380,0,0
 0x5E58F300,0,0,0x5E572300,0,1=0x5E58F300,0,0,0x5E58F380,0,0
@@ -4879,6 +4887,8 @@
 0x5E583400,0,0,0x5F500200,0,1=0x5E583400,0,0,0x5E572400,0,1
 0x5E572400,0,0,0x5F502500,3,0=0x5E572400,0,0,0x5E585400,3,0
 0x5E572400,3,0,0x5F502500,1,1=0x5E572400,3,0,0x5E585400,1,1
+0x5E572400,0,0,0x5F502500,0,1=0x5E572400,0,0,0x5E585400,0,1
+0x5E572400,3,0,0x5F502500,2,0=0x5E572400,3,0,0x5E585400,2,0
 0x5E585400,0,0,0x5F500200,0,1=0x5E585400,0,0,0x5E585480,0,0
 0x5E585400,0,0,0x5F500200,1,0=0x5E585400,0,0,0x5E585480,0,0
 0x5E585400,0,0,0x5E572400,0,1=0x5E585400,0,0,0x5E585480,0,0
@@ -4915,6 +4925,8 @@
 0x5E58D400,0,0,0x5F500200,0,1=0x5E58D400,0,0,0x5E572400,0,1
 0x5E572400,0,0,0x5F503800,3,0=0x5E572400,0,0,0x5E58F400,3,0
 0x5E572400,3,0,0x5F503800,1,1=0x5E572400,3,0,0x5E58F400,1,1
+0x5E572400,0,0,0x5F503800,0,1=0x5E572400,0,0,0x5E58F400,0,1
+0x5E572400,3,0,0x5F503800,2,0=0x5E572400,3,0,0x5E58F400,2,0
 0x5E58F400,0,0,0x5F500200,0,1=0x5E58F400,0,0,0x5E58F480,0,0
 0x5E58F400,0,0,0x5F500200,1,0=0x5E58F400,0,0,0x5E58F480,0,0
 0x5E58F400,0,0,0x5E572400,0,1=0x5E58F400,0,0,0x5E58F480,0,0
@@ -6333,6 +6345,8 @@
 0x5E583500,0,0,0x5F500200,0,1=0x5E583500,0,0,0x5E572500,0,1
 0x5E572500,0,0,0x5F502500,3,0=0x5E572500,0,0,0x5E585500,3,0
 0x5E572500,3,0,0x5F502500,1,1=0x5E572500,3,0,0x5E585500,1,1
+0x5E572500,0,0,0x5F502500,0,1=0x5E572500,0,0,0x5E585500,0,1
+0x5E572500,3,0,0x5F502500,2,0=0x5E572500,3,0,0x5E585500,2,0
 0x5E585500,0,0,0x5F500200,0,1=0x5E585500,0,0,0x5E585580,0,0
 0x5E585500,0,0,0x5F500200,1,0=0x5E585500,0,0,0x5E585580,0,0
 0x5E585500,0,0,0x5E572500,0,1=0x5E585500,0,0,0x5E585580,0,0
@@ -6369,6 +6383,8 @@
 0x5E58D500,0,0,0x5F500200,0,1=0x5E58D500,0,0,0x5E572500,0,1
 0x5E572500,0,0,0x5F503800,3,0=0x5E572500,0,0,0x5E58F500,3,0
 0x5E572500,3,0,0x5F503800,1,1=0x5E572500,3,0,0x5E58F500,1,1
+0x5E572500,0,0,0x5F503800,0,1=0x5E572500,0,0,0x5E58F500,0,1
+0x5E572500,3,0,0x5F503800,2,0=0x5E572500,3,0,0x5E58F500,2,0
 0x5E58F500,0,0,0x5F500200,0,1=0x5E58F500,0,0,0x5E58F580,0,0
 0x5E58F500,0,0,0x5F500200,1,0=0x5E58F500,0,0,0x5E58F580,0,0
 0x5E58F500,0,0,0x5E572500,0,1=0x5E58F500,0,0,0x5E58F580,0,0
@@ -7787,6 +7803,8 @@
 0x5E583600,0,0,0x5F500200,0,1=0x5E583600,0,0,0x5E572600,0,1
 0x5E572600,0,0,0x5F502500,3,0=0x5E572600,0,0,0x5E585600,3,0
 0x5E572600,3,0,0x5F502500,1,1=0x5E572600,3,0,0x5E585600,1,1
+0x5E572600,0,0,0x5F502500,0,1=0x5E572600,0,0,0x5E585600,0,1
+0x5E572600,3,0,0x5F502500,2,0=0x5E572600,3,0,0x5E585600,2,0
 0x5E585600,0,0,0x5F500200,0,1=0x5E585600,0,0,0x5E585680,0,0
 0x5E585600,0,0,0x5F500200,1,0=0x5E585600,0,0,0x5E585680,0,0
 0x5E585600,0,0,0x5E572600,0,1=0x5E585600,0,0,0x5E585680,0,0
@@ -7823,6 +7841,8 @@
 0x5E58D600,0,0,0x5F500200,0,1=0x5E58D600,0,0,0x5E572600,0,1
 0x5E572600,0,0,0x5F503800,3,0=0x5E572600,0,0,0x5E58F600,3,0
 0x5E572600,3,0,0x5F503800,1,1=0x5E572600,3,0,0x5E58F600,1,1
+0x5E572600,0,0,0x5F503800,0,1=0x5E572600,0,0,0x5E58F600,0,1
+0x5E572600,3,0,0x5F503800,2,0=0x5E572600,3,0,0x5E58F600,2,0
 0x5E58F600,0,0,0x5F500200,0,1=0x5E58F600,0,0,0x5E58F680,0,0
 0x5E58F600,0,0,0x5F500200,1,0=0x5E58F600,0,0,0x5E58F680,0,0
 0x5E58F600,0,0,0x5E572600,0,1=0x5E58F600,0,0,0x5E58F680,0,0
@@ -9241,6 +9261,8 @@
 0x5E583700,0,0,0x5F500200,0,1=0x5E583700,0,0,0x5E572700,0,1
 0x5E572700,0,0,0x5F502500,3,0=0x5E572700,0,0,0x5E585700,3,0
 0x5E572700,3,0,0x5F502500,1,1=0x5E572700,3,0,0x5E585700,1,1
+0x5E572700,0,0,0x5F502500,0,1=0x5E572700,0,0,0x5E585700,0,1
+0x5E572700,3,0,0x5F502500,2,0=0x5E572700,3,0,0x5E585700,2,0
 0x5E585700,0,0,0x5F500200,0,1=0x5E585700,0,0,0x5E585780,0,0
 0x5E585700,0,0,0x5F500200,1,0=0x5E585700,0,0,0x5E585780,0,0
 0x5E585700,0,0,0x5E572700,0,1=0x5E585700,0,0,0x5E585780,0,0
@@ -9277,6 +9299,8 @@
 0x5E58D700,0,0,0x5F500200,0,1=0x5E58D700,0,0,0x5E572700,0,1
 0x5E572700,0,0,0x5F503800,3,0=0x5E572700,0,0,0x5E58F700,3,0
 0x5E572700,3,0,0x5F503800,1,1=0x5E572700,3,0,0x5E58F700,1,1
+0x5E572700,0,0,0x5F503800,0,1=0x5E572700,0,0,0x5E58F700,0,1
+0x5E572700,3,0,0x5F503800,2,0=0x5E572700,3,0,0x5E58F700,2,0
 0x5E58F700,0,0,0x5F500200,0,1=0x5E58F700,0,0,0x5E58F780,0,0
 0x5E58F700,0,0,0x5F500200,1,0=0x5E58F700,0,0,0x5E58F780,0,0
 0x5E58F700,0,0,0x5E572700,0,1=0x5E58F700,0,0,0x5E58F780,0,0
@@ -10695,6 +10719,8 @@
 0x5E583800,0,0,0x5F500200,0,1=0x5E583800,0,0,0x5E572800,0,1
 0x5E572800,0,0,0x5F502500,3,0=0x5E572800,0,0,0x5E585800,3,0
 0x5E572800,3,0,0x5F502500,1,1=0x5E572800,3,0,0x5E585800,1,1
+0x5E572800,0,0,0x5F502500,0,1=0x5E572800,0,0,0x5E585800,0,1
+0x5E572800,3,0,0x5F502500,2,0=0x5E572800,3,0,0x5E585800,2,0
 0x5E585800,0,0,0x5F500200,0,1=0x5E585800,0,0,0x5E585880,0,0
 0x5E585800,0,0,0x5F500200,1,0=0x5E585800,0,0,0x5E585880,0,0
 0x5E585800,0,0,0x5E572800,0,1=0x5E585800,0,0,0x5E585880,0,0
@@ -10731,6 +10757,8 @@
 0x5E58D800,0,0,0x5F500200,0,1=0x5E58D800,0,0,0x5E572800,0,1
 0x5E572800,0,0,0x5F503800,3,0=0x5E572800,0,0,0x5E58F800,3,0
 0x5E572800,3,0,0x5F503800,1,1=0x5E572800,3,0,0x5E58F800,1,1
+0x5E572800,0,0,0x5F503800,0,1=0x5E572800,0,0,0x5E58F800,0,1
+0x5E572800,3,0,0x5F503800,2,0=0x5E572800,3,0,0x5E58F800,2,0
 0x5E58F800,0,0,0x5F500200,0,1=0x5E58F800,0,0,0x5E58F880,0,0
 0x5E58F800,0,0,0x5F500200,1,0=0x5E58F800,0,0,0x5E58F880,0,0
 0x5E58F800,0,0,0x5E572800,0,1=0x5E58F800,0,0,0x5E58F880,0,0
@@ -12149,6 +12177,8 @@
 0x5E583900,0,0,0x5F500200,0,1=0x5E583900,0,0,0x5E572900,0,1
 0x5E572900,0,0,0x5F502500,3,0=0x5E572900,0,0,0x5E585900,3,0
 0x5E572900,3,0,0x5F502500,1,1=0x5E572900,3,0,0x5E585900,1,1
+0x5E572900,0,0,0x5F502500,0,1=0x5E572900,0,0,0x5E585900,0,1
+0x5E572900,3,0,0x5F502500,2,0=0x5E572900,3,0,0x5E585900,2,0
 0x5E585900,0,0,0x5F500200,0,1=0x5E585900,0,0,0x5E585980,0,0
 0x5E585900,0,0,0x5F500200,1,0=0x5E585900,0,0,0x5E585980,0,0
 0x5E585900,0,0,0x5E572900,0,1=0x5E585900,0,0,0x5E585980,0,0
@@ -12185,6 +12215,8 @@
 0x5E58D900,0,0,0x5F500200,0,1=0x5E58D900,0,0,0x5E572900,0,1
 0x5E572900,0,0,0x5F503800,3,0=0x5E572900,0,0,0x5E58F900,3,0
 0x5E572900,3,0,0x5F503800,1,1=0x5E572900,3,0,0x5E58F900,1,1
+0x5E572900,0,0,0x5F503800,0,1=0x5E572900,0,0,0x5E58F900,0,1
+0x5E572900,3,0,0x5F503800,2,0=0x5E572900,3,0,0x5E58F900,2,0
 0x5E58F900,0,0,0x5F500200,0,1=0x5E58F900,0,0,0x5E58F980,0,0
 0x5E58F900,0,0,0x5F500200,1,0=0x5E58F900,0,0,0x5E58F980,0,0
 0x5E58F900,0,0,0x5E572900,0,1=0x5E58F900,0,0,0x5E58F980,0,0
@@ -13603,6 +13635,8 @@
 0x5E583A00,0,0,0x5F500200,0,1=0x5E583A00,0,0,0x5E572A00,0,1
 0x5E572A00,0,0,0x5F502500,3,0=0x5E572A00,0,0,0x5E585A00,3,0
 0x5E572A00,3,0,0x5F502500,1,1=0x5E572A00,3,0,0x5E585A00,1,1
+0x5E572A00,0,0,0x5F502500,0,1=0x5E572A00,0,0,0x5E585A00,0,1
+0x5E572A00,3,0,0x5F502500,2,0=0x5E572A00,3,0,0x5E585A00,2,0
 0x5E585A00,0,0,0x5F500200,0,1=0x5E585A00,0,0,0x5E585A80,0,0
 0x5E585A00,0,0,0x5F500200,1,0=0x5E585A00,0,0,0x5E585A80,0,0
 0x5E585A00,0,0,0x5E572A00,0,1=0x5E585A00,0,0,0x5E585A80,0,0
@@ -13639,6 +13673,8 @@
 0x5E58DA00,0,0,0x5F500200,0,1=0x5E58DA00,0,0,0x5E572A00,0,1
 0x5E572A00,0,0,0x5F503800,3,0=0x5E572A00,0,0,0x5E58FA00,3,0
 0x5E572A00,3,0,0x5F503800,1,1=0x5E572A00,3,0,0x5E58FA00,1,1
+0x5E572A00,0,0,0x5F503800,0,1=0x5E572A00,0,0,0x5E58FA00,0,1
+0x5E572A00,3,0,0x5F503800,2,0=0x5E572A00,3,0,0x5E58FA00,2,0
 0x5E58FA00,0,0,0x5F500200,0,1=0x5E58FA00,0,0,0x5E58FA80,0,0
 0x5E58FA00,0,0,0x5F500200,1,0=0x5E58FA00,0,0,0x5E58FA80,0,0
 0x5E58FA00,0,0,0x5E572A00,0,1=0x5E58FA00,0,0,0x5E58FA80,0,0
@@ -15057,6 +15093,8 @@
 0x5E583B00,0,0,0x5F500200,0,1=0x5E583B00,0,0,0x5E572B00,0,1
 0x5E572B00,0,0,0x5F502500,3,0=0x5E572B00,0,0,0x5E585B00,3,0
 0x5E572B00,3,0,0x5F502500,1,1=0x5E572B00,3,0,0x5E585B00,1,1
+0x5E572B00,0,0,0x5F502500,0,1=0x5E572B00,0,0,0x5E585B00,0,1
+0x5E572B00,3,0,0x5F502500,2,0=0x5E572B00,3,0,0x5E585B00,2,0
 0x5E585B00,0,0,0x5F500200,0,1=0x5E585B00,0,0,0x5E585B80,0,0
 0x5E585B00,0,0,0x5F500200,1,0=0x5E585B00,0,0,0x5E585B80,0,0
 0x5E585B00,0,0,0x5E572B00,0,1=0x5E585B00,0,0,0x5E585B80,0,0
@@ -15093,6 +15131,8 @@
 0x5E58DB00,0,0,0x5F500200,0,1=0x5E58DB00,0,0,0x5E572B00,0,1
 0x5E572B00,0,0,0x5F503800,3,0=0x5E572B00,0,0,0x5E58FB00,3,0
 0x5E572B00,3,0,0x5F503800,1,1=0x5E572B00,3,0,0x5E58FB00,1,1
+0x5E572B00,0,0,0x5F503800,0,1=0x5E572B00,0,0,0x5E58FB00,0,1
+0x5E572B00,3,0,0x5F503800,2,0=0x5E572B00,3,0,0x5E58FB00,2,0
 0x5E58FB00,0,0,0x5F500200,0,1=0x5E58FB00,0,0,0x5E58FB80,0,0
 0x5E58FB00,0,0,0x5F500200,1,0=0x5E58FB00,0,0,0x5E58FB80,0,0
 0x5E58FB00,0,0,0x5E572B00,0,1=0x5E58FB00,0,0,0x5E58FB80,0,0

src/main/scala/module/SamRuleGenerator.scala

@@ -804,6 +804,9 @@ class SamRuleGenerator(var context: RuleTransducer.Context) extends RuleGenerato
           // DxD T (sam thru)
           Rules += sam~ES | (Street ~> sam)~NW & minor~CNE      // DxD Thru T 1
           // Rules += sam~ES | (Street ~> sam)~NW & minor~CEN   // Eventual DxD Thru T 2 (pending base T-thru tile)
+          Rules += sam~ES | (Street ~> sam)~NW & minor~CWS      // Temp DxD Thru T 2 (works with DxD Thru T 1-2 Alt)
+
+          // Rules += sam~ES & minor~CEN | (Street ~> sam)~NW & minor~CSW   // Eventual DxD Thru T 1-2 (pending base T-thru tile)
           Rules += sam~ES & minor~CEN | Street~NW | % | sam~NW & minor~CSW  // DxD Thru T 1-2 Alt
           Rules += sam~ES & minor~CEN | sam~NW | % | sam~NW & minor~CSW     // DxD Thru T 1-2 Alt
           Rules += sam~NE & minor~CSE | (Street ~> sam)~WS & minor~CWN      // DxD Thru T 2-1