From 71637d7286d74a678c4d153d12986a2a9845b054 Mon Sep 17 00:00:00 2001
From: Michael Rausch <mra106@uclive.ac.nz>
Date: Wed, 24 May 2017 15:04:12 +1200
Subject: [PATCH] Removed dead code from canvas controller and canvas map

Tags: #story[928]
---
 .../seng302/controllers/CanvasController.java | 25 ++++++-------------
 .../java/seng302/models/map/CanvasMap.java    |  1 -
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index a1a83e8b..6fa9b773 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -1,10 +1,5 @@
 package seng302.controllers;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.PriorityBlockingQueue;
 import javafx.animation.AnimationTimer;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.fxml.FXML;
@@ -21,11 +16,7 @@ import seng302.models.Colors;
 import seng302.models.Yacht;
 import seng302.models.map.Boundary;
 import seng302.models.map.CanvasMap;
-import seng302.models.mark.GateMark;
-import seng302.models.mark.Mark;
-import seng302.models.mark.MarkGroup;
-import seng302.models.mark.MarkType;
-import seng302.models.mark.SingleMark;
+import seng302.models.mark.*;
 import seng302.models.stream.StreamParser;
 import seng302.models.stream.XMLParser;
 import seng302.models.stream.XMLParser.RaceXMLObject.Limit;
@@ -34,6 +25,12 @@ import seng302.models.stream.packets.BoatPositionPacket;
 import seng302.server.simulator.GeoUtility;
 import seng302.server.simulator.mark.Position;
 
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.PriorityBlockingQueue;
+
 /**
  * Created by ptg19 on 15/03/17.
  * Modified by Haoming Yin (hyi25) on 20/3/2017.
@@ -113,10 +110,6 @@ public class CanvasController {
     public void initializeCanvas (){
 
         gc = canvas.getGraphicsContext2D();
-//        gc.save();
-//        gc.setFill(Color.SKYBLUE);
-//        gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT);
-//        gc.restore();
         gc.setGlobalAlpha(0.5);
         fitMarksToCanvas();
         drawGoogleMap();
@@ -243,13 +236,9 @@ public class CanvasController {
 
     private void checkForCourseChanges() {
         if (StreamParser.isNewRaceXmlReceived()){
-//            gc.setFill(Color.SKYBLUE);
-//            gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT);
-//            gc.restore();
             gc.clearRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT);
             drawGoogleMap();
             addRaceBorder();
-//            canvas.toBack();
         }
     }
 
diff --git a/src/main/java/seng302/models/map/CanvasMap.java b/src/main/java/seng302/models/map/CanvasMap.java
index 3302112c..162358a1 100644
--- a/src/main/java/seng302/models/map/CanvasMap.java
+++ b/src/main/java/seng302/models/map/CanvasMap.java
@@ -30,7 +30,6 @@ public class CanvasMap {
 
 	public Image getMapImage() {
 		try {
-			System.out.println(getRequest());
 			URL url = new URL(getRequest());
 			HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();