michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed the parser from queing packets incorrectly. Used the marker boat location packets to get the live updates of the marker positions and implemented the markers being updated much like the boats currently are. This means the course more closely resembles the actual intended course design.

Browse Source 
#story[820]
This commit is contained in:
Kusal Ekanayake
2017-04-29 20:10:39 +12:00
parent 1e1e482b79
commit 1d28334346
9 changed files with 103 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/models/parsers/CourseParser.java
+2 -1
View File
@@ -35,7 +35,8 @@ public class CourseParser extends FileParser {
String name = element.getElementsByTagName("name").item(0).getTextContent();
double lat = Double.valueOf(element.getElementsByTagName("latitude").item(0).getTextContent());
double lon = Double.valueOf(element.getElementsByTagName("longitude").item(0).getTextContent());
SingleMark singleMark = new SingleMark(name, lat, lon);
int id = Integer.valueOf(element.getElementsByTagName("id").item(0).getTextContent());
SingleMark singleMark = new SingleMark(name, lat, lon, id);
return singleMark;
} else {
throw new NoSuchElementException("Cannot generate a mark by given node.");
src/main/java/seng302/models/parsers/StreamParser.java
+15 -17
View File
@@ -48,21 +48,20 @@ public class StreamParser extends Thread{
Thread.sleep(1);
}
while (StreamReceiver.packetBuffer.peek() != null){
StreamPacket packet = StreamReceiver.packetBuffer.peek();
int delayTime = 1000;
int loopTime = delayTime + 1000;
long sleepTime = 0;
long transitTime = (System.currentTimeMillis()%loopTime - packet.getTimeStamp()%loopTime);
if (transitTime < 0){
transitTime = loopTime + delayTime;
}
if (transitTime < delayTime) {
sleepTime = delayTime - (transitTime);
Thread.sleep(sleepTime);
}
System.out.println(sleepTime);
packet = StreamReceiver.packetBuffer.take();
// StreamPacket packet = StreamReceiver.packetBuffer.peek();
// int delayTime = 1000;
// int loopTime = delayTime + 1000;
// long sleepTime = 0;
// long transitTime = (System.currentTimeMillis()%loopTime - packet.getTimeStamp()%loopTime);
// if (transitTime < 0){
// transitTime = loopTime + delayTime;
// }
// if (transitTime < delayTime) {
// sleepTime = delayTime - (transitTime);
// Thread.sleep(sleepTime);
// }
// System.out.println(sleepTime);
StreamPacket packet = StreamReceiver.packetBuffer.take();
parsePacket(packet);
Thread.sleep(1);
while (StreamReceiver.packetBuffer.peek() == null) {
@@ -228,7 +227,6 @@ public class StreamParser extends Thread{
while (payloadStream.available() > 0 && (currentChar = payloadStream.read()) != 0) {
xmlMessage += (char)currentChar;
}
//Create XML document Object
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = null;
@@ -323,7 +321,7 @@ public class StreamParser extends Thread{
// long speed = extractTimeStamp(speedBytes, 2);
double groundSpeed = bytesToLong(groundSpeedBytes)/1000.0;
short s = (short) ((groundSpeedBytes[1] & 0xFF) << 8 | (groundSpeedBytes[0] & 0xFF));
if ((int)deviceType == 1 || (int)deviceType == 4){
if ((int)deviceType == 1 || (int)deviceType == 3){
// System.out.println("boatId = " + boatId);
// System.out.println("deviceType = " + (long)deviceType);
// System.out.println("seq = " + seq);