Skip to content

Commit

Permalink
Merge pull request #1128 from GeoscienceAustralia/s2-c1-ows-prod-deco…
Browse files Browse the repository at this point in the history 
…mmission

Decommission C1 Sentinel-2 prod OWS layers
  • Loading branch information
@JM-GA
JM-GA authored Jan 18, 2023
2 parents 4ceb2d3 + 22341bf commit f7ee7a9
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 1,257 deletions.
295 changes: 6 additions & 289 deletions dev/terria/dea-maps-v8.json
View file

Large diffs are not rendered by default.

257 changes: 1 addition & 256 deletions prod/services/wms/inventory.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"total_layers_count": 73,
"total_layers_count": 64,
"layers": [
{
"layer": "ga_ls_ard_3",
Expand All @@ -25,35 +25,6 @@
"fmask"
]
},
{
"layer": "s2_nrt_granule_nbar_t",
"product": [
"s2a_nrt_granule",
"s2b_nrt_granule"
],
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
"ndvi",
"ndwi",
"mndwi",
"ndci",
"nbr",
"aerosol",
"blue",
"green",
"red",
"red_edge_1",
"red_edge_2",
"red_edge_3",
"nir",
"narrow_nir",
"swir1",
"swir2",
"fmask"
]
},
{
"layer": "ga_s2m_ard_3",
"product": [
Expand Down Expand Up @@ -145,35 +116,6 @@
"s2cloudless_prob"
]
},
{
"layer": "s2_ard_granule_nbar_t",
"product": [
"s2a_ard_granule",
"s2b_ard_granule"
],
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
"ndvi",
"ndwi",
"mndwi",
"ndci",
"nbr",
"aerosol",
"blue",
"green",
"red",
"red_edge_1",
"red_edge_2",
"red_edge_3",
"nir",
"narrow_nir",
"swir1",
"swir2",
"fmask"
]
},
{
"layer": "ga_ls8c_nbart_gm_cyear_3",
"product": [
Expand Down Expand Up @@ -391,203 +333,6 @@
"fmask"
]
},
{
"layer": "s2b_nrt_granule_nbar_t",
"product": [
"s2b_nrt_granule"
],
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
"ndvi",
"ndwi",
"mndwi",
"ndci",
"nbr",
"aerosol",
"blue",
"green",
"red",
"red_edge_1",
"red_edge_2",
"red_edge_3",
"nir",
"narrow_nir",
"swir1",
"swir2",
"fmask"
]
},
{
"layer": "s2a_nrt_granule_nbar_t",
"product": [
"s2a_nrt_granule"
],
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
"ndvi",
"ndwi",
"mndwi",
"ndci",
"nbr",
"aerosol",
"blue",
"green",
"red",
"red_edge_1",
"red_edge_2",
"red_edge_3",
"nir",
"narrow_nir",
"swir1",
"swir2",
"fmask"
]
},
{
"layer": "s2_nrt_provisional_granule_nbar_t",
"product": [
"ga_s2am_ard_provisional_3",
"ga_s2bm_ard_provisional_3"
],
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
"ndvi",
"ndwi",
"mndwi",
"ndci",
"nbr",
"aerosol",
"blue",
"green",
"red",
"red_edge_1",
"red_edge_2",
"red_edge_3",
"nir",
"narrow_nir",
"swir1",
"swir2",
"fmask"
]
},
{
"layer": "s2b_nrt_provisional_granule_nbar_t",
"product": [
"ga_s2bm_ard_provisional_3"
],
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
"ndvi",
"ndwi",
"mndwi",
"ndci",
"nbr",
"aerosol",
"blue",
"green",
"red",
"red_edge_1",
"red_edge_2",
"red_edge_3",
"nir",
"narrow_nir",
"swir1",
"swir2",
"fmask"
]
},
{
"layer": "s2a_nrt_provisional_granule_nbar_t",
"product": [
"ga_s2am_ard_provisional_3"
],
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
"ndvi",
"ndwi",
"mndwi",
"ndci",
"nbr",
"aerosol",
"blue",
"green",
"red",
"red_edge_1",
"red_edge_2",
"red_edge_3",
"nir",
"narrow_nir",
"swir1",
"swir2",
"fmask"
]
},
{
"layer": "s2a_ard_granule_nbar_t",
"product": [
"s2a_ard_granule"
],
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
"ndvi",
"ndwi",
"mndwi",
"ndci",
"nbr",
"aerosol",
"blue",
"green",
"red",
"red_edge_1",
"red_edge_2",
"red_edge_3",
"nir",
"narrow_nir",
"swir1",
"swir2",
"fmask"
]
},
{
"layer": "s2b_ard_granule_nbar_t",
"product": [
"s2b_ard_granule"
],
"styles_count": 19,
"styles_list": [
"simple_rgb",
"infrared_green",
"ndvi",
"ndwi",
"mndwi",
"ndci",
"nbr",
"aerosol",
"blue",
"green",
"red",
"red_edge_1",
"red_edge_2",
"red_edge_3",
"nir",
"narrow_nir",
"swir1",
"swir2",
"fmask"
]
},
{
"layer": "ga_ls_fc_3",
"product": [
Expand Down
8 changes: 0 additions & 8 deletions prod/services/wms/ows_refactored/baseline_satellite_data/ows_category_root_cfg.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,10 @@
"include": "ows_refactored.baseline_satellite_data.landsat.ows_c3_cfg.combined_layer",
"type": "python",
},
{
"include": "ows_refactored.baseline_satellite_data.sentinel2.ows_nrt_cfg.combined_layer",
"type": "python",
},
{
"include": "ows_refactored.baseline_satellite_data.sentinel2.ows_ard_cfg.combined_layer",
"type": "python",
},
{
"include": "ows_refactored.baseline_satellite_data.sentinel2.ows_ard_c3_cfg.combined_layer",
"type": "python",
},
{
"include": "ows_refactored.baseline_satellite_data.landsat_annual.ows_landsat_annual_cfg.layers",
"type": "python",
Expand Down
73 changes: 0 additions & 73 deletions prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/band_s2_cfg.py
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,4 @@
bands_sentinel2 = {
"nbar_coastal_aerosol": ["nbar_coastal_aerosol", "nbar_narrow_blue"],
"nbar_blue": ["nbar_blue"],
"nbar_green": ["nbar_green"],
"nbar_red": ["nbar_red"],
"nbar_red_edge_1": ["nbar_red_edge_1"],
"nbar_red_edge_2": ["nbar_red_edge_2"],
"nbar_red_edge_3": ["nbar_red_edge_3"],
"nbar_nir_1": ["nbar_nir_1", "nbar_near_infrared_1"],
"nbar_nir_2": ["nbar_nir_2", "nbar_near_infrared_2"],
"nbar_swir_2": ["nbar_swir_2", "nbar_shortwave_infrared_2"],
"nbar_swir_3": ["nbar_swir_3", "nbar_shortwave_infrared_3"],
"nbart_coastal_aerosol": [
"nbart_coastal_aerosol",
"coastal_aerosol",
"nbart_narrow_blue",
"narrow_blue",
],
"nbart_blue": ["nbart_blue", "blue"],
"nbart_green": ["nbart_green", "green"],
"nbart_red": ["nbart_red", "red"],
"nbart_red_edge_1": ["nbart_red_edge_1", "red_edge_1"],
"nbart_red_edge_2": ["nbart_red_edge_2", "red_edge_2"],
"nbart_red_edge_3": ["nbart_red_edge_3", "red_edge_3"],
"nbart_nir_1": ["nbart_nir_1", "nir", "nir_1", "nbart_near_infrared_1"],
"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"]
}

bands_sentinel2_c3 = {
"nbart_coastal_aerosol": [
"nbart_coastal_aerosol",
"coastal_aerosol",
Expand All @@ -50,45 +19,3 @@
"oa_s2cloudless_mask": ["oa_s2cloudless_mask", "s2cloudless_mask"],
"oa_s2cloudless_prob": ["oa_s2cloudless_prob", "s2cloudless_prob"],
}

bands_sentinel2_provisional = {
"nbart_coastal_aerosol": [
"nbart_coastal_aerosol",
"coastal_aerosol",
"nbart_narrow_blue",
"narrow_blue",
],
"nbart_blue": ["nbart_blue", "blue"],
"nbart_green": ["nbart_green", "green"],
"nbart_red": ["nbart_red", "red"],
"nbart_red_edge_1": ["nbart_red_edge_1", "red_edge_1"],
"nbart_red_edge_2": ["nbart_red_edge_2", "red_edge_2"],
"nbart_red_edge_3": ["nbart_red_edge_3", "red_edge_3"],
"nbart_nir_1": ["nbart_nir_1", "nir", "nir_1", "nbart_near_infrared_1"],
"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"],
"oa_fmask": ["oa_fmask", "fmask"],
}

bands_sentinel2_ard_nbart = {
"nbart_coastal_aerosol": [
"nbar_coastal_aerosol",
"coastal_aerosol",
"nbart_coastal_aerosol",
"nbart_narrow_blue",
"nbar_narrow_blue",
"narrow_blue",
],
"nbart_blue": ["nbar_blue", "blue", "nbart_blue"],
"nbart_green": ["nbar_green", "green", "nbart_green"],
"nbart_red": ["nbar_red", "red", "nbart_red"],
"nbart_red_edge_1": ["nbar_red_edge_1", "red_edge_1", "nbart_red_edge_1"],
"nbart_red_edge_2": ["nbar_red_edge_2", "red_edge_2", "nbart_red_edge_2"],
"nbart_red_edge_3": ["nbar_red_edge_3", "red_edge_3", "nbart_red_edge_3"],
"nbart_nir_1": ["nbar_nir_1", "nir", "nir_1", "nbart_nir_1"],
"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"],
}
Loading

0 comments on commit f7ee7a9

Please sign in to comment.