From 43f35f555b0112b8d76a437278d4415ff9b2ba3c Mon Sep 17 00:00:00 2001 From: Paul Haesler Date: Wed, 28 Feb 2024 15:31:19 +1100 Subject: [PATCH 1/5] Make feature info output GeoJSON compatible. --- datacube_ows/data.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/datacube_ows/data.py b/datacube_ows/data.py index 0e859a61..dcb30827 100644 --- a/datacube_ows/data.py +++ b/datacube_ows/data.py @@ -895,7 +895,11 @@ def feature_info(args): "features": [ { "type": "Feature", - "properties": feature_json + "properties": feature_json, + "geometry": { + "type": "Point", + "coordinates": [feature_json["lon"], feature_json["lat"]] + } } ] } From 9a09dc48c9a405574256a1548dfef98d2fc064c8 Mon Sep 17 00:00:00 2001 From: Paul Haesler Date: Wed, 28 Feb 2024 15:42:34 +1100 Subject: [PATCH 2/5] Correct error message as per #985 --- datacube_ows/ows_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacube_ows/ows_configuration.py b/datacube_ows/ows_configuration.py index 06d8988c..cffedcfe 100644 --- a/datacube_ows/ows_configuration.py +++ b/datacube_ows/ows_configuration.py @@ -770,7 +770,7 @@ def ready_wcs(self, dc): native_bounding_box = self.bboxes[self.native_CRS] except KeyError: if not self.global_cfg.called_from_update_ranges: - _LOG.warning("Layer: %s No bounding box in ranges for native CRS %s - rerun update_ranges.py", + _LOG.warning("Layer: %s No bounding box in ranges for native CRS %s - rerun datacube-ows-update", self.name, self.native_CRS) self.hide = True From 9c7a30f7dd9f7c737b9642993d960e362dc96db7 Mon Sep 17 00:00:00 2001 From: Paul Haesler Date: Wed, 28 Feb 2024 15:46:48 +1100 Subject: [PATCH 3/5] Update product document for geomedian test data. --- check-code-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check-code-all.sh b/check-code-all.sh index 721b26dc..43c1ca1e 100755 --- a/check-code-all.sh +++ b/check-code-all.sh @@ -21,7 +21,7 @@ datacube product add https://raw.githubusercontent.com/GeoscienceAustralia/dea-c # Geomedian for summary product testing -datacube product add https://raw.githubusercontent.com/GeoscienceAustralia/dea-config/master/products/baseline_satellite_data/geomedian-au/ga_ls8c_nbart_gm_cyear_3.odc-product.yaml +datacube product add https://raw.githubusercontent.com/GeoscienceAustralia/dea-config/master/products/baseline_satellite_data/geomedian-au/ga_ls8cls9c_gm_cyear_3.odc-product.yaml # S2 multiproduct datasets datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/baseline/ga_s2bm_ard_3/52/LGM/2017/07/19/20170719T030622/ga_s2bm_ard_3-2-1_52LGM_2017-07-19_final.odc-metadata.yaml --ignore-lineage From a79a0b631277f795005261bff8dd8a8e95e8ef95 Mon Sep 17 00:00:00 2001 From: Paul Haesler Date: Wed, 28 Feb 2024 15:56:27 +1100 Subject: [PATCH 4/5] Update product document for geomedian test data. --- check-code-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check-code-all.sh b/check-code-all.sh index 43c1ca1e..8ac70aa0 100755 --- a/check-code-all.sh +++ b/check-code-all.sh @@ -21,7 +21,7 @@ datacube product add https://raw.githubusercontent.com/GeoscienceAustralia/dea-c # Geomedian for summary product testing -datacube product add https://raw.githubusercontent.com/GeoscienceAustralia/dea-config/master/products/baseline_satellite_data/geomedian-au/ga_ls8cls9c_gm_cyear_3.odc-product.yaml +datacube product add https://explorer-aws.dea.ga.gov.au/products/ga_ls8c_nbart_gm_cyear_3.odc-product.yaml # S2 multiproduct datasets datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/baseline/ga_s2bm_ard_3/52/LGM/2017/07/19/20170719T030622/ga_s2bm_ard_3-2-1_52LGM_2017-07-19_final.odc-metadata.yaml --ignore-lineage From fe2768ff4dd9c920456f86d6a425093a1c21ad22 Mon Sep 17 00:00:00 2001 From: Paul Haesler Date: Thu, 29 Feb 2024 11:03:17 +1100 Subject: [PATCH 5/5] Get GeoJSON output working for data and nodata case. --- datacube_ows/data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacube_ows/data.py b/datacube_ows/data.py index dcb30827..5f53b775 100644 --- a/datacube_ows/data.py +++ b/datacube_ows/data.py @@ -898,7 +898,7 @@ def feature_info(args): "properties": feature_json, "geometry": { "type": "Point", - "coordinates": [feature_json["lon"], feature_json["lat"]] + "coordinates": geo_point.coords[0] } } ]