From ecc0e722b5f2ea50a2af20bd73d07735f8263ef0 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Thu, 18 May 2017 13:19:59 +1200
Subject: [PATCH 01/12] Started sparkline prototype

#story[952]
---
 src/main/resources/views/RaceView.fxml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index cfb36f23..49c9d188 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.chart.*?>
 <?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
@@ -61,6 +62,14 @@
             <Button fx:id="selectAnnotationBtn" layoutX="35.0" layoutY="578.0" mnemonicParsing="false" prefHeight="18.0" prefWidth="170.0" styleClass="blue-ui-btn" text="Select Annotations" textFill="WHITE" />
             <Text fill="WHITE" layoutX="11.0" layoutY="649.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Boat Selection" />
             <ComboBox fx:id="boatSelectionComboBox" layoutX="37.0" layoutY="664.0" prefHeight="25.0" prefWidth="170.0" promptText="Select Boat" styleClass="combo-box-base" />
+            <LineChart fx:id="raceSparkLine" layoutX="12.0" layoutY="790.0" prefHeight="188.0" prefWidth="217.0">
+              <xAxis>
+                <CategoryAxis side="BOTTOM" />
+              </xAxis>
+              <yAxis>
+                <NumberAxis side="LEFT" tickLabelGap="1.0" upperBound="6.0" />
+              </yAxis>
+            </LineChart>
             </children>
         </AnchorPane>
         <AnchorPane fx:id="contentAnchorPane" prefHeight="960.0" prefWidth="1280.0" style="-fx-background-color: skyblue;" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowSpan="2147483647" GridPane.valignment="TOP">

From 390aabc78f4c2987f5d035db3039c7396971c999 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Thu, 18 May 2017 14:44:10 +1200
Subject: [PATCH 02/12] Adding race yacht series to the sparkline.

Next step is to make the series of the boats update when new position information is received.

#story[952]
---
 src/main/java/seng302/App.java                |  3 +-
 .../controllers/RaceViewController.java       | 21 +++++++++++-
 src/main/java/seng302/models/Yacht.java       | 32 +++++++++++++++++++
 src/main/resources/views/RaceView.fxml        | 12 +++----
 4 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index afcd3430..524b3d40 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -63,7 +63,8 @@ public class App extends Application {
         //Change the StreamReceiver in this else block to change the default data source.
         else{
             //sr = new StreamReceiver("localhost", 4949, "RaceStream");
-            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
+//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 22c96f13..577f985f 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -1,5 +1,6 @@
 package seng302.controllers;
 
+import java.util.concurrent.ConcurrentLinkedQueue;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.collections.FXCollections;
@@ -7,6 +8,10 @@ import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
+import javafx.scene.chart.LineChart;
+import javafx.scene.chart.NumberAxis;
+import javafx.scene.chart.XYChart;
+import javafx.scene.chart.XYChart.Series;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
@@ -36,6 +41,8 @@ import java.util.*;
  */
 public class RaceViewController extends Thread implements ImportantAnnotationDelegate {
 
+
+    public LineChart raceSparkLine;
     @FXML
     private VBox positionVbox;
     @FXML
@@ -61,6 +68,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Race race;
     private Stage stage;
 
+    private int index = 0;
+
     private ImportantAnnotationsState importantAnnotations;
     private Yacht selectedBoat;
 
@@ -82,7 +91,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         initialiseAnnotationSlider();
         initialiseBoatSelectionComboBox();
         includedCanvasController.timer.start();
-
+        initializeSparkline();
         selectAnnotationBtn.setOnAction(event -> {
             loadSelectAnnotationView();
         });
@@ -173,6 +182,16 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         annotationSlider.setValue(2);
     }
 
+    private void initializeSparkline(){
+        raceSparkLine.setTitle("Boat Positions");
+        for (Yacht yacht: startingBoats){
+            if (raceSparkLine.getData().contains(yacht.getSparklinePosition())) {
+                raceSparkLine.getData().remove(yacht.getSparklinePosition());
+            }
+            raceSparkLine.getData().add(yacht.getSparklinePosition());
+            System.out.println("Here");
+        }
+    }
 
     /**
      * Initalises a timer which updates elements of the RaceView such as wind direction, boat
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 23ba616a..2c2ff186 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -1,5 +1,9 @@
 package seng302.models;
 
+import java.util.concurrent.ConcurrentLinkedQueue;
+import javafx.scene.chart.XYChart;
+import javafx.scene.chart.XYChart.Data;
+import javafx.scene.chart.XYChart.Series;
 import javafx.scene.paint.Color;
 
 import java.text.DateFormat;
@@ -16,6 +20,9 @@ public class Yacht {
     private Color colour;
     private double velocity;
 
+    private int index;
+    private ConcurrentLinkedQueue<Number> dataQ1;
+
     private String boatType;
     private Integer sourceID;
     private String hullID; //matches HullNum in the XML spec.
@@ -33,6 +40,9 @@ public class Yacht {
     // Mark rounding
     private Long markRoundingTime;
 
+    // Used for sparkline
+    private XYChart.Series<Number, Number> sparklinePosition;
+
     /**
      * Used in EventTest and RaceTest.
      *
@@ -54,6 +64,11 @@ public class Yacht {
         this.velocity = boatVelocity;
         this.shortName = shortName;
         this.sourceID = id;
+        this.sparklinePosition = new XYChart.Series<>();
+        this.sparklinePosition.setName(boatName);
+        index = 0;
+        dataQ1 = new ConcurrentLinkedQueue<>();
+
     }
 
     public Yacht(String boatType, Integer sourceID, String hullID, String shortName, String boatName, String country) {
@@ -63,6 +78,10 @@ public class Yacht {
         this.shortName = shortName;
         this.boatName = boatName;
         this.country = country;
+        this.sparklinePosition = new XYChart.Series<>();
+        this.sparklinePosition.setName(boatName);
+        index = 0;
+        dataQ1 = new ConcurrentLinkedQueue<>();
     }
 
     public String getBoatType() {
@@ -140,6 +159,15 @@ public class Yacht {
     }
 
     public void setPosition(String position) {
+            try {
+                if (Integer.parseInt(position) != Integer.parseInt(this.position)){
+                dataQ1.add(Integer.parseInt(position));
+                sparklinePosition.getData().add(new XYChart.Data<>(index++, dataQ1.remove()));
+                System.out.println("new position found for " + boatName + " in position " + position + " old(" + this.position + ")");
+                }
+            } catch (NumberFormatException e) {
+                System.out.println("No position found");
+            }
         this.position = position;
     }
 
@@ -167,6 +195,10 @@ public class Yacht {
         this.markRoundingTime = markRoundingTime;
     }
 
+    public Series<Number, Number> getSparklinePosition() {
+        return sparklinePosition;
+    }
+
     @Override
     public String toString() {
         return boatName;
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 49c9d188..3260cec2 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -62,7 +62,12 @@
             <Button fx:id="selectAnnotationBtn" layoutX="35.0" layoutY="578.0" mnemonicParsing="false" prefHeight="18.0" prefWidth="170.0" styleClass="blue-ui-btn" text="Select Annotations" textFill="WHITE" />
             <Text fill="WHITE" layoutX="11.0" layoutY="649.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Boat Selection" />
             <ComboBox fx:id="boatSelectionComboBox" layoutX="37.0" layoutY="664.0" prefHeight="25.0" prefWidth="170.0" promptText="Select Boat" styleClass="combo-box-base" />
-            <LineChart fx:id="raceSparkLine" layoutX="12.0" layoutY="790.0" prefHeight="188.0" prefWidth="217.0">
+            </children>
+        </AnchorPane>
+        <AnchorPane fx:id="contentAnchorPane" prefHeight="960.0" prefWidth="1280.0" style="-fx-background-color: skyblue;" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowSpan="2147483647" GridPane.valignment="TOP">
+         <children>
+            <fx:include fx:id="includedCanvas" source="CanvasView.fxml" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+            <LineChart fx:id="raceSparkLine" layoutX="43.0" layoutY="597.0" prefHeight="277.0" prefWidth="727.0">
               <xAxis>
                 <CategoryAxis side="BOTTOM" />
               </xAxis>
@@ -70,11 +75,6 @@
                 <NumberAxis side="LEFT" tickLabelGap="1.0" upperBound="6.0" />
               </yAxis>
             </LineChart>
-            </children>
-        </AnchorPane>
-        <AnchorPane fx:id="contentAnchorPane" prefHeight="960.0" prefWidth="1280.0" style="-fx-background-color: skyblue;" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowSpan="2147483647" GridPane.valignment="TOP">
-         <children>
-            <fx:include fx:id="includedCanvas" source="CanvasView.fxml" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
          </children></AnchorPane>
     </children>
 </GridPane>

From 951a7263096b2084a7653b1fc26a00ac4c718511 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Thu, 18 May 2017 20:56:42 +1200
Subject: [PATCH 03/12] The line chart now has series which display on it.

Need to get the right data to display on the linechart when it updates.

#story[952]
---
 .../seng302/controllers/CanvasController.java | 15 ++++++++----
 .../controllers/RaceViewController.java       | 23 +++++++++++++++----
 src/main/java/seng302/models/Yacht.java       | 12 ----------
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 9a2a9797..aaea906b 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -22,10 +22,7 @@ import seng302.models.parsers.XMLParser.RaceXMLObject.Limit;
 import seng302.models.parsers.packets.BoatPositionPacket;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.PriorityBlockingQueue;
 
 /**
@@ -104,7 +101,13 @@ public class CanvasController {
         gc.restore();
         fitMarksToCanvas();
 
+        Timer t = new Timer();
+        t.schedule(new TimerTask() {
+            @Override
+            public void run() {
 
+            }
+        },1000);
         // TODO: 1/05/17 wmu16 - Change this call to now draw the marks as from the xml
         drawBoats();
         timer = new AnimationTimer() {
@@ -125,6 +128,10 @@ public class CanvasController {
                     long elapsedNanosPerFrame = elapsedNanos / frameTimes.length ;
                     Double frameRate = 1_000_000_000.0 / elapsedNanosPerFrame ;
                     drawFps(frameRate.intValue());
+                    System.out.println(elapsedNanos);
+                    if (elapsedNanos % 10 == 0) {
+                        raceViewController.updateSparkLine();
+                    }
                 }
 
                 // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay.
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 577f985f..61ada899 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -67,6 +67,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Timeline timerTimeline;
     private Race race;
     private Stage stage;
+    private ArrayList<XYChart.Series<String, Double>> sparklineData = new ArrayList<>();
+    private int time;
 
     private int index = 0;
 
@@ -95,6 +97,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         selectAnnotationBtn.setOnAction(event -> {
             loadSelectAnnotationView();
         });
+        time = 0;
     }
 
     /**
@@ -185,12 +188,24 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private void initializeSparkline(){
         raceSparkLine.setTitle("Boat Positions");
         for (Yacht yacht: startingBoats){
-            if (raceSparkLine.getData().contains(yacht.getSparklinePosition())) {
-                raceSparkLine.getData().remove(yacht.getSparklinePosition());
-            }
-            raceSparkLine.getData().add(yacht.getSparklinePosition());
+            XYChart.Series<String, Double> yachtData = new XYChart.Series<>();
+            yachtData.getData().add(new XYChart.Data<>(Integer.toString(time), Double.parseDouble(yacht.getPosition())));
+            sparklineData.add(yachtData);
             System.out.println("Here");
         }
+        for (Series<String, Double> spark:
+        sparklineData){
+            raceSparkLine.getData().add(spark);
+
+        }
+    }
+
+    public void updateSparkLine(){
+        for (int i = 0; i < startingBoats.size();i++){
+            sparklineData.get(i).getData().add(new XYChart.Data<>(Integer.toString(time),Double.parseDouble(startingBoats.get(i).getPosition())));
+            System.out.println("Here");
+        }
+        time++;
     }
 
     /**
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 2c2ff186..5777fc25 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -2,7 +2,6 @@ package seng302.models;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 import javafx.scene.chart.XYChart;
-import javafx.scene.chart.XYChart.Data;
 import javafx.scene.chart.XYChart.Series;
 import javafx.scene.paint.Color;
 
@@ -40,8 +39,6 @@ public class Yacht {
     // Mark rounding
     private Long markRoundingTime;
 
-    // Used for sparkline
-    private XYChart.Series<Number, Number> sparklinePosition;
 
     /**
      * Used in EventTest and RaceTest.
@@ -64,8 +61,6 @@ public class Yacht {
         this.velocity = boatVelocity;
         this.shortName = shortName;
         this.sourceID = id;
-        this.sparklinePosition = new XYChart.Series<>();
-        this.sparklinePosition.setName(boatName);
         index = 0;
         dataQ1 = new ConcurrentLinkedQueue<>();
 
@@ -78,8 +73,6 @@ public class Yacht {
         this.shortName = shortName;
         this.boatName = boatName;
         this.country = country;
-        this.sparklinePosition = new XYChart.Series<>();
-        this.sparklinePosition.setName(boatName);
         index = 0;
         dataQ1 = new ConcurrentLinkedQueue<>();
     }
@@ -162,7 +155,6 @@ public class Yacht {
             try {
                 if (Integer.parseInt(position) != Integer.parseInt(this.position)){
                 dataQ1.add(Integer.parseInt(position));
-                sparklinePosition.getData().add(new XYChart.Data<>(index++, dataQ1.remove()));
                 System.out.println("new position found for " + boatName + " in position " + position + " old(" + this.position + ")");
                 }
             } catch (NumberFormatException e) {
@@ -195,10 +187,6 @@ public class Yacht {
         this.markRoundingTime = markRoundingTime;
     }
 
-    public Series<Number, Number> getSparklinePosition() {
-        return sparklinePosition;
-    }
-
     @Override
     public String toString() {
         return boatName;

From 422dcd4501fa6f52d439d1177f15e44bc24b4e39 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Fri, 19 May 2017 15:15:05 +1200
Subject: [PATCH 04/12] Sparklines now update with boat position change.

Need to make it work for any amount of boats in the race and to work when the race first starts as it currently only shows one boat.
#story[952]
---
 src/main/java/seng302/App.java                |  4 +-
 .../seng302/controllers/CanvasController.java |  7 +--
 .../controllers/RaceViewController.java       | 55 ++++++++++++++++---
 3 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 524b3d40..108d44aa 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -63,8 +63,8 @@ public class App extends Application {
         //Change the StreamReceiver in this else block to change the default data source.
         else{
             //sr = new StreamReceiver("localhost", 4949, "RaceStream");
-            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
-//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+//            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
+            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index aaea906b..4ba21c00 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -128,10 +128,7 @@ public class CanvasController {
                     long elapsedNanosPerFrame = elapsedNanos / frameTimes.length ;
                     Double frameRate = 1_000_000_000.0 / elapsedNanosPerFrame ;
                     drawFps(frameRate.intValue());
-                    System.out.println(elapsedNanos);
-                    if (elapsedNanos % 10 == 0) {
-                        raceViewController.updateSparkLine();
-                    }
+                    raceViewController.checkForPositionChange();
                 }
 
                 // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay.
@@ -319,6 +316,8 @@ public class CanvasController {
         }
     }
 
+
+
     private void drawFps(int fps){
         if (raceViewController.isDisplayFps()){
             gc.clearRect(5,5,50,20);
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 61ada899..6eb3439f 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -1,5 +1,6 @@
 package seng302.controllers;
 
+import java.time.Year;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
@@ -7,6 +8,7 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.chart.LineChart;
 import javafx.scene.chart.NumberAxis;
@@ -35,6 +37,7 @@ import seng302.models.parsers.StreamParser;
 
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Created by ptg19 on 29/03/17.
@@ -68,6 +71,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Race race;
     private Stage stage;
     private ArrayList<XYChart.Series<String, Double>> sparklineData = new ArrayList<>();
+    private ArrayList<String> positions;
     private int time;
 
     private int index = 0;
@@ -83,7 +87,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         RaceController raceController = new RaceController();
         raceController.initializeRace();
         race = raceController.getRace();
-
+        positions = new ArrayList<>();
         startingBoats = new ArrayList<>(Arrays.asList(race.getBoats()));
 
         includedCanvasController.setup(this);
@@ -93,11 +97,10 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         initialiseAnnotationSlider();
         initialiseBoatSelectionComboBox();
         includedCanvasController.timer.start();
-        initializeSparkline();
+        time = 0;
         selectAnnotationBtn.setOnAction(event -> {
             loadSelectAnnotationView();
         });
-        time = 0;
     }
 
     /**
@@ -189,21 +192,53 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         raceSparkLine.setTitle("Boat Positions");
         for (Yacht yacht: startingBoats){
             XYChart.Series<String, Double> yachtData = new XYChart.Series<>();
-            yachtData.getData().add(new XYChart.Data<>(Integer.toString(time), Double.parseDouble(yacht.getPosition())));
+            yachtData.setName(yacht.getBoatName());
+            yachtData.getData().add(new XYChart.Data<>(Integer.toString(time), 1 + startingBoats.size() - Double.parseDouble(yacht.getPosition())));
             sparklineData.add(yachtData);
-            System.out.println("Here");
         }
-        for (Series<String, Double> spark:
-        sparklineData){
+        for (Series<String, Double> spark: sparklineData){
             raceSparkLine.getData().add(spark);
+        }
+        Set<Node> nodes = raceSparkLine.lookupAll(".series");
+        for (Node n : nodes) {
+            StringBuilder style = new StringBuilder();
+            style.append("-fx-stroke: red; -fx-background-color: red, white; ");
+            n.setStyle(style.toString());
+        }
+        time++;
+    }
 
+
+    public void checkForPositionChange(){
+        // initialize position array
+        if (positions.size() == 0 && startingBoats.size() == 6){
+            Boolean positionsAssigned = true;
+            for (Yacht yacht: startingBoats){
+                if (Objects.equals(yacht.getPosition(), "-")) {
+                    positionsAssigned = false;
+                }
+            }
+            if (positionsAssigned){
+                initializeSparkline();
+                positions.addAll(startingBoats.stream().map(Yacht::getPosition).collect(Collectors.toList()));
+            }
+        } else {
+            ArrayList<String> currentPositions = startingBoats.stream().map(Yacht::getPosition).collect(Collectors.toCollection(ArrayList::new));
+            if (!positions.equals(currentPositions)){
+                updateSparkLine();
+            }
+            positions.clear();
+            positions.addAll(startingBoats.stream().map(Yacht::getPosition).collect(Collectors.toList()));
         }
     }
 
+
+
     public void updateSparkLine(){
         for (int i = 0; i < startingBoats.size();i++){
-            sparklineData.get(i).getData().add(new XYChart.Data<>(Integer.toString(time),Double.parseDouble(startingBoats.get(i).getPosition())));
-            System.out.println("Here");
+            if (!Objects.equals(startingBoats.get(i).getPosition(), "-")) {
+                sparklineData.get(i).getData().add(new XYChart.Data<>(Integer.toString(time), 1 + startingBoats.size() - Double.parseDouble(startingBoats.get(i).getPosition())));
+            }
         }
         time++;
     }
@@ -365,6 +400,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     }
 
 
+
+
     public boolean isDisplayFps() {
         return displayFps;
     }

From 48d58ea6602992c035d288ddf5ce68706938cb06 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Fri, 19 May 2017 18:08:26 +1200
Subject: [PATCH 05/12] Sparklines now update when a boat passes a mark.

There are issue of initialising the sparkline before the race starts and when the race is being viewed when it starts. It works great though when you join a race halfway.
#story[952]
---
 src/main/java/seng302/App.java                |  2 +-
 .../controllers/RaceViewController.java       | 54 +++++++++----------
 src/main/java/seng302/models/Yacht.java       | 16 ++----
 3 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 108d44aa..bd39a80d 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,7 +62,7 @@ public class App extends Application {
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-            //sr = new StreamReceiver("localhost", 4949, "RaceStream");
+//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
 //            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
             sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
         }
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 6eb3439f..5adba02c 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -70,7 +70,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Timeline timerTimeline;
     private Race race;
     private Stage stage;
-    private ArrayList<XYChart.Series<String, Double>> sparklineData = new ArrayList<>();
+    private static HashMap<Integer, Series<String, Double>> sparklineData = new HashMap<>();
     private ArrayList<String> positions;
     private int time;
 
@@ -193,25 +193,39 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         for (Yacht yacht: startingBoats){
             XYChart.Series<String, Double> yachtData = new XYChart.Series<>();
             yachtData.setName(yacht.getBoatName());
-            yachtData.getData().add(new XYChart.Data<>(Integer.toString(time), 1 + startingBoats.size() - Double.parseDouble(yacht.getPosition())));
-            sparklineData.add(yachtData);
+            yachtData.getData().add(new XYChart.Data<>(Integer.toString(yacht.getLegNumber()), Double.parseDouble(yacht.getPosition())));
+            sparklineData.put(yacht.getSourceID(),yachtData);
         }
-        for (Series<String, Double> spark: sparklineData){
+        List<XYChart.Series<String, Double>> positions = new ArrayList<XYChart.Series<String, Double>>(sparklineData.values());
+
+        Collections.sort(positions, new Comparator<XYChart.Series>() {
+            @Override
+            public int compare(Series o1, Series o2) {
+                Integer leg1 =  Integer.parseInt( ((XYChart.Data<String, Double>) o1.getData().get(o1.getData().size()-1)).getXValue());
+                Integer leg2 =  Integer.parseInt( ((XYChart.Data<String, Double>) o2.getData().get(o2.getData().size()-1)).getXValue());
+                if (leg2 < leg1){
+                    return 1;
+                } else {
+                    return -1;
+                }
+            }
+        });
+        for (Series<String, Double> spark: positions){
             raceSparkLine.getData().add(spark);
         }
-        Set<Node> nodes = raceSparkLine.lookupAll(".series");
-        for (Node n : nodes) {
-            StringBuilder style = new StringBuilder();
-            style.append("-fx-stroke: red; -fx-background-color: red, white; ");
-            n.setStyle(style.toString());
-        }
-        time++;
+
+    }
+
+
+    public static void updateYachtPositionSparkline(Yacht yacht, Integer legNumber){
+        XYChart.Series<String, Double> positionData =  sparklineData.get(yacht.getSourceID());
+        positionData.getData().add(new XYChart.Data<>(Integer.toString(legNumber), Double.parseDouble(yacht.getPosition())));
     }
 
 
     public void checkForPositionChange(){
         // initialize position array
-        if (positions.size() == 0 && startingBoats.size() == 6){
+        if (startingBoats.size() == 6 && raceSparkLine.getData().size() != 6){
             Boolean positionsAssigned = true;
             for (Yacht yacht: startingBoats){
                 if (Objects.equals(yacht.getPosition(), "-")) {
@@ -220,28 +234,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             }
             if (positionsAssigned){
                 initializeSparkline();
-                positions.addAll(startingBoats.stream().map(Yacht::getPosition).collect(Collectors.toList()));
             }
-        } else {
-            ArrayList<String> currentPositions = startingBoats.stream().map(Yacht::getPosition).collect(Collectors.toCollection(ArrayList::new));
-            if (!positions.equals(currentPositions)){
-                updateSparkLine();
-            }
-            positions.clear();
-            positions.addAll(startingBoats.stream().map(Yacht::getPosition).collect(Collectors.toList()));
         }
     }
 
 
 
-    public void updateSparkLine(){
-        for (int i = 0; i < startingBoats.size();i++){
-            if (!Objects.equals(startingBoats.get(i).getPosition(), "-")) {
-                sparklineData.get(i).getData().add(new XYChart.Data<>(Integer.toString(time), 1 + startingBoats.size() - Double.parseDouble(startingBoats.get(i).getPosition())));
-            }
-        }
-        time++;
-    }
 
     /**
      * Initalises a timer which updates elements of the RaceView such as wind direction, boat
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 5777fc25..ec1110a3 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -4,6 +4,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import javafx.scene.chart.XYChart;
 import javafx.scene.chart.XYChart.Series;
 import javafx.scene.paint.Color;
+import seng302.controllers.RaceViewController;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -20,7 +21,6 @@ public class Yacht {
     private double velocity;
 
     private int index;
-    private ConcurrentLinkedQueue<Number> dataQ1;
 
     private String boatType;
     private Integer sourceID;
@@ -62,7 +62,6 @@ public class Yacht {
         this.shortName = shortName;
         this.sourceID = id;
         index = 0;
-        dataQ1 = new ConcurrentLinkedQueue<>();
 
     }
 
@@ -74,7 +73,6 @@ public class Yacht {
         this.boatName = boatName;
         this.country = country;
         index = 0;
-        dataQ1 = new ConcurrentLinkedQueue<>();
     }
 
     public String getBoatType() {
@@ -109,7 +107,11 @@ public class Yacht {
     }
 
     public void setLegNumber(Integer legNumber) {
+        if (legNumber != this.legNumber && colour != null && position != "-") {
+            RaceViewController.updateYachtPositionSparkline(this, legNumber);
+        }
         this.legNumber = legNumber;
+
     }
 
     public Integer getPenaltiesAwarded() {
@@ -152,14 +154,6 @@ public class Yacht {
     }
 
     public void setPosition(String position) {
-            try {
-                if (Integer.parseInt(position) != Integer.parseInt(this.position)){
-                dataQ1.add(Integer.parseInt(position));
-                System.out.println("new position found for " + boatName + " in position " + position + " old(" + this.position + ")");
-                }
-            } catch (NumberFormatException e) {
-                System.out.println("No position found");
-            }
         this.position = position;
     }
 

From 8e147bd1bd746303f4ce73e02d5bbad51f5b4073 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Sun, 21 May 2017 14:56:05 +1200
Subject: [PATCH 06/12] Making the boat sparkline initialise after the race
 screen is shown.

#story[952]
---
 src/main/java/seng302/controllers/CanvasController.java   | 2 +-
 src/main/java/seng302/controllers/RaceViewController.java | 7 +++++++
 src/main/java/seng302/models/Yacht.java                   | 6 +++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 4ba21c00..7d0db4ed 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -128,7 +128,7 @@ public class CanvasController {
                     long elapsedNanosPerFrame = elapsedNanos / frameTimes.length ;
                     Double frameRate = 1_000_000_000.0 / elapsedNanosPerFrame ;
                     drawFps(frameRate.intValue());
-                    raceViewController.checkForPositionChange();
+//                    raceViewController.checkForPositionChange();
                 }
 
                 // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay.
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 5adba02c..e7eb3b90 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -522,4 +522,11 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     Stage getStage() {
         return stage;
     }
+
+    public static boolean sparkLineStatus(Integer yachtId) {
+        if (sparklineData.containsKey(yachtId)){
+            return true;
+        }
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index ec1110a3..5b19046f 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -107,9 +107,9 @@ public class Yacht {
     }
 
     public void setLegNumber(Integer legNumber) {
-        if (legNumber != this.legNumber && colour != null && position != "-") {
-            RaceViewController.updateYachtPositionSparkline(this, legNumber);
-        }
+//        if (colour != null  && position != "-" && legNumber != this.legNumber&& RaceViewController.sparkLineStatus(sourceID)) {
+//            RaceViewController.updateYachtPositionSparkline(this, legNumber);
+//        }
         this.legNumber = legNumber;
 
     }

From 8f81060a18526507a604bf891f84ad8f08316b3f Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Sun, 21 May 2017 19:49:11 +1200
Subject: [PATCH 07/12] Managed to make the sparklines coordinate with their
 colour.

 However the symbols had to be removed. The sparkline can also be intialised at any time now but this might need to be tested further to ensure that it works.

#story[952]
---
 .../seng302/controllers/CanvasController.java |  2 +-
 .../controllers/RaceViewController.java       | 76 +++++++++----------
 src/main/java/seng302/models/Yacht.java       |  6 +-
 src/main/resources/css/master.css             | 20 ++++-
 src/main/resources/views/RaceView.fxml        | 16 ++--
 5 files changed, 68 insertions(+), 52 deletions(-)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 7d0db4ed..c5609cad 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -128,7 +128,7 @@ public class CanvasController {
                     long elapsedNanosPerFrame = elapsedNanos / frameTimes.length ;
                     Double frameRate = 1_000_000_000.0 / elapsedNanosPerFrame ;
                     drawFps(frameRate.intValue());
-//                    raceViewController.checkForPositionChange();
+                    raceViewController.updateSparkLine();
                 }
 
                 // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay.
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index e7eb3b90..0f2fabef 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -1,17 +1,13 @@
 package seng302.controllers;
 
-import java.time.Year;
-import java.util.concurrent.ConcurrentLinkedQueue;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.chart.LineChart;
-import javafx.scene.chart.NumberAxis;
 import javafx.scene.chart.XYChart;
 import javafx.scene.chart.XYChart.Series;
 import javafx.scene.control.Button;
@@ -37,7 +33,6 @@ import seng302.models.parsers.StreamParser;
 
 import java.io.IOException;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Created by ptg19 on 29/03/17.
@@ -70,7 +65,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Timeline timerTimeline;
     private Race race;
     private Stage stage;
-    private static HashMap<Integer, Series<String, Double>> sparklineData = new HashMap<>();
+    private static HashMap<Integer, Series<String, Double>> sparkLineData = new HashMap<>();
     private ArrayList<String> positions;
     private int time;
 
@@ -188,54 +183,57 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         annotationSlider.setValue(2);
     }
 
-    private void initializeSparkline(){
-        raceSparkLine.setTitle("Boat Positions");
+    public void updateSparkLine(){
+        ArrayList<Yacht> sparkLineCandidates = new ArrayList<>();
         for (Yacht yacht: startingBoats){
+            if (!sparkLineData.containsKey(yacht.getSourceID()) && yacht.getPosition() != "-") {
+                sparkLineCandidates.add(yacht);
+            }
+        }
+        for (Yacht yacht: sparkLineCandidates){
             XYChart.Series<String, Double> yachtData = new XYChart.Series<>();
             yachtData.setName(yacht.getBoatName());
-            yachtData.getData().add(new XYChart.Data<>(Integer.toString(yacht.getLegNumber()), Double.parseDouble(yacht.getPosition())));
-            sparklineData.put(yacht.getSourceID(),yachtData);
-        }
-        List<XYChart.Series<String, Double>> positions = new ArrayList<XYChart.Series<String, Double>>(sparklineData.values());
+            yachtData.getData().add(new XYChart.Data<>(Integer.toString(yacht.getLegNumber()),1 + sparkLineCandidates.size() - Double.parseDouble(yacht.getPosition())));
+            sparkLineData.put(yacht.getSourceID(), yachtData);
+       }
 
-        Collections.sort(positions, new Comparator<XYChart.Series>() {
-            @Override
-            public int compare(Series o1, Series o2) {
-                Integer leg1 =  Integer.parseInt( ((XYChart.Data<String, Double>) o1.getData().get(o1.getData().size()-1)).getXValue());
-                Integer leg2 =  Integer.parseInt( ((XYChart.Data<String, Double>) o2.getData().get(o2.getData().size()-1)).getXValue());
-                if (leg2 < leg1){
-                    return 1;
-                } else {
-                    return -1;
-                }
+        // Lambda function to sort the series in order of leg (later legs shown more to the right)
+        List<XYChart.Series<String, Double>> positions = new ArrayList<>(sparkLineData.values());
+        Collections.sort(positions, (o1, o2) -> {
+            Integer leg1 =  Integer.parseInt( ((XYChart.Data<String, Double>) o1.getData().get(o1.getData().size()-1)).getXValue());
+            Integer leg2 =  Integer.parseInt( ((XYChart.Data<String, Double>) o2.getData().get(o2.getData().size()-1)).getXValue());
+            if (leg2 < leg1){
+                return 1;
+            } else {
+                return -1;
             }
         });
+        raceSparkLine.setCreateSymbols(false);
         for (Series<String, Double> spark: positions){
-            raceSparkLine.getData().add(spark);
+            if (!raceSparkLine.getData().contains(spark)) {
+                raceSparkLine.getData().add(spark);
+                spark.getNode().lookup(".chart-series-line").setStyle("-fx-stroke:" + getBoatColorAsRGB(spark.getName()).toString());
+            }
         }
-
     }
 
 
     public static void updateYachtPositionSparkline(Yacht yacht, Integer legNumber){
-        XYChart.Series<String, Double> positionData =  sparklineData.get(yacht.getSourceID());
-        positionData.getData().add(new XYChart.Data<>(Integer.toString(legNumber), Double.parseDouble(yacht.getPosition())));
+        XYChart.Series<String, Double> positionData =  sparkLineData.get(yacht.getSourceID());
+        positionData.getData().add(new XYChart.Data<>(Integer.toString(legNumber), 1 + sparkLineData.size() - Double.parseDouble(yacht.getPosition())));
     }
 
-
-    public void checkForPositionChange(){
-        // initialize position array
-        if (startingBoats.size() == 6 && raceSparkLine.getData().size() != 6){
-            Boolean positionsAssigned = true;
-            for (Yacht yacht: startingBoats){
-                if (Objects.equals(yacht.getPosition(), "-")) {
-                    positionsAssigned = false;
-                }
-            }
-            if (positionsAssigned){
-                initializeSparkline();
+    private String getBoatColorAsRGB(String boatName){
+        Color color = Color.WHITE;
+        for (Yacht yacht: startingBoats){
+            if (yacht.getBoatName() == boatName){
+                color = yacht.getColour();
             }
         }
+        return String.format( "#%02X%02X%02X",
+            (int)( color.getRed() * 255 ),
+            (int)( color.getGreen() * 255 ),
+            (int)( color.getBlue() * 255 ) );
     }
 
 
@@ -524,7 +522,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     }
 
     public static boolean sparkLineStatus(Integer yachtId) {
-        if (sparklineData.containsKey(yachtId)){
+        if (sparkLineData.containsKey(yachtId)){
             return true;
         }
         return false;
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 5b19046f..22472810 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -107,9 +107,9 @@ public class Yacht {
     }
 
     public void setLegNumber(Integer legNumber) {
-//        if (colour != null  && position != "-" && legNumber != this.legNumber&& RaceViewController.sparkLineStatus(sourceID)) {
-//            RaceViewController.updateYachtPositionSparkline(this, legNumber);
-//        }
+        if (colour != null  && position != "-" && legNumber != this.legNumber&& RaceViewController.sparkLineStatus(sourceID)) {
+            RaceViewController.updateYachtPositionSparkline(this, legNumber);
+        }
         this.legNumber = legNumber;
 
     }
diff --git a/src/main/resources/css/master.css b/src/main/resources/css/master.css
index 8223fc00..a97dcfa5 100644
--- a/src/main/resources/css/master.css
+++ b/src/main/resources/css/master.css
@@ -181,4 +181,22 @@ Remove scroll bars
     -fx-background-radius: 0;
     -fx-background-insets: 0;
     -fx-padding: 0;
-}
\ No newline at end of file
+}
+
+/**
+SparkLine elements
+ */
+
+
+/*.spark-line-yaxis{*/
+    /*-fx-font-color: white;*/
+    /*-fx-tick-label-fill: #ffffff;}*/
+
+/*.spark-line-xaxis{*/
+    /*-fx-font-color: white;*/
+    /*-fx-tick-label-fill: #ffffff;*/
+/*}*/
+
+.chart{
+    -fx-background-color: #ffffff;
+}
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 3260cec2..970f8200 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -62,19 +62,19 @@
             <Button fx:id="selectAnnotationBtn" layoutX="35.0" layoutY="578.0" mnemonicParsing="false" prefHeight="18.0" prefWidth="170.0" styleClass="blue-ui-btn" text="Select Annotations" textFill="WHITE" />
             <Text fill="WHITE" layoutX="11.0" layoutY="649.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Boat Selection" />
             <ComboBox fx:id="boatSelectionComboBox" layoutX="37.0" layoutY="664.0" prefHeight="25.0" prefWidth="170.0" promptText="Select Boat" styleClass="combo-box-base" />
+            <LineChart fx:id="raceSparkLine" layoutX="-15.0" layoutY="719.0" legendVisible="false" prefHeight="277.0" prefWidth="260.0" title="Boat Positions">
+              <xAxis>
+                <CategoryAxis label="Leg Number" side="BOTTOM" styleClass="spark-line-xaxis" />
+              </xAxis>
+              <yAxis>
+                <NumberAxis label="Position" minorTickCount="1" minorTickLength="1.0" side="LEFT" styleClass="spark-line-yaxis" tickLabelGap="1.0" tickUnit="1.0" upperBound="7.0" />
+              </yAxis>
+            </LineChart>
             </children>
         </AnchorPane>
         <AnchorPane fx:id="contentAnchorPane" prefHeight="960.0" prefWidth="1280.0" style="-fx-background-color: skyblue;" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowSpan="2147483647" GridPane.valignment="TOP">
          <children>
             <fx:include fx:id="includedCanvas" source="CanvasView.fxml" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-            <LineChart fx:id="raceSparkLine" layoutX="43.0" layoutY="597.0" prefHeight="277.0" prefWidth="727.0">
-              <xAxis>
-                <CategoryAxis side="BOTTOM" />
-              </xAxis>
-              <yAxis>
-                <NumberAxis side="LEFT" tickLabelGap="1.0" upperBound="6.0" />
-              </yAxis>
-            </LineChart>
          </children></AnchorPane>
     </children>
 </GridPane>

From 7abb36c362c0eac173000891517d4d595ee3f081 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Wed, 24 May 2017 14:42:41 +1200
Subject: [PATCH 08/12] The axis is labeled correctly and is scaled
 accordingly.

The sparkline should work from the start of a race now also. We now have the boat in first place listed at the top along with the axis labeling and marking matching the position (eg, 1st at top. 6th at bottom). Boats picked up on the visualiser park way through the race are able to added and drawn onto the sparkline.

#story[952]
---
 src/main/java/seng302/App.java                |   5 +-
 .../controllers/RaceViewController.java       | 105 ++++++++++--------
 src/main/resources/views/RaceView.fxml        |   2 +-
 3 files changed, 63 insertions(+), 49 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index ac264db6..64ccaea8 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -62,8 +62,9 @@ public class App extends Application {
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
-            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+//            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
+//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 71f542ae..95214921 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -6,8 +6,10 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
+import javafx.geometry.Side;
 import javafx.scene.Scene;
 import javafx.scene.chart.LineChart;
+import javafx.scene.chart.NumberAxis;
 import javafx.scene.chart.XYChart;
 import javafx.scene.chart.XYChart.Series;
 import javafx.scene.control.Button;
@@ -33,14 +35,18 @@ import seng302.models.stream.StreamParser;
 
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
+ *
  * Created by ptg19 on 29/03/17.
  */
 public class RaceViewController extends Thread implements ImportantAnnotationDelegate {
 
-
-    public LineChart raceSparkLine;
+    @FXML
+    private LineChart raceSparkLine;
+    @FXML
+    private NumberAxis sparklineYAxis;
     @FXML
     private VBox positionVbox;
     @FXML
@@ -65,11 +71,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private Timeline timerTimeline;
     private Stage stage;
     private static HashMap<Integer, Series<String, Double>> sparkLineData = new HashMap<>();
-    private ArrayList<String> positions;
-    private int time;
-
-    private int index = 0;
-
+    private static ArrayList<Yacht> racingBoats = new ArrayList<>();
     private ImportantAnnotationsState importantAnnotations;
     private Yacht selectedBoat;
 
@@ -77,12 +79,13 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         // Load a default important annotation state
         importantAnnotations = new ImportantAnnotationsState();
 
-        //Initialise race controller
-        RaceController raceController = new RaceController();
-        raceController.initializeRace();
-        race = raceController.getRace();
-        positions = new ArrayList<>();
-        startingBoats = new ArrayList<>(Arrays.asList(race.getBoats()));
+        //Format the yaxis of the sparkline
+        raceSparkLine.getYAxis().setRotate(180);
+        raceSparkLine.getYAxis().setTickLabelRotation(180);
+        raceSparkLine.getYAxis().setTranslateX(15);
+        raceSparkLine.getYAxis().setAutoRanging(false);
+
+        startingBoats = new ArrayList<>(StreamParser.getBoats().values());
 
         includedCanvasController.setup(this);
         includedCanvasController.initializeCanvas();
@@ -91,12 +94,10 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         initialiseAnnotationSlider();
         initialiseBoatSelectionComboBox();
         includedCanvasController.timer.start();
-        time = 0;
-        selectAnnotationBtn.setOnAction(event -> {
-            loadSelectAnnotationView();
-        });
+        selectAnnotationBtn.setOnAction(event -> loadSelectAnnotationView());
     }
 
+
     /**
      * The important annotations have been changed, update this view
      * @param importantAnnotationsState The current state of the selected annotations
@@ -106,6 +107,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         setAnnotations((int) annotationSlider.getValue()); // Refresh the displayed annotations
     }
 
+
     /**
      * Loads the "select annotations" view in a new window
      */
@@ -143,6 +145,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
             (observable, oldValue, newValue) -> displayFps = !displayFps);
     }
 
+
     private void initialiseAnnotationSlider() {
         annotationSlider.setLabelFormatter(new StringConverter<Double>() {
             @Override
@@ -182,50 +185,65 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         annotationSlider.setValue(2);
     }
 
-    public void updateSparkLine(){
-        ArrayList<Yacht> sparkLineCandidates = new ArrayList<>();
-        for (Yacht yacht: startingBoats){
-            if (!sparkLineData.containsKey(yacht.getSourceID()) && yacht.getPosition() != "-") {
-                sparkLineCandidates.add(yacht);
-            }
-        }
-        for (Yacht yacht: sparkLineCandidates){
-            XYChart.Series<String, Double> yachtData = new XYChart.Series<>();
+    void updateSparkLine(){
+        // Goes through and collects the racing boats that aren't already in the chart
+        ArrayList<Yacht> sparkLineCandidates = startingBoats.stream().filter(yacht -> !sparkLineData.containsKey(yacht.getSourceID())
+                && yacht.getPosition() != null & yacht.getPosition() != "-").collect(Collectors.toCollection(ArrayList::new));
+
+        racingBoats = startingBoats.stream().filter(yacht ->
+        yacht.getPosition() != null & yacht.getPosition() != "-").collect(Collectors.toCollection(ArrayList::new));
+
+        // Creates new data series for boats to the data series on the line chart
+        sparkLineCandidates.stream().filter(yacht -> yacht.getPosition() != null).forEach(yacht -> {
+            Series<String, Double> yachtData = new Series<>();
             yachtData.setName(yacht.getBoatName());
-            yachtData.getData().add(new XYChart.Data<>(Integer.toString(yacht.getLegNumber()),1 + sparkLineCandidates.size() - Double.parseDouble(yacht.getPosition())));
+            yachtData.getData().add(new XYChart.Data<>(Integer.toString(yacht.getLegNumber()), 1 + racingBoats.size() - Double.parseDouble(yacht.getPosition())));
             sparkLineData.put(yacht.getSourceID(), yachtData);
-       }
+        });
 
         // Lambda function to sort the series in order of leg (later legs shown more to the right)
         List<XYChart.Series<String, Double>> positions = new ArrayList<>(sparkLineData.values());
         Collections.sort(positions, (o1, o2) -> {
-            Integer leg1 =  Integer.parseInt( ((XYChart.Data<String, Double>) o1.getData().get(o1.getData().size()-1)).getXValue());
-            Integer leg2 =  Integer.parseInt( ((XYChart.Data<String, Double>) o2.getData().get(o2.getData().size()-1)).getXValue());
+            Integer leg1 =  Integer.parseInt(o1.getData().get(o1.getData().size()-1).getXValue());
+            Integer leg2 =  Integer.parseInt(o2.getData().get(o2.getData().size()-1).getXValue());
             if (leg2 < leg1){
                 return 1;
             } else {
                 return -1;
             }
         });
+
+
+        sparklineYAxis.setUpperBound(racingBoats.size() + 1);
+        // Adds the new data series to the sparkline
         raceSparkLine.setCreateSymbols(false);
-        for (Series<String, Double> spark: positions){
-            if (!raceSparkLine.getData().contains(spark)) {
-                raceSparkLine.getData().add(spark);
-                spark.getNode().lookup(".chart-series-line").setStyle("-fx-stroke:" + getBoatColorAsRGB(spark.getName()).toString());
-            }
-        }
+        positions.stream().filter(spark -> !raceSparkLine.getData().contains(spark)).forEach(spark -> {
+            raceSparkLine.getData().add(spark);
+            spark.getNode().lookup(".chart-series-line").setStyle("-fx-stroke:" + getBoatColorAsRGB(spark.getName()));
+        });
     }
 
 
+    /**
+     * UUpdates the yachts sparkline of the desired boat and using the new leg number
+     * @param yacht
+     * @param legNumber
+     */
     public static void updateYachtPositionSparkline(Yacht yacht, Integer legNumber){
         XYChart.Series<String, Double> positionData =  sparkLineData.get(yacht.getSourceID());
-        positionData.getData().add(new XYChart.Data<>(Integer.toString(legNumber), 1 + sparkLineData.size() - Double.parseDouble(yacht.getPosition())));
+        positionData.getData().add(new XYChart.Data<>(Integer.toString(legNumber), 1 + racingBoats.size() - Double.parseDouble(yacht.getPosition())));
     }
 
+
+    /**
+     * gets the rgb string of the boats colour to use for the chart via css
+     * @param boatName boat passed in to get the boats colour
+     * @return
+     */
     private String getBoatColorAsRGB(String boatName){
         Color color = Color.WHITE;
         for (Yacht yacht: startingBoats){
-            if (yacht.getBoatName() == boatName){
+            if (Objects.equals(yacht.getBoatName(), boatName)){
                 color = yacht.getColour();
             }
         }
@@ -394,7 +412,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     }
 
 
-    public boolean isDisplayFps() {
+    boolean isDisplayFps() {
         return displayFps;
     }
 
@@ -455,9 +473,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                 break;
             // Important Annotations
             case 1:
-                for (BoatGroup bg : includedCanvasController.getBoatGroups()) {
-                    setBoatGroupImportantAnnotations(bg);
-                }
+                includedCanvasController.getBoatGroups().forEach(this::setBoatGroupImportantAnnotations);
                 break;
             // All Annotations
             case 2:
@@ -501,9 +517,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     }
 
     public static boolean sparkLineStatus(Integer yachtId) {
-        if (sparkLineData.containsKey(yachtId)){
-            return true;
-        }
-        return false;
+        return sparkLineData.containsKey(yachtId);
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 13ecaa7e..1a8f74ac 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -56,7 +56,7 @@
                 <CategoryAxis label="Leg Number" side="BOTTOM" styleClass="spark-line-xaxis" />
               </xAxis>
               <yAxis>
-                <NumberAxis label="Position" minorTickCount="1" minorTickLength="1.0" side="LEFT" styleClass="spark-line-yaxis" tickLabelGap="1.0" tickUnit="1.0" upperBound="7.0" />
+                <NumberAxis fx:id="sparklineYAxis" minorTickCount="1" minorTickLength="1.0" side="LEFT" styleClass="spark-line-yaxis" tickLabelGap="1.0" tickUnit="1.0" upperBound="7.0" />
               </yAxis>
             </LineChart>
             </children>

From 8ab57e4e614d75a448bd3707d7157954ce4655ee Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Wed, 24 May 2017 18:43:50 +1200
Subject: [PATCH 09/12] Cleaned up code for review.

#story[952]
---
 .../controllers/RaceViewController.java       | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 95214921..e9a3d423 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -79,7 +79,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         // Load a default important annotation state
         importantAnnotations = new ImportantAnnotationsState();
 
-        //Format the yaxis of the sparkline
+        //Formatting the y axis of the sparkline
         raceSparkLine.getYAxis().setRotate(180);
         raceSparkLine.getYAxis().setTickLabelRotation(180);
         raceSparkLine.getYAxis().setTranslateX(15);
@@ -185,15 +185,21 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         annotationSlider.setValue(2);
     }
 
+
+    /**
+     * Used to add any new boats into the race that may have started late or not have had data received yet
+     */
     void updateSparkLine(){
-        // Goes through and collects the racing boats that aren't already in the chart
+        // Collect the racing boats that aren't already in the chart
         ArrayList<Yacht> sparkLineCandidates = startingBoats.stream().filter(yacht -> !sparkLineData.containsKey(yacht.getSourceID())
                 && yacht.getPosition() != null & yacht.getPosition() != "-").collect(Collectors.toCollection(ArrayList::new));
 
+        // Obtain the qualifying boats to set the max on the Y axis
         racingBoats = startingBoats.stream().filter(yacht ->
         yacht.getPosition() != null & yacht.getPosition() != "-").collect(Collectors.toCollection(ArrayList::new));
+        sparklineYAxis.setUpperBound(racingBoats.size() + 1);
 
-        // Creates new data series for boats to the data series on the line chart
+        // Create a new data series for new boats
         sparkLineCandidates.stream().filter(yacht -> yacht.getPosition() != null).forEach(yacht -> {
             Series<String, Double> yachtData = new Series<>();
             yachtData.setName(yacht.getBoatName());
@@ -214,8 +220,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         });
 
 
-        sparklineYAxis.setUpperBound(racingBoats.size() + 1);
-        // Adds the new data series to the sparkline
+        // Adds the new data series to the sparkline (and set the colour of the series)
         raceSparkLine.setCreateSymbols(false);
         positions.stream().filter(spark -> !raceSparkLine.getData().contains(spark)).forEach(spark -> {
             raceSparkLine.getData().add(spark);
@@ -225,9 +230,9 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
 
 
     /**
-     * UUpdates the yachts sparkline of the desired boat and using the new leg number
-     * @param yacht
-     * @param legNumber
+     * Updates the yachts sparkline of the desired boat and using the new leg number
+     * @param yacht The yacht to be updated on the sparkline
+     * @param legNumber the leg number that the position will be assigned to
      */
     public static void updateYachtPositionSparkline(Yacht yacht, Integer legNumber){
         XYChart.Series<String, Double> positionData =  sparkLineData.get(yacht.getSourceID());
@@ -238,7 +243,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     /**
      * gets the rgb string of the boats colour to use for the chart via css
      * @param boatName boat passed in to get the boats colour
-     * @return
+     * @return the colour as an rgb string
      */
     private String getBoatColorAsRGB(String boatName){
         Color color = Color.WHITE;
@@ -254,8 +259,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     }
 
 
-
-
     /**
      * Initalises a timer which updates elements of the RaceView such as wind direction, boat
      * orderings etc.. which are dependent on the info from the stream parser constantly.
@@ -272,7 +275,6 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
                     updateWindDirection();
                     updateOrder();
                     updateBoatSelectionComboBox();
-
                 })
         );
 
@@ -516,6 +518,11 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
         return stage;
     }
 
+    /**
+     * Used for when the boat attempts to add data to the sparkline (first checks if the sparkline contains info on it)
+     * @param yachtId
+     * @return
+     */
     public static boolean sparkLineStatus(Integer yachtId) {
         return sparkLineData.containsKey(yachtId);
     }

From 46f5fc517236465ea7240c9ac047406077bcb411 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Wed, 24 May 2017 18:47:27 +1200
Subject: [PATCH 10/12] Merge with develop.

#story[952]
---
 src/main/java/seng302/App.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 93dcd998..64cf5e2c 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -64,9 +64,9 @@ public class App extends Application {
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-            sr = new StreamReceiver("localhost", 4949, "RaceStream");
+//            sr = new StreamReceiver("localhost", 4949, "RaceStream");
 //            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
-//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
+            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
         }
 
         sr.start();

From 34c3899ec4ff0d11612ea3d844bd7e1218e32958 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Wed, 24 May 2017 18:51:52 +1200
Subject: [PATCH 11/12] Removed unused css for charts

---
 src/main/resources/css/master.css | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/main/resources/css/master.css b/src/main/resources/css/master.css
index a97dcfa5..bef93923 100644
--- a/src/main/resources/css/master.css
+++ b/src/main/resources/css/master.css
@@ -183,20 +183,6 @@ Remove scroll bars
     -fx-padding: 0;
 }
 
-/**
-SparkLine elements
- */
-
-
-/*.spark-line-yaxis{*/
-    /*-fx-font-color: white;*/
-    /*-fx-tick-label-fill: #ffffff;}*/
-
-/*.spark-line-xaxis{*/
-    /*-fx-font-color: white;*/
-    /*-fx-tick-label-fill: #ffffff;*/
-/*}*/
-
 .chart{
     -fx-background-color: #ffffff;
 }

From e6aed881889486586b0b2020db78f2855d983b96 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Wed, 24 May 2017 18:56:56 +1200
Subject: [PATCH 12/12] Merge with develop.

#story[952]
---
 src/main/java/seng302/models/Yacht.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index 6358003d..c5bdcbb7 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -1,8 +1,6 @@
 package seng302.models;
 
-import java.util.concurrent.ConcurrentLinkedQueue;
-import javafx.scene.chart.XYChart;
-import javafx.scene.chart.XYChart.Series;
+
 import javafx.scene.paint.Color;
 import seng302.controllers.RaceViewController;
 
@@ -21,8 +19,6 @@ public class Yacht {
     private Color colour;
     private double velocity;
 
-    private int index;
-
     private String boatType;
     private Integer sourceID;
     private String hullID; //matches HullNum in the XML spec.