Merge pull request #787 from opendatacube/wcs1_envelope_srs

Fix WCS1 regression

Author: SpacemanPaul

datacube_ows/ows_configuration.py

@@ -1199,6 +1199,7 @@ def make_gml_name(name):
         self.published_CRSs = {}
         self.internal_CRSs = {}
         CRS_aliases = {}
+        geographic_CRSs = []
         for crs_str, crsdef in cfg["published_CRSs"].items():
             if "alias" in crsdef:
                 CRS_aliases[crs_str] = crsdef
@@ -1211,6 +1212,8 @@ def make_gml_name(name):
                 "gml_name": make_gml_name(crs_str),
                 "alias_of": None
             }
+            if crsdef["geographic"]:
+                geographic_CRSs.append(crs_str)
             self.published_CRSs[crs_str] = self.internal_CRSs[crs_str]
             if self.published_CRSs[crs_str]["geographic"]:
                 if self.published_CRSs[crs_str]["horizontal_coord"] != "longitude":
@@ -1219,6 +1222,16 @@ def make_gml_name(name):
                 if self.published_CRSs[crs_str]["vertical_coord"] != "latitude":
                     raise ConfigException(f"Published CRS {crs_str} is geographic"
                                     "but has a vertical coordinate that is not 'latitude'")
+        # default_geographic_CRS is used by WCS1
+        if not self.wcs:
+            self.default_geographic_CRS = ""
+        elif not geographic_CRSs:
+            raise ConfigException(f"At least one geographic CRS must be supplied")
+        elif "EPSG:4326" in geographic_CRSs or "WGS-84" in geographic_CRSs:
+            self.default_geographic_CRS = "urn:ogc:def:crs:OGC:1.3:CRS84"
+        else:
+            self.default_geographic_CRS = geographic_CRSs[0]
+
         for alias, alias_def in CRS_aliases.items():
             target_crs = alias_def["alias"]
             if target_crs not in self.published_CRSs:

tests/test_cfg_global.py

@@ -16,6 +16,7 @@ def test_minimal_global(minimal_global_raw_cfg, minimal_dc):
     assert cfg.ready
     assert cfg.initialised
     assert not cfg.wcs_tiff_statistics
+    assert cfg.default_geographic_CRS == "" # No WCS
 
 
 def test_global_no_title(minimal_global_raw_cfg):
@@ -41,6 +42,42 @@ def test_wcs_only(minimal_global_raw_cfg, wcs_global_cfg, minimal_dc):
     assert not cfg.wms
     assert not cfg.wmts
     assert cfg.wcs_tiff_statistics
+    assert cfg.default_geographic_CRS == "urn:ogc:def:crs:OGC:1.3:CRS84"
+
+def test_geog_crs(minimal_global_raw_cfg, wcs_global_cfg, minimal_dc):
+    OWSConfig._instance = None
+    minimal_global_raw_cfg["global"]["services"] = {
+        "wcs": True,
+        "wms": False,
+        "wmts": False,
+    }
+    minimal_global_raw_cfg["wcs"] = wcs_global_cfg
+    minimal_global_raw_cfg["global"]["published_CRSs"] = {
+        "EPSG:3857": {  # Web Mercator
+            "geographic": False,
+            "horizontal_coord": "x",
+            "vertical_coord": "y",
+        },
+    }
+    with pytest.raises(ConfigException) as e:
+        cfg = OWSConfig(cfg=minimal_global_raw_cfg)
+    assert "At least one geographic CRS must be supplied" in str(e.value)
+    OWSConfig._instance = None
+    minimal_global_raw_cfg["global"]["published_CRSs"] = {
+        "EPSG:3857": {  # Web Mercator
+            "geographic": False,
+            "horizontal_coord": "x",
+            "vertical_coord": "y",
+        },
+        "EPSG:99899": {  # Made up
+            "geographic": True,
+            "horizontal_coord": "longitude",
+            "vertical_coord": "latitude",
+        },
+    }
+    cfg = OWSConfig(cfg=minimal_global_raw_cfg)
+    cfg.make_ready(minimal_dc)
+    assert cfg.default_geographic_CRS == "EPSG:99899"
 
 
 def test_contact_details_parse(minimal_global_cfg):