8f93956ff1
Added methods to calculate optimal map size given a geo boundary.
...
- From zoom level 20 to 1, once find a size that contains the whole boundary, then the size will be used to retrieve map image from google
#story[928]
2017-05-24 00:49:03 +12:00
4fe4ac1079
Added get map size (width and height) method in canvasMap with given boundary
...
#story[928]
2017-05-24 00:49:03 +12:00
8a2f0a9f45
Added unit tests for Mercator projection class.
...
- changed its methods to static
- add some documentation for its methods
#story[928]
2017-05-24 00:49:03 +12:00
5cc865f0af
Created Mercator projection to convert between Geo location and planar projection point.
...
- MapGeo and MapPoint encapsulate geo location and planar projection point into classes.
#story[928]
2017-05-24 00:49:03 +12:00
189ba93e64
Created a canvas map class to fetch map image from google
...
- also added Bound class to encapsulate map boundary.
- created TestMapView and its controller just for testing.
#story[928]
2017-05-24 00:49:03 +12:00
6f1b0b06c3
Fixed est time to next mark and time from last mark annotation update after commit e0750f53 in BoatGroup.java
...
#story[924] #story[927]
2017-05-22 16:17:52 +12:00
408d70c420
Merge branch 'issue#10_unifying_marks' into 'develop'
...
Issue#10 unifying marks
Marks work properly, reading boat position packets and moving.
First and last marks are colored green and red respectively.
See merge request !35
2017-05-22 16:07:50 +12:00
e51c966969
Made sure only boats in participant list are replaced. Also removed mark coloring as it wasn't as accurate as was necessary.
...
#story[923]
2017-05-22 16:05:24 +12:00
c30629542b
Merged develop into issue10 branch. Fixed merge issues and completed manual testing before merge request.
...
#story[923]
2017-05-22 15:27:23 +12:00
3f9fa24c69
Merge branch 'develop' into issue#10_unifying_marks
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/controllers/CanvasController.java
2017-05-22 15:13:48 +12:00
78573fa837
Made start/finish lines a different color.
...
#story[923]
2017-05-22 15:10:05 +12:00
d4837cacda
Merge branch 'Issue#4_boat_movement' into 'develop'
...
Issue#4 boat movement
This merge will break several things:
1 boat wakes and trails will be the most effective and will have to be manually re-implemented in the re-engineered boatgroup
2 boat annotations in Raceviewcontroller have been effected
3 boat selection (on click) in Raceviewcontroller has been effected
See merge request !34
2017-05-22 15:03:11 +12:00
0367805f0f
fixed bug from merge where est time to next mark was null on some boats #story[923]
2017-05-22 15:01:04 +12:00
e0750f5341
Merge branch 'develop' into Issue#4_boat_movement
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/Race.java
2017-05-22 14:56:08 +12:00
80528c9c42
fixed bug in canvas controller
...
#bug
2017-05-22 14:30:31 +12:00
be633c0e60
Marks display correctly on the canvas, no double ups or anything like that left.
...
#[issue10]
2017-05-22 13:22:55 +12:00
97f1ccb6c1
Fixed a bug where an error was caused when attempting to flip the race around the prime meridian.
...
All x values are now flipped horizontally if the difference between the smallest lon, e.g. -179.5 and the largest e.g. 179.5 is greater than 180.
#story[923] #bug
2017-05-22 05:41:57 +12:00
68a243725b
Fixed a bug where an error was caused when attempting to flip the race around the prime meridian.
...
All x values are now flipped horizontally if the difference between the smallest lon, e.g. -179.5 and the largest e.g. 179.5 is greater than 180.
#story[923] #bug
2017-05-22 05:39:36 +12:00
c6ab96a86f
Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop
2017-05-21 16:05:37 +12:00
059c0de1fa
Quickfix for null pointer in boatObject
...
#pair[ptg19,kre39]
2017-05-21 15:58:17 +12:00
4d3cfe71f7
Merge branch 'develop' into Issue#4_boat_movement
...
Conflicts:
src/main/java/seng302/models/BoatGroup.java
src/main/java/seng302/models/Wake.java
2017-05-19 21:40:16 +12:00
5adb7c3762
Fixed failing ColorsTest
...
#story[923]
2017-05-19 20:57:40 +12:00
937b309b07
Added boat trails to the boat group, fixed annotations
...
- Set colours for the annotations
- Added boat trails back into the boat group
- Re-added time until next mark and time since last mark rounding
#story[923]
2017-05-19 20:55:02 +12:00
aaf2e6a3f0
Added boat wakes back to the visualiser
...
#story[923]
2017-05-19 16:57:29 +12:00
b692ddcbe6
Marks and gates correctly displaying from XML messages and mark(boat) position packets. Will need a little polishing but marks and gates are moving around.
...
#story[923] #pair[ajm412, ptg19]
2017-05-18 18:39:23 +12:00
5d6b356602
all marks displaying except currently gate marks are displaying as a single dot
...
#story[923] #pair[ajm412, ptg19]
2017-05-18 18:02:25 +12:00
08057edb28
Merge branch 'Issue#4_boat_movement' into issue#10_unifying_marks
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/mark/MarkGroup.java
2017-05-18 17:04:00 +12:00
a2123df0c5
Fixed Boat selection and lost annotations (Estimated and Leg Time)
...
Trails and Wakes, however, are still not re implemented yet.
story[923]
2017-05-18 14:41:08 +12:00
cf4d7e03f5
Merge branch 'issue#1_wakes_3.0' into 'develop'
...
Issue#1 wakes 3.0
Changed methods in the wake class to fix issues caused by unexpected velocities making the wakes go crazy.
Improved performance.
Made wakes look different.
See merge request !33
2017-05-18 11:45:28 +12:00
73eeeb0ef9
Removed extra print stmt and changed default server back to official
2017-05-18 11:45:06 +12:00
0f79353936
fixes from merge #story[923]
2017-05-17 20:15:47 +12:00
38b44fa92b
Merge branch 'develop' into Issue#4_boat_movement
...
# Conflicts:
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/mark/MarkGroup.java
# src/main/java/seng302/models/stream/StreamParser.java
# src/test/java/seng302/models/stream/StreamReceiverTest.java
2017-05-17 20:05:40 +12:00
3fd13ddc0a
Adjusted XMLParser to use model Mark objects rather than the simple datatype that existed in the XMLParser previously. Began attempting to implement them into the canvas controller but have issues
...
#[issue10]
2017-05-17 19:46:05 +12:00
2e375978bd
cleaned up code for merging back to develop #story[923]
2017-05-17 19:18:31 +12:00
45db731a60
Fixed a merge issue.
...
#story[923] #bug #refactor
2017-05-17 18:06:36 +12:00
95e353c14e
fixed initialization bug #story[923]
2017-05-17 17:55:21 +12:00
8a3a41294a
Fixed error causing build failure.
...
#story[923] #bug #refactor
2017-05-17 17:41:45 +12:00
f41858e2c7
Tidied variable names.
2017-05-17 17:35:59 +12:00
aaa3dc93f1
boat movement working reliably now, still need to fix one bug at initialization #story[923]
2017-05-17 17:34:47 +12:00
e5eab0a6c8
Merge remote-tracking branch 'origin/develop' into issue#1_wakes_3.0
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/models/BoatGroup.java
2017-05-17 17:27:34 +12:00
7c39368126
Removed unnecessary constant
2017-05-17 17:23:10 +12:00
ade926e2f2
StreamParser class now only shares thread safe classes.
...
#story[923] #bug
2017-05-17 16:44:05 +12:00
c63c8e4d73
Stripped out excess code in Wake class.
2017-05-17 16:33:45 +12:00
3c418b2aa4
Changed boat location message to milliseconds
2017-05-17 14:57:31 +12:00
d34a158c34
Merge branch '38a_Select_Boats' into 'develop'
...
38a select boats
Selection of boats now possible by selecting a boat from a drop down menu to focus that boat singularly or clicking a boat on the canvas to toggle that boats annotations.
Changed the annotations slider to remove the low annotation option. Only now includes None, Important and All. I think this makes much more sense.
Refactor of the race view controller class to combine all timelines for polling the Stream Parser to update race view data such as tables into one timeline for polling. In the future this should be improved further from polling to an observer model.
See merge request !31
2017-05-17 14:38:23 +12:00
6e3d037021
Merge branch 'develop' into 38a_Select_Boats
2017-05-17 14:34:10 +12:00
7d160eaf54
Removed unused imports from controller.java
2017-05-17 13:16:00 +12:00
4fc99edbd6
Merge branch 'issue#14_split_start_screen_view&controller' into 'develop'
...
Split Start Screen out from Main View view and controller.
The start screen has its own view and controller now. Returned main view to its original function.
(This solves issue#14)
See merge request !32
2017-05-17 13:07:48 +12:00
4da8c1645e
Split Start Screen out from Main View view and controller.
...
#story[923]
2017-05-17 12:56:13 +12:00
1c01aab1e7
Merge on to develop
...
story[955]
2017-05-17 10:34:00 +12:00
Haoming Yin
Zhi You Tan
Michael Rausch
Alistair McIntyre
Peter Galloway
Calum
alistairjmcintyre
Kusal Ekanayake
Michael Rausch
William Muir