Skip to content

Commit

Permalink
Sorry for delay in updating
Browse files Browse the repository at this point in the history
  • Loading branch information
carlaiau committed May 6, 2020
1 parent 1d2a74f commit 91f1c48
Show file tree
Hide file tree
Showing 9 changed files with 90,921 additions and 5,702 deletions.
40,786 changes: 39,990 additions & 796 deletions client/data/advanced.json

Large diffs are not rendered by default.

11,321 changes: 10,574 additions & 747 deletions client/data/countries.json

Large diffs are not rendered by default.

35,635 changes: 34,596 additions & 1,039 deletions client/data/cumulative.json

Large diffs are not rendered by default.

8,765 changes: 5,677 additions & 3,088 deletions client/data/nz-advanced.json

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions client/src/components/cumulative-graph/cumulative-graph.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ const CumulativeGraph = ({
height,
width,
areas_to_graph = [],
field = 'confirmed',
max_days = 30,
field = 'confirmed',
scale="log",
accumulateFrom

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const NZRegionalView = ({width, height}) => {
<div className="column is-one-third-desktop is-full-tablet">
<div className="box has-background-success">
<h3 className="is-size-4 title has-text-white title">
April cases by DHB
April and May cases by DHB
</h3>
<p className="is-size-6 subtitle has-text-white">
We use the Ministry of Health current case data found
Expand All @@ -101,6 +101,9 @@ const NZRegionalView = ({width, height}) => {
These comparisons are based on the case report date not when they are announced.
If a case have been reported for the same day as the 1pm national update they are included in the previous days results.
</p>
<p className="has-text-white is-size-7" style={{marginTop: '10px'}}>
If a region case count isn't changing I have a bug related to the outputting of the dates after the flattening occured.
</p>
</div>
<EnhancedTable
rows={rows}
Expand All @@ -113,7 +116,7 @@ const NZRegionalView = ({width, height}) => {
</div>
<div className="column is-two-thirds-desktop is-full-tablet">
<p className="title is-size-4" >
April total and confirmed cases {activeRegion == 'All' ? 'nationwide' : 'in ' + activeRegion + ' DHB'}
April and May total and confirmed cases {activeRegion == 'All' ? 'nationwide' : 'in ' + activeRegion + ' DHB'}
</p>
<GraphHeader className="field is-horizontal" style={{width: "100%", justifyContent: 'flex-end'}}>

Expand Down
23 changes: 0 additions & 23 deletions client/src/templates/advanced-country-template.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,26 +131,3 @@ query($slug: String!){
}
`

/*
import React from 'react';
import { graphql } from 'gatsby';
import DocsPage from '../components/docs-page';
export const query = graphql`
query($pageID: String!) {
docsPage(id: { eq: $pageID }) {
title
updated(fromNow: true)
body
}
}
`;
const DocsPageTemplate = ({ data }) => <DocsPage page={data.docsPage} />;
export default DocsPageTemplate;
*/
81 changes: 77 additions & 4 deletions processing/data/new-zealand.json
Original file line number Diff line number Diff line change
Expand Up @@ -447,17 +447,90 @@
"recovered": 1180
},
{
"date": "2020-04-26T00:00:00.000Z",
"date": "2020-04-27T00:00:00.000Z",
"confirmed": 1472,
"confirmed_per_mil": 301.29976461,
"deaths": 19,
"deaths_per_mil": 3.889059462,
"tests": 126066,
"recovered": 1214
},
{
"date": "2020-04-28T00:00:00.000Z",
"confirmed": 1474,
"confirmed_per_mil": 301.29976461,
"deaths": 19,
"deaths_per_mil": 3.889059462,
"tests": 128073,
"recovered": 1229
},
{
"date": "2020-04-29T00:00:00.000Z",
"confirmed": 1476,
"confirmed_per_mil": 301.29976461,
"deaths": 19,
"deaths_per_mil": 3.889059462,
"tests": 134570,
"recovered": 1241
},
{
"date": "2020-04-30T00:00:00.000Z",
"confirmed": 1479,
"confirmed_per_mil": 301.29976461,
"deaths": 19,
"deaths_per_mil": 3.889059462,
"tests": 139898,
"recovered": 1252
},
{
"date": "2020-05-01T00:00:00.000Z",
"confirmed": 1485,
"confirmed_per_mil": 301.29976461,
"deaths": 20,
"deaths_per_mil": 3.889059462,
"tests": 145589,
"recovered": 1263
},
{
"date": "2020-05-02T00:00:00.000Z",
"confirmed": 1487,
"confirmed_per_mil": 301.29976461,
"deaths": 20,
"deaths_per_mil": 3.889059462,
"tests": 150223,
"recovered": 1266
},
{
"date": "2020-05-03T00:00:00.000Z",
"confirmed": 1487,
"confirmed_per_mil": 301.29976461,
"deaths": 20,
"deaths_per_mil": 3.889059462,
"tests": 152696,
"recovered": 1276
},
{
"date": "2020-05-04T00:00:00.000Z",
"confirmed": 1486,
"confirmed_per_mil": 301.29976461,
"deaths": 20,
"deaths_per_mil": 3.889059462,
"tests": 155928,
"recovered": 1302
},
{
"date": "2020-05-05T00:00:00.000Z",
"confirmed": 1488,
"confirmed_per_mil": 304.574762051,
"deaths": 21,
"deaths_per_mil": 4.298434142,
"tests": 160700,
"recovered": 1316
}

],
"highest_confirmed": 1472,
"highest_deaths": 19,
"highest_recovered": 1214,
"highest_confirmed": 1488,
"highest_deaths": 21,
"highest_recovered": 1316,
"population": 4885500
}
2 changes: 1 addition & 1 deletion processing/get.js
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ const validKey = (key) => key != 'Country/Region' && key != 'Province/State' &&
// Country Logic = Cumulative number of cases, by number of days since 100th case
// Death Logic = cumulative number of deaths, by number of days since 10th deaths
const getCumulatives = (areas) => {
const max_days = 50
const max_days = 80
const output_areas = []

const confirmed_ranges = [100, 250, 500, 1000, 5000]
Expand Down

0 comments on commit 91f1c48

Please sign in to comment.