From 493932b93feab4162dddbfd56275becdf6f401e7 Mon Sep 17 00:00:00 2001 From: Erika Savell Date: Fri, 12 May 2017 10:27:55 +1200 Subject: [PATCH] Merged with visualiser side of mark boats #story[881] --- .../java/seng302/Mock/StreamedCourse.java | 4 +- .../main/java/seng302/Mock/StreamedRace.java | 6 +- .../main/java/seng302/Model/BoatInRace.java | 4 +- .../src/main/java/seng302/Model/Leg.java | 30 ++++----- .../Model/{CompoundMark.java => Marker.java} | 0 .../src/main/java/seng302/RaceDataSource.java | 4 +- .../src/main/java/seng302/RaceXMLReader.java | 18 +++--- .../java/seng302/Mock/StreamedRaceTest.java | 4 +- .../java/seng302/Model/BoatInRaceTest.java | 62 +++++++++---------- .../src/test/java/seng302/Model/LegTest.java | 24 +++---- ...{CompoundMarkTest.java => MarkerTest.java} | 12 ++-- 11 files changed, 84 insertions(+), 84 deletions(-) rename visualiser/src/main/java/seng302/Model/{CompoundMark.java => Marker.java} (100%) rename visualiser/src/test/java/seng302/Model/{CompoundMarkTest.java => MarkerTest.java} (77%) diff --git a/visualiser/src/main/java/seng302/Mock/StreamedCourse.java b/visualiser/src/main/java/seng302/Mock/StreamedCourse.java index 28ea85da..2457baf9 100644 --- a/visualiser/src/main/java/seng302/Mock/StreamedCourse.java +++ b/visualiser/src/main/java/seng302/Mock/StreamedCourse.java @@ -2,8 +2,8 @@ package seng302.Mock; import seng302.GPSCoordinate; import seng302.Model.Boat; -import seng302.Model.CompoundMark; import seng302.Model.Leg; +import seng302.Model.Marker; import seng302.RaceDataSource; import java.time.ZonedDateTime; @@ -75,7 +75,7 @@ public class StreamedCourse extends Observable implements RaceDataSource { return streamedCourseXMLReader.getLegs(); } - public List getMarkers() { return streamedCourseXMLReader.getCompoundMarks(); } + public List getMarkers() { return streamedCourseXMLReader.getMarkers(); } public List getBoundary() { return streamedCourseXMLReader.getBoundary(); diff --git a/visualiser/src/main/java/seng302/Mock/StreamedRace.java b/visualiser/src/main/java/seng302/Mock/StreamedRace.java index 0c16c594..75318754 100644 --- a/visualiser/src/main/java/seng302/Mock/StreamedRace.java +++ b/visualiser/src/main/java/seng302/Mock/StreamedRace.java @@ -4,7 +4,7 @@ import seng302.Controllers.RaceController; import seng302.GPSCoordinate; import seng302.Model.Boat; import seng302.Model.Leg; -import seng302.Model.CompoundMark; +import seng302.Model.Marker; import seng302.Model.Race; import seng302.Networking.Messages.BoatLocation; import seng302.Networking.Messages.BoatStatus; @@ -25,12 +25,12 @@ public class StreamedRace extends Race { public void initialiseBoats() { Leg officialStart = legs.get(0); String name = officialStart.getName(); - CompoundMark endCompoundMark = officialStart.getEndCompoundMark(); + Marker endCompoundMark = officialStart.getEndMarker(); for (Boat boat : startingBoats) { if (boat != null) { Leg startLeg = new Leg(name, 0); - startLeg.setEndCompoundMark(endCompoundMark); + startLeg.setEndMarker(endCompoundMark); boat.setCurrentLeg(startLeg); } } diff --git a/visualiser/src/main/java/seng302/Model/BoatInRace.java b/visualiser/src/main/java/seng302/Model/BoatInRace.java index c1db16a2..39087177 100644 --- a/visualiser/src/main/java/seng302/Model/BoatInRace.java +++ b/visualiser/src/main/java/seng302/Model/BoatInRace.java @@ -58,8 +58,8 @@ public class BoatInRace extends Boat { public double calculateAzimuth() { GeodeticCalculator calc = new GeodeticCalculator(); - GPSCoordinate start = currentLeg.getStartCompoundMark().getAverageGPSCoordinate(); - GPSCoordinate end = currentLeg.getEndCompoundMark().getAverageGPSCoordinate(); + GPSCoordinate start = currentLeg.getStartMarker().getAverageGPSCoordinate(); + GPSCoordinate end = currentLeg.getEndMarker().getAverageGPSCoordinate(); calc.setStartingGeographicPoint(start.getLongitude(), start.getLatitude()); calc.setDestinationGeographicPoint(end.getLongitude(), end.getLatitude()); diff --git a/visualiser/src/main/java/seng302/Model/Leg.java b/visualiser/src/main/java/seng302/Model/Leg.java index 2702a09f..3b394fd1 100644 --- a/visualiser/src/main/java/seng302/Model/Leg.java +++ b/visualiser/src/main/java/seng302/Model/Leg.java @@ -9,8 +9,8 @@ import seng302.GPSCoordinate; public class Leg { private final String name; //nautical miles private double distance; - private CompoundMark startCompoundMark; - private CompoundMark endCompoundMark; + private Marker startMarker; + private Marker endMarker; private final int legNumber; // 1 nautical mile = 1852 meters public static final int NM_TO_METERS = 1852; @@ -23,10 +23,10 @@ public class Leg { * @param end marker * @param number Leg's position in race */ - public Leg(String name, CompoundMark start, CompoundMark end, int number) { + public Leg(String name, Marker start, Marker end, int number) { this.name = name; - this.startCompoundMark = start; - this.endCompoundMark = end; + this.startMarker = start; + this.endMarker = end; this.legNumber = number; calculateDistance(); } @@ -71,20 +71,20 @@ public class Leg { } - public CompoundMark getStartCompoundMark() { - return startCompoundMark; + public Marker getStartMarker() { + return startMarker; } - public void setStartCompoundMark(CompoundMark startCompoundMark) { - this.startCompoundMark = startCompoundMark; + public void setStartMarker(Marker startMarker) { + this.startMarker = startMarker; } - public CompoundMark getEndCompoundMark() { - return endCompoundMark; + public Marker getEndMarker() { + return endMarker; } - public void setEndCompoundMark(CompoundMark endCompoundMark) { - this.endCompoundMark = endCompoundMark; + public void setEndMarker(Marker endMarker) { + this.endMarker = endMarker; } /** @@ -94,8 +94,8 @@ public class Leg { GeodeticCalculator calc = new GeodeticCalculator(); //Load start and end of leg - GPSCoordinate startMarker = this.startCompoundMark.getAverageGPSCoordinate(); - GPSCoordinate endMarker = this.endCompoundMark.getAverageGPSCoordinate(); + GPSCoordinate startMarker = this.startMarker.getAverageGPSCoordinate(); + GPSCoordinate endMarker = this.endMarker.getAverageGPSCoordinate(); calc.setStartingGeographicPoint(startMarker.getLongitude(), startMarker.getLatitude()); calc.setDestinationGeographicPoint(endMarker.getLongitude(), endMarker.getLatitude()); this.distance = calc.getOrthodromicDistance() / NM_TO_METERS; diff --git a/visualiser/src/main/java/seng302/Model/CompoundMark.java b/visualiser/src/main/java/seng302/Model/Marker.java similarity index 100% rename from visualiser/src/main/java/seng302/Model/CompoundMark.java rename to visualiser/src/main/java/seng302/Model/Marker.java diff --git a/visualiser/src/main/java/seng302/RaceDataSource.java b/visualiser/src/main/java/seng302/RaceDataSource.java index a4aba9e6..5f2e52ad 100644 --- a/visualiser/src/main/java/seng302/RaceDataSource.java +++ b/visualiser/src/main/java/seng302/RaceDataSource.java @@ -1,8 +1,8 @@ package seng302; import seng302.Model.Boat; -import seng302.Model.CompoundMark; import seng302.Model.Leg; +import seng302.Model.Marker; import java.time.ZonedDateTime; import java.util.List; @@ -13,7 +13,7 @@ import java.util.List; public interface RaceDataSource { List getBoats(); List getLegs(); - List getMarkers(); + List getMarkers(); List getBoundary(); ZonedDateTime getZonedDateTime(); diff --git a/visualiser/src/main/java/seng302/RaceXMLReader.java b/visualiser/src/main/java/seng302/RaceXMLReader.java index d615ddeb..ddab0b27 100644 --- a/visualiser/src/main/java/seng302/RaceXMLReader.java +++ b/visualiser/src/main/java/seng302/RaceXMLReader.java @@ -89,10 +89,10 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource { for (int i = 0; i < nLegs.getLength(); i++) { String label = getTextValueOfNode((Element) nLegs.item(i), "name"); NodeList start = ((Element) nLegs.item(i)).getElementsByTagName("start"); - CompoundMark startCompoundMark = getMarker(start); + Marker startMarker = getMarker(start); NodeList finish = ((Element) nLegs.item(i)).getElementsByTagName("finish"); - CompoundMark finishCompoundMark = getMarker(finish); - legs.add(new Leg(label, startCompoundMark, finishCompoundMark, i)); + Marker finishMarker = getMarker(finish); + legs.add(new Leg(label, startMarker, finishMarker, i)); } } @@ -172,7 +172,7 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource { * @param start base nodelist this should be the tag that contains * @return */ - private CompoundMark getMarker(NodeList start) { + private Marker getMarker(NodeList start) { return getMarker(start, 0); } @@ -182,7 +182,7 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource { * @param startIndex index in the node that has the coordinate tag * @return */ - private CompoundMark getMarker(NodeList start, int startIndex) { + private Marker getMarker(NodeList start, int startIndex) { return getMarker(start, startIndex, 0); } @@ -193,7 +193,7 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource { * @param nodeIndex coordinate index * @return */ - private CompoundMark getMarker(NodeList start, int startIndex, int nodeIndex) { + private Marker getMarker(NodeList start, int startIndex, int nodeIndex) { NodeList nodeList = ((Element) start.item(startIndex)).getElementsByTagName("marker"); Element marker = (Element) nodeList.item(nodeIndex); return getMarker(marker); @@ -204,7 +204,7 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource { * @param markerNode marker to turn into coordinates * @return */ - private CompoundMark getMarker(Element markerNode) { + private Marker getMarker(Element markerNode) { NodeList nCoordinates = markerNode.getElementsByTagName("coordinate"); @@ -215,7 +215,7 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource { } else { side2 = side1; } - return new CompoundMark(side1, side2); + return new Marker(side1, side2); } @@ -265,7 +265,7 @@ public class RaceXMLReader extends XMLReader implements RaceDataSource { } @Override - public List getMarkers() { + public List getMarkers() { return null; } diff --git a/visualiser/src/test/java/seng302/Mock/StreamedRaceTest.java b/visualiser/src/test/java/seng302/Mock/StreamedRaceTest.java index 98a1f986..bca938c7 100644 --- a/visualiser/src/test/java/seng302/Mock/StreamedRaceTest.java +++ b/visualiser/src/test/java/seng302/Mock/StreamedRaceTest.java @@ -5,7 +5,7 @@ import org.junit.Ignore; import org.junit.Test; import seng302.GPSCoordinate; import seng302.Model.Leg; -import seng302.Model.CompoundMark; +import seng302.Model.Marker; import java.util.List; @@ -87,7 +87,7 @@ public class StreamedRaceTest { GPSCoordinate topLeft = streamedCourseXMLReader.getMapTopLeft(); GPSCoordinate bottomRight = streamedCourseXMLReader.getMapBottomRight(); - for(CompoundMark compoundMark : streamedCourseXMLReader.getCompoundMarks()) { + for(Marker compoundMark : streamedCourseXMLReader.getMarkers()) { GPSCoordinate centre = compoundMark.getAverageGPSCoordinate(); assertTrue(centre.getLatitude() < bottomRight.getLatitude()); assertTrue(centre.getLatitude() > topLeft.getLatitude()); diff --git a/visualiser/src/test/java/seng302/Model/BoatInRaceTest.java b/visualiser/src/test/java/seng302/Model/BoatInRaceTest.java index a761bac9..029a0f43 100644 --- a/visualiser/src/test/java/seng302/Model/BoatInRaceTest.java +++ b/visualiser/src/test/java/seng302/Model/BoatInRaceTest.java @@ -19,18 +19,18 @@ public class BoatInRaceTest { @Test public void calculateDueNorthAzimuthReturns0() { - CompoundMark startCompoundMark = new CompoundMark(ORIGIN_COORDS); - CompoundMark endCompoundMark = new CompoundMark(new GPSCoordinate(50, 0)); - Leg start = new Leg("Start", startCompoundMark, endCompoundMark, 0); + Marker startMarker = new Marker(ORIGIN_COORDS); + Marker endMarker = new Marker(new GPSCoordinate(50, 0)); + Leg start = new Leg("Start", startMarker, endMarker, 0); TEST_BOAT.setCurrentLeg(start); assertEquals(TEST_BOAT.calculateAzimuth(), 0, 1e-8); } @Test public void calculateDueSouthAzimuthReturns180() { - CompoundMark startCompoundMark = new CompoundMark(ORIGIN_COORDS); - CompoundMark endCompoundMark = new CompoundMark(new GPSCoordinate(-50, 0)); - Leg start = new Leg("Start", startCompoundMark, endCompoundMark, 0); + Marker startMarker = new Marker(ORIGIN_COORDS); + Marker endMarker = new Marker(new GPSCoordinate(-50, 0)); + Leg start = new Leg("Start", startMarker, endMarker, 0); TEST_BOAT.setCurrentLeg(start); assertEquals(TEST_BOAT.calculateAzimuth(), 180, 1e-8); } @@ -39,9 +39,9 @@ public class BoatInRaceTest { @Test public void calculateDueEastAzimuthReturns90() { - CompoundMark startCompoundMark = new CompoundMark(ORIGIN_COORDS); - CompoundMark endCompoundMark = new CompoundMark(new GPSCoordinate(0, 50)); - Leg start = new Leg("Start", startCompoundMark, endCompoundMark, 0); + Marker startMarker = new Marker(ORIGIN_COORDS); + Marker endMarker = new Marker(new GPSCoordinate(0, 50)); + Leg start = new Leg("Start", startMarker, endMarker, 0); TEST_BOAT.setCurrentLeg(start); assertEquals(TEST_BOAT.calculateAzimuth(), 90, 1e-8); } @@ -49,9 +49,9 @@ public class BoatInRaceTest { @Test public void calculateDueWestAzimuthReturnsNegative90() { - CompoundMark startCompoundMark = new CompoundMark(ORIGIN_COORDS); - CompoundMark endCompoundMark = new CompoundMark(new GPSCoordinate(0, -50)); - Leg start = new Leg("Start", startCompoundMark, endCompoundMark, 0); + Marker startMarker = new Marker(ORIGIN_COORDS); + Marker endMarker = new Marker(new GPSCoordinate(0, -50)); + Leg start = new Leg("Start", startMarker, endMarker, 0); TEST_BOAT.setCurrentLeg(start); assertEquals(TEST_BOAT.calculateAzimuth(), -90, 1e-8); @@ -60,9 +60,9 @@ public class BoatInRaceTest { @Test public void calculateDueNorthHeadingReturns0() { - CompoundMark startCompoundMark = new CompoundMark(ORIGIN_COORDS); - CompoundMark endCompoundMark = new CompoundMark(new GPSCoordinate(50, 0)); - Leg start = new Leg("Start", startCompoundMark, endCompoundMark, 0); + Marker startMarker = new Marker(ORIGIN_COORDS); + Marker endMarker = new Marker(new GPSCoordinate(50, 0)); + Leg start = new Leg("Start", startMarker, endMarker, 0); TEST_BOAT.setCurrentLeg(start); assertEquals(TEST_BOAT.calculateHeading(), 0, 1e-8); } @@ -70,27 +70,27 @@ public class BoatInRaceTest { @Test public void calculateDueEastHeadingReturns90() { - CompoundMark startCompoundMark = new CompoundMark(ORIGIN_COORDS); - CompoundMark endCompoundMark = new CompoundMark(new GPSCoordinate(0, 50)); - Leg start = new Leg("Start", startCompoundMark, endCompoundMark, 0); + Marker startMarker = new Marker(ORIGIN_COORDS); + Marker endMarker = new Marker(new GPSCoordinate(0, 50)); + Leg start = new Leg("Start", startMarker, endMarker, 0); TEST_BOAT.setCurrentLeg(start); assertEquals(TEST_BOAT.calculateHeading(), 90, 1e-8); } @Test public void calculateDueSouthHeadingReturns180() { - CompoundMark startCompoundMark = new CompoundMark(ORIGIN_COORDS); - CompoundMark endCompoundMark = new CompoundMark(new GPSCoordinate(-50, 0)); - Leg start = new Leg("Start", startCompoundMark, endCompoundMark, 0); + Marker startMarker = new Marker(ORIGIN_COORDS); + Marker endMarker = new Marker(new GPSCoordinate(-50, 0)); + Leg start = new Leg("Start", startMarker, endMarker, 0); TEST_BOAT.setCurrentLeg(start); assertEquals(TEST_BOAT.calculateHeading(), 180, 1e-8); } @Test public void calculateDueWestHeadingReturns270() { - CompoundMark startCompoundMark = new CompoundMark(ORIGIN_COORDS); - CompoundMark endCompoundMark = new CompoundMark(new GPSCoordinate(0, -50)); - Leg start = new Leg("Start", startCompoundMark, endCompoundMark, 0); + Marker startMarker = new Marker(ORIGIN_COORDS); + Marker endMarker = new Marker(new GPSCoordinate(0, -50)); + Leg start = new Leg("Start", startMarker, endMarker, 0); TEST_BOAT.setCurrentLeg(start); assertEquals(TEST_BOAT.calculateHeading(), 270, 1e-8); } @@ -117,16 +117,16 @@ public class BoatInRaceTest { BoatInRace boat = new BoatInRace("Test", 1, Color.ALICEBLUE, "tt"); // Construct leg of 0 degrees - CompoundMark startCompoundMark = new CompoundMark(ORIGIN_COORDS); - CompoundMark endCompoundMark = new CompoundMark(new GPSCoordinate(50, 0)); - Leg leg0deg = new Leg("Start", startCompoundMark, endCompoundMark, 0); + Marker startMarker = new Marker(ORIGIN_COORDS); + Marker endMarker = new Marker(new GPSCoordinate(50, 0)); + Leg leg0deg = new Leg("Start", startMarker, endMarker, 0); boat.setCurrentLeg(leg0deg); boat.setCurrentPosition(new GPSCoordinate(0, 0)); assertEquals(0, boat.calculateHeading(), 1e-8); // Construct leg from wake - heading should be 180 degrees - Leg leg180deg = new Leg("Start", startCompoundMark, new CompoundMark(boat.getWake()), 0); + Leg leg180deg = new Leg("Start", startMarker, new Marker(boat.getWake()), 0); boat.setCurrentLeg(leg180deg); assertEquals(180, boat.calculateHeading(), 1e-8); @@ -138,9 +138,9 @@ public class BoatInRaceTest { BoatInRace boat = new BoatInRace("Test", 10, Color.ALICEBLUE, "tt"); // Construct leg of 0 degrees at 0 N - CompoundMark startCompoundMark = new CompoundMark(ORIGIN_COORDS); - CompoundMark endCompoundMark = new CompoundMark(new GPSCoordinate(50, 0)); - Leg leg0deg = new Leg("Start", startCompoundMark, endCompoundMark, 0); + Marker startMarker = new Marker(ORIGIN_COORDS); + Marker endMarker = new Marker(new GPSCoordinate(50, 0)); + Leg leg0deg = new Leg("Start", startMarker, endMarker, 0); boat.setCurrentLeg(leg0deg); boat.setCurrentPosition(new GPSCoordinate(0, 0)); diff --git a/visualiser/src/test/java/seng302/Model/LegTest.java b/visualiser/src/test/java/seng302/Model/LegTest.java index 5df351e4..c58f2eb1 100644 --- a/visualiser/src/test/java/seng302/Model/LegTest.java +++ b/visualiser/src/test/java/seng302/Model/LegTest.java @@ -14,7 +14,7 @@ import static seng302.Model.Leg.NM_TO_METERS; */ public class LegTest { - private final CompoundMark ORIGIN_CompoundMark = new CompoundMark(new GPSCoordinate(0, 0)); + private final Marker ORIGIN_Marker = new Marker(new GPSCoordinate(0, 0)); @Test public void calculateDistanceHandles5nmNorth() { @@ -22,8 +22,8 @@ public class LegTest { calc.setStartingGeographicPoint(0, 0); calc.setDirection(0, 5 * NM_TO_METERS); - CompoundMark endCompoundMark = getEndMarker(calc.getDestinationGeographicPoint()); - Leg test = new Leg("Test", ORIGIN_CompoundMark, endCompoundMark, 0); + Marker endMarker = getEndMarker(calc.getDestinationGeographicPoint()); + Leg test = new Leg("Test", ORIGIN_Marker, endMarker, 0); assertEquals(test.getDistance(), 5, 1e-8); } @@ -33,8 +33,8 @@ public class LegTest { calc.setStartingGeographicPoint(0, 0); calc.setDirection(90, 12 * NM_TO_METERS); - CompoundMark endCompoundMark = getEndMarker(calc.getDestinationGeographicPoint()); - Leg test = new Leg("Test", ORIGIN_CompoundMark, endCompoundMark, 0); + Marker endMarker = getEndMarker(calc.getDestinationGeographicPoint()); + Leg test = new Leg("Test", ORIGIN_Marker, endMarker, 0); assertEquals(test.getDistance(), 12, 1e-8); } @@ -44,8 +44,8 @@ public class LegTest { calc.setStartingGeographicPoint(0, 0); calc.setDirection(180, 0.5 * NM_TO_METERS); - CompoundMark endCompoundMark = getEndMarker(calc.getDestinationGeographicPoint()); - Leg test = new Leg("Test", ORIGIN_CompoundMark, endCompoundMark, 0); + Marker endMarker = getEndMarker(calc.getDestinationGeographicPoint()); + Leg test = new Leg("Test", ORIGIN_Marker, endMarker, 0); assertEquals(test.getDistance(), 0.5, 1e-8); } @@ -55,23 +55,23 @@ public class LegTest { calc.setStartingGeographicPoint(0, 0); calc.setDirection(-90, 0.1 * NM_TO_METERS); - CompoundMark endCompoundMark = getEndMarker(calc.getDestinationGeographicPoint()); - Leg test = new Leg("Test", ORIGIN_CompoundMark, endCompoundMark, 0); + Marker endMarker = getEndMarker(calc.getDestinationGeographicPoint()); + Leg test = new Leg("Test", ORIGIN_Marker, endMarker, 0); assertEquals(test.getDistance(), 0.1, 1e-8); } @Test public void calculateDistanceHandlesZeroDifference() { - Leg test = new Leg("Test", ORIGIN_CompoundMark, ORIGIN_CompoundMark, 0); + Leg test = new Leg("Test", ORIGIN_Marker, ORIGIN_Marker, 0); assertEquals(test.getDistance(), 0, 1e-8); } - private CompoundMark getEndMarker(Point2D point) { + private Marker getEndMarker(Point2D point) { GPSCoordinate coords = new GPSCoordinate(point.getY(), point.getX()); - return new CompoundMark(coords); + return new Marker(coords); } } diff --git a/visualiser/src/test/java/seng302/Model/CompoundMarkTest.java b/visualiser/src/test/java/seng302/Model/MarkerTest.java similarity index 77% rename from visualiser/src/test/java/seng302/Model/CompoundMarkTest.java rename to visualiser/src/test/java/seng302/Model/MarkerTest.java index 9323a5ea..420c5eff 100644 --- a/visualiser/src/test/java/seng302/Model/CompoundMarkTest.java +++ b/visualiser/src/test/java/seng302/Model/MarkerTest.java @@ -8,14 +8,14 @@ import static org.junit.Assert.assertTrue; /** * Created by esa46 on 29/03/17. */ -public class CompoundMarkTest { +public class MarkerTest { private final GPSCoordinate ORIGIN_COORD = new GPSCoordinate(0, 0); @Test public void averageOfSingleMarkAtOriginIsSingleMark() { - CompoundMark testMark = new CompoundMark(ORIGIN_COORD); + Marker testMark = new Marker(ORIGIN_COORD); assertTrue(testMark.getAverageGPSCoordinate().equals(ORIGIN_COORD)); } @@ -24,7 +24,7 @@ public class CompoundMarkTest { public void averageOfSingleMarkIsSingleMark() { GPSCoordinate testCoord = new GPSCoordinate(20, 25); - CompoundMark testMark = new CompoundMark(testCoord); + Marker testMark = new Marker(testCoord); assertTrue(testMark.getAverageGPSCoordinate().equals(testCoord)); } @@ -33,7 +33,7 @@ public class CompoundMarkTest { public void averageLatOfTwoMarksIsAccurate() { GPSCoordinate testCoord = new GPSCoordinate(10, 0); - CompoundMark testMark = new CompoundMark(ORIGIN_COORD, testCoord); + Marker testMark = new Marker(ORIGIN_COORD, testCoord); assertTrue(testMark.getAverageGPSCoordinate().equals(new GPSCoordinate(5, 0))); } @@ -41,7 +41,7 @@ public class CompoundMarkTest { public void averageLongOfTwoMarksIsAccurate() { GPSCoordinate testCoord = new GPSCoordinate(0, 10); - CompoundMark testMark = new CompoundMark(ORIGIN_COORD, testCoord); + Marker testMark = new Marker(ORIGIN_COORD, testCoord); assertTrue(testMark.getAverageGPSCoordinate().equals(new GPSCoordinate(0, 5))); } @@ -50,7 +50,7 @@ public class CompoundMarkTest { GPSCoordinate testCoord1 = new GPSCoordinate(10, 30); GPSCoordinate testCoord2 = new GPSCoordinate(30, 60); - CompoundMark testMark = new CompoundMark(testCoord1, testCoord2); + Marker testMark = new Marker(testCoord1, testCoord2); assertTrue(testMark.getAverageGPSCoordinate().equals(new GPSCoordinate(020.644102, 44.014817))); }