Skip to content

Update data URL for more accurate data #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
doofusdavid wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update data URL for more accurate data #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36a4a0a
Update data URL for more accurate data
doofusdavid Sep 9, 2019
9fd700f
building locally
doofusdavid Sep 9, 2019
409b8a9
Merge branch 'master' of https://github.com/doofusdavid/solar-scorecard
doofusdavid Sep 9, 2019
de17fdf
Updated Carbon Production ratios
doofusdavid Sep 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 30 additions & 11 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ import Main from '../App.vue';
Vue.component('solar-scorecard-stairstep', {
mounted: function() {
let xhr = new XMLHttpRequest();
xhr.open('GET', 'https://opencity.fcgov.com/resource/ykei-s9zt.json');
xhr.open('GET', 'https://opendata.fcgov.com/resource/3ku5-x4k9.json?$order=meta_row_index&$limit=100000');
// This is so Socrata and the City knows who we are and our app
// it can often prevent API throttling
xhr.setRequestHeader('X-App-Token', 'uGISPdpNnBfwN4kmj9goaZBNM');
Expand Down Expand Up @@ -114,9 +114,9 @@ Vue.component('solar-scorecard-ratios', {
PieChart({
selector: '#pie-chart',
data: {
Electric: 50,
'Ground Travel': 26,
'Natural Gas': 19,
Electric: 51,
'Ground Travel': 24,
'Natural Gas': 21,
'Solid Waste': 4,
'Water Related': 0.3,
},
Expand Down
4 changes: 2 additions & 2 deletions src/templates/why-solar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ <h2>Carbon Production Ratios in Fort Collins</h2>
<solar-scorecard-ratios></solar-scorecard-ratios>

<p>The above chart describes the carbon-dioxide-equivilent emissions related to categories of use in Fort Collins,
as described in the <a href="https://www.fcgov.com/climateaction/pdf/2015-community-carbon-inventory.pdf?1494967837">
2015 City of Fort Collins Carbon Inventory</a>. We are most interested in tackling electricity, which makes up
as described in the <a href="https://ftcollinscap.clearpointstrategy.com/">
Current (as of 2017) City of Fort Collins Climate Dashboard</a>. We are most interested in tackling electricity, which makes up
50% of the carbon emission in the City of Fort Collins.</p>

<p>Emissions from electricity use are caused by fossil fuel combustion. Most of the electricity for Fort Collins is
Expand Down