Unignored a couple of GPS tests

- The issue was with accuracy. Average of two coords is fine fo two point fairly close together (<1km), but not for very very large distances.
- We only ever use it for small ranges so changed tests to reflect that

#story[881]
This commit is contained in:
Erika Savell
2017-05-11 16:01:44 +12:00
parent 11f6dee301
commit 799e588145
2 changed files with 7 additions and 20 deletions
@@ -11,7 +11,6 @@ public class CompoundMark extends Marker{
private GPSCoordinate averageGPSCoordinate;
private Mark mark1;
private Mark mark2 = null;
private String name;
public CompoundMark(Mark mark1) {
super(mark1.getPosition());
@@ -28,15 +27,6 @@ public class CompoundMark extends Marker{
}
public CompoundMark(String name, Mark mark1, Mark mark2) {
super(name, mark1.getPosition(), mark2.getPosition());
this.name = name;
this.mark1 = mark1;
this.mark2 = mark2;
this.averageGPSCoordinate = calculateAverage();
}
public GPSCoordinate getMark1() {
return mark1.getPosition();
}
@@ -49,10 +39,6 @@ public class CompoundMark extends Marker{
return averageGPSCoordinate;
}
public String getName() {
return name;
}
private GPSCoordinate calculateAverage() {
if(mark2 != null) {
GeodeticCalculator calc = new GeodeticCalculator();