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

merging with wake remake #story[820]

Browse Source
This commit is contained in:
Peter Galloway
2017-05-01 20:09:51 +12:00
parent 130efa3a51
commit 33ae7beeb4
7 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/models/parsers/StreamParser.java
+2 -1
View File
@@ -5,6 +5,7 @@ import javafx.geometry.Point3D;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import seng302.models.Boat;
import seng302.models.parsers.packets.BoatPositionPacket;
import seng302.models.parsers.packets.StreamPacket;
@@ -337,7 +338,7 @@ public class StreamParser extends Thread{
long heading = bytesToLong(headingBytes);
double groundSpeed = bytesToLong(groundSpeedBytes)/1000.0;
short s = (short) ((groundSpeedBytes[1] & 0xFF) << 8 | (groundSpeedBytes[0] & 0xFF));
if ((int)deviceType == 1){
if ((int)deviceType == 1 || (int)deviceType == 3){
BoatPositionPacket boatPacket = new BoatPositionPacket(boatId, timeValid, lat, lon, heading, groundSpeed);
src/main/java/seng302/models/parsers/packets/BoatPositionPacket.java
+4
View File
@@ -32,4 +32,8 @@ public class BoatPositionPacket {
public double getHeading() {
return heading;
}
public double getGroundSpeed() {
return groundSpeed;
}
}