Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed JSON annotations to enable ODE processing of circle geometries #114

Open
wants to merge 7 commits into
base: dev
Choose a base branch
from
+167 −36
Open

Fixed JSON annotations to enable ODE processing of circle geometries #114

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9c9fe70
Fixed inconsistent json property annotating in Circle subclass of Asn…
dmccoystephenson Nov 4, 2024
27c2766
Reverted changes to whitespace in header of Circle subclass of Asn1Ob…
dmccoystephenson Nov 4, 2024
a62ac30
Added unit test to verify proper circle XML output from TimTransmogri…
dmccoystephenson Nov 5, 2024
031d16c
Cleaned up new tim transmogrifier unit test
dmccoystephenson Nov 5, 2024
e57ccb3
Added comment for new test case in TimTransmogrifierTest
dmccoystephenson Nov 5, 2024
29f4f38
Merge branch 'dev' into fix/update-circle-json-properties
dmccoystephenson Nov 20, 2024
3cb982b
Added missing imports in TimTransmogrifierTest
dmccoystephenson Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 25 additions & 34 deletions jpo-ode-plugins/src/main/java/us/dot/its/jpo/ode/plugin/j2735/timstorage/Circle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,48 +22,39 @@

@JsonPropertyOrder({ "center", "radius", "units" })
public class Circle extends Asn1Object {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;

private Position center;
@JsonProperty("center")
private Position center;

@JsonProperty("radius")
private String radius;
@JsonProperty("radius")
private String radius;

@JsonProperty("units")
private DistanceUnits units;
@JsonProperty("units")
private DistanceUnits units;

@JsonProperty("position")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: this is the offending annotation that caused the problem

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a unit test for this use case?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added!

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is position an invalid property on a Circle Asn1Object in all cases, or is there any scenario where we want to have position present? I'm gathering that, at minimum, we don't want both position and center present, but is there a scenario where we could want position present when center is not (and vice versa)?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is position an invalid property on a Circle Asn1Object in all cases, or is there any scenario where we want to have position present? I'm gathering that, at minimum, we don't want both position and center present, but is there a scenario where we could want position present when center is not (and vice versa)?

The ASN.1 representation for a Circle in J2735 only contains center, radius and units. I don't think we'll ever have a scenario where we want to have 'position' present.

public Position getPosition() {
return center;
}
public Position getCenter() {
return center;
}

@JsonProperty("center")
public void setPosition(Position position) {
this.center = position;
}
public void setCenter(Position center) {
this.center = center;
}

public String getRadius() {
return radius;
}
public String getRadius() {
return radius;
}

public void setRadius(String radius) {
this.radius = radius;
}
public void setRadius(String radius) {
this.radius = radius;
}

public Position getCenter() {
return center;
}
public DistanceUnits getUnits() {
return units;
}

public void setCenter(Position center) {
this.center = center;
}

public DistanceUnits getUnits() {
return units;
}

public void setUnits(DistanceUnits units) {
this.units = units;
}
public void setUnits(DistanceUnits units) {
this.units = units;
}

}
Loading
Loading