From 5297617970dff1d12c0ee25b7f4e2d58d68b4d43 Mon Sep 17 00:00:00 2001 From: Calvin Jhunjhnuwala Date: Mon, 28 Sep 2020 21:39:22 -0700 Subject: [PATCH] updates to the carbon calculator inputs, update to some of the copy on calc page --- assets/js/calculator/carbon-calculator.js | 14 ++++----- tool/template-calculator.html | 38 +++++++++++------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assets/js/calculator/carbon-calculator.js b/assets/js/calculator/carbon-calculator.js index 0b8453645a..5f74f0ebf9 100644 --- a/assets/js/calculator/carbon-calculator.js +++ b/assets/js/calculator/carbon-calculator.js @@ -1,11 +1,11 @@ let arr = { 'btc': { - 'kWh': 487.368757765725, - 'tons': 0.0000004103449, + 'kWh': 487.3687578, + 'tons': 0.0000002426743, 'gas': 38.7744 }, 'eth': { - 'kWh': 42.8633, + 'kWh': 42.86334969, 'tons': 0.0000000273454, 'gas': 2.38677 }, @@ -16,17 +16,17 @@ let arr = { }, 'xrp': { 'kWh': 0.0079, - 'tons': 0.000000000003688, + 'tons': 0.0000000000045, 'gas': 0.00063 }, 'vsa': { 'kWh': 0.0008, - 'tons': 0.0000000000005, + 'tons': 0.00000000000046, 'gas': 0.00006 }, 'mst': { 'kWh': 0.0006, - 'tons': 0.0000000000005, + 'tons': 0.00000000000051, 'gas': 0.00005 }, } @@ -75,7 +75,7 @@ function doCalculations(val){ kwhComp = ( total / 50340000000 ).toFixed( 2 ); if (data_comp === 'tons') { - total = parseInt(total * 1000000); + total = total * 1000000; } num.innerHTML = total.commarize(); diff --git a/tool/template-calculator.html b/tool/template-calculator.html index 23c33d4fc4..41c86452b2 100644 --- a/tool/template-calculator.html +++ b/tool/template-calculator.html @@ -93,7 +93,7 @@

{% trans %}Comparing Million Transactions in 2019{% endtrans %}

-

{% trans %}The country of Portugal consumes ~50twh (1 billion) Kilowatt hours (KWH) of energy annually. Explore how much energy today’s various currencies consume in relation to Portugal.{% endtrans %}

+

{% trans %}The country of Portugal consumes ~50twh (1 billion) Kilowatt hours (kWh) of energy annually. Explore how much energy today’s various currencies consume in relation to Portugal.{% endtrans %}

  • @@ -118,7 +118,7 @@

    {% trans %}Ethereum{% endtrans %}

    -

    {% trans %}KWh{% endtrans %}

    +

    {% trans %}kWh{% endtrans %}

  • @@ -130,7 +130,7 @@

    {% trans %}Cash{% endtrans %}

    -

    {% trans %}KWh{% endtrans %}

    +

    {% trans %}kWh{% endtrans %}

  • @@ -142,7 +142,7 @@

    XRP

    -

    {% trans %}KWh{% endtrans %}

    +

    {% trans %}kWh{% endtrans %}

  • @@ -154,7 +154,7 @@ {% trans %}Visa{% endtrans %}

    Visa

    -

    {% trans %}KWh{% endtrans %}

    +

    {% trans %}kWh{% endtrans %}

  • @@ -166,7 +166,7 @@ {% trans %}Mastercard{% endtrans %}

    {% trans %}Mastercard{% endtrans %}

    -

    {% trans %}KWh{% endtrans %}

    +

    {% trans %}kWh{% endtrans %}

    • @@ -267,7 +267,7 @@

    {% trans %}Breaking Down Individual Transactions{% endtrans %}

    -

    {% trans %}Looking at individual transactions below, compare how a single transaction across each form of currency equates to KWh, gallons of gas and CO2 emissions.{% endtrans %}

    +

    {% trans %}Looking at individual transactions below, compare how a single transaction across each form of currency equates to kWh, gallons of gas and CO2 emissions.{% endtrans %}

    @@ -282,37 +282,37 @@ - - + + - - + + - + - + - - + + - - + + - +
    Bitcoin    		487.3688 KWh/tx4.1-7 Mt/tx487.3688 kWh/tx2.42-7 Mt/tx 38.7744 gal/tx
    Ethereum    		42.8633 KWh/tx2.73-8 Mt/tx42.8633 kWh/tx4.5-8 Mt/tx 1.1311 gal/tx
    XRP    		0.0079 KWh/tx0.0079 kWh/tx 3.7-12 Mt/tx0.00060 gal/tx0.00063 gal/tx
    Visa    		0.0008 KWh/tx5.0-13 Mt/tx0.0008 kWh/tx4.6-13 Mt/tx 0.00006 gal/tx
    Mastercard    		0.0006 KWh/tx5.0-13 Mt/tx0.0006 kWh/tx5.1-13 Mt/tx 0.00005 gal/tx
    {% trans %}Paper Currency{% endtrans %}    		0.0440 KWh/tx0.0440 kWh/tx 2.32-11 Mt/tx 0.00350 gal/tx