Merge pull request #50 from earthrise-media/update-data-file

Update data to include all crops
earthrise-media · Nov 22, 2023 · 15fedcd · 15fedcd
2 parents 5db8c8f + 90109b0
commit 15fedcd
Show file tree

Hide file tree

Showing 45 changed files with 20,517 additions and 10,255 deletions.
diff --git a/vacs-map-app/public/data/crop-yields-mean-models(old).csv b/vacs-map-app/public/data/crop-yields-mean-models(old).csv
diff --git a/vacs-map-app/public/data/crop-yields-mean-models.csv b/vacs-map-app/public/data/crop-yields-mean-models.csv
diff --git a/vacs-map-app/scripts/generate-minimaps.js b/vacs-map-app/scripts/generate-minimaps.js
@@ -45,14 +45,14 @@ const getData = () => {
       const [_, crop, timeframe, scenario] = k.split('_');
       if (timeframe === 'historical') return;
 
-      const historicalKey = ['yield', crop, 'historical_ssp370'].join('_');
+      const historicalKey = ['yield', crop, 'historical'].join('_');
 
       if (!yieldKeys.includes(historicalKey)) return;
 
       const yieldRatioKey = ['yieldratio', crop, timeframe, scenario].join('_');
 
       let yieldRatioValue = null;
-      if (d[k] !== null && d[historicalKey] !== null) {
+      if (d[k] !== null && d[historicalKey] !== null && d[historicalKey]) {
         yieldRatioValue = (d[k] - d[historicalKey]) / d[historicalKey];
       }
       rowWithYields[yieldRatioKey] = yieldRatioValue;

diff --git a/vacs-map-app/src/assets/img/minimaps/africaneggplant_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/africaneggplant_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/africaneggplant_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/africaneggplant_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/bambaragroundnut_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/bambaragroundnut_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/bambaragroundnut_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/bambaragroundnut_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/cassava_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/cassava_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/cassava_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/cassava_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/cocoyam_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/cocoyam_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/cocoyam_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/cocoyam_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/cowpea_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/cowpea_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/cowpea_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/cowpea_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/fingermillet_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/fingermillet_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/fingermillet_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/fingermillet_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/fonio_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/fonio_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/fonio_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/fonio_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/grasspea_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/grasspea_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/grasspea_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/grasspea_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/groundnut_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/groundnut_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/groundnut_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/groundnut_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/josephscoat_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/josephscoat_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/josephscoat_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/josephscoat_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/lablab_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/lablab_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/lablab_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/lablab_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/maize_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/maize_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/maize_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/maize_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/mungbean_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/mungbean_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/mungbean_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/mungbean_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/okra_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/okra_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/okra_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/okra_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/pigeonpea_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/pigeonpea_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/pigeonpea_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/pigeonpea_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/sorghum_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/sorghum_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/sorghum_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/sorghum_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/soybean_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/soybean_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/soybean_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/soybean_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/sweetpotato_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/sweetpotato_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/sweetpotato_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/sweetpotato_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/tef_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/tef_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/tef_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/tef_future_ssp370.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/yams_future_ssp126.svg b/vacs-map-app/src/assets/img/minimaps/yams_future_ssp126.svg
diff --git a/vacs-map-app/src/assets/img/minimaps/yams_future_ssp370.svg b/vacs-map-app/src/assets/img/minimaps/yams_future_ssp370.svg
diff --git a/vacs-map-app/src/stores/cropYields.js b/vacs-map-app/src/stores/cropYields.js
@@ -24,14 +24,14 @@ export const useCropYieldsStore = defineStore('cropYields', () => {
         const [_, crop, timeframe, scenario] = k.split('_')
         if (timeframe === 'historical') return
 
-        const historicalKey = ['yield', crop, 'historical_ssp370'].join('_')
+        const historicalKey = ['yield', crop, 'historical'].join('_')
 
         if (!yieldKeys.includes(historicalKey)) return
 
         const yieldRatioKey = ['yieldratio', crop, timeframe, scenario].join('_')
 
         let yieldRatioValue = null
-        if (d[k] !== null && d[historicalKey] !== null) {
+        if (d[k] !== null && d[historicalKey] !== null && d[historicalKey]) {
           yieldRatioValue = (d[k] - d[historicalKey]) / d[historicalKey]
         }
 

diff --git a/vacs-map-app/src/stores/filters.js b/vacs-map-app/src/stores/filters.js
@@ -44,7 +44,7 @@ export const useFiltersStore = defineStore('filters', () => {
       new Set(
         Object.keys(firstRow)
           .filter((k) => k !== 'id')
-          .map((k) => k.split('_').slice(-2).join('_'))
+          .map((k) => k.split('_').slice(2).join('_'))
       )
     ).sort()
     selectedModel.value = availableModels.value[0]