update emissions calculations when dates are zoomed

opennem · Jan 31, 2024 · e8c9dd3 · e8c9dd3
1 parent 0d07129
commit e8c9dd3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/data/calculate-carbon-intensity.js b/data/calculate-carbon-intensity.js
@@ -36,7 +36,7 @@ export default function({
   isWemOrAu
 }) {
 
-  console.log('calculate EI', emissionsDomains, powerEnergyDomains, domainPowerEnergy)
+  // console.log('calculate EI', emissionsDomains, powerEnergyDomains, domainPowerEnergy)
 
   const timeCheck = 1696140000000
   const shouldTimeCheck = false
@@ -186,7 +186,9 @@ export default function({
     : Math.abs(sumEmissions / dataset.length)
 
   if (averageEmissions < 0) {
-    console.log(`averageEmissions < 0: ${averageEmissions}`)
+    // console.log(`averageEmissions < 0: ${averageEmissions}`)
+  } else {
+    // console.log(`emissions intensity... ${averageEmissions}`, hasSource, sumEmissionsMinusLoads, dataset.length, powerEnergyDomains, emissionsDomains)
   }
 
   return {

diff --git a/pages/energy/_region/index.vue b/pages/energy/_region/index.vue
@@ -355,6 +355,7 @@ export default {
         isZoomed: dates.length > 0,
         filterPeriod: this.filterPeriod
       })
+      this.updateEmissionsData()
     },
     filterPeriod(period) {
       this.doUpdateDatasetByFilterPeriod({
@@ -553,8 +554,12 @@ export default {
     },
 
     updateEmissionsData() {
+      const filteredTimes = this.filteredDates.map(d => d.getTime())
+      const dataset = filteredTimes.length
+        ? this.currentDataset.filter(d => d.time >= filteredTimes[0] && d.time < filteredTimes[filteredTimes.length - 1])
+        : this.currentDataset
       this.doUpdateEmissionIntensityDataset({
-        datasetAll: this.currentDataset,
+        datasetAll: dataset,
         isCalculateByGeneration: this.calculateByGeneration,
         emissionsDomains: this.emissionsDomains,
         powerEnergyDomains: this.powerEnergyDomains,