Skip to content

Show district readings and adapt to new data structure (Merge Broken)[DO NOT MERGE] #47

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
coffeeDev98 wants to merge 9 commits into
base: predictions
Choose a base branch
from
Open

Show district readings and adapt to new data structure (Merge Broken)[DO NOT MERGE] #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
da42dd6
district predictions data file
lucasstinson Aug 15, 2020
8d73b16
deleted district predictions data file
coffeeDev98 Aug 15, 2020
bc6b0ac
added district predictions data file
coffeeDev98 Aug 15, 2020
aacf95e
region counts done, totals bug not fixed
coffeeDev98 Aug 20, 2020
f6e10bd
added district counts
coffeeDev98 Aug 20, 2020
703f3dc
convertStructure function to convert the structure of the new data
coffeeDev98 Aug 21, 2020
fc39de5
function to convert data structure of covid19india API (buggy)
coffeeDev98 Aug 22, 2020
526f351
changes made for bugfix (bug still unresolved)
coffeeDev98 Aug 23, 2020
bb86217
removed logs
coffeeDev98 Aug 25, 2020
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
1,145 changes: 644 additions & 501 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"intersection-observer": "^0.10.0",
"leaflet": "^1.6.0",
"leaflet-knn": "^0.1.0",
"lodash": "^4.17.15",
"lodash": "^4.17.20",
"react": "^16.13.1",
"react-content-loader": "^5.0.4",
"react-date-picker": "^8.0.1",
Expand All @@ -50,7 +50,7 @@
"react-icons": "^3.10.0",
"react-is-visible": "^1.1.0",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.1",
"react-scripts": "^3.4.3",
"react-spring": "^8.0.27",
"react-use": "^15.1.1",
"react-use-gesture": "^7.0.15",
Expand Down
1 change: 1 addition & 0 deletions predictions_districts.json
View file
Open in desktop

Large diffs are not rendered by default.

274 changes: 254 additions & 20 deletions src/components/home.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,68 @@ function merge(past, future, today) {
const merged = {};
for (const st in past) {
merged[st] = {};
for (const dt in past[st]) {
if (dt === today) continue;
merged[st][dt] = {};
merged[st][dt]['delta'] = past[st][dt]['delta'];
merged[st][dt]['total'] = past[st][dt]['total'];
if (st === 'TT') {
for (const dt in past[st]) {
if (dt === today) continue;
merged[st][dt] = {};
merged[st][dt]['delta'] = past[st][dt]['delta'];
merged[st][dt]['total'] =
past[st][dt]['total'] !== {}
? past[st][dt]['total']
: {active: 0, confirmed: 0, deceased: 0, recovered: 0};
}
} else {
for (const district in past[st]) {
merged[st][district] = {};
for (const dt in past[st][district]) {
if (dt === today) continue;
merged[st][district][dt] = {};
merged[st][district][dt]['delta'] = past[st][district][dt]['delta'];

if (past[st][district][dt]['total'] !== {}) {
merged[st][district][dt]['total'] = past[st][district][dt]['total'];
} else {
merged[st][district][dt]['total'] = {
active: 0,
confirmed: 0,
deceased: 0,
recovered: 0,
};
}
}
}
}
}

for (const st in future) {
for (const dt in future[st]) {
if (dt < today) continue;
merged[st][dt] = {};
const dt_minus_1 = yesterday(dt);
merged[st][dt]['delta'] = future[st][dt]['delta'];
merged[st][dt]['total'] = {};
for (const k in merged[st][dt]['delta']) {
merged[st][dt]['total'][k] =
merged[st][dt_minus_1]['total'][k] + merged[st][dt]['delta'][k];
if (st === 'TT') {
for (const dt in future[st]) {
if (dt < today) continue;

merged[st][dt] = {};
const dt_minus_1 = yesterday(dt);
merged[st][dt]['delta'] = future[st][dt]['delta'];
merged[st][dt]['total'] = {};
for (const k in merged[st][dt]['delta']) {
merged[st][dt]['total'][k] =
merged[st][dt_minus_1]['total'][k] + merged[st][dt]['delta'][k];
}
}
} else {
for (const district in future[st]) {
for (const dt in future[st][district]) {
if (dt < today) continue;
merged[st][district][dt] = {};
const dt_minus_1 = yesterday(dt);
merged[st][district][dt]['delta'] = future[st][district][dt]['delta'];
merged[st][district][dt]['total'] = {};

for (const k in merged[st][district][dt]['delta']) {
merged[st][district][dt]['total'][k] =
merged[st][district][dt_minus_1]['total'][k] +
merged[st][district][dt]['delta'][k];
}
}
}
}
}
Expand All @@ -73,18 +118,198 @@ function Home(props) {
const [timeseries, setTimeseries] = useState({});
const {t} = useTranslation();

const convertStructure = (timeseries) => {
let ALL_STATES = Object.keys(timeseries['2020-07-01']);
ALL_STATES = ALL_STATES.filter((STATE) => STATE !== 'UN');
const ALL_DISTTS = {};
for (const st in ALL_STATES) {
const state = ALL_STATES[st];
if (state == 'TT') continue;
ALL_DISTTS[state] = Object.keys(
timeseries['2020-07-01'][state]['districts']
);
}
const ALL_DATA = {};

for (const dt in timeseries) {
for (const st in ALL_STATES) {
const state = ALL_STATES[st];

if (!ALL_DATA[state]) ALL_DATA[state] = {};
const stateObj = timeseries[dt][state] || {};

const deltac = stateObj['delta']
? stateObj['delta']['confirmed']
? stateObj['delta']['confirmed']
: 0
: 0;
const deltad = stateObj['delta']
? stateObj['delta']['deceased']
? stateObj['delta']['deceased']
: 0
: 0;
const deltar = stateObj['delta']
? stateObj['delta']['recovered']
? stateObj['delta']['recovered']
: 0
: 0;
const deltat = stateObj['delta']
? stateObj['delta']['tested']
? stateObj['delta']['tested']
: 0
: 0;

ALL_DATA[state]['TT'] = {};
ALL_DATA[state]['TT'][dt] = {};
ALL_DATA[state]['TT'][dt]['delta'] = {
confirmed: deltac,
active: deltac - deltar,
deceased: deltad,
recovered: deltar,
tested: deltat,
};

const totalc = stateObj['total']
? stateObj['total']['confirmed']
? stateObj['total']['confirmed']
: 0
: 0;
const totald = stateObj['total']
? stateObj['total']['deceased']
? stateObj['total']['deceased']
: 0
: 0;
const totalr = stateObj['total']
? stateObj['total']['recovered']
? stateObj['total']['recovered']
: 0
: 0;
const totalt = stateObj['total']
? stateObj['total']['tested']
? stateObj['total']['tested']
: 0
: 0;

ALL_DATA[state]['TT'][dt]['total'] = {
confirmed: totalc,
active: totalc - totalr,
deceased: totald,
recovered: totalr,
tested: totalt,
};

if (state == 'TT') {
ALL_DATA[state]['delta'] = {
confirmed: deltac,
active: deltac - deltar,
deceased: deltad,
recovered: deltar,
tested: deltat,
};
ALL_DATA[state]['total'] = {
confirmed: totalc,
active: totalc - totalr,
deceased: totald,
recovered: totalr,
tested: totalt,
};

continue;
}
for (const ds in ALL_DISTTS[state]) {
const district = ALL_DISTTS[state][ds];

if (!ALL_DATA[state][district]) {
ALL_DATA[state][district] = {};
}
if (!ALL_DATA[state][district][dt]) {
ALL_DATA[state][district][dt] = {};
}

const districtObj = stateObj['districts']
? stateObj['districts'][district]
? stateObj['districts'][district]
: 0
: {};

const deltac = districtObj['delta']
? districtObj['delta']['confirmed']
? districtObj['delta']['confirmed']
: 0
: 0;
const deltad = districtObj['delta']
? districtObj['delta']['deceased']
? districtObj['delta']['deceased']
: 0
: 0;
const deltar = districtObj['delta']
? districtObj['delta']['recovered']
? districtObj['delta']['recovered']
: 0
: 0;
const deltat = districtObj['delta']
? districtObj['delta']['tested']
? districtObj['delta']['tested']
: 0
: 0;

ALL_DATA[state][district][dt]['delta'] = {
confirmed: deltac,
active: deltac - deltar,
deceased: deltad,
recovered: deltar,
tested: deltat,
};

const totalc = districtObj['total']
? districtObj['total']['confirmed']
? districtObj['total']['confirmed']
: 0
: 0;
const totald = districtObj['total']
? districtObj['total']['deceased']
? districtObj['total']['deceased']
: 0
: 0;
const totalr = districtObj['total']
? districtObj['total']['recovered']
? districtObj['total']['recovered']
: 0
: 0;
const totalt = districtObj['total']
? districtObj['total']['tested']
? districtObj['total']['tested']
: 0
: 0;

ALL_DATA[state][district][dt]['total'] = {
confirmed: totalc,
active: totalc - totalr,
deceased: totald,
recovered: totalr,
tested: totalt,
};
}
}
}

return ALL_DATA;
};

useMemo(() => {
const pastTimeseries = axios.get(
'https://api.covid19india.org/v3/min/timeseries.min.json'
'https://api.covid19india.org/v4/data-all.json'
);
const futureTimeseries = axios.get(
'https://vics-core.github.io/covid-api/predictions.json'
'https://raw.githubusercontent.com/coffeeDev98/covid19india-react/predictions/predictions_districts.json'
);
axios.all([pastTimeseries, futureTimeseries]).then(
axios.spread((...responses) => {
const pastTimeseriesData = responses[0].data;
let pastTimeseriesData = responses[0].data;
const futureTimeseriesData = responses[1].data;

pastTimeseriesData = convertStructure(pastTimeseriesData);

const mergedTimeseriesData = merge(
pastTimeseriesData,
futureTimeseriesData,
Expand All @@ -96,10 +321,19 @@ function Home(props) {
}, [today]);

useMemo(() => {
let ret = {};
const ret = {};
for (const st in timeseries) {
if (timeseries.hasOwnProperty(st)) {
ret[st] = timeseries[st][date];
ret[st] = {};
if (st === 'TT') {
if (timeseries.hasOwnProperty(st)) {
ret[st] = timeseries[st][date];
}
} else {
for (const district in timeseries[st]) {
if (timeseries.hasOwnProperty(st)) {
ret[st][district] = timeseries[st][district][date];
}
}
}
}
setData(ret);
Expand Down
Loading