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

Tidied code, added MidPoint to CompoundMark class

Browse Source 
Compound Mark class is now constructed with a list of marks.
A mid point is created on its construction for use in Geo Calculations

#story[1124] #pair[wmu16, hyi25]
This commit is contained in:
William Muir
2017-08-10 13:58:32 +12:00
parent abb15f6edf
commit 9c79897e01
6 changed files with 87 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/seng302/model/YachtTest.java
+6 -3
View File
@@ -2,6 +2,8 @@ package seng302.model;
import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import seng302.model.mark.CompoundMark;
@@ -33,11 +35,12 @@ public class YachtTest {
yacht.setLocation(57.670333, 11.827833);
compoundMark = new CompoundMark(0, "HaomingsMark");
List<Mark> subMarks = new ArrayList<>();
Mark subMark1 = new Mark("H", 57.671524, 11.844495, 0);
Mark subMark2 = new Mark("H", 57.670822, 11.843392, 0);
compoundMark.addSubMarks(subMark1, subMark2);
subMarks.add(subMark1);
subMarks.add(subMark2);
compoundMark = new CompoundMark(0, "HaomingsMark", subMarks);
}