Skip to content

Changes to rollback centroid within INTERSECT area #134

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
NekoLyn merged 2 commits into from
Jun 18, 2025
Merged

Changes to rollback centroid within INTERSECT area #134

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
017648a
Changes to rollback centroid within INTERSECT area
utas-raymondng Jun 18, 2025
877f7f4
No need test to cover rollback changes
utas-raymondng Jun 18, 2025
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: 23 additions & 22 deletions server/src/main/java/au/org/aodn/ogcapi/server/core/parser/stac/GeometryVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,35 @@
@Builder
public class GeometryVisitor extends DefaultFilterVisitor {
/**
* If user used intersect, then we make sure we reduce the geometry to within the intersect area
* so later centroid is always within the intersect area
* Not a good idea to implement this because it will focus all points within a small area due to intersect with the
* area. This make the UI hard to display so many points in the same cluster
* @param filter - Intersect filter
* @param data - The income data
* @return - Return same data if no filter set, or the geometry and only intersect with the CQL intersect geometry
*/
@Override
public Object visit(Intersects filter, Object data) {
if(filter instanceof IntersectsImpl<?> impl) {
if(data instanceof Polygon || data instanceof GeometryCollection) {
if(impl.getGeometry().isPresent()) {
// The getGeometry return the INTERSECT() geometry area, so we make a intersection
// with the Object data
Geometry input = impl.getGeometry().get();
try {
return input.intersection(input);
}
catch(Exception e) {
// buffer is expensive to fix invalid geometry, call it only if needed
return input.intersection(input.buffer(0.0));
}
}
else {
return data;
}
}
}
return null;
// if(filter instanceof IntersectsImpl<?> impl) {
// if(data instanceof Polygon || data instanceof GeometryCollection) {
// if(impl.getGeometry().isPresent()) {
// // The getGeometry return the INTERSECT() geometry area, so we make a intersection
// // with the Object data
// Geometry input = impl.getGeometry().get();
// try {
// return input.intersection(input);
// }
// catch(Exception e) {
// // buffer is expensive to fix invalid geometry, call it only if needed
// return input.intersection(input.buffer(0.0));
// }
// }
// else {
// return data;
// }
// }
// }
// return null;
return data;
}
/**
* Always return data, the reason is that this GeometryVisitor only purpose is to consider the BBOX aka the view point
Expand Down
33 changes: 0 additions & 33 deletions server/src/test/java/au/org/aodn/ogcapi/server/core/parser/stac/ParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,37 +157,4 @@ public void verifyBBoxWorks3() throws CQLException, IOException {
Assertions.assertEquals(151.62121416760516, mp.getGeometryN(0).getCentroid().getX(), 0.0000001, "getX() for 1");
Assertions.assertEquals(-18.000822620336752, mp.getGeometryN(0).getCentroid().getY(), 0.0000001, "getY() for 1");
}

@Test
public void verifyIntersectWorks1() throws CQLException, IOException, FactoryException, TransformException, ParseException {
// Assume we have the following CQL
Converter.Param param = Converter.Param.builder()
.coordinationSystem(CQLCrsType.EPSG4326)
.filter("score>=1.5 AND INTERSECTS(geometry,POLYGON ((145.16909105878426 -10.464349225802914, 144.73440233886106 -9.848517493899884, 144.47064456419093 -9.657695528909853, 144.46280593719746 -9.905001382894994, 144.2060197558053 -10.242037054678411, 144.16893528215599 -10.457443951550495, 144.0000000000374 -10.46518242537087, 144.0000000000374 -10.686536176266213, 144.9994690420176 -10.681893446539034, 145.00106191494456 -12.998524118431453, 146.00107091314112 -14.998515117696627, 147.00107091515906 -17.498488120437123, 149.96308495492246 -19.293403529258228, 152.91580273613386 -20.997390209369716, 154.00000443319107 -24.495283451153206, 158.33154102878632 -24.498407105902825, 157.8012592598626 -23.248298763101843, 157.31004039489108 -22.519537254185753, 157.21996792100708 -22.18289466451383, 157.24246410497653 -21.781057076406388, 157.17153685914286 -21.215798230336727, 157.05264790906187 -20.54107583454862, 156.82625898816468 -20.141075746345383, 156.2603178109748 -19.293585408462032, 156.63014151780646 -18.925219368232813, 156.94570327990823 -18.540241996336075, 158.3761729881353 -16.430664685375895, 158.76098074418962 -15.735241194712154, 157.72268453595484 -14.68925351658542, 157.25646824177636 -14.286426921513115, 156.97026318293013 -14.177729011764056, 156.67405154112384 -14.093699797756436, 156.61349189679618 -14.08296197760852, 154.2550937971438 -14.747312889369214, 152.12620732406822 -14.63230005662328, 150.23373673986976 -13.961229062351725, 148.08837935213808 -13.174974098634262, 147.1427175218439 -12.640158093580235, 146.50484986992365 -12.33365784677699, 145.16909105878426 -10.464349225802914)))")
.build();
// Expected polygon shape after the no land area intersection of the Intersect polygon
Optional<Geometry> expected = GeometryUtils.readGeometry(
GeometryUtils.convertToGeoJson(
new LiteralExpressionImpl(
"POLYGON ((144.73440233886106 -9.848517493899884, 145.16909105878426 -10.464349225802914, 146.50484986992365 -12.33365784677699, 147.1427175218439 -12.640158093580235, 148.08837935213808 -13.174974098634262, 150.23373673986976 -13.961229062351727, 152.12620732406822 -14.63230005662328, 154.2550937971438 -14.747312889369214, 156.6134918967962 -14.08296197760852, 156.67405154112384 -14.093699797756436, 156.97026318293013 -14.177729011764056, 157.25646824177636 -14.286426921513115, 157.72268453595484 -14.68925351658542, 158.76098074418962 -15.735241194712154, 158.3761729881353 -16.430664685375895, 156.94570327990823 -18.540241996336075, 156.63014151780646 -18.925219368232813, 156.2603178109748 -19.293585408462032, 156.82625898816468 -20.141075746345383, 157.05264790906187 -20.54107583454862, 157.17153685914286 -21.215798230336727, 157.24246410497653 -21.781057076406388, 157.21996792100708 -22.18289466451383, 157.31004039489108 -22.519537254185753, 157.8012592598626 -23.248298763101843, 158.3315410287863 -24.498407105902825, 154.00000443319107 -24.49528345115321, 152.91580273613386 -20.997390209369716, 149.96308495492246 -19.293403529258228, 147.00107091515906 -17.498488120437123, 146.00107091314112 -14.998515117696625, 145.00106191494456 -12.998524118431453, 144.9994690420176 -10.681893446539034, 144.0000000000374 -10.686536176266213, 144.0000000000374 -10.46518242537087, 144.168935282156 -10.457443951550495, 144.2060197558053 -10.24203705467841, 144.46280593719746 -9.905001382894994, 144.47064456419093 -9.657695528909853, 144.73440233886106 -9.848517493899884))"),
CQLCrsType.EPSG4326
)
);

// Parse the json and get the noland section
String json = BaseTestClass.readResourceFile("classpath:databag/e26d0a56-5603-4413-911d-7b359a533a75.json");
StacCollectionModel model = mapper.readValue(json, StacCollectionModel.class);

Filter filter = CompilerUtil.parseFilter(Language.CQL, param.getFilter(), factory);
Optional<Geometry> geo = GeometryUtils.readGeometry(model.getSummaries().getGeometryNoLand());

Assertions.assertTrue(geo.isPresent(), "Parse no land correct");
GeometryVisitor visitor = GeometryVisitor.builder()
.build();

// return value are geo applied the CQL, and in this case only INTERSECTS
Geometry g = (Geometry)filter.accept(visitor, geo.get());
Assertions.assertTrue(expected.isPresent(), "Expected parse correct");
Assertions.assertEquals(g, expected.get(), "They are equals");
}
}