Version and top level folder

.github/workflows/test.yml

@@ -70,3 +70,5 @@ jobs:
         with:
           directory: ./artifacts/
           fail_ci_if_error: false
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

datacube_ows/ows_configuration.py

@@ -1385,14 +1385,19 @@ def parse_layers(self, cfg):
         self.product_index = {}
         self.declare_unready("native_product_index")
         self.root_layer_folder = OWSFolder({
-            "title": "Root Folder (hidden)",
-            "label": "ows_root_hidden",
+            "title": self.title,
+            "abstract": self.abstract,
+            "label": "ows_root",
             "layers": cfg
         }, global_cfg=self, parent_layer=None)
 
     @property
     def layers(self):
-        return self.root_layer_folder.child_layers
+        # Multiple top-level are not consistent with a strict reading of the OWS standard.
+        # If we have multiple top-level folders, wrap them in an auto-generated top-level folder.
+        if len(self.root_layer_folder.child_layers) == 1:
+            return self.root_layer_folder.child_layers
+        return [self.root_layer_folder]
 
     def alias_bboxes(self, bboxes):
         out = {}

datacube_ows/wsgi.py

@@ -14,12 +14,19 @@
 # The location of the datcube config file.
 os.environ.setdefault("DATACUBE_CONFIG_PATH", "/opt/odc/.datacube.conf.local")
 
+from datacube_ows import __version__
+
 from datacube_ows.ogc import app  # isort:skip
 
 application = app
 
 
 def main():
+    if "--version" in sys.argv:
+        print("Open Data Cube Open Web Services (datacube-ows) version",
+              __version__
+              )
+        exit(0)
     app.run()
 
 

docs/cfg_layers.rst

@@ -17,6 +17,15 @@ at least one named layer (defined below).
 
 The "layers" section is a list of Layer configurations.
 
+> Note: Although many WMS clients support multiple
+> top-level layers, a strict reading of the WMS standard requires
+> only one. Some WMS clients do not recognise all top level
+> layers if more than one is defined.
+>
+> Therefore, in the interests of WMS standards compliance, if you define multiple top
+> level layers, they will be automatically wrapped in a single top-level folder
+> using the global metadata.
+
 A layer may be either:
 
 * A `named layer <#named-layers>`_ which represents a queryable

integration_tests/cfg/translations/de/LC_MESSAGES/ows_cfg.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Open web-services for the Open Data Cube "
 "2022-03-24T23:29:57.407805\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2022-08-26 13:23+1000\n"
+"POT-Creation-Date: 2024-07-18 10:48+1000\n"
 "PO-Revision-Date: 2022-03-24 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.15.0\n"
 
 msgid "global.title"
 msgstr "This is the German translation of the title"

integration_tests/cfg/translations/en/LC_MESSAGES/ows_cfg.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Over-ridden: aardvark 2022-03-24T23:29:57.407805\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2022-10-18 13:28+1100\n"
+"POT-Creation-Date: 2024-07-18 10:48+1000\n"
 "PO-Revision-Date: 2022-03-24 23:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.15.0\n"
 
 msgid "global.title"
 msgstr "Open web-services for the Open Data Cube"