Merge remote-tracking branch 'origin/story34_v2' into story34_v2

# Conflicts:
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Mock/StreamedRace.java

visualiser/src/main/java/seng302/Controllers/RaceController.java

@@ -109,8 +109,9 @@ public class RaceController extends Controller {
             startBoats.add(boat);
         }
         for (int i=0; i<startBoats.size(); i++){
+            Float startPos = ((float)startBoats.size()+1)/2;
             XYChart.Series<Number, Number> series = new XYChart.Series();
-            series.getData().add(new XYChart.Data(0, i+1));
+            series.getData().add(new XYChart.Data(0, startPos));
             sparklineChart.getData().add(series);
         }
 
@@ -123,8 +124,6 @@ public class RaceController extends Controller {
 
         sparklineChart.setCreateSymbols(false);
 
-        sparklineChart.setStyle(".default-color0.chart-series-line { -fx-stroke: #e9967a; }");
-
         // hide axis ticks and labels
         sparklineChart.getXAxis().setTickLabelsVisible(false);
         sparklineChart.getYAxis().setTickLabelsVisible(false);
@@ -220,6 +219,7 @@ public class RaceController extends Controller {
         //int [] boatsInRace = {1, 2, 3, 4, 5, 6};
         int colourIndex = 0;
         int placingVal = boatsInRace.size();
+        //System.out.println(boatsInRace.get(0).toString());
         sparkLineNumber++;
         for (int i=0; i<boatsInRace.size(); i++){
             for (int j=0; j<startBoats.size(); j++){

visualiser/src/main/java/seng302/Mock/StreamedRace.java

@@ -84,7 +84,10 @@ public class StreamedRace implements Runnable {
             int legNumber = boatStatusMessage.getLegNumber();
 
             if (legNumber >= 1 && legNumber < legs.size()) {
-                boat.setCurrentLeg(legs.get(legNumber));
+                if (boat.getCurrentLeg() != legs.get(legNumber)){
+                    boat.setCurrentLeg(legs.get(legNumber));
+                    controller.updateSparkline(startingBoats);
+                }
             }
 
             if (boatStatusEnum == BoatStatusEnum.RACING) {
@@ -190,6 +193,7 @@ public class StreamedRace implements Runnable {
             public void handle(long arg0) {
                 if (boatsFinished < startingBoats.size()) {
                     boatsFinished = 0;
+                    //controller.updateSparkline(startingBoats);
                     totalTimeElapsed = System.currentTimeMillis() - timeRaceStarted;
 
                     for (Boat boat : startingBoats) {
@@ -212,9 +216,6 @@ public class StreamedRace implements Runnable {
                     controller.finishRace(startingBoats);
                     stop();
                 }
-                controller.updateSparkline(startingBoats);
-
-
                 controller.updateMap(startingBoats, boatMarkers);
                 fps++;
                 if ((System.currentTimeMillis() - timeCurrent) > 1000) {