Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Landcover Release Dev Test #1299

Merged
merged 9 commits into from
Nov 19, 2024
Merged

Landcover Release Dev Test #1299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c7c957
Update ga_ls7_landcover_inter_class_cyear_3.yaml
JM-GA Nov 15, 2024
22e71b4
Update ga_ls8ls9_landcover_inter_class_cyear_3.yaml
JM-GA Nov 15, 2024
cfa46c5
Update srtm_landcover_dem.yaml
JM-GA Nov 15, 2024
031d3ad
Update terria-cube-v8.json
JM-GA Nov 18, 2024
ea1e2b1
Update terria-cube-v8.json
JM-GA Nov 18, 2024
1937fb3
Update terria-cube-v8.json
JM-GA Nov 19, 2024
cfed18b
Update ows_c3_lc_cyear_cfg.py
JM-GA Nov 19, 2024
535a366
Merge branch 'master' into landcover
JM-GA Nov 19, 2024
045f589
Update ows_c3_lc_cyear_cfg.py
JM-GA Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dev/services/odc-stats/lccs/ga_ls7_landcover_inter_class_cyear_3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ plugin_config:
measurements: [level_3_4, water_season]

product:
name: ga_ls5_landcover_inter_class_cyear_3
short_name: ga_ls5_landcover_inter_class_cyear_3
name: ga_ls7_landcover_inter_class_cyear_3
short_name: ga_ls7_landcover_inter_class_cyear_3
version: 1.0.0
product_family: lc

Expand Down Expand Up @@ -86,7 +86,7 @@ cog_opts:
zlevel: 9
apply_eodatasets3: True
output_location: >-
s3://dea-public-data-dev/derivative/ga_ls5_landcover_inter_class_cyear_3/1-0-0
s3://dea-public-data-dev/derivative/ga_ls7_landcover_inter_class_cyear_3/1-0-0

# save-tasks options
input_products: ga_ls7e_gm_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/derivative/srtm_landcover_dem/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0/
Expand Down
6 changes: 3 additions & 3 deletions dev/services/odc-stats/lccs/ga_ls8ls9_landcover_inter_class_cyear_3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ plugin_config:
measurements: [level_3_4, water_season]

product:
name: ga_ls5_landcover_inter_class_cyear_3
short_name: ga_ls5_landcover_inter_class_cyear_3
name: ga_ls8ls9_landcover_inter_class_cyear_3
short_name: ga_ls8ls9_landcover_inter_class_cyear_3
version: 1.0.0
product_family: lc

Expand Down Expand Up @@ -86,7 +86,7 @@ cog_opts:
zlevel: 9
apply_eodatasets3: True
output_location: >-
s3://dea-public-data-dev/derivative/ga_ls5_landcover_inter_class_cyear_3/1-0-0
s3://dea-public-data-dev/derivative/ga_ls8ls9_landcover_inter_class_cyear_3/1-0-0

# save-tasks options
input_products: ga_ls8cls9c_gm_cyear_3+ga_ls_wo_fq_cyear_3+s3://dea-public-data-dev/derivative/ga_ls_landcover_vwf_cyear_3/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_mangrove_cover_cyear_3/4-0-0/+s3://dea-public-data-dev/derivative/srtm_landcover_dem/1-0-0/+s3://dea-public-data-dev/derivative/ga_ls_landcover_nidem_myear_2/1-0-0/
Expand Down
2 changes: 1 addition & 1 deletion dev/services/odc-stats/lccs/srtm_landcover_dem.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ cog_opts:
zlevel: 9
apply_eodatasets3: True
output_location: >-
s3://dea-public-data-dev/derivative/lccs/srtm_landcover_dem/1-0-0
s3://dea-public-data-dev/derivative/srtm_landcover_dem/1-0-0

# save-tasks options
input_products: ga_srtm_dem1sv1_0
Expand Down
15 changes: 7 additions & 8 deletions dev/services/wms/ows_refactored/land_and_vegetation/landcover/ows_c3_lc_cyear_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,14 +285,13 @@
"default_style": "canopyco",
"styles": [style_c3_level4_canopyco, style_c3_level4_lifeform, style_c3_level4_watersea, style_c3_level4_waterper, style_c3_level4_baregrad],
},
# Remove labels for now while testing new styling
# "feature_info": {
# "include_custom": {
# "description": {
# "function": "ows_refactored.land_and_vegetation.landcover.lc_class_desc.env_descriptor_labels",
# }
# }
# }
"feature_info": {
"include_custom": {
"description": {
"function": "ows_refactored.land_and_vegetation.landcover.lc_class_desc.class_labels",
}
}
}
}
]
}
45 changes: 43 additions & 2 deletions dev/terria/terria-cube-v8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@
"members": [
{
"type": "wms",
"name": "DEA Land Cover (Landsat)",
"name": "DEA Land Cover C2 (Landsat)",
"url": "https://ows.dev.dea.ga.gov.au/",
"opacity": 1,
"layers": "ga_ls_landcover",
Expand All @@ -415,7 +415,7 @@
},
{
"type": "wms",
"name": "DEA Land Cover Descriptors (Landsat)",
"name": "DEA Land Cover Descriptors C2 (Landsat)",
"url": "https://ows.dev.dea.ga.gov.au/",
"opacity": 1,
"layers": "ga_ls_landcover_descriptors",
Expand All @@ -432,6 +432,47 @@
},
"dateFormat": "'Year: 'yyyy",
"id": "wejk58"
},
{
"type": "wms",
"name": "DEA Land Cover C3 (Landsat)",
"url": "https://ows.dev.dea.ga.gov.au/",
"opacity": 1,
"layers": "ga_ls_landcover_c3",
"styles": "level4",
"linkedWcsUrl": "https://ows.dev.dea.ga.gov.au/",
"linkedWcsCoverage": "ga_ls_landcover_c3",
"chartColor": "white",
"leafletUpdateInterval": 750,
"chartType": "momentPoints",
"tileErrorHandlingOptions": {
"ignoreUnknownTileErrors": true
},
"featureInfoTemplate": {
"template": "<div style='width:480px'><h3 style='font-weight:normal'>Digital Earth Australia Land Cover</h3>Annual land cover for selected location, {{#terria.formatDateTime}}{format: \"yyyy\"}{{data.0.time}}{{/terria.formatDateTime}}<br/><br/>Base class: {{data.0.description.level3_label}}<br/><br/>Full classification: {{data.0.description.level4_label}}<br/><br/></div>"
},
"dateFormat": "'Year: 'yyyy",
"id": "546erz"
},
{
"type": "wms",
"name": "DEA Land Cover Descriptors C3 (Landsat)",
"url": "https://ows.dev.dea.ga.gov.au/",
"opacity": 1,
"layers": "ga_ls_landcover_c3_descriptors",
"linkedWcsUrl": "https://ows.dev.dea.ga.gov.au/",
"linkedWcsCoverage": "ga_ls_landcover_c3_descriptors_c3",
"chartColor": "white",
"leafletUpdateInterval": 750,
"chartType": "momentPoints",
"tileErrorHandlingOptions": {
"ignoreUnknownTileErrors": true
},
"featureInfoTemplate": {
"template": "<div style='width:480px'><h3 style='font-weight:normal'>Digital Earth Australia Land Cover</h3>Annual land cover for selected location, {{#terria.formatDateTime}}{format: \"yyyy\"}{{data.0.time}}{{/terria.formatDateTime}}<br/><br/>Base class: {{data.0.description.level3_label}}<br/><br/>Full classification: {{data.0.description.level4_label}}<br/><br/></div>"
},
"dateFormat": "'Year: 'yyyy",
"id": "wejk59"
}
]
},
Expand Down
Loading