Merge pull request #138 from VATSIM-UK/136-ground-network-coordinates

fix(groundnetwork): output coordinates in the ground network
VATSIM-UK · Apr 4, 2021 · 7292454 · 7292454
2 parents 08ddb84 + 65f4638
commit 7292454
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/Compiler/Model/GroundNetwork.cs b/src/Compiler/Model/GroundNetwork.cs
@@ -25,7 +25,10 @@ List<GroundNetworkRunwayExit> runwayExits
 
         public IEnumerable<ICompilableElement> GetCompilableElements()
         {
-            return Taxiways.Concat<ICompilableElement>(RunwayExits);
+            List<ICompilableElement> values = new();
+            Taxiways.ForEach(taxiway => values.AddRange(taxiway.GetCompilableElements()));
+            RunwayExits.ForEach(exit => values.AddRange(exit.GetCompilableElements()));
+            return values;
         }
     }
-}
+}
diff --git a/tests/CompilerTest/Model/GroundNetworkTest.cs b/tests/CompilerTest/Model/GroundNetworkTest.cs
@@ -63,10 +63,23 @@ public void TestItReturnsCompilableElements()
             var expected = new List<ICompilableElement>
             {
                 taxiway1,
+                taxiway1.Coordinates[0],
+                taxiway1.Coordinates[1],
+                taxiway1.Coordinates[2],
                 taxiway2,
+                taxiway2.Coordinates[0],
+                taxiway2.Coordinates[1],
+                taxiway2.Coordinates[2],
                 exit1,
-                exit2
+                exit1.Coordinates[0],
+                exit1.Coordinates[1],
+                exit1.Coordinates[2],
+                exit2,
+                exit2.Coordinates[0],
+                exit2.Coordinates[1],
+                exit2.Coordinates[2],
             };
+
             Assert.Equal(expected, network.GetCompilableElements());
         }
     }