From c30629542be84df83ebc3b735a72e4cc77715015 Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Mon, 22 May 2017 15:27:23 +1200
Subject: [PATCH] Merged develop into issue10 branch. Fixed merge issues and
 completed manual testing before merge request. #story[923]

---
 src/main/java/seng302/controllers/CanvasController.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 4850b4f4..2884de27 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -189,8 +189,8 @@ public class CanvasController {
             boatGroup.move();
         }
         for (MarkGroup markGroup : markGroups) {
-            for (int id : markGroup.getRaceIds()) {
-                if (StreamParser.boatPositions.containsKey(id)) {
+            for (Long id : markGroup.getRaceIds()) {
+                if (StreamParser.markPositions.containsKey(id)) {
                     updateMarkGroup(id, markGroup);
                 }
             }
@@ -224,8 +224,8 @@ public class CanvasController {
         }
     }
 
-    void updateMarkGroup (int raceId, MarkGroup markGroup) {
-        PriorityBlockingQueue<BoatPositionPacket> movementQueue = StreamParser.boatPositions.get(raceId);
+    void updateMarkGroup (long raceId, MarkGroup markGroup) {
+        PriorityBlockingQueue<BoatPositionPacket> movementQueue = StreamParser.markPositions.get(raceId);
         if (movementQueue.size() > 0){
             try {
                 BoatPositionPacket positionPacket = movementQueue.take();
@@ -256,7 +256,6 @@ public class CanvasController {
 
     private void initializeMarks() {
         ArrayList<Mark> allMarks = StreamParser.getXmlObject().getRaceXML().getCompoundMarks();
-        System.out.println(allMarks);
         for (Mark mark : allMarks) {
             if (mark.getMarkType() == MarkType.SINGLE_MARK) {
                 SingleMark sMark = (SingleMark) mark;