Skip to content

expose spatial_extents in collection properties #345

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
utas-amberbian wants to merge 1 commit into from
Closed

expose spatial_extents in collection properties #345

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
4 changes: 4 additions & 0 deletions server/src/main/java/au/org/aodn/ogcapi/server/core/mapper/Converter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,10 @@
collection.getProperties().put(CollectionProperty.geometry, m.getSummaries().getGeometry());
}

if (m.getSummaries().getSpatialExtents() != null) {

Check failure on line 233 in server/src/main/java/au/org/aodn/ogcapi/server/core/mapper/Converter.java

View workflow job for this annotation

GitHub Actions / build_test 

cannot find symbol

Check failure on line 233 in server/src/main/java/au/org/aodn/ogcapi/server/core/mapper/Converter.java

View workflow job for this annotation

GitHub Actions / build_test 

cannot find symbol
collection.getProperties().put(CollectionProperty.spatialExtents, m.getSummaries().getSpatialExtents());

Check failure on line 234 in server/src/main/java/au/org/aodn/ogcapi/server/core/mapper/Converter.java

View workflow job for this annotation

GitHub Actions / build_test 

cannot find symbol

Check failure on line 234 in server/src/main/java/au/org/aodn/ogcapi/server/core/mapper/Converter.java

View workflow job for this annotation

GitHub Actions / build_test 

cannot find symbol
}

if (m.getSummaries().getTemporal() != null) {
collection.getProperties().put(CollectionProperty.temporal, m.getSummaries().getTemporal());
}
Expand Down
3 changes: 2 additions & 1 deletion ...er/src/main/java/au/org/aodn/ogcapi/server/core/model/enumeration/CollectionProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ public enum CollectionProperty {
platformVocabs("platform_vocabs"),
organisationVocabs("organisation_vocabs"),
aiPlatformVocabs("ai:platform_vocabs"),
datasetProvider("dataset_provider");
datasetProvider("dataset_provider"),
spatialExtents("spatial_extents");

private final String value;

Expand Down
27 changes: 27 additions & 0 deletions server/src/test/java/au/org/aodn/ogcapi/server/core/mapper/StacToCollectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import au.org.aodn.stac.model.LinkModel;
import au.org.aodn.stac.model.StacCollectionModel;
import au.org.aodn.stac.model.SummariesModel;
import au.org.aodn.stac.model.SpatialExtentModel;
import au.org.aodn.stac.model.ThemesModel;
import au.org.aodn.ogcapi.server.core.model.enumeration.CollectionProperty;
import au.org.aodn.ogcapi.server.core.parser.stac.CQLToStacFilterFactory;
Expand All @@ -30,6 +31,7 @@
import org.springframework.boot.test.context.SpringBootTest;

import java.io.IOException;
import java.math.BigDecimal;
import java.time.Instant;
import java.util.*;

Expand Down Expand Up @@ -313,4 +315,29 @@ public void verifyConvertWorks1() throws IOException, CQLException {
CompilerUtil.parseFilter(Language.CQL, "score>=1.5 AND INTERSECTS(geometry,POLYGON ((104 -43, 163 -43, 163 -8, 104 -8, 104 -43)))", factory)
);
}

@Test
public void verifySpatialExtentsInProperties() {
SpatialExtentModel extent = SpatialExtentModel.builder()
.description("Pelorus Reef")
.bbox(List.of(BigDecimal.valueOf(146.5), BigDecimal.valueOf(-18.5),
BigDecimal.valueOf(146.5), BigDecimal.valueOf(-18.5)))
.build();
StacCollectionModel model = StacCollectionModel.builder()
.summaries(SummariesModel.builder().score(0).spatialExtents(List.of(extent)).build())
.build();

ExtendedCollection collection = (ExtendedCollection) new StacToCollectionImpl().convert(model, null);
Assertions.assertEquals(List.of(extent), collection.getProperties().get(CollectionProperty.spatialExtents));
}

@Test
public void verifyNoSpatialExtentsNoProperty() {
StacCollectionModel model = StacCollectionModel.builder()
.summaries(SummariesModel.builder().score(0).build())
.build();

ExtendedCollection collection = (ExtendedCollection) new StacToCollectionImpl().convert(model, null);
Assertions.assertFalse(collection.getProperties().containsKey(CollectionProperty.spatialExtents));
}
}
Loading