Merge pull request #3416 from Vizzuality/feature/plantation-sentence

Plantations Extent Sentence

Author: edbrett

app/javascript/components/widgets/widgets/land-cover/primary-forest/selectors.js

@@ -46,7 +46,7 @@ export const parseData = createSelector(
 export const getSentence = createSelector(
   [parseData, getSettings, getCurrentLocation, getIndicator, getSentences],
   (parsedData, settings, currentLabel, indicator, sentences) => {
-    if (!parsedData || !currentLabel || !indicator) return null;
+    if (!parsedData || !currentLabel) return null;
     const { initial, withIndicator } = sentences;
     const totalExtent = parsedData
       .filter(d => d.label !== 'Non-Forest')
@@ -57,8 +57,8 @@ export const getSentence = createSelector(
       totalExtent *
       100;
 
-    let indicatorLabel = indicator.label;
-    switch (indicator.value) {
+    let indicatorLabel = indicator && indicator.label;
+    switch (indicator && indicator.value) {
       case 'primary_forest__mining':
         indicatorLabel = 'Mining concessions';
         break;
@@ -84,7 +84,9 @@ export const getSentence = createSelector(
     };
 
     const sentence =
-      indicator.value === 'primary_forest' ? initial : withIndicator;
+      indicator && indicator.value === 'primary_forest'
+        ? initial
+        : withIndicator;
 
     return {
       sentence,

app/javascript/components/widgets/widgets/land-cover/tree-cover-plantations/initial-state.js

@@ -14,13 +14,11 @@ export default {
     },
     sentences: {
       initialSpecies:
-        'In {location}, {firstSpecies} and {secondSpecies} represent the largest plantation area by {type}, spanning {extent}.',
+        'In {location}, {firstSpecies} and {secondSpecies} represent the largest plantation area by {type}, spanning {extent} and {percent} of land area.',
       singleSpecies:
-        'In {location}, {firstSpecies} represent the largest plantation area by {type}, spanning {extent}.',
-      remainingSpecies:
-        'The remaining {other} is distributed between {count} other plantation species.',
+        'In {location}, {firstSpecies} represent the largest plantation area by {type}, spanning {extent} and {percent} of land area.',
       initialTypes:
-        'In {location}, the largest plantation area by type are {topType}, spanning {extent}.'
+        'In {location}, the largest plantation area by type are {topType}, spanning {extent} and {percent} of land area.'
     }
   },
   settings: {

app/javascript/components/widgets/widgets/land-cover/tree-cover-plantations/selectors.js

@@ -38,18 +38,13 @@ export const parseData = createSelector(
 );
 
 export const getSentence = createSelector(
-  [parseData, getSettings, getCurrentLocation, getSentences],
-  (data, settings, currentLabel, sentences) => {
+  [getData, parseData, getSettings, getCurrentLocation, getSentences],
+  (rawData, data, settings, currentLabel, sentences) => {
     if (isEmpty(data) || !sentences) return null;
-    const {
-      initialSpecies,
-      singleSpecies,
-      remainingSpecies,
-      initialTypes
-    } = sentences;
+    const { initialSpecies, singleSpecies, initialTypes } = sentences;
     const top =
       settings.type === 'bound2' ? data.slice(0, 2) : data.slice(0, 1);
-
+    const areaPerc = 100 * sumBy(top, 'value') / rawData.totalArea;
     const params = {
       location: currentLabel,
       firstSpecies: top[0].label.toLowerCase(),
@@ -58,13 +53,13 @@ export const getSentence = createSelector(
       extent: `${format('.3s')(sumBy(top, 'value'))}ha`,
       other: `${format('.3s')(sumBy(data.slice(2), 'value'))}ha`,
       count: data.length - top.length,
-      topType: `${top[0].label}${endsWith(top[0].label, 's') ? '' : 's'}`
+      topType: `${top[0].label}${endsWith(top[0].label, 's') ? '' : 's'}`,
+      percent: areaPerc >= 0.1 ? `${format('.2r')(areaPerc)}%` : '<0.1%'
     };
     const sentence =
       settings.type === 'bound1'
         ? initialTypes
-        : `${top.length > 1 ? initialSpecies : singleSpecies} ${data.length >
-            top.length && remainingSpecies}`;
+        : `${top.length > 1 ? initialSpecies : singleSpecies}`;
 
     return {
       sentence,