diff --git a/indexer/src/main/java/au/org/aodn/esindexer/model/RelationType.java b/indexer/src/main/java/au/org/aodn/esindexer/model/RelationType.java index fc8868d2..74869845 100644 --- a/indexer/src/main/java/au/org/aodn/esindexer/model/RelationType.java +++ b/indexer/src/main/java/au/org/aodn/esindexer/model/RelationType.java @@ -13,6 +13,8 @@ public enum RelationType { DESCRIBEDBY("describedby"), ICON("icon"), PREVIEW("preview"), + WFS("wfs"), + WMS("wms"), ; private final String value; diff --git a/indexer/src/main/java/au/org/aodn/esindexer/service/StacCollectionMapperService.java b/indexer/src/main/java/au/org/aodn/esindexer/service/StacCollectionMapperService.java index 9509b25a..ed1d1954 100644 --- a/indexer/src/main/java/au/org/aodn/esindexer/service/StacCollectionMapperService.java +++ b/indexer/src/main/java/au/org/aodn/esindexer/service/StacCollectionMapperService.java @@ -584,10 +584,16 @@ List mapLinks(MDMetadataType source) { // an empty string by default linkModel.setRel(""); - // WMS or WFS links shouldn't be displayed in the link panel) + // differentiate WMS, WFS and others safeGet(() -> ciOnlineResource.getProtocol().getCharacterString().getValue().toString()) .ifPresent(protocol -> { - if (!LinkUtils.isWmsOrWfs(protocol)) { + if (LinkUtils.isWms(protocol)) { + linkModel.setRel(RelationType.WMS.getValue()); + } + else if (LinkUtils.isWfs(protocol)) { + linkModel.setRel(RelationType.WFS.getValue()); + } + else { linkModel.setRel(RelationType.RELATED.getValue()); } }); diff --git a/indexer/src/main/java/au/org/aodn/esindexer/utils/LinkUtils.java b/indexer/src/main/java/au/org/aodn/esindexer/utils/LinkUtils.java index ebfcac7f..349d0ad8 100644 --- a/indexer/src/main/java/au/org/aodn/esindexer/utils/LinkUtils.java +++ b/indexer/src/main/java/au/org/aodn/esindexer/utils/LinkUtils.java @@ -43,10 +43,17 @@ public class LinkUtils { ); public static boolean isWmsOrWfs (String protocol) { + return isWms(protocol) || isWfs(protocol); + } + + public static boolean isWms(String protocol) { return protocol.startsWith("OGC:WMS") - || protocol.startsWith("OGC:WFS") || protocol.startsWith("IMOS:NCWMS") ; } + public static boolean isWfs(String protocol) { + return protocol.startsWith("OGC:WFS"); + } + } diff --git a/indexer/src/test/resources/canned/abstract_resposibilty_null_stac.json b/indexer/src/test/resources/canned/abstract_resposibilty_null_stac.json index 665b0506..210ff69e 100644 --- a/indexer/src/test/resources/canned/abstract_resposibilty_null_stac.json +++ b/indexer/src/test/resources/canned/abstract_resposibilty_null_stac.json @@ -180,6 +180,7 @@ "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/associated/self.json b/indexer/src/test/resources/canned/associated/self.json index 468fdeb9..11e9669d 100644 --- a/indexer/src/test/resources/canned/associated/self.json +++ b/indexer/src/test/resources/canned/associated/self.json @@ -227,5 +227,5 @@ "sci:citation" : "{\"suggestedCitation\":\"The citation in a list of references is: \\\"IMOS [year-of-data-download], [Title], [data-access-URL], accessed [date-of-access].\\\"\",\"useLimitations\":[\"Data, products and services from IMOS are provided \\\"as is\\\" without any warranty as to fitness for a particular purpose.\"],\"otherConstraints\":[\"Any users of IMOS data are required to clearly acknowledge the source of the material derived from IMOS in the format: \\\"Data was sourced from Australia’s Integrated Marine Observing System (IMOS) – IMOS is enabled by the National Collaborative Research Infrastructure strategy (NCRIS).\\\" If relevant, also credit other organisations involved in collection of this particular datastream (as listed in 'credit' in the metadata record).\"]}", "type" : "Collection", "stac_version" : "1.0.0", - "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json" ] + "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json", "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/keywords_null_stac.json b/indexer/src/test/resources/canned/keywords_null_stac.json index 0ca2607d..f462ec59 100644 --- a/indexer/src/test/resources/canned/keywords_null_stac.json +++ b/indexer/src/test/resources/canned/keywords_null_stac.json @@ -258,6 +258,7 @@ "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample10_stac.json b/indexer/src/test/resources/canned/sample10_stac.json index a4493faa..1931ac05 100644 --- a/indexer/src/test/resources/canned/sample10_stac.json +++ b/indexer/src/test/resources/canned/sample10_stac.json @@ -1068,7 +1068,7 @@ }, { "href": "http://geoserver-123.aodn.org.au/geoserver/wms", - "rel": "", + "rel": "wms", "type": "", "title": "imos:anmn_velocity_timeseries_map" }, @@ -1389,6 +1389,7 @@ "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample11_stac.json b/indexer/src/test/resources/canned/sample11_stac.json index 4d7f184d..f4dc6375 100644 --- a/indexer/src/test/resources/canned/sample11_stac.json +++ b/indexer/src/test/resources/canned/sample11_stac.json @@ -736,6 +736,7 @@ "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample12_stac.json b/indexer/src/test/resources/canned/sample12_stac.json index 46c50aca..19c80cde 100644 --- a/indexer/src/test/resources/canned/sample12_stac.json +++ b/indexer/src/test/resources/canned/sample12_stac.json @@ -412,6 +412,7 @@ "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample13_stac.json b/indexer/src/test/resources/canned/sample13_stac.json index 30eb7527..a619b047 100644 --- a/indexer/src/test/resources/canned/sample13_stac.json +++ b/indexer/src/test/resources/canned/sample13_stac.json @@ -372,6 +372,7 @@ "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample14_stac.json b/indexer/src/test/resources/canned/sample14_stac.json index c1cdd17c..5507ded9 100644 --- a/indexer/src/test/resources/canned/sample14_stac.json +++ b/indexer/src/test/resources/canned/sample14_stac.json @@ -418,6 +418,7 @@ "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample15_stac.json b/indexer/src/test/resources/canned/sample15_stac.json index 84a02772..9cc73e42 100644 --- a/indexer/src/test/resources/canned/sample15_stac.json +++ b/indexer/src/test/resources/canned/sample15_stac.json @@ -366,13 +366,13 @@ "links": [ { "href": "https://geoserver.imas.utas.edu.au/geoserver/seamap/wfs?version=1.0.0&request=GetFeature&typeName=SeamapAus_QLD_GBRWHA_seagrass&outputFormat=SHAPE-ZIP", - "rel": "", + "rel": "wfs", "type": "", "title": "SHAPE-ZIP" }, { "href": "https://geoserver.imas.utas.edu.au/geoserver/seamap/wms", - "rel": "", + "rel": "wms", "type": "", "title": "seamap:SeamapAus_QLD_GBRWHA_seagrass" }, @@ -509,6 +509,7 @@ "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample4_stac.json b/indexer/src/test/resources/canned/sample4_stac.json index 99666716..f536dbf2 100644 --- a/indexer/src/test/resources/canned/sample4_stac.json +++ b/indexer/src/test/resources/canned/sample4_stac.json @@ -206,37 +206,37 @@ "title" : "NetCDF files via THREDDS catalog" }, { "href" : "http://geoserver-123.aodn.org.au/geoserver/ncwms", - "rel" : "", + "rel" : "wms", "type" : "", "title" : "csiro_oa_reconstruction_url/SST" }, { "href" : "http://geoserver-123.aodn.org.au/geoserver/ncwms", - "rel" : "", + "rel" : "wms", "type" : "", "title" : "csiro_oa_reconstruction_url/SSS" }, { "href" : "http://geoserver-123.aodn.org.au/geoserver/ncwms", - "rel" : "", + "rel" : "wms", "type" : "", "title" : "csiro_oa_reconstruction_url/ALK" }, { "href" : "http://geoserver-123.aodn.org.au/geoserver/ncwms", - "rel" : "", + "rel" : "wms", "type" : "", "title" : "csiro_oa_reconstruction_url/DIC" }, { "href" : "http://geoserver-123.aodn.org.au/geoserver/ncwms", - "rel" : "", + "rel" : "wms", "type" : "", "title" : "csiro_oa_reconstruction_url/OMEGA_A" }, { "href" : "http://geoserver-123.aodn.org.au/geoserver/ncwms", - "rel" : "", + "rel" : "wms", "type" : "", "title" : "csiro_oa_reconstruction_url/OMEGA_C" }, { "href" : "http://geoserver-123.aodn.org.au/geoserver/ncwms", - "rel" : "", + "rel" : "wms", "type" : "", "title" : "csiro_oa_reconstruction_url/pH_T" }, { @@ -386,5 +386,5 @@ "sci:citation" : "{\"suggestedCitation\":null,\"useLimitations\":null,\"otherConstraints\":[\"The citation in a list of references is: citation name/s (year metadata published), metadata title. File identifier and Data accessed at (add http link).\"]}", "type" : "Collection", "stac_version" : "1.0.0", - "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json" ] + "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json", "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample5_stac.json b/indexer/src/test/resources/canned/sample5_stac.json index 1c363791..d6d12274 100644 --- a/indexer/src/test/resources/canned/sample5_stac.json +++ b/indexer/src/test/resources/canned/sample5_stac.json @@ -187,5 +187,5 @@ "sci:citation" : "{\"suggestedCitation\":\"The citation in a list of references is: \\\"IMOS [year-of-data-download], [Title], [data-access-URL], accessed [date-of-access].\\\"\",\"useLimitations\":[\"Data, products and services from IMOS are provided \\\"as is\\\" without any warranty as to fitness for a particular purpose.\"],\"otherConstraints\":[\"Any users of IMOS data are required to clearly acknowledge the source of the material derived from IMOS in the format: \\\"Data was sourced from Australia’s Integrated Marine Observing System (IMOS) – IMOS is enabled by the National Collaborative Research Infrastructure strategy (NCRIS).\\\" If relevant, also credit other organisations involved in collection of this particular datastream (as listed in 'credit' in the metadata record).\"]}", "type" : "Collection", "stac_version" : "1.0.0", - "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json" ] + "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json", "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample6_stac.json b/indexer/src/test/resources/canned/sample6_stac.json index c55fec45..9d58fda4 100644 --- a/indexer/src/test/resources/canned/sample6_stac.json +++ b/indexer/src/test/resources/canned/sample6_stac.json @@ -544,5 +544,5 @@ "sci:citation" : "{\"suggestedCitation\":null,\"useLimitations\":null,\"otherConstraints\":[\"Access to the raw (not quality-controlled) voyage data is intended for the collectors and processors of the data obtained in the MNF RV Investigator voyage. Quality-controlled data products will be made available under a CCBY licence.\"]}", "type" : "Collection", "stac_version" : "1.0.0", - "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json" ] + "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json", "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample7_stac.json b/indexer/src/test/resources/canned/sample7_stac.json index b78f3640..dd5f3bb8 100644 --- a/indexer/src/test/resources/canned/sample7_stac.json +++ b/indexer/src/test/resources/canned/sample7_stac.json @@ -208,5 +208,5 @@ "sci:citation" : "{\"suggestedCitation\":null,\"useLimitations\":null,\"otherConstraints\":[\"The data was collected under contract between AIMS and another party(s). Specific agreements for access and use of the data shall be negotiated separately. Contact the AIMS Data Centre (adc@aims.gov.au) for further information\"]}", "type" : "Collection", "stac_version" : "1.0.0", - "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json" ] + "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json", "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample7_stac_no_es.json b/indexer/src/test/resources/canned/sample7_stac_no_es.json index bbcc92ba..dcc2947b 100644 --- a/indexer/src/test/resources/canned/sample7_stac_no_es.json +++ b/indexer/src/test/resources/canned/sample7_stac_no_es.json @@ -448,6 +448,7 @@ "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample8_stac.json b/indexer/src/test/resources/canned/sample8_stac.json index a299c5ab..11cb6e42 100644 --- a/indexer/src/test/resources/canned/sample8_stac.json +++ b/indexer/src/test/resources/canned/sample8_stac.json @@ -531,5 +531,5 @@ "sci:citation" : "{\"suggestedCitation\":null,\"useLimitations\":null,\"otherConstraints\":[\"Access to the raw (not quality-controlled) voyage data is intended for the collectors and processors of the data obtained in the MNF RV Investigator voyage. Quality-controlled data products will be made available under the MNF CCBY licence.\"]}", "type" : "Collection", "stac_version" : "1.0.0", - "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json" ] + "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json", "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample9_stac.json b/indexer/src/test/resources/canned/sample9_stac.json index 705b0c9f..6d55eb2e 100644 --- a/indexer/src/test/resources/canned/sample9_stac.json +++ b/indexer/src/test/resources/canned/sample9_stac.json @@ -356,6 +356,7 @@ "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample_abstract_citation_null_stac.json b/indexer/src/test/resources/canned/sample_abstract_citation_null_stac.json index 3463a3dc..485cd918 100644 --- a/indexer/src/test/resources/canned/sample_abstract_citation_null_stac.json +++ b/indexer/src/test/resources/canned/sample_abstract_citation_null_stac.json @@ -257,5 +257,5 @@ "sci:citation" : "{\"suggestedCitation\":null,\"useLimitations\":null,\"otherConstraints\":[\"Data is made available under a Creative Commons Attribution 4.0 International Licence, please see link. Data is supplied 'as is' without any warranty or guarantee except as required by law to be given to you. The data may not be free of error, comprehensive, current or appropriate for your particular purpose. You accept all risk and responsibility for its use. ATTRIBUTION STATEMENT: The dataset [Insert-dataset-name-here] downloaded on [Insert-DD-Mmm-YYYY-here] was collected on voyage [Insert-voyage-name-here] by the Marine National Facility.\"]}", "type" : "Collection", "stac_version" : "1.0.0", - "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json" ] + "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json", "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample_incorrect_projection_stac.json b/indexer/src/test/resources/canned/sample_incorrect_projection_stac.json index 288a9db4..a6157598 100644 --- a/indexer/src/test/resources/canned/sample_incorrect_projection_stac.json +++ b/indexer/src/test/resources/canned/sample_incorrect_projection_stac.json @@ -1381,6 +1381,7 @@ "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample_malform_date_stac.json b/indexer/src/test/resources/canned/sample_malform_date_stac.json index d6f1366a..3da5fc5a 100644 --- a/indexer/src/test/resources/canned/sample_malform_date_stac.json +++ b/indexer/src/test/resources/canned/sample_malform_date_stac.json @@ -83,5 +83,5 @@ "sci:citation" : "{\"suggestedCitation\":null,\"useLimitations\":null,\"otherConstraints\":[\"Data is made available under a Creative Commons Attribution 4.0 International Licence, please see link. Data is supplied 'as is' without any warranty or guarantee except as required by law to be given to you. The data may not be free of error, comprehensive, current or appropriate for your particular purpose. You accept all risk and responsibility for its use. ATTRIBUTION STATEMENT: The dataset [Insert-dataset-name-here] downloaded on [Insert-DD-Mmm-YYYY-here] was provided by CSIRO.\"]}", "type" : "Collection", "stac_version" : "1.0.0", - "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json" ] + "stac_extensions" : [ "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", "https://stac-extensions.github.io/themes/v1.0.0/schema.json", "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample_multiple_temporal1_stac.json b/indexer/src/test/resources/canned/sample_multiple_temporal1_stac.json index da4ff7a1..465c59a4 100644 --- a/indexer/src/test/resources/canned/sample_multiple_temporal1_stac.json +++ b/indexer/src/test/resources/canned/sample_multiple_temporal1_stac.json @@ -506,7 +506,7 @@ }, { "href": "https://geoserver.apps.aims.gov.au/aims/ows", - "rel": "", + "rel": "wfs", "type": "", "title": "aims:weather_data" }, @@ -518,7 +518,7 @@ }, { "href": "https://geoserver.apps.aims.gov.au/aims/wms", - "rel": "", + "rel": "wms", "type": "", "title": "aims:weather_deployment" }, @@ -662,6 +662,7 @@ "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample_multiple_temporal2_stac.json b/indexer/src/test/resources/canned/sample_multiple_temporal2_stac.json index a18e850c..d9084ebe 100644 --- a/indexer/src/test/resources/canned/sample_multiple_temporal2_stac.json +++ b/indexer/src/test/resources/canned/sample_multiple_temporal2_stac.json @@ -506,7 +506,7 @@ }, { "href": "https://geoserver.apps.aims.gov.au/aims/ows", - "rel": "", + "rel": "wfs", "type": "", "title": "aims:weather_data" }, @@ -518,7 +518,7 @@ }, { "href": "https://geoserver.apps.aims.gov.au/aims/wms", - "rel": "", + "rel": "wms", "type": "", "title": "aims:weather_deployment" }, @@ -662,6 +662,7 @@ "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/indexer/src/test/resources/canned/sample_multiple_temporal_null_stac.json b/indexer/src/test/resources/canned/sample_multiple_temporal_null_stac.json index 1c5fa639..80554393 100644 --- a/indexer/src/test/resources/canned/sample_multiple_temporal_null_stac.json +++ b/indexer/src/test/resources/canned/sample_multiple_temporal_null_stac.json @@ -350,6 +350,7 @@ "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", "https://stac-extensions.github.io/projection/v1.1.0/schema.json", "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" ] } diff --git a/stacmodel/src/main/java/au/org/aodn/stac/model/StacCollectionModel.java b/stacmodel/src/main/java/au/org/aodn/stac/model/StacCollectionModel.java index 472b8d46..3f0df2c6 100644 --- a/stacmodel/src/main/java/au/org/aodn/stac/model/StacCollectionModel.java +++ b/stacmodel/src/main/java/au/org/aodn/stac/model/StacCollectionModel.java @@ -48,11 +48,12 @@ public String getType() { @JsonProperty("stac_extensions") public String[] getStacExtension() { return new String[] { - "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", - "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", - "https://stac-extensions.github.io/projection/v1.1.0/schema.json", - "https://stac-extensions.github.io/language/v1.0.0/schema.json", - "https://stac-extensions.github.io/themes/v1.0.0/schema.json" + "https://stac-extensions.github.io/scientific/v1.0.0/schema.json", + "https://stac-extensions.github.io/contacts/v0.1.1/schema.json", + "https://stac-extensions.github.io/projection/v1.1.0/schema.json", + "https://stac-extensions.github.io/language/v1.0.0/schema.json", + "https://stac-extensions.github.io/themes/v1.0.0/schema.json", + "https://stac-extensions.github.io/web-map-links/v1.2.0/schema.json" }; } }