Skip to content

Commit f7ee7a9

Browse files
JM-GAJM-GA
authored
Merge pull request #1128 from GeoscienceAustralia/s2-c1-ows-prod-decommission
Decommission C1 Sentinel-2 prod OWS layers
2 parents 4ceb2d3 + 22341bf commit f7ee7a9

File tree

10 files changed

+48
-1257
lines changed

10 files changed

+48
-1257
lines changed

‎dev/terria/dea-maps-v8.json

Lines changed: 6 additions & 289 deletions
Large diffs are not rendered by default.

‎prod/services/wms/inventory.json

Lines changed: 1 addition & 256 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"total_layers_count": 73,
2+
"total_layers_count": 64,
33
"layers": [
44
{
55
"layer": "ga_ls_ard_3",
@@ -25,35 +25,6 @@
2525
"fmask"
2626
]
2727
},
28-
{
29-
"layer": "s2_nrt_granule_nbar_t",
30-
"product": [
31-
"s2a_nrt_granule",
32-
"s2b_nrt_granule"
33-
],
34-
"styles_count": 19,
35-
"styles_list": [
36-
"simple_rgb",
37-
"infrared_green",
38-
"ndvi",
39-
"ndwi",
40-
"mndwi",
41-
"ndci",
42-
"nbr",
43-
"aerosol",
44-
"blue",
45-
"green",
46-
"red",
47-
"red_edge_1",
48-
"red_edge_2",
49-
"red_edge_3",
50-
"nir",
51-
"narrow_nir",
52-
"swir1",
53-
"swir2",
54-
"fmask"
55-
]
56-
},
5728
{
5829
"layer": "ga_s2m_ard_3",
5930
"product": [
@@ -145,35 +116,6 @@
145116
"s2cloudless_prob"
146117
]
147118
},
148-
{
149-
"layer": "s2_ard_granule_nbar_t",
150-
"product": [
151-
"s2a_ard_granule",
152-
"s2b_ard_granule"
153-
],
154-
"styles_count": 19,
155-
"styles_list": [
156-
"simple_rgb",
157-
"infrared_green",
158-
"ndvi",
159-
"ndwi",
160-
"mndwi",
161-
"ndci",
162-
"nbr",
163-
"aerosol",
164-
"blue",
165-
"green",
166-
"red",
167-
"red_edge_1",
168-
"red_edge_2",
169-
"red_edge_3",
170-
"nir",
171-
"narrow_nir",
172-
"swir1",
173-
"swir2",
174-
"fmask"
175-
]
176-
},
177119
{
178120
"layer": "ga_ls8c_nbart_gm_cyear_3",
179121
"product": [
@@ -391,203 +333,6 @@
391333
"fmask"
392334
]
393335
},
394-
{
395-
"layer": "s2b_nrt_granule_nbar_t",
396-
"product": [
397-
"s2b_nrt_granule"
398-
],
399-
"styles_count": 19,
400-
"styles_list": [
401-
"simple_rgb",
402-
"infrared_green",
403-
"ndvi",
404-
"ndwi",
405-
"mndwi",
406-
"ndci",
407-
"nbr",
408-
"aerosol",
409-
"blue",
410-
"green",
411-
"red",
412-
"red_edge_1",
413-
"red_edge_2",
414-
"red_edge_3",
415-
"nir",
416-
"narrow_nir",
417-
"swir1",
418-
"swir2",
419-
"fmask"
420-
]
421-
},
422-
{
423-
"layer": "s2a_nrt_granule_nbar_t",
424-
"product": [
425-
"s2a_nrt_granule"
426-
],
427-
"styles_count": 19,
428-
"styles_list": [
429-
"simple_rgb",
430-
"infrared_green",
431-
"ndvi",
432-
"ndwi",
433-
"mndwi",
434-
"ndci",
435-
"nbr",
436-
"aerosol",
437-
"blue",
438-
"green",
439-
"red",
440-
"red_edge_1",
441-
"red_edge_2",
442-
"red_edge_3",
443-
"nir",
444-
"narrow_nir",
445-
"swir1",
446-
"swir2",
447-
"fmask"
448-
]
449-
},
450-
{
451-
"layer": "s2_nrt_provisional_granule_nbar_t",
452-
"product": [
453-
"ga_s2am_ard_provisional_3",
454-
"ga_s2bm_ard_provisional_3"
455-
],
456-
"styles_count": 19,
457-
"styles_list": [
458-
"simple_rgb",
459-
"infrared_green",
460-
"ndvi",
461-
"ndwi",
462-
"mndwi",
463-
"ndci",
464-
"nbr",
465-
"aerosol",
466-
"blue",
467-
"green",
468-
"red",
469-
"red_edge_1",
470-
"red_edge_2",
471-
"red_edge_3",
472-
"nir",
473-
"narrow_nir",
474-
"swir1",
475-
"swir2",
476-
"fmask"
477-
]
478-
},
479-
{
480-
"layer": "s2b_nrt_provisional_granule_nbar_t",
481-
"product": [
482-
"ga_s2bm_ard_provisional_3"
483-
],
484-
"styles_count": 19,
485-
"styles_list": [
486-
"simple_rgb",
487-
"infrared_green",
488-
"ndvi",
489-
"ndwi",
490-
"mndwi",
491-
"ndci",
492-
"nbr",
493-
"aerosol",
494-
"blue",
495-
"green",
496-
"red",
497-
"red_edge_1",
498-
"red_edge_2",
499-
"red_edge_3",
500-
"nir",
501-
"narrow_nir",
502-
"swir1",
503-
"swir2",
504-
"fmask"
505-
]
506-
},
507-
{
508-
"layer": "s2a_nrt_provisional_granule_nbar_t",
509-
"product": [
510-
"ga_s2am_ard_provisional_3"
511-
],
512-
"styles_count": 19,
513-
"styles_list": [
514-
"simple_rgb",
515-
"infrared_green",
516-
"ndvi",
517-
"ndwi",
518-
"mndwi",
519-
"ndci",
520-
"nbr",
521-
"aerosol",
522-
"blue",
523-
"green",
524-
"red",
525-
"red_edge_1",
526-
"red_edge_2",
527-
"red_edge_3",
528-
"nir",
529-
"narrow_nir",
530-
"swir1",
531-
"swir2",
532-
"fmask"
533-
]
534-
},
535-
{
536-
"layer": "s2a_ard_granule_nbar_t",
537-
"product": [
538-
"s2a_ard_granule"
539-
],
540-
"styles_count": 19,
541-
"styles_list": [
542-
"simple_rgb",
543-
"infrared_green",
544-
"ndvi",
545-
"ndwi",
546-
"mndwi",
547-
"ndci",
548-
"nbr",
549-
"aerosol",
550-
"blue",
551-
"green",
552-
"red",
553-
"red_edge_1",
554-
"red_edge_2",
555-
"red_edge_3",
556-
"nir",
557-
"narrow_nir",
558-
"swir1",
559-
"swir2",
560-
"fmask"
561-
]
562-
},
563-
{
564-
"layer": "s2b_ard_granule_nbar_t",
565-
"product": [
566-
"s2b_ard_granule"
567-
],
568-
"styles_count": 19,
569-
"styles_list": [
570-
"simple_rgb",
571-
"infrared_green",
572-
"ndvi",
573-
"ndwi",
574-
"mndwi",
575-
"ndci",
576-
"nbr",
577-
"aerosol",
578-
"blue",
579-
"green",
580-
"red",
581-
"red_edge_1",
582-
"red_edge_2",
583-
"red_edge_3",
584-
"nir",
585-
"narrow_nir",
586-
"swir1",
587-
"swir2",
588-
"fmask"
589-
]
590-
},
591336
{
592337
"layer": "ga_ls_fc_3",
593338
"product": [

‎prod/services/wms/ows_refactored/baseline_satellite_data/ows_category_root_cfg.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,10 @@
66
"include": "ows_refactored.baseline_satellite_data.landsat.ows_c3_cfg.combined_layer",
77
"type": "python",
88
},
9-
{
10-
"include": "ows_refactored.baseline_satellite_data.sentinel2.ows_nrt_cfg.combined_layer",
11-
"type": "python",
12-
},
139
{
1410
"include": "ows_refactored.baseline_satellite_data.sentinel2.ows_ard_cfg.combined_layer",
1511
"type": "python",
1612
},
17-
{
18-
"include": "ows_refactored.baseline_satellite_data.sentinel2.ows_ard_c3_cfg.combined_layer",
19-
"type": "python",
20-
},
2113
{
2214
"include": "ows_refactored.baseline_satellite_data.landsat_annual.ows_landsat_annual_cfg.layers",
2315
"type": "python",

‎prod/services/wms/ows_refactored/baseline_satellite_data/sentinel2/band_s2_cfg.py

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,4 @@
11
bands_sentinel2 = {
2-
"nbar_coastal_aerosol": ["nbar_coastal_aerosol", "nbar_narrow_blue"],
3-
"nbar_blue": ["nbar_blue"],
4-
"nbar_green": ["nbar_green"],
5-
"nbar_red": ["nbar_red"],
6-
"nbar_red_edge_1": ["nbar_red_edge_1"],
7-
"nbar_red_edge_2": ["nbar_red_edge_2"],
8-
"nbar_red_edge_3": ["nbar_red_edge_3"],
9-
"nbar_nir_1": ["nbar_nir_1", "nbar_near_infrared_1"],
10-
"nbar_nir_2": ["nbar_nir_2", "nbar_near_infrared_2"],
11-
"nbar_swir_2": ["nbar_swir_2", "nbar_shortwave_infrared_2"],
12-
"nbar_swir_3": ["nbar_swir_3", "nbar_shortwave_infrared_3"],
13-
"nbart_coastal_aerosol": [
14-
"nbart_coastal_aerosol",
15-
"coastal_aerosol",
16-
"nbart_narrow_blue",
17-
"narrow_blue",
18-
],
19-
"nbart_blue": ["nbart_blue", "blue"],
20-
"nbart_green": ["nbart_green", "green"],
21-
"nbart_red": ["nbart_red", "red"],
22-
"nbart_red_edge_1": ["nbart_red_edge_1", "red_edge_1"],
23-
"nbart_red_edge_2": ["nbart_red_edge_2", "red_edge_2"],
24-
"nbart_red_edge_3": ["nbart_red_edge_3", "red_edge_3"],
25-
"nbart_nir_1": ["nbart_nir_1", "nir", "nir_1", "nbart_near_infrared_1"],
26-
"nbart_nir_2": ["nbart_nir_2", "nir_2", "nbart_near_infrared_2"],
27-
"nbart_swir_2": ["nbart_swir_2", "swir_2", "nbart_shortwave_infrared_2"],
28-
"nbart_swir_3": ["nbart_swir_3", "swir_3", "nbart_shortwave_infrared_3"],
29-
"fmask": ["fmask"]
30-
}
31-
32-
bands_sentinel2_c3 = {
332
"nbart_coastal_aerosol": [
343
"nbart_coastal_aerosol",
354
"coastal_aerosol",
@@ -50,45 +19,3 @@
5019
"oa_s2cloudless_mask": ["oa_s2cloudless_mask", "s2cloudless_mask"],
5120
"oa_s2cloudless_prob": ["oa_s2cloudless_prob", "s2cloudless_prob"],
5221
}
53-
54-
bands_sentinel2_provisional = {
55-
"nbart_coastal_aerosol": [
56-
"nbart_coastal_aerosol",
57-
"coastal_aerosol",
58-
"nbart_narrow_blue",
59-
"narrow_blue",
60-
],
61-
"nbart_blue": ["nbart_blue", "blue"],
62-
"nbart_green": ["nbart_green", "green"],
63-
"nbart_red": ["nbart_red", "red"],
64-
"nbart_red_edge_1": ["nbart_red_edge_1", "red_edge_1"],
65-
"nbart_red_edge_2": ["nbart_red_edge_2", "red_edge_2"],
66-
"nbart_red_edge_3": ["nbart_red_edge_3", "red_edge_3"],
67-
"nbart_nir_1": ["nbart_nir_1", "nir", "nir_1", "nbart_near_infrared_1"],
68-
"nbart_nir_2": ["nbart_nir_2", "nir_2", "nbart_near_infrared_2"],
69-
"nbart_swir_2": ["nbart_swir_2", "swir_2", "nbart_shortwave_infrared_2"],
70-
"nbart_swir_3": ["nbart_swir_3", "swir_3", "nbart_shortwave_infrared_3"],
71-
"oa_fmask": ["oa_fmask", "fmask"],
72-
}
73-
74-
bands_sentinel2_ard_nbart = {
75-
"nbart_coastal_aerosol": [
76-
"nbar_coastal_aerosol",
77-
"coastal_aerosol",
78-
"nbart_coastal_aerosol",
79-
"nbart_narrow_blue",
80-
"nbar_narrow_blue",
81-
"narrow_blue",
82-
],
83-
"nbart_blue": ["nbar_blue", "blue", "nbart_blue"],
84-
"nbart_green": ["nbar_green", "green", "nbart_green"],
85-
"nbart_red": ["nbar_red", "red", "nbart_red"],
86-
"nbart_red_edge_1": ["nbar_red_edge_1", "red_edge_1", "nbart_red_edge_1"],
87-
"nbart_red_edge_2": ["nbar_red_edge_2", "red_edge_2", "nbart_red_edge_2"],
88-
"nbart_red_edge_3": ["nbar_red_edge_3", "red_edge_3", "nbart_red_edge_3"],
89-
"nbart_nir_1": ["nbar_nir_1", "nir", "nir_1", "nbart_nir_1"],
90-
"nbart_nir_2": ["nbar_nir_2", "nir2", "nbart_nir_2"],
91-
"nbart_swir_2": ["nbar_swir_2", "swir_2", "nbart_swir_2"],
92-
"nbart_swir_3": ["nbar_swir_3", "swir_3", "nbart_swir_3"],
93-
"fmask": ["fmask"],
94-
}

0 commit comments

Comments
 (0)