Skip to content

fix(jts): align GEOMETRYCOLLECTION with MULTIPOLYGON WKT parse #238

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

Closed
arimu1 wants to merge 1 commit into from
Closed

fix(jts): align GEOMETRYCOLLECTION with MULTIPOLYGON WKT parse #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion src/main/java/org/locationtech/spatial4j/shape/jts/JtsShapeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,16 @@ public Shape build() {
last = s.getClass();
}

return makeShapeFromGeometry(geometryFactory.buildGeometry(geoms));
if (shapes.size() == 1) {

@dsmiley dsmiley Sep 28, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It's not clear why this check is here, relative to the fix. If this is an unrelated optimization, it could go at the start of build(); yes?

return shapes.get(0);
}

Geometry combined = geometryFactory.buildGeometry(geoms);
// Homogeneous collections become Multi* types; match multi* builders (no re-validate).
if (combined.getClass().equals(GeometryCollection.class)) {
return makeShapeFromGeometry(combined);
}
return makeShape(combined);
}
}

Expand Down
11 changes: 11 additions & 0 deletions src/test/java/org/locationtech/spatial4j/io/JtsWktShapeParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,17 @@ public void testLineStringDateline() throws ParseException {
assertEquals(30, s.getBoundingBox().getWidth(), 0.0 );
}

@Test
public void selfIntersectingMultiPolygonSameInGeometryCollection() throws ParseException {
WKTReader geoReader = (WKTReader) JtsSpatialContext.GEO.getFormats().getWktReader();
String multi =
"MULTIPOLYGON (((5 5, 10 5, 10 10, 5 5)), ((6 6, 10 5, 10 10, 6 6)))";
String collection =
"GEOMETRYCOLLECTION ( MULTIPOLYGON (((5 5, 10 5, 10 10, 5 5)), ((6 6, 10 5, 10 10, 6 6))) )";
geoReader.parse(multi);
geoReader.parse(collection);
}

@Test
public void testWrapTopologyException() throws Exception {
//test that we can catch ParseException without having to detect TopologyException too
Expand Down
Loading