Skip to content

Update Wfs to use unwrap Antimeridian functionality #6956

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

Open
nickchooleidos wants to merge 1 commit into
base: master
Choose a base branch
from
+46 −1
Open

Update Wfs to use unwrap Antimeridian functionality #6956

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
45 changes: 45 additions & 0 deletions catalog/core/catalog-core-commons/src/test/java/ddf/util/AntimeridianTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.util.List;
import org.junit.Test;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.io.ParseException;
import org.locationtech.jts.io.WKTReader;
Expand Down Expand Up @@ -84,4 +85,48 @@ public void testNonCrossingShapesAreNotSplit() {
String outputWkt = Antimeridian.unwrapAndSplitWkt(inputWkt);
assertThat(outputWkt, is(inputWkt));
}

@Test
public void testAntimeridianCrossingIsSplitWithNegativeLongtitude() {
String originalWkt =
"POLYGON ((167.422137 -37.935528, -173.149957 -49.494589, -166.265735 -32.563561, -176.051446 -24.815088, 167.422137 -37.935528))";
String expectedWkt =
"MULTIPOLYGON (((180 -27.949873104584977, 167.422137 -37.935528, 180 -45.419004894866745, 180 -27.949873104584977)), ((-180 -45.419004894866745, -173.149957 -49.494589, -166.265735 -32.563561, -176.051446 -24.815088, -180 -27.949873104584977, -180 -45.419004894866745)))";
String actualWkt = Antimeridian.unwrapAndSplitWkt(originalWkt);
assertWktTopologicallyEqual(actualWkt, expectedWkt);
assertCoordinatesWithinBounds(actualWkt);
Geometry originalBounds = getBoundaryFromWkt(originalWkt);
Geometry updatedBounds = getBoundaryFromWkt(actualWkt);
assertThat(originalBounds.getArea(), is(updatedBounds.getArea()));
}

@Test(expected = ParseException.class)
public void testInvalidWktFormatFailsToParse() throws ParseException {
String invalidWkt =
"MULTIPOLYGON (((180 10, 170 10, 170 -10, 180 -10, 180 10)), ((-180 -10, -170 -10, -170, 10, -180 10, -180 -10)))";
WKT_READER.read(invalidWkt);
}

private void assertCoordinatesWithinBounds(String wkt) {
Geometry geometry;
try {
geometry = WKT_READER.read(wkt);
} catch (ParseException e) {
throw new IllegalArgumentException("Unable to parse WKT", e);
}
for (Coordinate coordinate : geometry.getCoordinates()) {
assertThat(coordinate.x >= -180.0 && coordinate.x <= 180.0, is(true));
assertThat(coordinate.y >= -90.0 && coordinate.y <= 90.0, is(true));
}
}

private void assertWktTopologicallyEqual(String actualWkt, String expectedWkt) {
try {
Geometry actual = WKT_READER.read(actualWkt);
Geometry expected = WKT_READER.read(expectedWkt);
assertThat(actual.equalsTopo(expected), is(true));
} catch (ParseException e) {
throw new IllegalArgumentException("Unable to parse WKT", e);
}
}
}
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/codice/ddf/spatial/ogc/wfs/v110/catalog/source/WfsFilterDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,7 +1073,7 @@ private FilterType buildSingleGeospatialFilter(

private JAXBElement<? extends SpatialOpsType> createSpatialOpType(
String operation, String propertyName, String wkt, Double distance) {
String adjustedWkt = Antimeridian.normalizeWkt(wkt);
String adjustedWkt = Antimeridian.unwrapAndSplitWkt(wkt);
Copy link
Member

@jlcsmith jlcsmith Feb 2, 2026

Choose a reason for hiding this comment

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

nice find - didn't realize we already had a method to solve this problem

switch (SPATIAL_OPERATORS.valueOf(operation)) {
case BBOX:
return buildBBoxType(propertyName, adjustedWkt);
Expand Down
Loading