correct meta definition of overlapping roundabouts

Author: jflann

src/main/scala/module/MiscResolver.scala

@@ -318,7 +318,7 @@ class MiscResolver extends IdResolver {
     // Road roundabouts
     add(RdRndbt~(0,2,0,-2),                       0x5F06BC80) // surrogate tile "straight roundabout"
     add(RdRndbt~(0,0,-2,2),                       0x5F06BC00) // INRUL
-    add(RdRndbt~(0,0,-2,2) & Road~(102,102,0,0),  0x5F06BD00) // INRUL
+    add(RdRndbt~(0,0,-2,2) & RdRndbt~(2,-2,0,0),  0x5F06BD00) // INRUL
     add(RdRndbt~(0,0,-2,2) & Road~NC,             0x5F06BA00) // INRUL
     add(RdRndbt~(0,0,-2,2) & Road~(0,1,0,0),      0x5F06BE00) // INRUL
     add(RdRndbt~(0,0,-2,2) & Road~(0,3,0,0),      0x5F06B800) // INRUL

src/main/scala/module/RoundaboutGenerator.scala

@@ -64,7 +64,7 @@ class RoundaboutGenerator(var context: RuleTransducer.Context) extends RuleGener
       RdRndbt~(0,0,-2,2) & Road~(0,3,0,0),            // road diag right
       RdRndbt~(0,0,-2,2) & Road~WC & Road~(0,3,0,0),  // road orth + road diag right
       RdRndbt~(0,0,-2,2) & Road~WC & Road~(0,1,0,0),  // road orth + road diag left
-      RdRndbt~(0,0,-2,2) & Road~(102,102,0,0),        // overlapping roundabouts
+      RdRndbt~(0,0,-2,2) & RdRndbt~(2,-2,0,0),        // overlapping roundabouts
     )
     // inrul tile override of surrogate tile
     for (t <- inrulTiles){