Skip to content

Commit

Permalink
Merge pull request #803 from GeoscienceAustralia/Collection-3-web-ser…
Browse files Browse the repository at this point in the history 
…vice-release

C3 Web service production release
  • Loading branch information
@GypsyBojangles
GypsyBojangles authored Jul 30, 2021
2 parents 834c07e + 5a3b8c8 commit af7a82c
Show file tree
Hide file tree
Showing 5 changed files with 416 additions and 39 deletions.
38 changes: 25 additions & 13 deletions prod/services/wms/inventory.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
"s2a_nrt_granule",
"s2b_nrt_granule"
],
"styles_count": 17,
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
Expand All @@ -267,14 +267,16 @@
"nir",
"narrow_nir",
"swir1",
"swir2"
"swir2",
"nbr",
"fmask"
]
},
{
"product": [
"s2b_nrt_granule"
],
"styles_count": 17,
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
Expand All @@ -292,14 +294,16 @@
"nir",
"narrow_nir",
"swir1",
"swir2"
"swir2",
"nbr",
"fmask"
]
},
{
"product": [
"s2a_nrt_granule"
],
"styles_count": 17,
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
Expand All @@ -317,15 +321,17 @@
"nir",
"narrow_nir",
"swir1",
"swir2"
"swir2",
"nbr",
"fmask"
]
},
{
"product": [
"s2a_ard_granule",
"s2b_ard_granule"
],
"styles_count": 17,
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
Expand All @@ -343,14 +349,16 @@
"nir",
"narrow_nir",
"swir1",
"swir2"
"swir2",
"nbr",
"fmask"
]
},
{
"product": [
"s2b_ard_granule"
],
"styles_count": 17,
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
Expand All @@ -368,14 +376,16 @@
"nir",
"narrow_nir",
"swir1",
"swir2"
"swir2",
"nbr",
"fmask"
]
},
{
"product": [
"s2a_ard_granule"
],
"styles_count": 17,
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
Expand All @@ -393,7 +403,9 @@
"nir",
"narrow_nir",
"swir1",
"swir2"
"swir2",
"nbr",
"fmask"
]
},
{
Expand Down Expand Up @@ -990,4 +1002,4 @@
}
],
"total_layers_count": 79
}
}
8 changes: 8 additions & 0 deletions prod/services/wms/ows_refactored/c3/style_c3_cfg.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@
# The count range for which this handler is to be used - a tuple of two ints, the smallest and
# largest date counts for which this handler will be used. Required.
"allowed_count_range": [2, 2],
# Preserve user date order
"preserve_user_date_order": True,
# A function, expressed in the standard format as described elsewhere in this example file.
# The function is assumed to take one arguments, an xarray Dataset.
# The function returns an xarray Dataset with a single band, which is the input to the
Expand Down Expand Up @@ -242,6 +244,8 @@
# The count range for which this handler is to be used - a tuple of two ints, the smallest and
# largest date counts for which this handler will be used. Required.
"allowed_count_range": [2, 2],
# Preserve user date order
"preserve_user_date_order": True,
# A function, expressed in the standard format as described elsewhere in this example file.
# The function is assumed to take one arguments, an xarray Dataset.
# The function returns an xarray Dataset with a single band, which is the input to the
Expand Down Expand Up @@ -332,6 +336,8 @@
# The count range for which this handler is to be used - a tuple of two ints, the smallest and
# largest date counts for which this handler will be used. Required.
"allowed_count_range": [2, 2],
# Preserve user date order
"preserve_user_date_order": True,
# A function, expressed in the standard format as described elsewhere in this example file.
# The function is assumed to take one arguments, an xarray Dataset.
# The function returns an xarray Dataset with a single band, which is the input to the
Expand Down Expand Up @@ -529,6 +535,8 @@
# The count range for which this handler is to be used - a tuple of two ints, the smallest and
# largest date counts for which this handler will be used. Required.
"allowed_count_range": [2, 2],
# Preserve user date order
"preserve_user_date_order": True,
# A function, expressed in the standard format as described elsewhere in this example file.
# The function is assumed to take one arguments, an xarray Dataset.
# The function returns an xarray Dataset with a single band, which is the input to the
Expand Down
54 changes: 49 additions & 5 deletions prod/services/wms/ows_refactored/sentinel2/ows_ard_cfg.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from ows_refactored.ows_reslim_cfg import reslim_wms_min_zoom_35
from ows_refactored.ows_reslim_cfg import reslim_wms_min_zoom_15_cache_rules
from ows_refactored.sentinel2.style_s2_cfg import styles_s2_list

bands_sentinel2_ard_nbart = {
Expand All @@ -7,7 +7,8 @@
"coastal_aerosol",
"nbart_coastal_aerosol",
"nbart_narrow_blue",
"nbar_narrow_blue" "narrow_blue",
"nbar_narrow_blue",
"narrow_blue",
],
"nbart_blue": ["nbar_blue", "blue", "nbart_blue"],
"nbart_green": ["nbar_green", "green", "nbart_green"],
Expand All @@ -19,6 +20,7 @@
"nbart_nir_2": ["nbar_nir_2", "nir2", "nbart_nir_2"],
"nbart_swir_2": ["nbar_swir_2", "swir_2", "nbart_swir_2"],
"nbart_swir_3": ["nbar_swir_3", "swir_3", "nbart_swir_3"],
"fmask": ["fmask"],
}

layers = {
Expand All @@ -45,13 +47,27 @@
"multi_product": True,
"product_names": ["s2a_ard_granule", "s2b_ard_granule"],
"bands": bands_sentinel2_ard_nbart,
"resource_limits": reslim_wms_min_zoom_35,
"resource_limits": reslim_wms_min_zoom_15_cache_rules,
"dynamic": True,
"image_processing": {
"extent_mask_func": "datacube_ows.ogc_utils.mask_by_val",
"always_fetch_bands": [],
"manual_merge": False,
},
"flags": [
{
"band": "fmask",
"products": ["s2a_ard_granule", "s2b_ard_granule"],
"ignore_time": False,
"ignore_info_flags": []
},
{
"band": "land",
"products": ["geodata_coast_100k", "geodata_coast_100k"],
"ignore_time": True,
"ignore_info_flags": []
},
],
"wcs": {
"native_crs": "EPSG:3577",
"native_resolution": [10.0, 10.0],
Expand All @@ -67,13 +83,27 @@
""",
"product_name": "s2b_ard_granule",
"bands": bands_sentinel2_ard_nbart,
"resource_limits": reslim_wms_min_zoom_35,
"resource_limits": reslim_wms_min_zoom_15_cache_rules,
"dynamic": True,
"image_processing": {
"extent_mask_func": "datacube_ows.ogc_utils.mask_by_val",
"always_fetch_bands": [],
"manual_merge": False,
},
"flags": [
{
"band": "fmask",
"product": "s2b_ard_granule",
"ignore_time": False,
"ignore_info_flags": []
},
{
"band": "land",
"product": "geodata_coast_100k",
"ignore_time": True,
"ignore_info_flags": []
},
],
"wcs": {
"native_crs": "EPSG:3577",
"native_resolution": [10.0, 10.0],
Expand All @@ -89,13 +119,27 @@
""",
"product_name": "s2a_ard_granule",
"bands": bands_sentinel2_ard_nbart,
"resource_limits": reslim_wms_min_zoom_35,
"resource_limits": reslim_wms_min_zoom_15_cache_rules,
"dynamic": True,
"image_processing": {
"extent_mask_func": "datacube_ows.ogc_utils.mask_by_val",
"always_fetch_bands": [],
"manual_merge": False,
},
"flags": [
{
"band": "fmask",
"product": "s2a_ard_granule",
"ignore_time": False,
"ignore_info_flags": []
},
{
"band": "land",
"product": "geodata_coast_100k",
"ignore_time": True,
"ignore_info_flags": []
},
],
"wcs": {
"native_crs": "EPSG:3577",
"native_resolution": [10.0, 10.0],
Expand Down
50 changes: 46 additions & 4 deletions prod/services/wms/ows_refactored/sentinel2/ows_nrt_cfg.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from ows_refactored.ows_reslim_cfg import reslim_wms_min_zoom_15_cache_rules
from ows_refactored.sentinel2.style_s2_cfg import (style_s2_nbr_list,
styles_s2_list)
from ows_refactored.sentinel2.style_s2_cfg import styles_s2_list

bands_sentinel2 = {
"nbar_coastal_aerosol": ["nbar_coastal_aerosol", "nbar_narrow_blue"],
Expand Down Expand Up @@ -30,6 +29,7 @@
"nbart_nir_2": ["nbart_nir_2", "nir_2", "nbart_near_infrared_2"],
"nbart_swir_2": ["nbart_swir_2", "swir_2", "nbart_shortwave_infrared_2"],
"nbart_swir_3": ["nbart_swir_3", "swir_3", "nbart_shortwave_infrared_3"],
"fmask": ["fmask"],
}

multi_layers = {
Expand Down Expand Up @@ -59,6 +59,20 @@
"always_fetch_bands": [],
"manual_merge": False,
},
"flags": [
{
"band": "fmask",
"products": ["s2a_nrt_granule", "s2b_nrt_granule"],
"ignore_time": False,
"ignore_info_flags": [],
},
{
"band": "land",
"products": ["geodata_coast_100k", "geodata_coast_100k"],
"ignore_time": True,
"ignore_info_flags": []
},
],
"wcs": {
"native_crs": "EPSG:3577",
"native_resolution": [10.0, 10.0],
Expand All @@ -68,7 +82,7 @@
"nbart_blue",
],
},
"styling": {"default_style": "simple_rgb", "styles": style_s2_nbr_list},
"styling": {"default_style": "simple_rgb", "styles": styles_s2_list},
}

s2b_layer = {
Expand Down Expand Up @@ -97,6 +111,20 @@
"always_fetch_bands": [],
"manual_merge": False,
},
"flags": [
{
"band": "fmask",
"product": "s2b_nrt_granule",
"ignore_time": False,
"ignore_info_flags": []
},
{
"band": "land",
"product": "geodata_coast_100k",
"ignore_time": True,
"ignore_info_flags": []
},
],
"wcs": {
"native_crs": "EPSG:3577",
"native_resolution": [10.0, 10.0],
Expand Down Expand Up @@ -135,6 +163,20 @@
"always_fetch_bands": [],
"manual_merge": False,
},
"flags": [
{
"band": "fmask",
"product": "s2a_nrt_granule",
"ignore_time": False,
"ignore_info_flags": []
},
{
"band": "land",
"product": "geodata_coast_100k",
"ignore_time": True,
"ignore_info_flags": []
},
],
"wcs": {
"native_crs": "EPSG:3577",
"native_resolution": [10.0, 10.0],
Expand All @@ -144,5 +186,5 @@
"nbart_blue",
],
},
"styling": {"default_style": "simple_rgb", "styles": style_s2_nbr_list},
"styling": {"default_style": "simple_rgb", "styles": styles_s2_list},
}
Loading

0 comments on commit af7a82c

Please sign in to comment.