fix: map loading old indicator approach; issues of loading data when …

…not available;
eurodatacube · Jul 20, 2023 · 8d2ae91 · 8d2ae91
1 parent c98a857
commit 8d2ae91
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/app/src/components/DataPanel.vue b/app/src/components/DataPanel.vue
@@ -192,7 +192,7 @@
                   :href="dataHrefCSV"
                   :download="downloadFileName"
                   target="_blank"
-                  v-if="indicatorObject
+                  v-if="dataObject
                     && !showMap
                     && !this.baseConfig.indicatorsDefinition[
                       indicatorObject.indicator
@@ -453,6 +453,9 @@ export default {
       }
       return indicatorObject;
     },
+    dataObject() {
+      return this.$store.state.features.featureData;
+    },
     dataHrefCSV() {
       let dataHref = 'data:text/csv;charset=utf-8,';
       const exportKeys = [
@@ -462,15 +465,15 @@ export default {
       ];
       const header = `${exportKeys.join()}\n`;
       let csv = header;
-      for (let i = 0; i < this.indicatorObject.time.length; i++) {
+      for (let i = 0; i < this.dataObject.time.length; i++) {
         let row = '';
         for (let kk = 0; kk < exportKeys.length; kk++) {
           const cKey = exportKeys[kk];
           let txtVal = '';
           if (cKey === 'aoi') {
-            txtVal = `"${this.indicatorObject[cKey]}",`;
+            txtVal = `"${this.dataObject[cKey]}",`;
           } else {
-            txtVal = `"${this.indicatorObject[cKey][i]}",`;
+            txtVal = `"${this.dataObject[cKey][i]}",`;
           }
           row += txtVal;
         }

diff --git a/app/src/components/IndicatorData.vue b/app/src/components/IndicatorData.vue
@@ -23,6 +23,7 @@
   <div style="width: 100%; height: 100%;"
     v-else-if="mapchartIndicators.includes(indicatorObject.indicator)">
       <map-chart
+        v-if='datacollection'
         id="chart"
         class="fill-height"
         :width="null"
@@ -49,7 +50,7 @@
       </div>
   </div>
   <div style="width: 100%; height: 100%;" v-else>
-    <line-chart v-if='lineChartIndicators.includes(indicatorObject.indicator)'
+    <line-chart v-if='lineChartIndicators.includes(indicatorObject.indicator) && dataObject'
       id="chart" ref="lineChart"
       @extentChanged="extentChanged"
       class="fill-height"

diff --git a/app/src/components/map/Map.vue b/app/src/components/map/Map.vue
@@ -335,7 +335,8 @@ export default {
       // the current indicator definition object.
       // will use the "currentIndicator"-Prop if defined (dashboard)
       // otherwise it will use the selected indicator from the store
-      return getIndicatorFilteredInputData(this.currentIndicator);
+      return this.$store.state.indicators.selectedIndicator;
+      // return getIndicatorFilteredInputData(this.currentIndicator);
     },
     drawnArea() {
       // in store or prop saved as 'object', in this component and

diff --git a/app/src/utils.js b/app/src/utils.js
@@ -183,6 +183,8 @@ export async function loadIndicatorData(baseConfig, payload) {
         */
       };
       timeBasedLayerFound = true;
+    } else {
+      indicatorObject.display = null;
     }
 
     const times = [];