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

PROD Deploy 2023-09-11 06:40am EST #4689

Merged
merged 2 commits into from
Sep 11, 2023
Merged

PROD Deploy 2023-09-11 06:40am EST #4689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07efd4e
Revert "Revert "FLAG-900: Undefined year causing an error in the TCL …
SARodrigues Sep 5, 2023
92f87da
Merge pull request #4685 from wri/revert-4684-revert-4681-FLAG-900-un…
SARodrigues Sep 11, 2023
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
17 changes: 7 additions & 10 deletions components/widgets/fires/tree-loss-fires-annual/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ import {

import getWidgetProps from './selectors';

const MAX_YEAR = 2022;
const MIN_YEAR = 2001;

const getGlobalLocation = (params) => ({
adm0: params.type === 'global' ? null : params.adm0,
adm1: params.type === 'global' ? null : params.adm1,
Expand Down Expand Up @@ -638,9 +635,11 @@ export default {
settings: {
threshold: 30,
ifl: 2000,
startYear: 2001,
endYear: 2022,
},
getData: (params = {}) => {
const { adm0, adm1, adm2, type } = params || {};
const { adm0, adm1, adm2, type, startYear, endYear } = params || {};

const globalLocation = {
adm0: type === 'global' ? null : adm0,
Expand All @@ -666,19 +665,17 @@ export default {
};
}

const { startYear, endYear, range } = getYearsRangeFromMinMax(
MIN_YEAR,
MAX_YEAR
);
const { range: yearsRange } = getYearsRangeFromMinMax(startYear, endYear);

return {
...data,
settings: {
startYear,
endYear,
yearsRange: range,
yearsRange,
},
options: {
years: range,
years: yearsRange,
},
};
});
Expand Down
4 changes: 3 additions & 1 deletion services/analysis-cached.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const SQL_QUERIES = {
lossFires:
'SELECT {select_location}, umd_tree_cover_loss__year, SUM(umd_tree_cover_loss__ha) AS umd_tree_cover_loss__ha, SUM(umd_tree_cover_loss_from_fires__ha) AS "umd_tree_cover_loss_from_fires__ha" FROM data {WHERE} GROUP BY umd_tree_cover_loss__year, {location} ORDER BY umd_tree_cover_loss__year, {location}',
lossFiresOTF:
'SELECT umd_tree_cover_loss__year, sum(umd_tree_cover_loss__ha), sum(umd_tree_cover_loss_from_fires__ha) FROM data WHERE umd_tree_cover_loss__year >= {startYear} AND umd_tree_cover_loss__year <= {endYear} AND umd_tree_cover_density_2000__threshold >= 30 GROUP BY umd_tree_cover_loss__year',
'SELECT umd_tree_cover_loss__year, sum(umd_tree_cover_loss__ha), sum(umd_tree_cover_loss_from_fires__ha) FROM data WHERE umd_tree_cover_loss__year >= {startYear} AND umd_tree_cover_loss__year <= {endYear} AND umd_tree_cover_density_2000__threshold >= {threshold} GROUP BY umd_tree_cover_loss__year',
emissions:
'SELECT {select_location}, umd_tree_cover_loss__year, SUM("gfw_gross_emissions_co2e_all_gases__Mg") AS "gfw_gross_emissions_co2e_all_gases__Mg", SUM("gfw_full_extent_gross_emissions_non_CO2__Mg_CO2e") AS "gfw_gross_emissions_co2e_non_co2__Mg", SUM("gfw_full_extent_gross_emissions_CO2_only__Mg_CO2") AS "gfw_gross_emissions_co2e_co2_only__Mg" FROM data {WHERE} GROUP BY umd_tree_cover_loss__year, {location} ORDER BY umd_tree_cover_loss__year, {location}',
emissionsLossOTF:
Expand Down Expand Up @@ -817,6 +817,7 @@ export const getLossFiresOTF = (params) => {
geostore,
startYear,
endYear,
threshold,
} = params || {};

const geostoreId = geostore.id || adm0;
Expand All @@ -827,6 +828,7 @@ export const getLossFiresOTF = (params) => {
`${urlBase + sql}&geostore_id=${geostoreId}`
.replace('{startYear}', startYear)
.replace('{endYear}', endYear)
.replace('{threshold}', threshold)
);

if (download) {
Expand Down
Loading