v0.5.12

README.md

@@ -43,6 +43,22 @@ most countries.
 
 `access_log` uses marginal data by default.
 
+### Update the data
+
+1. Go to the `data/output` directory on [co2.js
+   repository](https://github.com/thegreenwebfoundation/co2.js/tree/v0.16.2/data/output)
+   for the latest version released (in this example 0.16.2)
+
+2. Download the `average-intensities.json` file.
+
+3. Run `src/average_intensities_by_country.cr` with this file as stdin.
+
+```
+crystal run src/average_intensities_by_country.cr < average-intensities.json >> src/swd/average_intensity.cr
+```
+
+4. Modify `src/swd/average_intensity.cr` to fix the data.
+
 ## Create database
 
 ```bash

shard.yml

@@ -1,5 +1,5 @@
 name: "access_log"
-version: "0.5.6"
+version: "0.5.12"
 authors:
 - "f <f@sutty.nl>"
 targets:

src/access_log.cr

@@ -11,7 +11,7 @@ require "./models/access_log"
 require "./models/crawler"
 require "./swd"
 
-VERSION = "0.5.6"
+VERSION = "0.5.8"
 
 Log.setup_from_env
 

src/average_intensities_by_country.cr

@@ -23,7 +23,12 @@ JSON.parse(ARGF.gets_to_end).as_h.each do |country, data|
 
   STDERR.puts "ok - #{country}"
 
-  average_intensities[countries[data["country_code"].as_s]] = data["emissions_intensity_gco2_per_kwh"].as_f
+  average_intensities[countries[data["country_code"].as_s]] =
+    begin
+      data["emissions_intensity_gco2_per_kwh"].as_f
+    rescue TypeCastError
+      data["emissions_intensity_gco2_per_kwh"].as_i.to_f
+    end
 end
 
 puts average_intensities.to_json

src/swd/intensity_data.cr

@@ -2,215 +2,215 @@ class SWD
   module IntensityData
     # @see {co2.js/data/output/average-intensities.json}
     AVERAGE_INTENSITY_BY_ISO_CODE = {
-      "AE": 407.98,
-      "AF": 120.48,
-      "AG": 657.14,
-      "AL": 23.44,
-      "AM": 222.68,
-      "AO": 195.98,
-      "AR": 344.31,
-      "AS": 687.5,
-      "AT": 158.22,
-      "AU": 501.7,
-      "AW": 591.4,
-      "AZ": 469.58,
-      "BA": 553.47,
-      "BB": 644.86,
-      "BD": 574.28,
-      "BE": 167.11,
-      "BF": 611.43,
-      "BG": 399.72,
-      "BH": 494.02,
-      "BI": 250.0,
-      "BJ": 666.67,
-      "BN": 493.59,
-      "BO": 335.4,
-      "BR": 102.04,
-      "BS": 698.11,
-      "BT": 24.44,
-      "BW": 794.52,
-      "BY": 425.9,
-      "BZ": 484.38,
-      "CA": 125.84,
-      "CD": 25.36,
+      "AF": 123.71,
+      "AE": 492.7,
+      "AG": 611.11,
+      "AL": 24.42,
+      "AM": 244.34,
+      "AO": 167.22,
+      "AR": 358.95,
+      "AS": 647.06,
+      "AT": 102.62,
+      "AU": 551.59,
+      "AW": 550.0,
+      "AZ": 633.07,
+      "BA": 637.76,
+      "BB": 600.0,
+      "BD": 694.63,
+      "BE": 117.58,
+      "BF": 554.91,
+      "BG": 264.21,
+      "BH": 902.41,
+      "BI": 230.77,
+      "BJ": 590.0,
+      "BN": 892.67,
+      "BO": 468.02,
+      "BR": 103.21,
+      "BS": 653.66,
+      "BT": 24.19,
+      "BW": 849.42,
+      "BY": 313.62,
+      "BZ": 155.56,
+      "CA": 174.81,
+      "CD": 27.04,
       "CF": 0.0,
-      "CG": 395.52,
-      "CH": 41.28,
-      "CI": 410.75,
-      "CK": 400.0,
-      "CL": 332.61,
-      "CM": 278.26,
-      "CN": 533.98,
-      "CO": 163.99,
-      "CR": 37.21,
-      "CU": 654.68,
-      "CV": 600.0,
-      "CY": 589.35,
-      "CZ": 414.8,
-      "DE": 385.39,
-      "DJ": 666.67,
-      "DK": 180.42,
-      "DM": 529.41,
-      "DO": 549.8,
-      "DZ": 485.49,
-      "EC": 183.63,
-      "EE": 460.26,
-      "EG": 469.63,
-      "ER": 688.89,
-      "ES": 217.42,
-      "ET": 25.19,
-      "FI": 131.71,
-      "FJ": 289.47,
-      "FK": 500.0,
-      "FO": 428.57,
-      "FR": 84.88,
-      "GA": 397.38,
-      "GB": 261.16,
-      "GD": 714.29,
-      "GE": 134.83,
-      "GF": 254.72,
-      "GH": 361.2,
-      "GL": 133.33,
-      "GM": 700.0,
-      "GN": 208.63,
-      "GP": 623.53,
-      "GQ": 492.96,
-      "GR": 344.41,
-      "GT": 304.71,
-      "GU": 670.33,
-      "GW": 750.0,
-      "GY": 642.28,
-      "HK": 609.93,
-      "HN": 373.96,
-      "HR": 246.29,
-      "HT": 606.06,
-      "HU": 222.1,
-      "ID": 619.03,
-      "IE": 346.43,
-      "IL": 537.57,
-      "IN": 633.4,
-      "IQ": 531.36,
-      "IR": 487.86,
-      "IS": 28.56,
-      "IT": 372.63,
-      "JM": 537.93,
-      "JO": 391.13,
-      "JP": 494.86,
-      "KE": 101.13,
-      "KG": 104.43,
-      "KH": 400.46,
-      "KI": 666.67,
-      "KM": 714.29,
-      "KN": 681.82,
-      "KP": 102.42,
-      "KR": 437.6,
-      "KW": 574.56,
-      "KY": 684.93,
-      "KZ": 635.57,
-      "LA": 242.18,
-      "LB": 663.1,
-      "LC": 685.71,
-      "LK": 501.53,
-      "LR": 304.35,
-      "LS": 20.0,
-      "LT": 195.7,
-      "LU": 162.6,
-      "LV": 183.43,
-      "LY": 558.85,
-      "MA": 630.75,
-      "MD": 666.67,
-      "ME": 392.75,
-      "MG": 483.25,
-      "MK": 543.71,
-      "ML": 463.13,
-      "MM": 330.8,
-      "MN": 749.66,
-      "MO": 491.53,
-      "MQ": 698.63,
-      "MR": 526.6,
+      "CG": 713.73,
+      "CH": 36.6,
+      "CI": 393.53,
+      "CK": 250.0,
+      "CL": 265.52,
+      "CM": 285.71,
+      "CN": 559.55,
+      "CO": 285.8,
+      "CR": 63.01,
+      "CU": 638.98,
+      "CV": 480.0,
+      "CY": 512.24,
+      "CZ": 413.86,
+      "DE": 344.14,
+      "DJ": 450.0,
+      "DK": 143.3,
+      "DM": 600.0,
+      "DO": 566.05,
+      "DZ": 633.65,
+      "EC": 209.7,
+      "EE": 341.02,
+      "EG": 571.92,
+      "ER": 590.91,
+      "ES": 146.15,
+      "ET": 23.55,
+      "FI": 72.25,
+      "FJ": 278.26,
+      "FK": 1000.0,
+      "FO": 354.17,
+      "FR": 44.18,
+      "GA": 429.47,
+      "GB": 210.89,
+      "GD": 666.67,
+      "GE": 143.06,
+      "GF": 204.08,
+      "GH": 452.86,
+      "GL": 111.11,
+      "GM": 666.67,
+      "GN": 182.72,
+      "GP": 493.9,
+      "GQ": 605.1,
+      "GR": 319.76,
+      "GT": 272.66,
+      "GU": 611.11,
+      "GW": 625.0,
+      "GY": 634.33,
+      "HK": 681.99,
+      "HN": 289.5,
+      "HR": 174.48,
+      "HT": 534.65,
+      "HU": 182.82,
+      "ID": 682.43,
+      "IE": 279.7,
+      "IL": 567.26,
+      "IN": 708.32,
+      "IQ": 689.4,
+      "IR": 641.94,
+      "IS": 28.33,
+      "IT": 287.53,
+      "JM": 561.25,
+      "JO": 539.21,
+      "JP": 482.32,
+      "KE": 88.79,
+      "KG": 162.71,
+      "KH": 497.46,
+      "KI": 500.0,
+      "KM": 642.86,
+      "KN": 636.36,
+      "KP": 344.26,
+      "KR": 414.27,
+      "KW": 637.24,
+      "KY": 642.86,
+      "KZ": 801.95,
+      "LA": 232.12,
+      "LB": 369.47,
+      "LC": 650.0,
+      "LK": 509.78,
+      "LR": 435.9,
+      "LS": 20.83,
+      "LT": 139.34,
+      "LU": 134.62,
+      "LV": 136.22,
+      "LY": 830.53,
+      "MA": 577.65,
+      "MD": 631.68,
+      "ME": 413.51,
+      "MG": 477.27,
+      "MK": 568.97,
+      "ML": 394.5,
+      "MM": 578.82,
+      "MN": 784.01,
+      "MO": 448.98,
+      "MQ": 516.78,
+      "MR": 481.71,
       "MS": 1000.0,
-      "MT": 433.48,
-      "MU": 611.11,
-      "MV": 651.52,
-      "MW": 133.8,
-      "MX": 423.81,
-      "MY": 543.87,
-      "MZ": 126.63,
-      "NA": 63.69,
-      "NC": 610.12,
-      "NE": 622.22,
-      "NG": 368.11,
-      "NI": 354.21,
-      "NL": 354.31,
-      "NO": 28.93,
-      "NP": 24.51,
+      "MT": 484.16,
+      "MU": 633.03,
+      "MV": 611.77,
+      "MW": 54.65,
+      "MX": 484.83,
+      "MY": 609.85,
+      "MZ": 127.81,
+      "NA": 47.62,
+      "NC": 585.76,
+      "NE": 687.5,
+      "NG": 507.85,
+      "NI": 288.33,
+      "NL": 253.31,
+      "NO": 30.75,
+      "NP": 23.36,
       "NR": 750.0,
-      "NZ": 105.22,
-      "OM": 488.27,
-      "PA": 152.68,
-      "PE": 256.51,
-      "PF": 471.43,
-      "PG": 526.75,
-      "PH": 594.45,
-      "PK": 344.16,
-      "PL": 633.23,
-      "PM": 800.0,
-      "PR": 612.39,
-      "PS": 465.12,
-      "PT": 234.61,
-      "PY": 25.49,
-      "QA": 490.28,
-      "RE": 519.03,
-      "RO": 264.24,
-      "RS": 582.13,
-      "RU": 363.68,
-      "RW": 294.12,
-      "SA": 557.78,
-      "SB": 727.27,
-      "SC": 615.39,
-      "SD": 288.13,
-      "SE": 45.12,
-      "SG": 488.78,
-      "SI": 237.38,
-      "SK": 140.14,
+      "NZ": 120.11,
+      "OM": 545.25,
+      "PA": 258.74,
+      "PE": 263.27,
+      "PF": 436.62,
+      "PG": 513.74,
+      "PH": 613.38,
+      "PK": 398.61,
+      "PL": 614.98,
+      "PM": 600.0,
+      "PR": 664.53,
+      "PS": 460.78,
+      "PT": 112.29,
+      "PY": 24.86,
+      "QA": 602.83,
+      "RE": 525.22,
+      "RO": 245.55,
+      "RS": 673.16,
+      "RU": 449.2,
+      "RW": 301.89,
+      "SA": 696.31,
+      "SB": 636.36,
+      "SC": 571.43,
+      "SD": 214.33,
+      "SE": 35.82,
+      "SG": 498.74,
+      "SI": 227.65,
+      "SK": 96.49,
       "SL": 47.62,
-      "SN": 523.13,
-      "SO": 634.15,
-      "SR": 356.44,
-      "SS": 684.21,
-      "ST": 600.0,
-      "SV": 194.23,
-      "SY": 541.17,
-      "SZ": 189.19,
-      "TC": 703.7,
-      "TD": 677.42,
-      "TG": 460.32,
-      "TH": 501.57,
-      "TJ": 83.63,
-      "TM": 490.19,
-      "TN": 469.43,
-      "TO": 625.0,
-      "TR": 413.6,
-      "TT": 491.41,
-      "TW": 560.98,
-      "TZ": 366.75,
-      "UA": 232.74,
-      "UG": 52.27,
-      "US": 368.1,
-      "UY": 150.13,
-      "UZ": 505.41,
-      "VC": 500.0,
-      "VE": 212.48,
-      "VG": 714.29,
-      "VI": 685.71,
-      "VN": 386.49,
-      "VU": 571.43,
-      "WS": 470.59,
-      "XK": 767.0,
-      "YE": 559.66,
-      "ZA": 708.21,
-      "ZM": 84.7,
-      "ZW": 392.28
+      "SN": 535.4,
+      "SO": 523.81,
+      "SR": 383.18,
+      "SS": 610.17,
+      "ST": 555.56,
+      "SV": 103.13,
+      "SY": 682.27,
+      "SZ": 142.86,
+      "TC": 653.85,
+      "TD": 615.39,
+      "TG": 478.26,
+      "TH": 554.5,
+      "TJ": 112.79,
+      "TM": 1306.3,
+      "TN": 560.25,
+      "TO": 571.43,
+      "TR": 469.7,
+      "TT": 682.11,
+      "TW": 635.65,
+      "TZ": 371.59,
+      "UA": 256.21,
+      "UG": 57.39,
+      "US": 383.55,
+      "UY": 96.7,
+      "UZ": 1121.18,
+      "VC": 600.0,
+      "VE": 180.25,
+      "VG": 647.06,
+      "VI": 641.79,
+      "VN": 471.16,
+      "VU": 500.0,
+      "WS": 400.0,
+      "XK": 958.72,
+      "YE": 586.32,
+      "ZA": 708.88,
+      "ZM": 111.0,
+      "ZW": 298.44
     }
 
     # @see {co2.js/data/output/marginal-intensities-2021.json}