WCS fixes. (cherry pick of PR #1027 to 1.9 branch)

.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE.md

@@ -18,11 +18,11 @@ assignees: ''
 4.
 
 ## Context (Environment)
-### `datacube-ows` version (datacube-ows --version):
-<!-- Run command datacube-ows --versiion -->
+### `datacube-ows` version (datacube-ows-update --version):
+<!-- Run command datacube-ows-update --version -->
 
 ### `ows_config.py` file (link, sample code)
-<!-- Porvide a link to config or paste the config code below -->
+<!-- Provide a link to config or paste the config code below -->
 
 ### datacube product metadata (datacube product show product_name)
 <!-- If issue is related to a specific layer, run `datacube product show <product_name>` to get the product metadata and provide below -->

datacube_ows/sql/postgres/ows_schema/grants/read_only/002_grant_range_read_requires_role.sql

@@ -0,0 +1,3 @@
+-- Granting select on layer ranges table to {role}
+
+GRANT SELECT ON ows.layer_ranges TO {role};

datacube_ows/sql/postgres/ows_schema/grants/read_only/003_grant_agdc_user_requires_role.sql

@@ -0,0 +1,3 @@
+-- Granting agdc_user role to {role}
+
+GRANT agdc_user to {role};

datacube_ows/templates/wms_capabilities.xml

@@ -35,8 +35,8 @@
     {%  endif %}
 {%- endmacro %}
 {% macro render_named_layer(lyr, depth=0) -%}
-    {% if not lyr.hide %}
     {% set lyr_ranges = lyr.ranges %}
+    {% if not lyr.hide %}
     <Layer queryable="1">
         <Name>{{ lyr.name }}</Name>
         <Title>{{ lyr.title }}</Title>

datacube_ows/wcs1_utils.py

@@ -357,15 +357,17 @@ def get_coverage_data(req, qprof):
             nparrays = {
                 band: (("time", yname, xname),
                        numpy.full((len(req.times), len(yvals), len(xvals)),
-                                  req.layer.band_idx.nodata_val(band))
+                                  req.layer.band_idx.nodata_val(band),
+                                  dtype=req.layer.band_idx.dtype_val(band))
                       )
                 for band in req.bands
             }
         else:
             nparrays = {
                 band: (("time", xname, yname),
                        numpy.full((len(req.times), len(xvals), len(yvals)),
-                                  req.layer.band_idx.nodata_val(band))
+                                  req.layer.band_idx.nodata_val(band),
+                                  dtype=req.layer.band_idx.dtype_val(band))
                       )
                 for band in req.bands
             }

datacube_ows/wcs_scaler.py

@@ -130,27 +130,26 @@ def to_crs(self, new_crs):
         grid = self.layer.grids[new_crs]
         skip_x_xform = False
         skip_y_xform = False
-        if self.crs != new_crs:
-            if not self.subsetted.x and not self.subsetted.y:
-                # Neither axis subsetted
-                self.min.x = self.layer.ranges["bboxes"][new_crs]["left"]
-                self.max.x = self.layer.ranges["bboxes"][new_crs]["right"]
-                self.min.y = self.layer.ranges["bboxes"][new_crs]["bottom"]
-                self.max.y = self.layer.ranges["bboxes"][new_crs]["top"]
-                self.crs = new_crs
-            elif not self.subsetted.x or not self.subsetted.y:
-                # One axis subsetted
-                if self.subsetted.x:
-                    self.min.y = self.layer.ranges["bboxes"][self.crs]["bottom"]
-                    self.max.y = self.layer.ranges["bboxes"][self.crs]["top"]
-                    skip_y_xform = True
-                if self.subsetted.y:
-                    self.min.x = self.layer.ranges["bboxes"][self.crs]["left"]
-                    self.max.x = self.layer.ranges["bboxes"][self.crs]["right"]
-                    skip_x_xform = True
-            else:
-                # Both axes subsetted
-                pass
+        if not self.subsetted.x and not self.subsetted.y:
+            # Neither axis subsetted
+            self.min.x = self.layer.ranges.bboxes[new_crs]["left"]
+            self.max.x = self.layer.ranges.bboxes[new_crs]["right"]
+            self.min.y = self.layer.ranges.bboxes[new_crs]["bottom"]
+            self.max.y = self.layer.ranges.bboxes[new_crs]["top"]
+            self.crs = new_crs
+        elif not self.subsetted.x or not self.subsetted.y:
+            # One axis subsetted
+            if self.subsetted.x:
+                self.min.y = self.layer.ranges.bboxes[self.crs]["bottom"]
+                self.max.y = self.layer.ranges.bboxes[self.crs]["top"]
+                skip_y_xform = True
+            if self.subsetted.y:
+                self.min.x = self.layer.ranges.bboxes[self.crs]["left"]
+                self.max.x = self.layer.ranges.bboxes[self.crs]["right"]
+                skip_x_xform = True
+        else:
+            # Both axes subsetted
+            pass
 
         if self.crs != new_crs:
             is_point = False
@@ -189,14 +188,14 @@ def to_crs(self, new_crs):
                 proj_geom = geom.to_crs(new_crs_obj)
                 bbox = proj_geom.boundingbox
                 if skip_x_xform:
-                    self.min.x = self.layer.ranges["bboxes"][new_crs]["left"]
-                    self.max.x = self.layer.ranges["bboxes"][new_crs]["right"]
+                    self.min.x = self.layer.ranges.bboxes[new_crs]["left"]
+                    self.max.x = self.layer.ranges.bboxes[new_crs]["right"]
                 else:
                     self.min.x = bbox.left
                     self.max.x = bbox.right
                 if skip_y_xform:
-                    self.min.y = self.layer.ranges["bboxes"][new_crs]["bottom"]
-                    self.max.y = self.layer.ranges["bboxes"][new_crs]["top"]
+                    self.min.y = self.layer.ranges.bboxes[new_crs]["bottom"]
+                    self.max.y = self.layer.ranges.bboxes[new_crs]["top"]
                 else:
                     self.min.y = bbox.bottom
                     self.max.y = bbox.top

integration_tests/test_wcs_server.py

@@ -1099,6 +1099,13 @@ def test_wcs20_getcoverage_geotiff_bigimage(ows_server):
             scalesize="x(3000),y(3000)",
         )
     assert "too much data for a single request" in str(e.value)
+    # Test default request
+    with pytest.raises(ServiceException) as e:
+        output = wcs.getCoverage(
+            identifier=[layer.name],
+            format="application/x-netcdf",
+        )
+    assert "too much data for a single request" in str(e.value)
 
 
 def test_wcs20_getcoverage_netcdf(ows_server):

tests/test_wcs_scaler.py

@@ -10,6 +10,7 @@
 from affine import Affine
 
 from datacube_ows.ows_configuration import OWSConfig, OWSProductLayer
+from datacube_ows.index.api import CoordRange, LayerExtent
 from datacube_ows.wcs_scaler import (SpatialParameter, WCSScaler,
                                      WCSScalerUnknownDimension)
 
@@ -124,20 +125,11 @@ def layer_crs_geom():
     times = [datetime.date(2013, 1, 1), datetime.date(2014, 1, 1), datetime.date(2015, 1, 1),
               datetime.date(2016, 1, 1), datetime.date(2017, 1, 1), datetime.date(2018, 1, 1)]
     product_layer.dynamic = False
-    product_layer._ranges = {
-        'lat': {
-            'min': -34.5250413940276,
-            'max': -33.772472435988
-        },
-        'lon': {
-            'min': 150.330509919584,
-            'max': 151.258021405841
-        },
-        'times': times,
-        'start_time': datetime.date(2013, 1, 1),
-        'end_time': datetime.date(2018, 1, 1),
-        'time_set': set(times),
-        'bboxes': {
+    product_layer._ranges = LayerExtent(
+        lat=CoordRange(min=-34.5250413940276, max=-33.772472435988),
+        lon=CoordRange(min=150.330509919584, max=151.258021405841),
+        times=times,
+        bboxes={
             'EPSG:3111': {
                 'top': 5725844.213533809, 'left': -1623290.9363678931,
                 'right': 3983581.449863785, 'bottom': 1042109.9920098772
@@ -155,7 +147,7 @@ def layer_crs_geom():
                 'right': 157.105656164263, 'bottom': -45.761684927317
             }
         }
-    }
+    )
     return product_layer