Move best line Displacement to separate property

codemeyer · May 3, 2019 · b67ca95 · b67ca95
1 parent 42f0e6c
commit b67ca95
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 25 deletions.
diff --git a/Source/ArgData.Tests/Internals/BestLineReaderFacts.cs b/Source/ArgData.Tests/Internals/BestLineReaderFacts.cs
@@ -1,26 +1,23 @@
 using System.IO;
 using System.Linq;
-using ArgData.Entities;
 using ArgData.Internals;
 using FluentAssertions;
 using Xunit;
 
 namespace ArgData.Tests.Internals
 {
     public class BestLineReaderFacts
-    {     
+    {
         [Fact]
-        public void Phoenix_FirstSegment_IsDisplacement()
+        public void Phoenix_Displacement_576()
         {
             var trackData = TrackFactsHelper.GetTrackPhoenix();
 
             using (var reader = new BinaryReader(MemoryStreamProvider.Open(trackData.Path)))
             {
                 var result = BestLineReader.Read(reader, trackData.KnownBestLineSectionDataStart);
 
-                var firstSegment = result.BestLineSegments.First();
-                firstSegment.SegmentType.Should().Be(TrackBestLineSegmentType.Displacement);
-                firstSegment.Displacement.Should().Be(576);
+                result.Displacement.Should().Be(576);
             }
         }
 
@@ -39,7 +36,7 @@ public void PhoenixBestLineHas40Segments()
         }
 
         [Fact]
-        public void PhoenixBestLineHasFirstSegmentWithLength40()
+        public void PhoenixBestLineHasFirstSegmentWithLength48()
         {
             var trackData = TrackFactsHelper.GetTrackPhoenix();
 
@@ -49,7 +46,6 @@ public void PhoenixBestLineHasFirstSegmentWithLength40()
 
                 var firstSegment = result.BestLineSegments.First();
                 firstSegment.Length.Should().Be(48);
-                firstSegment.Displacement.Should().Be(576);
             }
         }
     }

diff --git a/Source/ArgData.Tests/TrackReaderFacts.cs b/Source/ArgData.Tests/TrackReaderFacts.cs
@@ -16,6 +16,7 @@ public void PhoenixDataIntegration()
 
             track.TrackSections.Count.Should().Be(67);
             track.PitLaneSections.Count.Should().Be(13);
+            track.BestLineDisplacement.Should().Be(576);
             track.BestLineSegments.Count.Should().Be(40);
             track.ComputerCarSetup.FrontWing.Should().Be(48);
             track.ComputerCarSetup.TyreCompound.Should().Be(SetupTyreCompound.C);

diff --git a/Source/ArgData/Entities/Track.cs b/Source/ArgData/Entities/Track.cs
@@ -54,6 +54,11 @@ public Track()
         /// </summary>
         public IList<TrackSection> TrackSections { get; internal set; }
 
+        /// <summary>
+        /// Gets or sets the displacement of the best line.
+        /// </summary>
+        public short BestLineDisplacement { get; set; }
+
         /// <summary>
         /// Gets a list of the best line/computer car line segments.
         /// </summary>

diff --git a/Source/ArgData/Entities/TrackBestLineSegment.cs b/Source/ArgData/Entities/TrackBestLineSegment.cs
@@ -15,18 +15,13 @@ public class TrackBestLineSegment
         /// </summary>
         public int Length { get; set; }
 
-        /// <summary>
-        /// Gets or sets the displacement value. Only used when SegmentType is Displacement.
-        /// </summary>
-        public short Displacement { get; set; }
-
         /// <summary>
         /// Gets or sets the correction value. Called Tighter/Wider in GP2 Track Editor.
         /// </summary>
         public short Correction { get; set; }
 
         /// <summary>
-        /// Gets or sets the corner radius.
+        /// Gets or sets the corner radius. Only used when SegmentType is Normal.
         /// </summary>
         public short Radius { get; set; }
 
@@ -46,11 +41,6 @@ public class TrackBestLineSegment
     /// </summary>
     public enum TrackBestLineSegmentType
     {
-        /// <summary>
-        /// Displacement. Always the first one for a track.
-        /// </summary>
-        Displacement,
-
         /// <summary>
         /// Normal segment.
         /// </summary>

diff --git a/Source/ArgData/Internals/BestLineReader.cs b/Source/ArgData/Internals/BestLineReader.cs
@@ -22,7 +22,6 @@ public static TrackBestLineReadingResult Read(BinaryReader reader, int startPosi
             list.Add(new TrackBestLineSegment
             {
                 Length = firstLength,
-                Displacement = displacement,
                 Correction = correction,
                 Radius = radius
             });
@@ -74,7 +73,7 @@ public static TrackBestLineReadingResult Read(BinaryReader reader, int startPosi
             }
 
             int position = (int)reader.BaseStream.Position;
-            return new TrackBestLineReadingResult(list, position);
+            return new TrackBestLineReadingResult(displacement, list, position);
         }
     }
 }
diff --git a/...nternals/ComputerCarSetupReadingResult.cs → ...Internals/ComputerCarDataReadingResult.cs b/...nternals/ComputerCarSetupReadingResult.cs → ...Internals/ComputerCarDataReadingResult.cs
diff --git a/Source/ArgData/Internals/TrackBestLineReadingResult.cs b/Source/ArgData/Internals/TrackBestLineReadingResult.cs
@@ -5,12 +5,16 @@ namespace ArgData.Internals
 {
     internal class TrackBestLineReadingResult
     {
-        public TrackBestLineReadingResult(List<TrackBestLineSegment> bestLineSegments, int positionAfterReading)
+        public TrackBestLineReadingResult(short displacement,
+            List<TrackBestLineSegment> bestLineSegments, int positionAfterReading)
         {
+            Displacement = displacement;
             BestLineSegments = bestLineSegments;
             PositionAfterReading = positionAfterReading;
         }
 
+        public short Displacement { get; set; }
+
         public List<TrackBestLineSegment> BestLineSegments { get; set; }
 
         public int PositionAfterReading { get; private set; }

diff --git a/Source/ArgData/TrackReader.cs b/Source/ArgData/TrackReader.cs
@@ -32,6 +32,7 @@ public Track Read(string path)
                 track.TrackSections = sectionReading.TrackSections;
 
                 var bestLines = BestLineReader.Read(reader, sectionReading.Position);
+                track.BestLineDisplacement = bestLines.Displacement;
                 track.BestLineSegments = bestLines.BestLineSegments;
 
                 int positionAfterReadingBestLine = bestLines.PositionAfterReading;

diff --git a/Source/ArgData/TrackWriter.cs b/Source/ArgData/TrackWriter.cs
@@ -47,7 +47,7 @@ public void Write(Track trackData, string path)
             var trackSectionBytes = GetTrackSectionBytes(trackData.TrackSections);
             trackBytes.Add(trackSectionBytes);
 
-            var bestLineBytes = GetBestLineBytes(trackData.BestLineSegments);
+            var bestLineBytes = GetBestLineBytes(trackData.BestLineDisplacement, trackData.BestLineSegments);
             trackBytes.Add(bestLineBytes);
 
             var computerCarSetupBytes = GetComputerCarSetupBytes(trackData.ComputerCarSetup);
@@ -361,15 +361,15 @@ private static byte[] GetTrackSectionBytes(IEnumerable<TrackSection> sections)
             return sectionBytes.GetBytes();
         }
 
-        private static byte[] GetBestLineBytes(IList<TrackBestLineSegment> bestLines)
+        private static byte[] GetBestLineBytes(short displacement, IList<TrackBestLineSegment> bestLines)
         {
             var bestLineBytes = new ByteList();
 
             var first = bestLines.First();
 
             bestLineBytes.Add((byte)first.Length);
             bestLineBytes.Add((byte)0x80);
-            bestLineBytes.Add(first.Displacement);
+            bestLineBytes.Add(displacement);
             bestLineBytes.Add(first.Correction);
             bestLineBytes.Add(first.Radius);