Merge branch 'merge_fix_story51'

# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java

racevisionGame/src/main/java/mock/app/Event.java

@@ -107,12 +107,13 @@ public class Event {
 
         //Read XML files.
         try {
-
+            //this.raceXML = RaceXMLCreator.alterRaceToWind(raceXMLFile, 90);
-            //this.raceXML = XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8);
             this.raceXML = Event.setRaceXMLAtCurrentTimeToNow(XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8));
-            this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, 300, false);
             if(mapIndex==4){
-                this.raceXML = Event.setRaceXMLAtCurrentTimeToNow(XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8), 1000, 5000);
+                //this.raceXML = Event.setRaceXMLAtCurrentTimeToNow(XMLReader.readXMLFileToString(raceXMLFile, StandardCharsets.UTF_8), 1000, 5000);
+                this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, -1, true);
+            } else {
+                this.raceXML = RaceXMLCreator.alterRaceToWind(this.raceXML, XMLFileType.Contents, 300, false);
             }
 
             this.boatXML = XMLReader.readXMLFileToString(boatsXMLFile, StandardCharsets.UTF_8);

racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java

@@ -92,7 +92,9 @@ public class RaceXMLCreator {
 
             double degreesToRotate = degrees - raceOriginalBearing;
 
-            alterRaceRotation(race, degreesToRotate);
+            if (degrees >= 0) {
+                alterRaceRotation(race, degreesToRotate);
+            }
 
             return XMLUtilities.classToXML(race);