From 55a6f2bfe24de392a0ed3bde05020f3650806e66 Mon Sep 17 00:00:00 2001 From: "Adam J. Pain" Date: Fri, 18 May 2018 12:44:07 +0200 Subject: [PATCH] Fixes data issue with fao pie chart --- .../widgets/land-cover/fao-cover/selectors.js | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/app/javascript/components/widgets/widgets/land-cover/fao-cover/selectors.js b/app/javascript/components/widgets/widgets/land-cover/fao-cover/selectors.js index b4a9cc3b89..b400990e79 100644 --- a/app/javascript/components/widgets/widgets/land-cover/fao-cover/selectors.js +++ b/app/javascript/components/widgets/widgets/land-cover/fao-cover/selectors.js @@ -1,7 +1,6 @@ import { createSelector } from 'reselect'; import isEmpty from 'lodash/isEmpty'; import { format } from 'd3-format'; -import { getColorPalette } from 'utils/data'; // get list data const getData = state => state.data || null; @@ -16,31 +15,39 @@ export const parseData = createSelector( if (isEmpty(data)) return null; const { area_ha, + extent, planted_forest, forest_primary, forest_regenerated } = data; - const colorRange = getColorPalette(colors.ramp, 3); - const nonForest = - area_ha - (forest_regenerated + forest_primary + planted_forest); + const colorRange = colors.ramp; + const otherCover = + extent - (forest_regenerated + forest_primary + planted_forest); + const nonForest = area_ha - extent; return [ { - label: 'Naturally regenerated Forest', + label: 'Naturally Regenerated Forest', value: forest_regenerated, percentage: forest_regenerated / area_ha * 100, - color: colorRange[0] + color: colorRange[1] }, { label: 'Primary Forest', value: forest_primary, percentage: forest_primary / area_ha * 100, - color: colorRange[1] + color: colorRange[2] }, { label: 'Planted Forest', value: planted_forest, percentage: planted_forest / area_ha * 100, - color: colorRange[2] + color: colorRange[4] + }, + { + label: 'Other Tree Cover', + value: otherCover, + percentage: otherCover / area_ha * 100, + color: colorRange[6] }, { label: 'Non-Forest',