projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Correct IMU axes for telemetry data
[fw/altos]
/
altoslib
/
AltosMapPathPoint.java
diff --git
a/altoslib/AltosMapPathPoint.java
b/altoslib/AltosMapPathPoint.java
index 5182ecfd6b21da1233bd337049a29c5212932ced..88a8bfcf28db86706154f397688f647a4845127b 100644
(file)
--- a/
altoslib/AltosMapPathPoint.java
+++ b/
altoslib/AltosMapPathPoint.java
@@
-16,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1
1
;
+package org.altusmetrum.altoslib_1
3
;
import java.io.*;
import java.lang.Math;
import java.io.*;
import java.lang.Math;
@@
-24,11
+24,13
@@
import java.util.*;
import java.util.concurrent.*;
public class AltosMapPathPoint {
import java.util.concurrent.*;
public class AltosMapPathPoint {
- public AltosLatLon lat_lon;
+ public AltosGPS gps;
+ public double time;
public int state;
public int state;
+ public double gps_height;
public int hashCode() {
public int hashCode() {
- return
lat_lon
.hashCode() ^ state;
+ return
Double.valueOf(gps.lat).hashCode() ^ Double.valueOf(gps.lon)
.hashCode() ^ state;
}
public boolean equals(Object o) {
}
public boolean equals(Object o) {
@@
-40,12
+42,14
@@
public class AltosMapPathPoint {
AltosMapPathPoint other = (AltosMapPathPoint) o;
AltosMapPathPoint other = (AltosMapPathPoint) o;
- return
lat_lon.equals(other.lat_lon)
&& state == other.state;
+ return
gps.lat == other.gps.lat && gps.lon == other.gps.lon
&& state == other.state;
}
}
- public AltosMapPathPoint(AltosLatLon lat_lon, int state) {
- this.lat_lon = lat_lon;
+ public AltosMapPathPoint(AltosGPS gps, double time, int state, double gps_height) {
+ this.gps = gps;
+ this.time = time;
this.state = state;
this.state = state;
+ this.gps_height = gps_height;
}
}
}
}