Update hydro intensities

electricitymaps · Nov 28, 2018 · d6d9987 · d6d9987
1 parent 36def87
commit d6d9987
Show file tree

Hide file tree

Showing 3 changed files with 523 additions and 19 deletions.
diff --git a/config/co2eq_parameters.js b/config/co2eq_parameters.js
@@ -3,19 +3,11 @@ var exports = module.exports = {};
 const co2eqParameters = require('./co2eq_parameters.json');
 
 exports.footprintOf = function(mode, zoneKey) {
-  const fallbackCarbonIntensity = (co2eqParameters.fallbackZoneMixes[zoneKey] || {}).carbonIntensity;
-  if (mode === 'hydro discharge' && fallbackCarbonIntensity) {
-    return fallbackCarbonIntensity;
-  }
   const defaultFootprint = co2eqParameters.emissionFactors.defaults[mode];
   const override = (co2eqParameters.emissionFactors.zoneOverrides[zoneKey] || {})[mode];
   return (override || defaultFootprint || {}).value;
 };
 exports.sourceOf = function(mode, zoneKey) {
-  const fallbackCarbonIntensity = (co2eqParameters.fallbackZoneMixes[zoneKey] || {}).carbonIntensity;
-  if (mode.indexOf('discharge') !== -1 && fallbackCarbonIntensity) {
-    return 'Annual carbon intensity';
-  }
   const defaultFootprint = co2eqParameters.emissionFactors.defaults[mode];
   const override = (co2eqParameters.emissionFactors.zoneOverrides[zoneKey] || {})[mode];
   return (override || defaultFootprint || {}).source;