add solar+wind metric

opennem · May 23, 2024 · 46ff71c · 46ff71c
1 parent 37e0791
commit 46ff71c
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 11 deletions.
diff --git a/components/Charts/OpenChart.vue b/components/Charts/OpenChart.vue
@@ -112,7 +112,7 @@
       :convert-value="convertValue"
       :pad-y-axis="padYAxis"
       :annotations="annotations"
-      :path-stroke-width="3"
+      :path-stroke-width="2"
       class="vis-chart"
       @date-hover="handleDateHover"
       @domain-hover="handleDomainHover"

diff --git a/components/MetricsSelect.vue b/components/MetricsSelect.vue
@@ -7,8 +7,11 @@
         Carbon intensity
       </option>
 
-      <optgroup label="Generation">
+      <optgroup 
+        label="Generation" 
+        v-if="isCompareView">
         <option value="renewables">Renewables generation</option>
+        <option value="solarWind">Solar + Wind generation</option>
         <option value="solar">Solar generation</option>
         <option value="wind">Wind generation</option>
         <option value="gas">Gas generation</option>
@@ -22,6 +25,9 @@
         <option value="renewablesProportion">
           Renewables proportion
         </option>
+        <option value="solarWindProportion">
+          Solar + Wind proportion
+        </option>
         <option value="solarProportion">
           Solar proportion
         </option>
@@ -52,17 +58,25 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
+
   export default {
     computed: {
+      ...mapGetters({
+        currentView: 'currentView',
+      }),
       selectedMetric: {
-      get() {
-        return this.$store.getters['stripes/selectedMetric']
-      },
+        get() {
+          return this.$store.getters['stripes/selectedMetric']
+        },
 
-      set(val) {
-        this.$store.commit('stripes/selectedMetric', val)
-      }
-    },
+        set(val) {
+          this.$store.commit('stripes/selectedMetric', val)
+        }
+      },
+      isCompareView() {
+        return this.currentView === 'compare'
+      },
     }
   }
 </script>
diff --git a/constants/energy-regions.js b/constants/energy-regions.js
@@ -45,7 +45,7 @@ const EnergyRegions = [
     id: ENERGY_SA,
     abbr: 'SA',
     label: 'South Australia',
-    colour: '#F8D35B',
+    colour: '#f7c41d',
     timezoneString: 'AEST',
     parentRegion: ENERGY_NEM
   },

diff --git a/constants/stripes/index.js b/constants/stripes/index.js
@@ -56,6 +56,16 @@ export const metrics = [
     numberFormatString: ',.0f',
     legendType: 'ramp'
   },
+  {
+    label: 'Solar + Wind proportion (of demand)',
+    value: 'solarWindProportion',
+    divisor: 100,
+    domain: [0, 0.5, 1],
+    range: ['#fff', '#52BCA3', 'darkgreen'],
+    unit: '%',
+    numberFormatString: ',.0f',
+    legendType: 'ramp'
+  },
   {
     label: 'Wind proportion (of demand)',
     value: 'windProportion',
@@ -123,6 +133,16 @@ export const metrics = [
     numberFormatString: '',
     legendType: 'ramp'
   },
+  {
+    label: 'Solar + Wind generation',
+    value: 'solarWind',
+    divisor: 100,
+    domain: [0, 0.5, 1],
+    range: ['#fff', '#52BCA3', 'darkgreen'],
+    unit: 'GWh',
+    numberFormatString: '',
+    legendType: 'ramp'
+  },
   {
     label: 'Solar generation',
     value: 'solar',

diff --git a/data/transform/energy-to-stripe-metrics.js b/data/transform/energy-to-stripe-metrics.js
@@ -222,6 +222,7 @@ function updateMetricObject(
       d._totalDemandWindProportion < 0 ? 0 : d._totalDemandWindProportion
     obj.solarProportion =
       d._totalDemandSolarProportion < 0 ? 0 : d._totalDemandSolarProportion
+    obj.solarWindProportion = obj.windProportion + obj.solarProportion
     obj.coalProportion =
       d._totalDemandCoalProportion < 0 ? 0 : d._totalDemandCoalProportion
     obj.coal = d._totalCoal
@@ -231,6 +232,7 @@ function updateMetricObject(
     obj.gas = d._totalGas
     obj.wind = d._totalWind
     obj.solar = d._totalSolar
+    obj.solarWind = d._totalSolar + d._totalWind
     obj.renewables = d._totalRenewables
     obj.coal = d._totalCoal
 

diff --git a/pages/compare/index.vue b/pages/compare/index.vue
@@ -285,6 +285,18 @@ export default {
           metric: val
         }
       })
+
+      this.doUpdateXTicks({
+        range: this.range,
+        interval: this.interval,
+        isZoomed: this.zoomExtent.length > 0,
+        filterPeriod: this.filterPeriod
+      })
+      this.doUpdateTickFormats({
+        range: this.range,
+        interval: this.interval,
+        filterPeriod: this.filterPeriod
+      })
     },
     
     rangeIntervalsQuery(val) {
@@ -338,7 +350,9 @@ export default {
       doGetAllMonthlyData: 'regionEnergy/doGetAllMonthlyData',
       doUpdateAllRegionDatasetByInterval: 'regionEnergy/doUpdateAllRegionDatasetByInterval',
       doUpdateTickFormats: 'visInteract/doUpdateTickFormats',
-      doUpdateXGuides: 'visInteract/doUpdateXGuides'
+      doUpdateXGuides: 'visInteract/doUpdateXGuides',
+      doUpdateXTicks: 'visInteract/doUpdateXTicks',
+      doUpdateTickFormats: 'visInteract/doUpdateTickFormats'
     }),
     ...mapMutations({
       setHighlightDomain: 'visInteract/highlightDomain',