From b3a89279d68809ba3c1b95fbe9ac2971bcecb8b9 Mon Sep 17 00:00:00 2001
From: William Muir <wmu16@uclive.ac.nz>
Date: Tue, 2 May 2017 21:31:38 +1200
Subject: [PATCH] Quick change to stop adding course markers as they are
 dynamic and add them in the previous way

---
 src/main/java/seng302/App.java                |  4 ++--
 .../seng302/controllers/CanvasController.java | 20 ++-----------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index 5d4ce825..012b3945 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -34,9 +34,9 @@ public class App extends Application
             sr = new StreamReceiver("localhost", 8085, "TestThread1");
         }
         else{
-//            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941,"TestThread1");
+            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941,"TestThread1");
 //            sr = new StreamReceiver("livedata.americascup.com", 4941, "TestThread1");
-            sr = new StreamReceiver("localhost", 8085, "TestThread1");
+//            sr = new StreamReceiver("localhost", 8085, "TestThread1");
         }
 
         sr.start();
diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 47267cc5..bb138e70 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -100,24 +100,7 @@ public class CanvasController {
         gc.setFill(Color.SKYBLUE);
         gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT);
         gc.restore();
-//        fitMarksToCanvas();
-
-        //Wait until wer have received the XML
-        while(StreamParser.getXmlObject().getRaceXML() == null) {
-            try {
-                Thread.sleep(1);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-
-        findMinMaxPoint();
-        double minLonToMaxLon = scaleRaceExtremities();
-        calculateReferencePointLocation(minLonToMaxLon);
-        addRaceBorder();
-        addCourseMarks();
-        findMetersToPixels();
-
+        fitMarksToCanvas();
 
 
         // TODO: 1/05/17 wmu16 - Change this call to now draw the marks as from the xml
@@ -357,6 +340,7 @@ public class CanvasController {
         double minLonToMaxLon = scaleRaceExtremities();
         calculateReferencePointLocation(minLonToMaxLon);
         givePointsXY();
+        addRaceBorder();
         findMetersToPixels();
     }