Merge pull request #34 from EOPF-Sample-Service/konstntokas-xxx-small_adjustments

Fine adjustments on open_params schema and varaible attributes

Author: forman

xcube_eopf/constants.py

@@ -6,6 +6,7 @@
 
 from xcube.util.jsonschema import (
     JsonArraySchema,
+    JsonComplexSchema,
     JsonDateSchema,
     JsonIntegerSchema,
     JsonNumberSchema,
@@ -54,19 +55,28 @@
         "Start and stop are inclusive."
     ),
 )
-SCHEMA_VARIABLES = JsonArraySchema(
-    items=(JsonStringSchema(min_length=0)),
-    unique_items=True,
+SCHEMA_VARIABLES = JsonComplexSchema(
     title="Names of variables in dataset",
     description="Names of variables which will be included in the data cube.",
+    one_of=[
+        JsonStringSchema(
+            title="Variable name or regex pattern",
+            min_length=0,
+        ),
+        JsonArraySchema(
+            title="Iterable of variables",
+            items=(JsonStringSchema(min_length=0)),
+            unique_items=True,
+        ),
+    ],
 )
 SCHEMA_SPATIAL_RES = JsonNumberSchema(title="Spatial Resolution", exclusive_minimum=0.0)
 SCHEMA_CRS = JsonStringSchema(title="Coordinate reference system")
 SCHEMA_TILE_SIZE = JsonArraySchema(
     nullable=True,
     title="Tile size of returned dataset",
     description=(
-        "Tile size in y and x (or lat and lon if crs is geographic) "
+        "Spatial tile size in y and x (or lat and lon if crs is geographic) "
         "in returned dataset."
     ),
     items=[JsonIntegerSchema(minimum=1), JsonIntegerSchema(minimum=1)],

xcube_eopf/prodhandlers/sentinel2.py

@@ -55,6 +55,11 @@
     "flag_colors",
     "grid_mapping",
 ]
+_LONG_NAME_TRANSLATION = {
+    "cld": "Cloud probability, based on Sen2Cor processor",
+    "scl": "Scene classification data, based on Sen2Cor processor",
+    "snw": "Snow probability, based on Sen2Cor processor",
+}
 _INTERPOLATIONS = {0: "nearest", 2: "bilinear"}
 _SCHEMA_SPLINE_ORDERS = JsonComplexSchema(
     title="Spline orders for updampling",
@@ -727,5 +732,7 @@ def _create_empty_dataset(
             for k in _ATTRIBUTE_KEYS
             if k in sample_ds[key].attrs
         }
+        if key in _LONG_NAME_TRANSLATION.keys():
+            ds[key].attrs["long_name"] = _LONG_NAME_TRANSLATION[key]
 
     return ds