978493853d
Merge branch 'Story29' into merge_branch_front
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/Boat.java
# src/main/java/seng302/models/Colors.java
# src/main/java/seng302/models/Event.java
# src/main/java/seng302/models/Race.java
# src/main/java/seng302/models/mark/GateMark.java
# src/main/java/seng302/models/mark/Mark.java
# src/main/java/seng302/models/mark/MarkType.java
# src/main/java/seng302/models/mark/SingleMark.java
# src/main/java/seng302/models/parsers/CourseParser.java
# src/main/java/seng302/models/parsers/TeamsParser.java
# src/main/resources/views/MainView.fxml
# src/main/resources/views/RaceView.fxml
# src/test/java/seng302/BoatTest.java
# src/test/java/seng302/ColorsTest.java
# src/test/java/seng302/EventTest.java
# src/test/java/seng302/models/mark/MarkTest.java
# src/test/java/seng302/models/parsers/CourseParserTest.java
2017-05-01 17:06:17 +12:00
e7f9954970
Removed unneeded files, also fixed heading calculation
...
Tags #story[829]
2017-04-30 23:29:15 +12:00
d07c660eb9
Merge remote-tracking branch 'origin/Story29' into Story29
2017-04-30 17:47:05 +12:00
6491efec4c
Fixed race status sent in race status messages
...
#story[829]
2017-04-30 17:46:56 +12:00
85f461c88c
Fixed bug so XML messages are located and sent properly on the server
...
Imported appache commons to read inputstream to a bytearray
#story[829]
2017-04-30 17:08:06 +12:00
1cf55f3e96
Fixed an issue where buffers aren't being sent properly
...
Tags #Story[829]
2017-04-30 16:16:44 +12:00
9a995ddcc1
Boat status changes to finished when a boat finishes the race
...
Tags: #story[829]
2017-04-30 01:55:49 +12:00
3e97f016d5
Getting boat locations from race simulator & bug fixes
...
- Boat locations that are generated by the simulator are sent to the client as they happen
- Fixed heading and lat/lon encoding
- Fixed a bug where the header wasn't included in the sent byte stream
- Fixed the format of data as it's sent to the client.
- Data is now sent using a channel
- Removed tests that don't work with channels
Tags: #story[829]
2017-04-29 19:38:21 +12:00
8a04a0e5b7
Added documents for Boat, RaceParser and Simulator classes.
...
#story[828]
2017-04-28 14:53:26 +12:00
705a0a2eaf
Added document and unit tests for GeoUtility class.
...
- three methods in GeoUtility have been tested and passed.
#story[828]
2017-04-28 14:34:24 +12:00
8c8f253233
Created simulator to generate mock data.
...
- simulator runs as a background thread and sleep for a given time lapse.
- simulator extends observable, so it can notify all its observers when boats positions have been updated
#story[828]
2017-04-26 22:58:13 +12:00
8b8422de3a
Renamed course parser to race parser
...
- because in AC35 spec. race xml file contain course set up and all other general race settings
#story[828]
2017-04-26 22:52:18 +12:00
7bf2d4c40e
Added Position class to better use GeoUtility.
...
- mark now inherit from Position
#story[828]
2017-04-26 22:52:18 +12:00
2a67f04d15
Create GeoUtility to process all geo calculations.
...
- calculate distance between two geo positions
- calculate the bearing from one geo position to another
- calculate the new geo position by passing original position, bearing and
distance
#story[828]
2017-04-26 22:52:18 +12:00
b2ea8196d5
Fixed a bug of getCourse method as it didn't parse xml correctly.
...
- a typo 'CompoundmarkID'(should be 'CompoundMarkID') which caused parser failed to parse file.
- add typeOf method in RoundingType to convert strings to types
#story[828]
2017-04-26 22:52:18 +12:00
7f38191d03
Rewrote course parser to parse race xml file specified in AC35 spec.
...
#story[828]
2017-04-26 22:52:18 +12:00
f6b7a3042f
Rewrote all kind of marks to fit marks specified in AC35 spec.
...
- added compound mark
- added corner
- rewrote mark as a single mark
- added rounding type enum
#story[828]
2017-04-26 22:52:18 +12:00
bc31987f96
Added Boat location messages to the mock streaming data interface
...
- Added static methods to convert between binary packed lat/longs and floating point numbers
Tags: #story[829]
2017-04-26 22:38:39 +12:00
1f8f1f0f86
Added boat location, and race start messages to the mock data interface
...
- Added proper support for signed and unsigned types. This includes automatic conversion to the correct data type (long to int, short, or byte).
- Moved code related to adding values into the byte buffer into the abstract Message class
Tags: #story[29]
2017-04-25 21:49:51 +12:00
6874f288ee
Added Race Status messages to the mock streaming data interface
...
Tags: #story[29]
2017-04-24 21:53:42 +12:00
edc306da22
Created AC35 Streaming server
...
- Sends heartbeat messages every 5 seconds
- Sends XML at beginning
Tags: #story[29]
2017-04-19 19:05:19 +12:00
Haoming Yin
Michael Rausch
Michael Rausch
William Muir