Skip to content

Fix #22209 #10

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

Merged
merged 2 commits into from
Aug 25, 2022
Merged

Fix #22209 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2695843
Fix #22209: NPE in DataSetChangesetBuilder#mergeBounds
tsmock Jul 12, 2022
cf0ba20
ChangesetLayer: Avoid getCoor calls
tsmock Jul 12, 2022
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
6 changes: 3 additions & 3 deletions src/org/openstreetmap/josm/plugins/changeset/ChangesetLayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ public void paint(Graphics2D g, final MapView mv, Bounds bounds) {
for (int i = 0; i <= way.getNodes().size() - 2; i++) {
Node node1 = way.getNode(i);
Node node2 = way.getNode(i + 1);
Point pnt1 = mv.getPoint(node1.getCoor());
Point pnt2 = mv.getPoint(node2.getCoor());
Point pnt1 = mv.getPoint(node1);
Point pnt2 = mv.getPoint(node2);
g.draw(new Line2D.Double(pnt1.x, pnt1.y, pnt2.x, pnt2.y));
}
} else if (primitive instanceof Node) {
Expand All @@ -132,7 +132,7 @@ public void paint(Graphics2D g, final MapView mv, Bounds bounds) {
g.setColor(new Color(229, 228, 61));
}

Point pnt = mv.getPoint(node.getCoor());
Point pnt = mv.getPoint(node);
g.fillOval(pnt.x, pnt.y, 7, 7);
}
}
Expand Down
14 changes: 8 additions & 6 deletions src/org/openstreetmap/josm/plugins/changeset/util/DataSetChangesetBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import javax.json.JsonValue;

import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.ILatLon;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
Expand Down Expand Up @@ -164,18 +165,19 @@ private Map<String, String> getTags(final JsonObject tags, final String action)
return mapTags;
}

private Bounds mergeBounds(final Bounds bounds, final OsmPrimitive osmPrimitive) {
if (osmPrimitive instanceof Node) { // ways and relations consist of nodes that are already in the dataset
return mergeBounds(bounds, ((Node) osmPrimitive).getCoor());
private static Bounds mergeBounds(final Bounds bounds, final OsmPrimitive osmPrimitive) {
// ways and relations consist of nodes that are already in the dataset
if (osmPrimitive instanceof Node && ((Node) osmPrimitive).isLatLonKnown()) {
return mergeBounds(bounds, ((ILatLon) osmPrimitive));
}
return bounds;
}

private Bounds mergeBounds(final Bounds bounds, final LatLon coords) {
private static Bounds mergeBounds(final Bounds bounds, final ILatLon coords) {
if (bounds == null) {
return new Bounds(coords);
return new Bounds(coords.lat(), coords.lon(), coords.lat(), coords.lon());
} else {
bounds.extend(coords);
bounds.extend(coords.lat(), coords.lon());
return bounds;
}
}
Expand Down