all marks displaying except currently gate marks are displaying as a single dot

#story[923] #pair[ajm412, ptg19]

src/main/java/seng302/models/mark/Mark.java

@@ -10,7 +10,7 @@ public abstract class Mark {
     private MarkType markType;
     private double latitude;
     private double longitude;
-    private int id;
+    private long id;
 
     /**
      * Create a mark instance by passing its name and type
@@ -125,7 +125,7 @@ public abstract class Mark {
         return longitude;
     }
 
-    public int getId() {
+    public long getId() {
         return id;
     }
 

src/main/java/seng302/models/mark/MarkGroup.java

@@ -1,14 +1,12 @@
 package seng302.models.mark;
 
+import java.util.ArrayList;
+import java.util.List;
 import javafx.geometry.Point2D;
 import javafx.scene.Group;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Circle;
 import javafx.scene.shape.Line;
-import javafx.scene.transform.Rotate;
-
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Created by CJIRWIN on 26/04/2017.
@@ -72,7 +70,7 @@ public class MarkGroup extends Group {
         }
     }
 
-    public void moveMarkTo (double x, double y, int raceId)
+    public void moveMarkTo (double x, double y, long raceId)
     {
         if (mainMark.getMarkType() == MarkType.SINGLE_MARK) {
             Circle markCircle = (Circle) super.getChildren().get(0);
@@ -104,8 +102,8 @@ public class MarkGroup extends Group {
         return false;
     }
 
-    public int[] getRaceIds () {
-        int[] idArray = new int[marks.size()];
+    public long[] getRaceIds () {
+        long[] idArray = new long[marks.size()];
         int i = 0;
         for (Mark mark : marks)
             idArray[i++] = mark.getId();

src/main/java/seng302/models/stream/StreamParser.java

@@ -1,6 +1,23 @@
 package seng302.models.stream;
 
 
+import java.io.IOException;
+import java.io.StringReader;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.PriorityBlockingQueue;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -8,19 +25,6 @@ import seng302.models.Yacht;
 import seng302.models.stream.packets.BoatPositionPacket;
 import seng302.models.stream.packets.StreamPacket;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListMap;
-import java.util.concurrent.PriorityBlockingQueue;
-import seng302.models.stream.XMLParser;
-
 /**
  * The purpose of this class is to take in the stream of divided packets so they can be read
  * and parsed in by turning the byte arrays into useful data. There are two public static hashmaps
@@ -29,6 +33,7 @@ import seng302.models.stream.XMLParser;
  */
 public class StreamParser extends Thread{
 
+     public static ConcurrentHashMap<Long, PriorityBlockingQueue<BoatPositionPacket>> markPositions = new ConcurrentHashMap<>();
      public static ConcurrentHashMap<Long, PriorityBlockingQueue<BoatPositionPacket>> boatPositions = new ConcurrentHashMap<>();
      private String threadName;
      private Thread t;
@@ -400,6 +405,20 @@ public class StreamParser extends Thread{
                 }));
             }
             boatPositions.get(boatId).put(boatPacket);
+        } else if (deviceType == 3){
+            BoatPositionPacket markPacket = new BoatPositionPacket(boatId, timeValid, lat, lon, heading, groundSpeed);
+
+            //add a new priority que to the boatPositions HashMap
+            if (!markPositions.containsKey(boatId)) {
+                markPositions.put(boatId,
+                    new PriorityBlockingQueue<>(256, new Comparator<BoatPositionPacket>() {
+                        @Override
+                        public int compare(BoatPositionPacket p1, BoatPositionPacket p2) {
+                            return (int) (p1.getTimeValid() - p2.getTimeValid());
+                        }
+                    }));
+            }
+            markPositions.get(boatId).put(markPacket);
         }
     }
 

src/main/java/seng302/models/stream/XMLParser.java

@@ -1,6 +1,9 @@
 package seng302.models.stream;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -9,10 +12,6 @@ import seng302.models.Yacht;
 import seng302.models.mark.GateMark;
 import seng302.models.mark.Mark;
 import seng302.models.mark.MarkType;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
 import seng302.models.mark.SingleMark;
 
 /**
@@ -349,7 +348,6 @@ public class XMLParser {
                 }
             }
 
-            System.out.println(marksList.size());
             if (marksList.size() == 1) {
                 return marksList.get(0);
             } else if (marksList.size() == 2) {