Skip to content

Commit 74b4567

Browse files
committed
Update JSON standard for trajectories
1 parent 3a3753a commit 74b4567

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

app/src/main/java/org/team2363/helixnavigator/document/HTrajectorySample.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@
1313
@JSONDeserializable({JSONType.OBJECT})
1414
public class HTrajectorySample {
1515

16-
@SerializedJSONObjectValue(key = "ts")
16+
@SerializedJSONObjectValue(key = "timestamp")
1717
public final double ts;
1818
@SerializedJSONObjectValue(key = "x")
1919
public final double x;
2020
@SerializedJSONObjectValue(key = "y")
2121
public final double y;
2222
@SerializedJSONObjectValue(key = "heading")
2323
public final double heading;
24-
@SerializedJSONObjectValue(key = "vx")
24+
@SerializedJSONObjectValue(key = "velocityX")
2525
public final double vx;
26-
@SerializedJSONObjectValue(key = "vy")
26+
@SerializedJSONObjectValue(key = "velocityY")
2727
public final double vy;
28-
@SerializedJSONObjectValue(key = "omega")
28+
@SerializedJSONObjectValue(key = "angularVelocity")
2929
public final double omega;
3030

3131
@DeserializedJSONConstructor
3232
public HTrajectorySample(
33-
@DeserializedJSONObjectValue(key = "ts") double ts,
33+
@DeserializedJSONObjectValue(key = "timestamp") double ts,
3434
@DeserializedJSONObjectValue(key = "x") double x,
3535
@DeserializedJSONObjectValue(key = "y") double y,
3636
@DeserializedJSONObjectValue(key = "heading") double heading,
37-
@DeserializedJSONObjectValue(key = "vx") double vx,
38-
@DeserializedJSONObjectValue(key = "vy") double vy,
39-
@DeserializedJSONObjectValue(key = "omega") double omega) {
37+
@DeserializedJSONObjectValue(key = "velocityX") double vx,
38+
@DeserializedJSONObjectValue(key = "velocityY") double vy,
39+
@DeserializedJSONObjectValue(key = "angularVelocity") double omega) {
4040
this.ts = ts;
4141
this.x = x;
4242
this.y = y;

0 commit comments

Comments
 (0)