Merge pull request #3015 from SEED-platform/refactor/better-include-e…

…lec-unknown refactor: include Electricity - Unknown meter type in analyses
SEED-platform · Nov 19, 2021 · 41161e4 · 41161e4
2 parents 762089d + 9db5682
commit 41161e4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/seed/analysis_pipelines/better/buildingsync.py b/seed/analysis_pipelines/better/buildingsync.py
@@ -36,6 +36,7 @@
 # NOTE: this is semi-redundant with to_energy_type dict in building_sync/mappings.py
 SEED_TO_BSYNC_RESOURCE_TYPE = {
     Meter.ELECTRICITY_GRID: 'Electricity',
+    Meter.ELECTRICITY_UNKNOWN: 'Electricity',
     Meter.NATURAL_GAS: 'Natural gas',
     Meter.DIESEL: 'Diesel',
     Meter.PROPANE: 'Propane',

diff --git a/seed/analysis_pipelines/bsyncr.py b/seed/analysis_pipelines/bsyncr.py
@@ -147,7 +147,7 @@ def _prepare_all_properties(self, analysis_view_ids_by_property_view_id, analysi
             .annotate(readings_count=Count('meter_readings'))
             .filter(
                 property=analysis_property_view.property,
-                type__in=[Meter.ELECTRICITY_GRID, Meter.ELECTRICITY_SOLAR, Meter.ELECTRICITY_WIND],
+                type__in=[Meter.ELECTRICITY_GRID, Meter.ELECTRICITY_SOLAR, Meter.ELECTRICITY_WIND, Meter.ELECTRICITY_UNKNOWN],
                 readings_count__gte=12,
             )
         )

diff --git a/seed/analysis_pipelines/co2.py b/seed/analysis_pipelines/co2.py
@@ -44,7 +44,7 @@
     ERROR_INVALID_REGION_CODE: 'Could not find C02 rate for provided eGRID subregion code.'
 }
 
-VALID_METERS = [Meter.ELECTRICITY_GRID]
+VALID_METERS = [Meter.ELECTRICITY_GRID, Meter.ELECTRICITY_UNKNOWN]
 TIME_PERIOD = datetime.timedelta(days=365)
 
 # These factors represent how much CO2e is emitted per MWh of electricity used

diff --git a/seed/analysis_pipelines/eui.py b/seed/analysis_pipelines/eui.py
@@ -43,7 +43,7 @@
     WARNING_SOME_INVALID_PROPERTIES: 'Some properties failed to validate.'
 }
 
-VALID_METERS = [Meter.ELECTRICITY_GRID, Meter.ELECTRICITY_SOLAR, Meter.ELECTRICITY_WIND]
+VALID_METERS = [Meter.ELECTRICITY_GRID, Meter.ELECTRICITY_SOLAR, Meter.ELECTRICITY_WIND, Meter.ELECTRICITY_UNKNOWN]
 TIME_PERIOD = datetime.timedelta(days=365)