Added XMLMessageEncoder.

Refactored XMLMessageDecoder to be consistent with other decoders - only needs to expose the XMLMessage. Refactored BoatLocationDecoder to be consistent with other decoders - only needs to expose the BoatLocation. Updated XMLMessageDecoderTest to use new encoder/decoder. Also tests all three message types. Removed XMLMessageEncoderTest as it was redundant. Updated BinaryMessageDecoderTest.xmlMessageTest() to use updated XMLMessage encoder/decoder. issue #35 #36 #story[1095]
2017-08-06 01:01:05 +12:00
parent 8ef906472b
commit b486f99dbe
13 changed files with 535 additions and 317 deletions
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<BoatConfig>
+    <Modified>2017-04-19T15:49:40+1200</Modified>
+    <Version>1</Version>
+    <Settings>
+        <RaceBoatType Type="AC45" />
+        <BoatDimension BoatLength="14.019" HullLength="13.449" />
+        <ZoneSize MarkZoneSize="40.347" CourseZoneSize="40.347" />
+        <ZoneLimits Limit1="200" Limit2="100" Limit3="40.347" Limit4="0" Limit5="-100" />
+    </Settings>
+    <BoatShapes>
+        <BoatShape ShapeID="0">
+            <Vertices>
+                <Vtx Seq="1" Y="0" X="-2.659" />
+                <Vtx Seq="2" Y="18.359" X="-2.659" />
+                <Vtx Seq="3" Y="18.359" X="2.659" />
+                <Vtx Seq="4" Y="0" X="2.659" />
+            </Vertices>
+        </BoatShape>
+        <BoatShape ShapeID="1">
+            <Vertices>
+                <Vtx Seq="1" Y="0" X="-1.278" />
+                <Vtx Seq="2" Y="8.876" X="-1.278" />
+                <Vtx Seq="3" Y="8.876" X="1.278" />
+                <Vtx Seq="4" Y="0" X="1.278" />
+            </Vertices>
+        </BoatShape>
+        <BoatShape ShapeID="2">
+            <Vertices>
+                <Vtx Seq="1" Y="0" X="-1.1" />
+                <Vtx Seq="2" Y="8.3" X="-1.1" />
+                <Vtx Seq="3" Y="8.3" X="1.1" />
+                <Vtx Seq="4" Y="0" X="1.1" />
+            </Vertices>
+        </BoatShape>
+        <BoatShape ShapeID="3">
+            <Vertices>
+                <Vtx Seq="1" Y="0" X="-0.75" />
+                <Vtx Seq="2" Y="3" X="-0.75" />
+                <Vtx Seq="3" Y="3" X="0.75" />
+                <Vtx Seq="4" Y="0" X="0.75" />
+            </Vertices>
+        </BoatShape>
+        <BoatShape ShapeID="4">
+            <Vertices>
+                <Vtx Seq="1" Y="0" X="-3.46" />
+                <Vtx Seq="2" Y="13.449" X="-3.46" />
+                <Vtx Seq="3" Y="14.019" X="0" />
+                <Vtx Seq="4" Y="13.449" X="3.46" />
+                <Vtx Seq="5" Y="0" X="3.46" />
+            </Vertices>
+            <Catamaran>
+                <Vtx Seq="1" Y="1.769" X="-2.752" />
+                <Vtx Seq="2" Y="0" X="-2.813" />
+                <Vtx Seq="3" Y="0" X="-3.34" />
+                <Vtx Seq="4" Y="5.351" X="-3.46" />
+                <Vtx Seq="5" Y="10.544" X="-3.387" />
+                <Vtx Seq="6" Y="13.449" X="-3.075" />
+                <Vtx Seq="7" Y="10.851" X="-2.793" />
+                <Vtx Seq="8" Y="6.669" X="-2.699" />
+                <Vtx Seq="9" Y="6.669" X="2.699" />
+                <Vtx Seq="10" Y="10.851" X="2.793" />
+                <Vtx Seq="11" Y="13.449" X="3.075" />
+                <Vtx Seq="12" Y="10.544" X="3.387" />
+                <Vtx Seq="13" Y="5.351" X="3.46" />
+                <Vtx Seq="14" Y="0" X="3.34" />
+                <Vtx Seq="15" Y="0" X="2.813" />
+                <Vtx Seq="16" Y="1.769" X="2.752" />
+            </Catamaran>
+            <Bowsprit>
+                <Vtx Seq="1" Y="6.669" X="-0.2" />
+                <Vtx Seq="2" Y="11.377" X="-0.2" />
+                <Vtx Seq="3" Y="14.019" X="0" />
+                <Vtx Seq="4" Y="11.377" X="0.2" />
+                <Vtx Seq="5" Y="6.669" X="0.2" />
+            </Bowsprit>
+            <Trampoline>
+                <Vtx Seq="1" Y="2" X="-2.699" />
+                <Vtx Seq="2" Y="6.438" X="-2.699" />
+                <Vtx Seq="3" Y="6.438" X="2.699" />
+                <Vtx Seq="4" Y="2" X="2.699" />
+            </Trampoline>
+        </BoatShape>
+        <BoatShape ShapeID="5" />
+    </BoatShapes>
+    <Boats>>
+        <Boat Type="Yacht" SourceID="101" ShapeID="4" HullNum="AC4501" ShortName="USA"
+              BoatName="ORACLE TEAM USA" Country="USA">
+            <GPSposition Z="1.738" Y="0.625" X="0.001" />
+            <MastTop Z="21.496" Y="4.233" X="0.000" />
+        </Boat>
+        <Boat Type="Yacht" SourceID="102" ShapeID="4" HullNum="AC4502" ShortName="GBR"
+              BoatName="Land Rover BAR" Country="United Kingdom">
+            <GPSposition Z="1.738" Y="0.625" X="0.001" />
+            <MastTop Z="21.496" Y="4.233" X="0.000" />
+        </Boat>
+        <Boat Type="Yacht" SourceID="103" ShapeID="4" HullNum="AC4503" ShortName="JPN"
+              BoatName="SoftBank Team Japan" Country="Japan">
+            <GPSposition Z="1.738" Y="0.625" X="0.001" />
+            <MastTop Z="21.496" Y="4.233" X="0.000" />
+        </Boat>
+        <Boat Type="Yacht" SourceID="104" ShapeID="4" HullNum="AC4504" ShortName="FRA"
+              BoatName="Groupama Team France" Country="France">
+            <GPSposition Z="1.738" Y="0.625" X="0.001" />
+            <MastTop Z="21.496" Y="4.233" X="0.000" />
+        </Boat>
+        <Boat Type="Yacht" SourceID="105" ShapeID="4" HullNum="AC4505" ShortName="SWE"
+              BoatName="Artemis Racing" Country="Sweden">
+            <GPSposition Z="1.738" Y="0.625" X="0.001" />
+            <MastTop Z="21.496" Y="4.233" X="0.000" />
+        </Boat>
+        <Boat Type="Yacht" SourceID="106" ShapeID="4" HullNum="AC4506" ShortName="NZL"
+              BoatName="Emirates Team New Zealand" Country="New Zealand">
+            <GPSposition Z="1.738" Y="0.625" X="0.001" />
+            <MastTop Z="21.496" Y="4.233" X="0.000" />
+        </Boat>
+    </Boats>
+</BoatConfig>