From d4e255df71f972d2ad8a4abfb44f7548f03dc74b Mon Sep 17 00:00:00 2001 From: Carl Aiau Date: Sun, 29 Mar 2020 11:26:38 +1300 Subject: [PATCH] Fix for AK --- client/data/countries.json | 2 +- client/data/cumulative.json | 2 +- client/data/united-states-cum.json | 1700 +---------------- client/data/united-states.json | 352 ++-- .../src/components/advanced-country.page.js | 19 +- .../cumulative-graph/cumulative-graph.js | 4 +- .../cumulative-graph/graph-options-sidebar.js | 4 +- processing/get.js | 13 +- 8 files changed, 232 insertions(+), 1864 deletions(-) diff --git a/client/data/countries.json b/client/data/countries.json index 9a391dd..ee6d92f 100644 --- a/client/data/countries.json +++ b/client/data/countries.json @@ -27938,7 +27938,7 @@ "highest_confirmed": 8 }, { - "name": "United States", + "name": "All", "population": 327167434, "time_series": [ { diff --git a/client/data/cumulative.json b/client/data/cumulative.json index 5f6e314..b49d552 100644 --- a/client/data/cumulative.json +++ b/client/data/cumulative.json @@ -59272,7 +59272,7 @@ "highest_confirmed": 118234, "highest_deaths": 1965, "population": 327167434, - "name": "United States", + "name": "All", "confirmed": [ { "range": 50, diff --git a/client/data/united-states-cum.json b/client/data/united-states-cum.json index 51e3eb1..8a774b4 100644 --- a/client/data/united-states-cum.json +++ b/client/data/united-states-cum.json @@ -9,1602 +9,94 @@ "time_series": [ { "num_day": 0, - "date": "2020-03-06T00:00:00Z", - "confirmed": 223 - }, - { - "num_day": 1, - "date": "2020-03-07T00:00:00Z", - "confirmed": 341 - }, - { - "num_day": 2, - "date": "2020-03-08T00:00:00Z", - "confirmed": 417 - }, - { - "num_day": 3, - "date": "2020-03-09T00:00:00Z", - "confirmed": 584 - }, - { - "num_day": 4, - "date": "2020-03-10T00:00:00Z", - "confirmed": 778 - }, - { - "num_day": 5, - "date": "2020-03-11T00:00:00Z", - "confirmed": 1053 - }, - { - "num_day": 6, - "date": "2020-03-12T00:00:00Z", - "confirmed": 1315 - }, - { - "num_day": 7, - "date": "2020-03-13T00:00:00Z", - "confirmed": 1922 - }, - { - "num_day": 8, - "date": "2020-03-14T00:00:00Z", - "confirmed": 2450 - }, - { - "num_day": 9, - "date": "2020-03-15T00:00:00Z", - "confirmed": 3173 - }, - { - "num_day": 10, - "date": "2020-03-16T00:00:00Z", - "confirmed": 4019 - }, - { - "num_day": 11, - "date": "2020-03-17T00:00:00Z", - "confirmed": 5723 - }, - { - "num_day": 12, - "date": "2020-03-18T00:00:00Z", - "confirmed": 7730 - }, - { - "num_day": 13, - "date": "2020-03-19T00:00:00Z", - "confirmed": 11719 - }, - { - "num_day": 14, - "date": "2020-03-20T00:00:00Z", - "confirmed": 17033 - }, - { - "num_day": 15, - "date": "2020-03-21T00:00:00Z", - "confirmed": 23197 - }, - { - "num_day": 16, - "date": "2020-03-22T00:00:00Z", - "confirmed": 31879 - }, - { - "num_day": 17, - "date": "2020-03-23T00:00:00Z", - "confirmed": 42152 - }, - { - "num_day": 18, - "date": "2020-03-24T00:00:00Z", - "confirmed": 51954 - }, - { - "num_day": 19, - "date": "2020-03-25T00:00:00Z", - "confirmed": 63928 - }, - { - "num_day": 20, - "date": "2020-03-26T00:00:00Z", - "confirmed": 80735 - }, - { - "num_day": 21, - "date": "2020-03-27T00:00:00Z", - "confirmed": 99413 - }, - { - "num_day": 22, - "date": "2020-03-28T00:00:00Z", - "confirmed": 118234 - } - ] - }, - { - "range": 100, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-06T00:00:00Z", - "confirmed": 223 - }, - { - "num_day": 1, - "date": "2020-03-07T00:00:00Z", - "confirmed": 341 - }, - { - "num_day": 2, - "date": "2020-03-08T00:00:00Z", - "confirmed": 417 - }, - { - "num_day": 3, - "date": "2020-03-09T00:00:00Z", - "confirmed": 584 - }, - { - "num_day": 4, - "date": "2020-03-10T00:00:00Z", - "confirmed": 778 - }, - { - "num_day": 5, - "date": "2020-03-11T00:00:00Z", - "confirmed": 1053 - }, - { - "num_day": 6, - "date": "2020-03-12T00:00:00Z", - "confirmed": 1315 - }, - { - "num_day": 7, - "date": "2020-03-13T00:00:00Z", - "confirmed": 1922 - }, - { - "num_day": 8, - "date": "2020-03-14T00:00:00Z", - "confirmed": 2450 - }, - { - "num_day": 9, - "date": "2020-03-15T00:00:00Z", - "confirmed": 3173 - }, - { - "num_day": 10, - "date": "2020-03-16T00:00:00Z", - "confirmed": 4019 - }, - { - "num_day": 11, - "date": "2020-03-17T00:00:00Z", - "confirmed": 5723 - }, - { - "num_day": 12, - "date": "2020-03-18T00:00:00Z", - "confirmed": 7730 - }, - { - "num_day": 13, - "date": "2020-03-19T00:00:00Z", - "confirmed": 11719 - }, - { - "num_day": 14, - "date": "2020-03-20T00:00:00Z", - "confirmed": 17033 - }, - { - "num_day": 15, - "date": "2020-03-21T00:00:00Z", - "confirmed": 23197 - }, - { - "num_day": 16, - "date": "2020-03-22T00:00:00Z", - "confirmed": 31879 - }, - { - "num_day": 17, - "date": "2020-03-23T00:00:00Z", - "confirmed": 42152 - }, - { - "num_day": 18, - "date": "2020-03-24T00:00:00Z", - "confirmed": 51954 - }, - { - "num_day": 19, - "date": "2020-03-25T00:00:00Z", - "confirmed": 63928 - }, - { - "num_day": 20, - "date": "2020-03-26T00:00:00Z", - "confirmed": 80735 - }, - { - "num_day": 21, - "date": "2020-03-27T00:00:00Z", - "confirmed": 99413 - }, - { - "num_day": 22, - "date": "2020-03-28T00:00:00Z", - "confirmed": 118234 - } - ] - }, - { - "range": 200, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-06T00:00:00Z", - "confirmed": 223 - }, - { - "num_day": 1, - "date": "2020-03-07T00:00:00Z", - "confirmed": 341 - }, - { - "num_day": 2, - "date": "2020-03-08T00:00:00Z", - "confirmed": 417 - }, - { - "num_day": 3, - "date": "2020-03-09T00:00:00Z", - "confirmed": 584 - }, - { - "num_day": 4, - "date": "2020-03-10T00:00:00Z", - "confirmed": 778 - }, - { - "num_day": 5, - "date": "2020-03-11T00:00:00Z", - "confirmed": 1053 - }, - { - "num_day": 6, - "date": "2020-03-12T00:00:00Z", - "confirmed": 1315 - }, - { - "num_day": 7, - "date": "2020-03-13T00:00:00Z", - "confirmed": 1922 - }, - { - "num_day": 8, - "date": "2020-03-14T00:00:00Z", - "confirmed": 2450 - }, - { - "num_day": 9, - "date": "2020-03-15T00:00:00Z", - "confirmed": 3173 - }, - { - "num_day": 10, - "date": "2020-03-16T00:00:00Z", - "confirmed": 4019 - }, - { - "num_day": 11, - "date": "2020-03-17T00:00:00Z", - "confirmed": 5723 - }, - { - "num_day": 12, - "date": "2020-03-18T00:00:00Z", - "confirmed": 7730 - }, - { - "num_day": 13, - "date": "2020-03-19T00:00:00Z", - "confirmed": 11719 - }, - { - "num_day": 14, - "date": "2020-03-20T00:00:00Z", - "confirmed": 17033 - }, - { - "num_day": 15, - "date": "2020-03-21T00:00:00Z", - "confirmed": 23197 - }, - { - "num_day": 16, - "date": "2020-03-22T00:00:00Z", - "confirmed": 31879 - }, - { - "num_day": 17, - "date": "2020-03-23T00:00:00Z", - "confirmed": 42152 - }, - { - "num_day": 18, - "date": "2020-03-24T00:00:00Z", - "confirmed": 51954 - }, - { - "num_day": 19, - "date": "2020-03-25T00:00:00Z", - "confirmed": 63928 - }, - { - "num_day": 20, - "date": "2020-03-26T00:00:00Z", - "confirmed": 80735 - }, - { - "num_day": 21, - "date": "2020-03-27T00:00:00Z", - "confirmed": 99413 - }, - { - "num_day": 22, - "date": "2020-03-28T00:00:00Z", - "confirmed": 118234 - } - ] - }, - { - "range": 300, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-07T00:00:00Z", - "confirmed": 341 - }, - { - "num_day": 1, - "date": "2020-03-08T00:00:00Z", - "confirmed": 417 - }, - { - "num_day": 2, - "date": "2020-03-09T00:00:00Z", - "confirmed": 584 - }, - { - "num_day": 3, - "date": "2020-03-10T00:00:00Z", - "confirmed": 778 - }, - { - "num_day": 4, - "date": "2020-03-11T00:00:00Z", - "confirmed": 1053 - }, - { - "num_day": 5, - "date": "2020-03-12T00:00:00Z", - "confirmed": 1315 - }, - { - "num_day": 6, - "date": "2020-03-13T00:00:00Z", - "confirmed": 1922 - }, - { - "num_day": 7, - "date": "2020-03-14T00:00:00Z", - "confirmed": 2450 - }, - { - "num_day": 8, - "date": "2020-03-15T00:00:00Z", - "confirmed": 3173 - }, - { - "num_day": 9, - "date": "2020-03-16T00:00:00Z", - "confirmed": 4019 - }, - { - "num_day": 10, - "date": "2020-03-17T00:00:00Z", - "confirmed": 5723 - }, - { - "num_day": 11, - "date": "2020-03-18T00:00:00Z", - "confirmed": 7730 - }, - { - "num_day": 12, - "date": "2020-03-19T00:00:00Z", - "confirmed": 11719 - }, - { - "num_day": 13, - "date": "2020-03-20T00:00:00Z", - "confirmed": 17033 - }, - { - "num_day": 14, - "date": "2020-03-21T00:00:00Z", - "confirmed": 23197 - }, - { - "num_day": 15, - "date": "2020-03-22T00:00:00Z", - "confirmed": 31879 - }, - { - "num_day": 16, - "date": "2020-03-23T00:00:00Z", - "confirmed": 42152 - }, - { - "num_day": 17, - "date": "2020-03-24T00:00:00Z", - "confirmed": 51954 - }, - { - "num_day": 18, - "date": "2020-03-25T00:00:00Z", - "confirmed": 63928 - }, - { - "num_day": 19, - "date": "2020-03-26T00:00:00Z", - "confirmed": 80735 - }, - { - "num_day": 20, - "date": "2020-03-27T00:00:00Z", - "confirmed": 99413 - }, - { - "num_day": 21, - "date": "2020-03-28T00:00:00Z", - "confirmed": 118234 - } - ] - }, - { - "range": 400, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-08T00:00:00Z", - "confirmed": 417 - }, - { - "num_day": 1, - "date": "2020-03-09T00:00:00Z", - "confirmed": 584 - }, - { - "num_day": 2, - "date": "2020-03-10T00:00:00Z", - "confirmed": 778 - }, - { - "num_day": 3, - "date": "2020-03-11T00:00:00Z", - "confirmed": 1053 - }, - { - "num_day": 4, - "date": "2020-03-12T00:00:00Z", - "confirmed": 1315 - }, - { - "num_day": 5, - "date": "2020-03-13T00:00:00Z", - "confirmed": 1922 - }, - { - "num_day": 6, - "date": "2020-03-14T00:00:00Z", - "confirmed": 2450 - }, - { - "num_day": 7, - "date": "2020-03-15T00:00:00Z", - "confirmed": 3173 - }, - { - "num_day": 8, - "date": "2020-03-16T00:00:00Z", - "confirmed": 4019 - }, - { - "num_day": 9, - "date": "2020-03-17T00:00:00Z", - "confirmed": 5723 - }, - { - "num_day": 10, - "date": "2020-03-18T00:00:00Z", - "confirmed": 7730 - }, - { - "num_day": 11, - "date": "2020-03-19T00:00:00Z", - "confirmed": 11719 - }, - { - "num_day": 12, - "date": "2020-03-20T00:00:00Z", - "confirmed": 17033 - }, - { - "num_day": 13, - "date": "2020-03-21T00:00:00Z", - "confirmed": 23197 - }, - { - "num_day": 14, - "date": "2020-03-22T00:00:00Z", - "confirmed": 31879 - }, - { - "num_day": 15, - "date": "2020-03-23T00:00:00Z", - "confirmed": 42152 - }, - { - "num_day": 16, - "date": "2020-03-24T00:00:00Z", - "confirmed": 51954 - }, - { - "num_day": 17, - "date": "2020-03-25T00:00:00Z", - "confirmed": 63928 - }, - { - "num_day": 18, - "date": "2020-03-26T00:00:00Z", - "confirmed": 80735 - }, - { - "num_day": 19, - "date": "2020-03-27T00:00:00Z", - "confirmed": 99413 - }, - { - "num_day": 20, - "date": "2020-03-28T00:00:00Z", - "confirmed": 118234 - } - ] - }, - { - "range": 500, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-09T00:00:00Z", - "confirmed": 584 - }, - { - "num_day": 1, - "date": "2020-03-10T00:00:00Z", - "confirmed": 778 - }, - { - "num_day": 2, - "date": "2020-03-11T00:00:00Z", - "confirmed": 1053 - }, - { - "num_day": 3, - "date": "2020-03-12T00:00:00Z", - "confirmed": 1315 - }, - { - "num_day": 4, - "date": "2020-03-13T00:00:00Z", - "confirmed": 1922 - }, - { - "num_day": 5, - "date": "2020-03-14T00:00:00Z", - "confirmed": 2450 - }, - { - "num_day": 6, - "date": "2020-03-15T00:00:00Z", - "confirmed": 3173 - }, - { - "num_day": 7, - "date": "2020-03-16T00:00:00Z", - "confirmed": 4019 - }, - { - "num_day": 8, - "date": "2020-03-17T00:00:00Z", - "confirmed": 5723 - }, - { - "num_day": 9, - "date": "2020-03-18T00:00:00Z", - "confirmed": 7730 - }, - { - "num_day": 10, - "date": "2020-03-19T00:00:00Z", - "confirmed": 11719 - }, - { - "num_day": 11, - "date": "2020-03-20T00:00:00Z", - "confirmed": 17033 - }, - { - "num_day": 12, - "date": "2020-03-21T00:00:00Z", - "confirmed": 23197 - }, - { - "num_day": 13, - "date": "2020-03-22T00:00:00Z", - "confirmed": 31879 - }, - { - "num_day": 14, - "date": "2020-03-23T00:00:00Z", - "confirmed": 42152 - }, - { - "num_day": 15, - "date": "2020-03-24T00:00:00Z", - "confirmed": 51954 - }, - { - "num_day": 16, - "date": "2020-03-25T00:00:00Z", - "confirmed": 63928 - }, - { - "num_day": 17, - "date": "2020-03-26T00:00:00Z", - "confirmed": 80735 - }, - { - "num_day": 18, - "date": "2020-03-27T00:00:00Z", - "confirmed": 99413 - }, - { - "num_day": 19, - "date": "2020-03-28T00:00:00Z", - "confirmed": 118234 - } - ] - }, - { - "range": 750, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-10T00:00:00Z", - "confirmed": 778 - }, - { - "num_day": 1, - "date": "2020-03-11T00:00:00Z", - "confirmed": 1053 - }, - { - "num_day": 2, - "date": "2020-03-12T00:00:00Z", - "confirmed": 1315 - }, - { - "num_day": 3, - "date": "2020-03-13T00:00:00Z", - "confirmed": 1922 - }, - { - "num_day": 4, - "date": "2020-03-14T00:00:00Z", - "confirmed": 2450 - }, - { - "num_day": 5, - "date": "2020-03-15T00:00:00Z", - "confirmed": 3173 - }, - { - "num_day": 6, - "date": "2020-03-16T00:00:00Z", - "confirmed": 4019 - }, - { - "num_day": 7, - "date": "2020-03-17T00:00:00Z", - "confirmed": 5723 - }, - { - "num_day": 8, - "date": "2020-03-18T00:00:00Z", - "confirmed": 7730 - }, - { - "num_day": 9, - "date": "2020-03-19T00:00:00Z", - "confirmed": 11719 - }, - { - "num_day": 10, - "date": "2020-03-20T00:00:00Z", - "confirmed": 17033 - }, - { - "num_day": 11, - "date": "2020-03-21T00:00:00Z", - "confirmed": 23197 - }, - { - "num_day": 12, - "date": "2020-03-22T00:00:00Z", - "confirmed": 31879 - }, - { - "num_day": 13, - "date": "2020-03-23T00:00:00Z", - "confirmed": 42152 - }, - { - "num_day": 14, - "date": "2020-03-24T00:00:00Z", - "confirmed": 51954 - }, - { - "num_day": 15, - "date": "2020-03-25T00:00:00Z", - "confirmed": 63928 - }, - { - "num_day": 16, - "date": "2020-03-26T00:00:00Z", - "confirmed": 80735 - }, - { - "num_day": 17, - "date": "2020-03-27T00:00:00Z", - "confirmed": 99413 - }, - { - "num_day": 18, - "date": "2020-03-28T00:00:00Z", - "confirmed": 118234 - } - ] - }, - { - "range": 1000, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-11T00:00:00Z", - "confirmed": 1053 - }, - { - "num_day": 1, - "date": "2020-03-12T00:00:00Z", - "confirmed": 1315 - }, - { - "num_day": 2, - "date": "2020-03-13T00:00:00Z", - "confirmed": 1922 - }, - { - "num_day": 3, - "date": "2020-03-14T00:00:00Z", - "confirmed": 2450 - }, - { - "num_day": 4, - "date": "2020-03-15T00:00:00Z", - "confirmed": 3173 - }, - { - "num_day": 5, - "date": "2020-03-16T00:00:00Z", - "confirmed": 4019 - }, - { - "num_day": 6, - "date": "2020-03-17T00:00:00Z", - "confirmed": 5723 - }, - { - "num_day": 7, - "date": "2020-03-18T00:00:00Z", - "confirmed": 7730 - }, - { - "num_day": 8, - "date": "2020-03-19T00:00:00Z", - "confirmed": 11719 - }, - { - "num_day": 9, - "date": "2020-03-20T00:00:00Z", - "confirmed": 17033 - }, - { - "num_day": 10, - "date": "2020-03-21T00:00:00Z", - "confirmed": 23197 - }, - { - "num_day": 11, - "date": "2020-03-22T00:00:00Z", - "confirmed": 31879 - }, - { - "num_day": 12, - "date": "2020-03-23T00:00:00Z", - "confirmed": 42152 - }, - { - "num_day": 13, - "date": "2020-03-24T00:00:00Z", - "confirmed": 51954 - }, - { - "num_day": 14, - "date": "2020-03-25T00:00:00Z", - "confirmed": 63928 - }, - { - "num_day": 15, - "date": "2020-03-26T00:00:00Z", - "confirmed": 80735 - }, - { - "num_day": 16, - "date": "2020-03-27T00:00:00Z", - "confirmed": 99413 - }, - { - "num_day": 17, - "date": "2020-03-28T00:00:00Z", - "confirmed": 118234 - } - ] - } - ], - "deaths": [ - { - "range": 10, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-11T00:00:00Z", - "deaths": 27 - }, - { - "num_day": 1, - "date": "2020-03-12T00:00:00Z", - "deaths": 36 - }, - { - "num_day": 2, - "date": "2020-03-13T00:00:00Z", - "deaths": 39 - }, - { - "num_day": 3, - "date": "2020-03-14T00:00:00Z", - "deaths": 49 - }, - { - "num_day": 4, - "date": "2020-03-15T00:00:00Z", - "deaths": 60 - }, - { - "num_day": 5, - "date": "2020-03-16T00:00:00Z", - "deaths": 71 - }, - { - "num_day": 6, - "date": "2020-03-17T00:00:00Z", - "deaths": 90 - }, - { - "num_day": 7, - "date": "2020-03-18T00:00:00Z", - "deaths": 112 - }, - { - "num_day": 8, - "date": "2020-03-19T00:00:00Z", - "deaths": 160 - }, - { - "num_day": 9, - "date": "2020-03-20T00:00:00Z", - "deaths": 219 - }, - { - "num_day": 10, - "date": "2020-03-21T00:00:00Z", - "deaths": 272 - }, - { - "num_day": 11, - "date": "2020-03-22T00:00:00Z", - "deaths": 398 - }, - { - "num_day": 12, - "date": "2020-03-23T00:00:00Z", - "deaths": 471 - }, - { - "num_day": 13, - "date": "2020-03-24T00:00:00Z", - "deaths": 675 - }, - { - "num_day": 14, - "date": "2020-03-25T00:00:00Z", - "deaths": 900 - }, - { - "num_day": 15, - "date": "2020-03-26T00:00:00Z", - "deaths": 1163 - }, - { - "num_day": 16, - "date": "2020-03-27T00:00:00Z", - "deaths": 1530 - }, - { - "num_day": 17, - "date": "2020-03-28T00:00:00Z", - "deaths": 1965 - } - ] - }, - { - "range": 20, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-11T00:00:00Z", - "deaths": 27 - }, - { - "num_day": 1, - "date": "2020-03-12T00:00:00Z", - "deaths": 36 - }, - { - "num_day": 2, - "date": "2020-03-13T00:00:00Z", - "deaths": 39 - }, - { - "num_day": 3, - "date": "2020-03-14T00:00:00Z", - "deaths": 49 - }, - { - "num_day": 4, - "date": "2020-03-15T00:00:00Z", - "deaths": 60 - }, - { - "num_day": 5, - "date": "2020-03-16T00:00:00Z", - "deaths": 71 - }, - { - "num_day": 6, - "date": "2020-03-17T00:00:00Z", - "deaths": 90 - }, - { - "num_day": 7, - "date": "2020-03-18T00:00:00Z", - "deaths": 112 - }, - { - "num_day": 8, - "date": "2020-03-19T00:00:00Z", - "deaths": 160 - }, - { - "num_day": 9, - "date": "2020-03-20T00:00:00Z", - "deaths": 219 - }, - { - "num_day": 10, - "date": "2020-03-21T00:00:00Z", - "deaths": 272 - }, - { - "num_day": 11, - "date": "2020-03-22T00:00:00Z", - "deaths": 398 - }, - { - "num_day": 12, - "date": "2020-03-23T00:00:00Z", - "deaths": 471 - }, - { - "num_day": 13, - "date": "2020-03-24T00:00:00Z", - "deaths": 675 - }, - { - "num_day": 14, - "date": "2020-03-25T00:00:00Z", - "deaths": 900 - }, - { - "num_day": 15, - "date": "2020-03-26T00:00:00Z", - "deaths": 1163 - }, - { - "num_day": 16, - "date": "2020-03-27T00:00:00Z", - "deaths": 1530 - }, - { - "num_day": 17, - "date": "2020-03-28T00:00:00Z", - "deaths": 1965 - } - ] - }, - { - "range": 30, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-12T00:00:00Z", - "deaths": 36 - }, - { - "num_day": 1, - "date": "2020-03-13T00:00:00Z", - "deaths": 39 - }, - { - "num_day": 2, - "date": "2020-03-14T00:00:00Z", - "deaths": 49 - }, - { - "num_day": 3, - "date": "2020-03-15T00:00:00Z", - "deaths": 60 - }, - { - "num_day": 4, - "date": "2020-03-16T00:00:00Z", - "deaths": 71 - }, - { - "num_day": 5, - "date": "2020-03-17T00:00:00Z", - "deaths": 90 - }, - { - "num_day": 6, - "date": "2020-03-18T00:00:00Z", - "deaths": 112 - }, - { - "num_day": 7, - "date": "2020-03-19T00:00:00Z", - "deaths": 160 - }, - { - "num_day": 8, - "date": "2020-03-20T00:00:00Z", - "deaths": 219 - }, - { - "num_day": 9, - "date": "2020-03-21T00:00:00Z", - "deaths": 272 - }, - { - "num_day": 10, - "date": "2020-03-22T00:00:00Z", - "deaths": 398 - }, - { - "num_day": 11, - "date": "2020-03-23T00:00:00Z", - "deaths": 471 - }, - { - "num_day": 12, - "date": "2020-03-24T00:00:00Z", - "deaths": 675 - }, - { - "num_day": 13, - "date": "2020-03-25T00:00:00Z", - "deaths": 900 - }, - { - "num_day": 14, - "date": "2020-03-26T00:00:00Z", - "deaths": 1163 - }, - { - "num_day": 15, - "date": "2020-03-27T00:00:00Z", - "deaths": 1530 - }, - { - "num_day": 16, - "date": "2020-03-28T00:00:00Z", - "deaths": 1965 - } - ] - }, - { - "range": 40, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-14T00:00:00Z", - "deaths": 49 - }, - { - "num_day": 1, - "date": "2020-03-15T00:00:00Z", - "deaths": 60 - }, - { - "num_day": 2, - "date": "2020-03-16T00:00:00Z", - "deaths": 71 - }, - { - "num_day": 3, - "date": "2020-03-17T00:00:00Z", - "deaths": 90 - }, - { - "num_day": 4, - "date": "2020-03-18T00:00:00Z", - "deaths": 112 - }, - { - "num_day": 5, - "date": "2020-03-19T00:00:00Z", - "deaths": 160 - }, - { - "num_day": 6, - "date": "2020-03-20T00:00:00Z", - "deaths": 219 - }, - { - "num_day": 7, - "date": "2020-03-21T00:00:00Z", - "deaths": 272 - }, - { - "num_day": 8, - "date": "2020-03-22T00:00:00Z", - "deaths": 398 - }, - { - "num_day": 9, - "date": "2020-03-23T00:00:00Z", - "deaths": 471 - }, - { - "num_day": 10, - "date": "2020-03-24T00:00:00Z", - "deaths": 675 - }, - { - "num_day": 11, - "date": "2020-03-25T00:00:00Z", - "deaths": 900 - }, - { - "num_day": 12, - "date": "2020-03-26T00:00:00Z", - "deaths": 1163 - }, - { - "num_day": 13, - "date": "2020-03-27T00:00:00Z", - "deaths": 1530 - }, - { - "num_day": 14, - "date": "2020-03-28T00:00:00Z", - "deaths": 1965 - } - ] - }, - { - "range": 50, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-15T00:00:00Z", - "deaths": 60 - }, - { - "num_day": 1, - "date": "2020-03-16T00:00:00Z", - "deaths": 71 - }, - { - "num_day": 2, - "date": "2020-03-17T00:00:00Z", - "deaths": 90 - }, - { - "num_day": 3, - "date": "2020-03-18T00:00:00Z", - "deaths": 112 - }, - { - "num_day": 4, - "date": "2020-03-19T00:00:00Z", - "deaths": 160 - }, - { - "num_day": 5, - "date": "2020-03-20T00:00:00Z", - "deaths": 219 - }, - { - "num_day": 6, - "date": "2020-03-21T00:00:00Z", - "deaths": 272 - }, - { - "num_day": 7, - "date": "2020-03-22T00:00:00Z", - "deaths": 398 - }, - { - "num_day": 8, - "date": "2020-03-23T00:00:00Z", - "deaths": 471 - }, - { - "num_day": 9, - "date": "2020-03-24T00:00:00Z", - "deaths": 675 - }, - { - "num_day": 10, - "date": "2020-03-25T00:00:00Z", - "deaths": 900 - }, - { - "num_day": 11, - "date": "2020-03-26T00:00:00Z", - "deaths": 1163 - }, - { - "num_day": 12, - "date": "2020-03-27T00:00:00Z", - "deaths": 1530 - }, - { - "num_day": 13, - "date": "2020-03-28T00:00:00Z", - "deaths": 1965 - } - ] - }, - { - "range": 75, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-17T00:00:00Z", - "deaths": 90 - }, - { - "num_day": 1, - "date": "2020-03-18T00:00:00Z", - "deaths": 112 - }, - { - "num_day": 2, - "date": "2020-03-19T00:00:00Z", - "deaths": 160 - }, - { - "num_day": 3, - "date": "2020-03-20T00:00:00Z", - "deaths": 219 - }, - { - "num_day": 4, - "date": "2020-03-21T00:00:00Z", - "deaths": 272 - }, - { - "num_day": 5, - "date": "2020-03-22T00:00:00Z", - "deaths": 398 - }, - { - "num_day": 6, - "date": "2020-03-23T00:00:00Z", - "deaths": 471 - }, - { - "num_day": 7, - "date": "2020-03-24T00:00:00Z", - "deaths": 675 - }, - { - "num_day": 8, - "date": "2020-03-25T00:00:00Z", - "deaths": 900 - }, - { - "num_day": 9, - "date": "2020-03-26T00:00:00Z", - "deaths": 1163 - }, - { - "num_day": 10, - "date": "2020-03-27T00:00:00Z", - "deaths": 1530 - }, - { - "num_day": 11, - "date": "2020-03-28T00:00:00Z", - "deaths": 1965 - } - ] - }, - { - "range": 100, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-18T00:00:00Z", - "deaths": 112 - }, - { - "num_day": 1, - "date": "2020-03-19T00:00:00Z", - "deaths": 160 - }, - { - "num_day": 2, - "date": "2020-03-20T00:00:00Z", - "deaths": 219 - }, - { - "num_day": 3, - "date": "2020-03-21T00:00:00Z", - "deaths": 272 - }, - { - "num_day": 4, - "date": "2020-03-22T00:00:00Z", - "deaths": 398 - }, - { - "num_day": 5, - "date": "2020-03-23T00:00:00Z", - "deaths": 471 - }, - { - "num_day": 6, - "date": "2020-03-24T00:00:00Z", - "deaths": 675 - }, - { - "num_day": 7, - "date": "2020-03-25T00:00:00Z", - "deaths": 900 - }, - { - "num_day": 8, - "date": "2020-03-26T00:00:00Z", - "deaths": 1163 - }, - { - "num_day": 9, - "date": "2020-03-27T00:00:00Z", - "deaths": 1530 - }, - { - "num_day": 10, - "date": "2020-03-28T00:00:00Z", - "deaths": 1965 - } - ] - }, - { - "range": 200, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-20T00:00:00Z", - "deaths": 219 - }, - { - "num_day": 1, - "date": "2020-03-21T00:00:00Z", - "deaths": 272 - }, - { - "num_day": 2, - "date": "2020-03-22T00:00:00Z", - "deaths": 398 - }, - { - "num_day": 3, - "date": "2020-03-23T00:00:00Z", - "deaths": 471 - }, - { - "num_day": 4, - "date": "2020-03-24T00:00:00Z", - "deaths": 675 - }, - { - "num_day": 5, - "date": "2020-03-25T00:00:00Z", - "deaths": 900 - }, - { - "num_day": 6, "date": "2020-03-26T00:00:00Z", - "deaths": 1163 + "confirmed": 59 }, { - "num_day": 7, + "num_day": 1, "date": "2020-03-27T00:00:00Z", - "deaths": 1530 + "confirmed": 69 }, { - "num_day": 8, + "num_day": 2, "date": "2020-03-28T00:00:00Z", - "deaths": 1965 + "confirmed": 85 } ] }, + { + "range": 100, + "time_series": [] + }, + { + "range": 200, + "time_series": [] + }, { "range": 300, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-22T00:00:00Z", - "deaths": 398 - }, - { - "num_day": 1, - "date": "2020-03-23T00:00:00Z", - "deaths": 471 - }, - { - "num_day": 2, - "date": "2020-03-24T00:00:00Z", - "deaths": 675 - }, - { - "num_day": 3, - "date": "2020-03-25T00:00:00Z", - "deaths": 900 - }, - { - "num_day": 4, - "date": "2020-03-26T00:00:00Z", - "deaths": 1163 - }, - { - "num_day": 5, - "date": "2020-03-27T00:00:00Z", - "deaths": 1530 - }, - { - "num_day": 6, - "date": "2020-03-28T00:00:00Z", - "deaths": 1965 - } - ] + "time_series": [] }, { "range": 400, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-23T00:00:00Z", - "deaths": 471 - }, - { - "num_day": 1, - "date": "2020-03-24T00:00:00Z", - "deaths": 675 - }, - { - "num_day": 2, - "date": "2020-03-25T00:00:00Z", - "deaths": 900 - }, - { - "num_day": 3, - "date": "2020-03-26T00:00:00Z", - "deaths": 1163 - }, - { - "num_day": 4, - "date": "2020-03-27T00:00:00Z", - "deaths": 1530 - }, - { - "num_day": 5, - "date": "2020-03-28T00:00:00Z", - "deaths": 1965 - } - ] + "time_series": [] }, { "range": 500, - "time_series": [ - { - "num_day": 0, - "date": "2020-03-24T00:00:00Z", - "deaths": 675 - }, - { - "num_day": 1, - "date": "2020-03-25T00:00:00Z", - "deaths": 900 - }, - { - "num_day": 2, - "date": "2020-03-26T00:00:00Z", - "deaths": 1163 - }, - { - "num_day": 3, - "date": "2020-03-27T00:00:00Z", - "deaths": 1530 - }, - { - "num_day": 4, - "date": "2020-03-28T00:00:00Z", - "deaths": 1965 - } - ] + "time_series": [] + }, + { + "range": 750, + "time_series": [] + }, + { + "range": 1000, + "time_series": [] + } + ], + "deaths": [ + { + "range": 10, + "time_series": [] + }, + { + "range": 20, + "time_series": [] + }, + { + "range": 30, + "time_series": [] + }, + { + "range": 40, + "time_series": [] + }, + { + "range": 50, + "time_series": [] + }, + { + "range": 75, + "time_series": [] + }, + { + "range": 100, + "time_series": [] + }, + { + "range": 200, + "time_series": [] + }, + { + "range": 300, + "time_series": [] + }, + { + "range": 400, + "time_series": [] + }, + { + "range": 500, + "time_series": [] } ] }, @@ -2174,56 +666,46 @@ "time_series": [ { "num_day": 0, - "date": "2020-03-04T00:00:00Z", - "confirmed": 118 - }, - { - "num_day": 1, - "date": "2020-03-05T00:00:00Z", - "confirmed": 176 - }, - { - "num_day": 2, "date": "2020-03-20T00:00:00Z", "confirmed": 65 }, { - "num_day": 3, + "num_day": 1, "date": "2020-03-21T00:00:00Z", "confirmed": 104 }, { - "num_day": 4, + "num_day": 2, "date": "2020-03-22T00:00:00Z", "confirmed": 152 }, { - "num_day": 5, + "num_day": 3, "date": "2020-03-23T00:00:00Z", "confirmed": 265 }, { - "num_day": 6, + "num_day": 4, "date": "2020-03-24T00:00:00Z", "confirmed": 357 }, { - "num_day": 7, + "num_day": 5, "date": "2020-03-25T00:00:00Z", "confirmed": 450 }, { - "num_day": 8, + "num_day": 6, "date": "2020-03-26T00:00:00Z", "confirmed": 577 }, { - "num_day": 9, + "num_day": 7, "date": "2020-03-27T00:00:00Z", "confirmed": 736 }, { - "num_day": 10, + "num_day": 8, "date": "2020-03-28T00:00:00Z", "confirmed": 873 } @@ -2234,51 +716,41 @@ "time_series": [ { "num_day": 0, - "date": "2020-03-04T00:00:00Z", - "confirmed": 118 - }, - { - "num_day": 1, - "date": "2020-03-05T00:00:00Z", - "confirmed": 176 - }, - { - "num_day": 2, "date": "2020-03-21T00:00:00Z", "confirmed": 104 }, { - "num_day": 3, + "num_day": 1, "date": "2020-03-22T00:00:00Z", "confirmed": 152 }, { - "num_day": 4, + "num_day": 2, "date": "2020-03-23T00:00:00Z", "confirmed": 265 }, { - "num_day": 5, + "num_day": 3, "date": "2020-03-24T00:00:00Z", "confirmed": 357 }, { - "num_day": 6, + "num_day": 4, "date": "2020-03-25T00:00:00Z", "confirmed": 450 }, { - "num_day": 7, + "num_day": 5, "date": "2020-03-26T00:00:00Z", "confirmed": 577 }, { - "num_day": 8, + "num_day": 6, "date": "2020-03-27T00:00:00Z", "confirmed": 736 }, { - "num_day": 9, + "num_day": 7, "date": "2020-03-28T00:00:00Z", "confirmed": 873 } @@ -19086,7 +17558,7 @@ "highest_confirmed": 118234, "highest_deaths": 1965, "population": 327167434, - "name": "United States", + "name": "All", "confirmed": [ { "range": 50, diff --git a/client/data/united-states.json b/client/data/united-states.json index e3dc2ec..43b52ab 100644 --- a/client/data/united-states.json +++ b/client/data/united-states.json @@ -4,279 +4,187 @@ "time_series": [ { "date": "2020-03-06T00:00:00Z", - "confirmed": 223, - "deaths": 0, - "hospitalized": 0, - "tests": 1794, - "old_date": 20200306, - "confirmed_per_mil": 0.6816081823107125, - "deaths_per_mil": 0, - "hospitalized_per_mil": 0, - "tests_per_mil": 5.4834308478269875 + "confirmed": 0, + "deaths": null, + "hospitalized": null, + "tests": 8, + "old_date": 20200306 }, { "date": "2020-03-07T00:00:00Z", - "confirmed": 341, - "deaths": 0, - "hospitalized": 0, - "tests": 2150, - "old_date": 20200307, - "confirmed_per_mil": 1.0422797765379057, - "deaths_per_mil": 0, - "hospitalized_per_mil": 0, - "tests_per_mil": 6.571558708376824 + "confirmed": 0, + "deaths": null, + "hospitalized": null, + "tests": 12, + "old_date": 20200307 }, { "date": "2020-03-08T00:00:00Z", - "confirmed": 417, - "deaths": 0, - "hospitalized": 0, - "tests": 2752, - "old_date": 20200308, - "confirmed_per_mil": 1.274576735531691, - "deaths_per_mil": 0, - "hospitalized_per_mil": 0, - "tests_per_mil": 8.411595146722336 + "confirmed": 0, + "deaths": null, + "hospitalized": null, + "tests": 14, + "old_date": 20200308 }, { "date": "2020-03-09T00:00:00Z", - "confirmed": 584, - "deaths": 0, - "hospitalized": 0, - "tests": 3951, - "old_date": 20200309, - "confirmed_per_mil": 1.7850187375311932, - "deaths_per_mil": 0, - "hospitalized_per_mil": 0, - "tests_per_mil": 12.076385328742713 + "confirmed": 0, + "deaths": null, + "hospitalized": null, + "tests": 23, + "old_date": 20200309 }, { "date": "2020-03-10T00:00:00Z", - "confirmed": 778, - "deaths": 0, - "hospitalized": 0, - "tests": 4585, - "old_date": 20200310, - "confirmed_per_mil": 2.3779872907521717, - "deaths_per_mil": 0, - "hospitalized_per_mil": 0, - "tests_per_mil": 14.014231012980344 + "confirmed": 0, + "deaths": null, + "hospitalized": null, + "tests": 23, + "old_date": 20200310 }, { "date": "2020-03-11T00:00:00Z", - "confirmed": 1053, - "deaths": 27, - "hospitalized": 0, - "tests": 7123, - "old_date": 20200311, - "confirmed_per_mil": 3.2185354976375797, - "deaths_per_mil": 0.0825265512214764, - "hospitalized_per_mil": 0, - "tests_per_mil": 21.771726827799124 + "confirmed": 0, + "deaths": null, + "hospitalized": null, + "tests": 46, + "old_date": 20200311 }, { "date": "2020-03-12T00:00:00Z", - "confirmed": 1315, - "deaths": 36, - "hospitalized": 0, - "tests": 9356, - "old_date": 20200312, - "confirmed_per_mil": 4.019348698379313, - "deaths_per_mil": 0.11003540162863519, - "hospitalized_per_mil": 0, - "tests_per_mil": 28.596978267708636 + "confirmed": 0, + "deaths": null, + "hospitalized": null, + "tests": 46, + "old_date": 20200312 }, { "date": "2020-03-13T00:00:00Z", - "confirmed": 1922, - "deaths": 39, - "hospitalized": 0, - "tests": 15535, - "old_date": 20200313, - "confirmed_per_mil": 5.874667831395468, - "deaths_per_mil": 0.11920501843102146, - "hospitalized_per_mil": 0, - "tests_per_mil": 47.483332341690215 + "confirmed": 1, + "deaths": null, + "hospitalized": null, + "tests": 60, + "old_date": 20200313 }, { "date": "2020-03-14T00:00:00Z", - "confirmed": 2450, - "deaths": 49, - "hospitalized": 0, - "tests": 19552, - "old_date": 20200314, - "confirmed_per_mil": 7.488520388615451, - "deaths_per_mil": 0.14977040777230902, - "hospitalized_per_mil": 0, - "tests_per_mil": 59.761449240085426 + "confirmed": 1, + "deaths": null, + "hospitalized": null, + "tests": 144, + "old_date": 20200314 }, { "date": "2020-03-15T00:00:00Z", - "confirmed": 3173, - "deaths": 60, - "hospitalized": 0, - "tests": 25724, - "old_date": 20200315, - "confirmed_per_mil": 9.698398037990541, - "deaths_per_mil": 0.18339233604772534, - "hospitalized_per_mil": 0, - "tests_per_mil": 78.62640754152811 + "confirmed": 1, + "deaths": null, + "hospitalized": null, + "tests": 144, + "old_date": 20200315 }, { "date": "2020-03-16T00:00:00Z", - "confirmed": 4019, - "deaths": 71, - "hospitalized": 0, - "tests": 40123, - "old_date": 20200316, - "confirmed_per_mil": 12.284229976263468, - "deaths_per_mil": 0.21701426432314164, - "hospitalized_per_mil": 0, - "tests_per_mil": 122.63751165404805 + "confirmed": 1, + "deaths": null, + "hospitalized": null, + "tests": 144, + "old_date": 20200316 }, { "date": "2020-03-17T00:00:00Z", - "confirmed": 5723, - "deaths": 90, - "hospitalized": 0, - "tests": 53327, - "old_date": 20200317, - "confirmed_per_mil": 17.49257232001887, - "deaths_per_mil": 0.27508850407158797, - "hospitalized_per_mil": 0, - "tests_per_mil": 162.99605174028414 + "confirmed": 3, + "deaths": null, + "hospitalized": null, + "tests": 337, + "old_date": 20200317 }, { "date": "2020-03-18T00:00:00Z", - "confirmed": 7730, - "deaths": 112, - "hospitalized": 0, - "tests": 73955, - "old_date": 20200318, - "confirmed_per_mil": 23.62704596081528, - "deaths_per_mil": 0.3423323606224206, - "hospitalized_per_mil": 0, - "tests_per_mil": 226.04633687349212 + "confirmed": 6, + "deaths": null, + "hospitalized": null, + "tests": 412, + "old_date": 20200318 }, { "date": "2020-03-19T00:00:00Z", - "confirmed": 11719, - "deaths": 160, - "hospitalized": 0, - "tests": 100838, - "old_date": 20200319, - "confirmed_per_mil": 35.81957976905488, - "deaths_per_mil": 0.4890462294606009, - "hospitalized_per_mil": 0, - "tests_per_mil": 308.2152730396754 + "confirmed": 6, + "deaths": null, + "hospitalized": null, + "tests": 406, + "old_date": 20200319 }, { "date": "2020-03-20T00:00:00Z", - "confirmed": 17033, - "deaths": 219, - "hospitalized": 0, - "tests": 135180, - "old_date": 20200320, - "confirmed_per_mil": 52.062027665015094, - "deaths_per_mil": 0.6693820265741974, - "hospitalized_per_mil": 0, - "tests_per_mil": 413.18293311552515 + "confirmed": 12, + "deaths": null, + "hospitalized": null, + "tests": 698, + "old_date": 20200320 }, { "date": "2020-03-21T00:00:00Z", - "confirmed": 23197, - "deaths": 272, - "hospitalized": 1964, - "tests": 179106, - "old_date": 20200321, - "confirmed_per_mil": 70.90253365498474, - "deaths_per_mil": 0.8313785900830215, - "hospitalized_per_mil": 6.003042466628876, - "tests_per_mil": 547.4444623360649 + "confirmed": 14, + "deaths": null, + "hospitalized": 0, + "tests": 772, + "old_date": 20200321 }, { "date": "2020-03-22T00:00:00Z", - "confirmed": 31879, - "deaths": 398, - "hospitalized": 2554, - "tests": 225342, - "old_date": 20200322, - "confirmed_per_mil": 97.4394046810906, - "deaths_per_mil": 1.2165024957832447, - "hospitalized_per_mil": 7.806400437764841, - "tests_per_mil": 688.7665964944421 + "confirmed": 22, + "deaths": null, + "hospitalized": 0, + "tests": 968, + "old_date": 20200322 }, { "date": "2020-03-23T00:00:00Z", - "confirmed": 42152, - "deaths": 471, - "hospitalized": 3325, - "tests": 279473, - "old_date": 20200323, - "confirmed_per_mil": 128.8392291513953, - "deaths_per_mil": 1.4396298379746437, - "hospitalized_per_mil": 10.162991955978113, - "tests_per_mil": 854.2201055377657 + "confirmed": 22, + "deaths": null, + "hospitalized": 0, + "tests": 968, + "old_date": 20200323 }, { "date": "2020-03-24T00:00:00Z", - "confirmed": 51954, - "deaths": 675, - "hospitalized": 4468, - "tests": 344712, - "old_date": 20200324, - "confirmed_per_mil": 158.79942378372536, - "deaths_per_mil": 2.06316378053691, - "hospitalized_per_mil": 13.65661595768728, - "tests_per_mil": 1053.6256490613916 + "confirmed": 36, + "deaths": null, + "hospitalized": 0, + "tests": 1022, + "old_date": 20200324 }, { "date": "2020-03-25T00:00:00Z", - "confirmed": 63928, - "deaths": 900, - "hospitalized": 6136, - "tests": 421532, - "old_date": 20200325, - "confirmed_per_mil": 195.39842098098308, - "deaths_per_mil": 2.75088504071588, - "hospitalized_per_mil": 18.754922899814044, - "tests_per_mil": 1288.4289699811625 + "confirmed": 42, + "deaths": 1, + "hospitalized": 1, + "tests": 1691, + "old_date": 20200325 }, { "date": "2020-03-26T00:00:00Z", - "confirmed": 80735, - "deaths": 1163, - "hospitalized": 10131, - "tests": 519338, - "old_date": 20200326, - "confirmed_per_mil": 246.76967084688508, - "deaths_per_mil": 3.5547547803917428, - "hospitalized_per_mil": 30.96579594165842, - "tests_per_mil": 1587.3768169725597 + "confirmed": 59, + "deaths": 1, + "hospitalized": 3, + "tests": 1860, + "old_date": 20200326 }, { "date": "2020-03-27T00:00:00Z", - "confirmed": 99413, - "deaths": 1530, - "hospitalized": 13717, - "tests": 626633, - "old_date": 20200327, - "confirmed_per_mil": 303.859705058542, - "deaths_per_mil": 4.676504569216996, - "hospitalized_per_mil": 41.92654455944414, - "tests_per_mil": 1915.3281619099043 + "confirmed": 69, + "deaths": 1, + "hospitalized": 3, + "tests": 2388, + "old_date": 20200327 }, { "date": "2020-03-28T00:00:00Z", - "confirmed": 118234, - "deaths": 1965, - "hospitalized": 16729, - "tests": 735704, - "old_date": 20200328, - "confirmed_per_mil": 361.3868243377793, - "deaths_per_mil": 6.006099005563004, - "hospitalized_per_mil": 51.13283982903995, - "tests_per_mil": 2248.707919994262 + "confirmed": 85, + "deaths": 2, + "hospitalized": 5, + "tests": 2921, + "old_date": 20200328 } ], "highest_confirmed": 85, @@ -780,27 +688,19 @@ "time_series": [ { "date": "2020-03-04T00:00:00Z", - "confirmed": 118, - "deaths": 0, - "hospitalized": 0, - "tests": 866, - "old_date": 20200304, - "confirmed_per_mil": 0.36067159422719314, - "deaths_per_mil": 0, - "hospitalized_per_mil": 0, - "tests_per_mil": 2.6469627169555023 + "confirmed": 2, + "deaths": null, + "hospitalized": null, + "tests": 29, + "old_date": 20200304 }, { "date": "2020-03-05T00:00:00Z", - "confirmed": 176, - "deaths": 0, - "hospitalized": 0, - "tests": 1129, - "old_date": 20200305, - "confirmed_per_mil": 0.537950852406661, - "deaths_per_mil": 0, - "hospitalized_per_mil": 0, - "tests_per_mil": 3.450832456631365 + "confirmed": 2, + "deaths": null, + "hospitalized": null, + "tests": 30, + "old_date": 20200305 }, { "date": "2020-03-06T00:00:00Z", @@ -10692,7 +10592,7 @@ "highest_tests": 1557 }, { - "name": "United States", + "name": "All", "population": 327167434, "time_series": [ { diff --git a/client/src/components/advanced-country.page.js b/client/src/components/advanced-country.page.js index 0a84128..81fe089 100644 --- a/client/src/components/advanced-country.page.js +++ b/client/src/components/advanced-country.page.js @@ -52,10 +52,7 @@ export default class AdvancedCountryPage extends React.Component{ }) - // Quick fixes while resolve AK - const all = this.props.all.filter(s => s.name != 'AK') - - const {rows, headCells} = SetupAdvancedCountryTable(all) + const {rows, headCells} = SetupAdvancedCountryTable(this.props.all) @@ -220,11 +217,8 @@ export default class AdvancedCountryPage extends React.Component{ The United States total and state level COVID-19 data is sourced from the {' '} COVID Tracking Project - . + . This page is in active development.

-

- This page is in active development. We have a bug with AK data, which is presently not shown. -

@@ -359,12 +353,13 @@ export default class AdvancedCountryPage extends React.Component{

United States Overview

-

There is inconsistent reporting of hospitalizations and tests between states.

+

+ Data is sourced from the + {' '} + COVID Tracking Project + . This page is in active development

-

- Page under active development. AK is currently not been shown due to data issues. -

diff --git a/client/src/components/cumulative-graph/cumulative-graph.js b/client/src/components/cumulative-graph/cumulative-graph.js index 5fc9a17..56e2e04 100644 --- a/client/src/components/cumulative-graph/cumulative-graph.js +++ b/client/src/components/cumulative-graph/cumulative-graph.js @@ -39,8 +39,8 @@ const CumulativeGraph = ({ else if(type_of_area == 'state'){ all_possible_areas = ( field == 'confirmed' ? - areas.confirmed[accumulateFrom].filter(c => c).filter(c => c.name != 'AK') : - areas.deaths[accumulateFrom].filter( c => c ).filter(c => c.name != 'AK') + areas.confirmed[accumulateFrom].filter(c => c) : + areas.deaths[accumulateFrom].filter( c => c ) ) .slice(0, limit) } diff --git a/client/src/components/cumulative-graph/graph-options-sidebar.js b/client/src/components/cumulative-graph/graph-options-sidebar.js index 839aed3..eb75c50 100644 --- a/client/src/components/cumulative-graph/graph-options-sidebar.js +++ b/client/src/components/cumulative-graph/graph-options-sidebar.js @@ -39,8 +39,8 @@ const GraphOptionsSideBar = ({ else if(type_of_area == 'state'){ areas_avaliable = ( field == 'confirmed' ? - areas.confirmed[accumulateFrom].filter(c => c).filter(c => c.name != 'AK') : - areas.deaths[accumulateFrom].filter( c => c ).filter(c => c.name != 'AK') + areas.confirmed[accumulateFrom].filter(c => c) : + areas.deaths[accumulateFrom].filter( c => c ) ) .slice(0, limit) } diff --git a/processing/get.js b/processing/get.js index 3a60b54..194a0a8 100644 --- a/processing/get.js +++ b/processing/get.js @@ -402,10 +402,6 @@ const getUnitedStates = (json_data) => { states.push({ name: state, time_series: time_series.reverse().map(day => ({ - // - // Set the date to "2018-09-01T16:01:36.386Z" - //const utcDate = zonedTimeToUtc('2018-09-01 18:01:36.386', 'Europe/Berlin') - date: format(parse(day.date, 'yyyyMMdd', new Date() ), 'yyyy-MM-dd') + 'T00:00:00Z', confirmed: day.positive, //confirmed_per_mil, @@ -422,6 +418,9 @@ const getUnitedStates = (json_data) => { }) }) + + + const total_time_series = {} states.forEach(state => { @@ -433,7 +432,7 @@ const getUnitedStates = (json_data) => { total_time_series[day.old_date].tests += day.tests } else{ - total_time_series[day.old_date] = day + total_time_series[day.old_date] = Object.assign({}, day) } }) }) @@ -441,7 +440,7 @@ const getUnitedStates = (json_data) => { const US_time_series = _.map(total_time_series, day => day) const most_recent_day = US_time_series[US_time_series.length -1] const total = { - name: "United States", + name: "All", population: 327167434, time_series: US_time_series, highest_confirmed: most_recent_day.confirmed, @@ -459,6 +458,8 @@ const getUnitedStates = (json_data) => { states.push(total) + + console.log(states[0]) return { states, total_only: total