diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index c05ce5e..a3406e6 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,5 +1,7 @@
import { Component, ElementRef, HostListener, ViewChild } from '@angular/core';
import { Router, NavigationEnd } from '@angular/router';
+import { Subscription } from 'rxjs';
+import { Co2SavingsService } from './co2-savings.service';
import { EGridService } from './e-grid.service';
// declare ga as a function to access the JS code in TS
@@ -25,8 +27,11 @@ export class AppComponent {
this.setContainerSize();
}
headerHeight: number;
+ isModalOpenSub: Subscription;
baselineSelected: boolean = true;
- constructor(public router: Router, private eGridService: EGridService){
+ isModalOpen: boolean;
+
+ constructor(public router: Router, private eGridService: EGridService, private co2SavingsService: Co2SavingsService){
this.router.events.subscribe(event => {
if(event instanceof NavigationEnd){
gtag('config', 'G-29K0R91S12',
@@ -38,8 +43,16 @@ export class AppComponent {
}
)}
- ngOnInit() {
- this.eGridService.getAllSubRegions();
+ async ngOnInit() {
+ this.isModalOpenSub = this.co2SavingsService.modalOpen.subscribe(val => {
+ this.isModalOpen = val;
+ });
+
+ await this.eGridService.parseEGridData();
+ }
+
+ ngOnDestroy() {
+ this.isModalOpenSub.unsubscribe();
}
ngAfterViewInit(){
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 7f11968..1c9b5a9 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
-
import { AppComponent } from './app.component';
import { BannerComponent } from './banner/banner.component';
import { ResultsComponent } from './results/results.component';
@@ -10,6 +9,8 @@ import { FormComponent } from './energy-use-forms/form/form.component';
import { FormsModule } from '@angular/forms';
import { PlotlyViaWindowModule } from 'angular-plotly.js';
import { RouterModule } from '@angular/router';
+import { MarketEmissionsTableComponent } from './market-emissions-table/market-emissions-table.component';
+import { ModalModule } from 'ngx-bootstrap/modal';
@NgModule({
declarations: [
@@ -18,12 +19,14 @@ import { RouterModule } from '@angular/router';
ResultsComponent,
HelpComponent,
EnergyUseFormsComponent,
- FormComponent
+ FormComponent,
+ MarketEmissionsTableComponent
],
imports: [
BrowserModule,
FormsModule,
PlotlyViaWindowModule,
+ ModalModule,
RouterModule.forRoot([])
],
providers: [],
diff --git a/src/app/co2-savings.service.ts b/src/app/co2-savings.service.ts
index cc55ec3..9932b65 100644
--- a/src/app/co2-savings.service.ts
+++ b/src/app/co2-savings.service.ts
@@ -1,6 +1,7 @@
import { Injectable } from '@angular/core';
import { BehaviorSubject } from 'rxjs';
import { MobileTypeProperties } from './co2MobileSavings';
+import { MarketYearEmissions } from './e-grid.service';
@Injectable({
providedIn: 'root'
@@ -11,8 +12,10 @@ export class Co2SavingsService {
baselineData: BehaviorSubject
>;
modificationData: BehaviorSubject>;
energyUnits: BehaviorSubject;
+ modalOpen: BehaviorSubject;
constructor() {
this.currentField = new BehaviorSubject('default');
+ this.modalOpen = new BehaviorSubject(false);
this.energyUnits = new BehaviorSubject('MMBtu');
this.baselineData = new BehaviorSubject>([{
energyType: 'fuel',
@@ -151,6 +154,7 @@ export interface Co2SavingsData {
eGridRegion?: string;
eGridSubregion?: string;
totalEmissionOutput: number;
+ selectedEmissionsMarket?: MarketYearEmissions;
customUnits?: string;
carbonFactor?: number;
methaneFactor?: number;
diff --git a/src/app/e-grid.service.ts b/src/app/e-grid.service.ts
index bf2c2e4..e90d4a9 100644
--- a/src/app/e-grid.service.ts
+++ b/src/app/e-grid.service.ts
@@ -1,6 +1,7 @@
import { Injectable } from '@angular/core';
import * as Papa from 'papaparse';
import * as _ from 'lodash';
+import * as XLSX from 'xlsx';
@Injectable({
providedIn: 'root'
@@ -12,63 +13,138 @@ export class EGridService {
co2Emissions: Array;
constructor() {}
-
- getAllSubRegions() {
- Papa.parse("assets/eGRID-co2-emissions.csv", {
- header: true,
- download: true,
- complete: results => {
- this.setCo2Emissions(results.data);
- }
- });
- Papa.parse("assets/eGrid_zipcode_lookup.csv", {
- header: true,
- download: true,
- complete: results => {
- this.setSubRegionsByZip(results.data);
- }
- });
+ findEGRIDCO2Emissions(eGridSubregion: string): SubregionEmissions {
+ return _.find(this.co2Emissions, (val) => val.subregion.includes(eGridSubregion));
}
- setSubRegionsByZip(csvResults: Array) {
+
+ async parseEGridData() {
+ await fetch('assets/eGrid_zipcode_lookup.xlsx')
+ .then(response => response.arrayBuffer())
+ .then(buffer => {
+ let wb: XLSX.WorkBook = XLSX.read(new Uint8Array(buffer), { type: "array", raw: false });
+ //zip code regions
+ // [0: "ZIP (character)"
+ // 1: "ZIP (numeric)"
+ // 2: "state"
+ // 3: "eGRID Subregion #1"
+ // 4: "eGRID Subregion #2"
+ // 5: "eGRID Subregion #3"]
+ let sheetOne = XLSX.utils.sheet_to_json(wb.Sheets["eGrid_zipcode_lookup"], { raw: false });
+ this.setSubRegionsByZip(sheetOne)
+ //eGrid data
+ //0: SUBRGN
+ //1: YEAR
+ //2: CATEGORY
+ //3: CO2e
+ let sheetTwo = XLSX.utils.sheet_to_json(wb.Sheets["eGrid_co2"], { raw: false });
+ this.setCo2Emissions(sheetTwo);
+ });
+ }
+
+ setSubRegionsByZip(fileData: Array) {
let subRegionsByZipcode = new Array();
- csvResults.forEach(result => {
+ fileData.forEach(result => {
if (result['ZIP (character)']) {
- subRegionsByZipcode.push({
- zip: result['ZIP (character)'],
- state: result['state'],
- subregions: [
- result['eGRID Subregion #1'],
- result['eGRID Subregion #2'],
- result['eGRID Subregion #3'],
- ]
- });
+ subRegionsByZipcode.push({
+ zip: result['ZIP (character)'],
+ state: result['state'],
+ subregions: [
+ result['eGRID Subregion #1'],
+ result['eGRID Subregion #2'],
+ result['eGRID Subregion #3'],
+ ]
+ })
}
});
-
this.subRegionsByZipcode = subRegionsByZipcode;
}
-
+
setCo2Emissions(csvResults: Array) {
- let co2Emissions = new Array();
+ let subregionEmissions = new Array();
csvResults.forEach(result => {
- if (result['eGRID Subregion']) {
- co2Emissions.push({
- subregion: result['eGRID Subregion'],
- co2Factor: Number(result['CO2 Factor']),
- chFactor: Number(result['CH4 Factor']),
- n2OFactor: Number(result['N2O Factor']),
- })
+ let subregion: string = result['SUBRGN'];
+ if (subregion) {
+ let co2Emissions: number = Number(result['CO2e']);
+ let year: number = Number(result['YEAR']);
+ let category: 'LocationMix' | 'ResidualMix' = result['CATEGORY'];
+ subregionEmissions = this.addEmissionRate(subregion, co2Emissions, year, category, subregionEmissions);
}
});
- this.co2Emissions = co2Emissions;
+ this.co2Emissions = subregionEmissions;
}
- findEGRIDCO2Emissions(eGridSubregion: string): SubregionEmissions {
- return _.find(this.co2Emissions, (val) => val.subregion.includes(eGridSubregion));
+ addEmissionRate(subregion: string, co2Emissions: number, year: number, category: 'LocationMix' | 'ResidualMix', subregionEmissions: Array): Array {
+ let subregionIndex: number = subregionEmissions.findIndex(sEmissions => { return sEmissions.subregion == subregion });
+ if (subregionIndex != -1) {
+ if (category == 'LocationMix') {
+ subregionEmissions[subregionIndex].locationEmissionRates.push({
+ year: year,
+ display: `${year} Location Rate`,
+ co2Emissions: co2Emissions
+ })
+ } else {
+ subregionEmissions[subregionIndex].residualEmissionRates.push({
+ year: year,
+ display: `${year} Residual Rate`,
+ co2Emissions: co2Emissions
+ })
+ }
+ } else {
+ if (category == 'LocationMix') {
+ subregionEmissions.push({
+ subregion: subregion,
+ locationEmissionRates: [{
+ year: year,
+ display: `${year} Location Rate`,
+ co2Emissions: co2Emissions
+ }],
+ residualEmissionRates: new Array()
+ })
+ } else {
+ subregionEmissions.push({
+ subregion: subregion,
+ locationEmissionRates: new Array(),
+ residualEmissionRates: [{
+ year: year,
+ display: `${year} Residual Rate`,
+ co2Emissions: co2Emissions
+ }]
+ })
+ }
+ }
+
+ if (subregionEmissions[subregionIndex]) {
+ subregionEmissions[subregionIndex].residualEmissionRates = _.orderBy(subregionEmissions[subregionIndex].residualEmissionRates, emissionRate => emissionRate.year);
+ subregionEmissions[subregionIndex].locationEmissionRates = _.orderBy(subregionEmissions[subregionIndex].locationEmissionRates, emissionRate => emissionRate.year);
+ }
+ return subregionEmissions;
+ }
+
+
+ getEmissionsRate(subregion: string, year: number): { marketRate: number, locationRate: number } {
+ let subregionEmissions: SubregionEmissions = this.co2Emissions.find(emissions => { return emissions.subregion == subregion });
+ if (subregionEmissions) {
+ let marketRate: number = 0;
+ let locationRate: number = 0;
+ if (subregionEmissions.locationEmissionRates.length != 0) {
+ let closestYearRate: { co2Emissions: number, year: number } = _.minBy(subregionEmissions.locationEmissionRates, (emissionRate: { co2Emissions: number, year: number }) => {
+ return Math.abs(emissionRate.year - year);
+ });
+ locationRate = closestYearRate.co2Emissions;
+ }
+ if (subregionEmissions.residualEmissionRates.length != 0) {
+ let closestYearRate: { co2Emissions: number, year: number } = _.minBy(subregionEmissions.residualEmissionRates, (emissionRate: { co2Emissions: number, year: number }) => {
+ return Math.abs(emissionRate.year - year);
+ });
+ marketRate = closestYearRate.co2Emissions;
+ }
+ return { marketRate: marketRate, locationRate: locationRate };
+ }
+ return { marketRate: 0, locationRate: 0 };
}
}
@@ -84,8 +160,13 @@ export interface SubRegionData {
}
export interface SubregionEmissions {
- subregion: string,
- co2Factor: number,
- chFactor: number,
- n2OFactor: number,
+ subregion: string,
+ locationEmissionRates: Array,
+ residualEmissionRates: Array,
+ co2Factor?: number,
+ chFactor?: number,
+ n2OFactor?: number,
}
+
+
+export interface MarketYearEmissions { display: string, co2Emissions: number, year: number }
diff --git a/src/app/energy-use-forms/form/form.component.css b/src/app/energy-use-forms/form/form.component.css
index e69de29..d98af91 100644
--- a/src/app/energy-use-forms/form/form.component.css
+++ b/src/app/energy-use-forms/form/form.component.css
@@ -0,0 +1,11 @@
+.click-link {
+ cursor: pointer;
+}
+.disabled-link {
+ color: gray;
+ pointer-events: none;
+}
+
+.disabled-link :hover {
+ text-decoration: none;
+}
\ No newline at end of file
diff --git a/src/app/energy-use-forms/form/form.component.html b/src/app/energy-use-forms/form/form.component.html
index 04e9b62..fa59ae5 100644
--- a/src/app/energy-use-forms/form/form.component.html
+++ b/src/app/energy-use-forms/form/form.component.html
@@ -126,23 +126,41 @@
+
+ 