From 6491a39a23018a5ef137fb70ee2b9c53a1c03826 Mon Sep 17 00:00:00 2001 From: Simao Rodrigues Date: Fri, 1 Sep 2023 11:20:02 +0100 Subject: [PATCH] getLossFiresOTF analysis function to make use of the threshold setting --- services/analysis-cached.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/analysis-cached.js b/services/analysis-cached.js index f9bce06026..299ee31820 100644 --- a/services/analysis-cached.js +++ b/services/analysis-cached.js @@ -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: @@ -817,6 +817,7 @@ export const getLossFiresOTF = (params) => { geostore, startYear, endYear, + threshold, } = params || {}; const geostoreId = geostore.id || adm0; @@ -827,6 +828,7 @@ export const getLossFiresOTF = (params) => { `${urlBase + sql}&geostore_id=${geostoreId}` .replace('{startYear}', startYear) .replace('{endYear}', endYear) + .replace('{threshold}', threshold) ); if (download) {