Skip to content

Commit

Permalink
Choose most recent analysis with current projection data
Browse files Browse the repository at this point in the history
  • Loading branch information
mcarans committed Aug 23, 2024
1 parent 78f7c4d commit 0b45c7c
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 19 deletions.
2 changes: 1 addition & 1 deletion analysis_dates.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DEFAULT=2017-01-01,AFG=2024-03-01,START_DATE=2017-01-01,END_DATE=2025-04-30,AGO=2021-06-01,BDI=2024-05-01,BEN=2024-03-01,BFA=2024-03-01,BGD=2024-02-01,CAF=2024-04-01,CIV=2024-03-01,CMR=2024-03-01,COD=2023-11-01,CPV=2024-03-01,DJI=2024-04-01,DOM=2023-09-01,ETH=2021-05-01,GHA=2024-03-01,GIN=2024-03-01,GMB=2024-03-01,GNB=2024-03-01,GTM=2023-05-01,HND=2024-02-01,HTI=2024-03-01,KEN=2024-02-01,LBN=2024-03-01,LBR=2023-03-01,LSO=2023-07-01,MDG=2024-06-01,MLI=2024-03-01,MMR=2023-09-01,MOZ=2023-07-01,MRT=2024-03-01,MWI=2024-05-01,NAM=2024-05-01,NER=2024-03-01,NGA=2024-03-01,PAK=2024-03-01,PSE=2024-05-01,SDN=2024-04-01,SEN=2024-03-01,SLE=2024-03-01,SLV=2021-08-01,SOM=2024-01-01,SSD=2023-09-01,SWZ=2024-06-01,TCD=2024-03-01,TGO=2024-03-01,TLS=2023-11-01,TZA=2023-11-01,UGA=2024-04-01,YEM=2023-10-01,ZAF=2020-10-01,ZMB=2023-09-01,ZWE=2020-10-01
DEFAULT=2017-01-01
44 changes: 26 additions & 18 deletions ipc.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,24 +239,31 @@ def get_country_data(self, countryiso3):
time_period = {"start_date": default_enddate, "end_date": default_date}

output = {"countryiso3": countryiso3}
country_rows = output["country_rows_latest"] = []
country_rows_wide = output["country_rows_wide_latest"] = []
group_rows = output["group_rows_latest"] = []
group_rows_wide = output["group_rows_wide_latest"] = []
area_rows = output["area_rows_latest"] = []
area_rows_wide = output["area_rows_wide_latest"] = []
self.add_country_rows(most_recent_analysis, countryiso3, time_period,
country_rows, country_rows_wide)
self.add_subnational_rows(
most_recent_analysis, countryiso3, time_period, group_rows,
group_rows_wide, area_rows, area_rows_wide,
)
self.output["country_rows_latest"].extend(country_rows)
self.output["country_rows_wide_latest"].extend(country_rows_wide)
self.output["group_rows_latest"].extend(group_rows)
self.output["group_rows_wide_latest"].extend(group_rows_wide)
self.output["area_rows_latest"].extend(area_rows)
self.output["area_rows_wide_latest"].extend(area_rows_wide)

most_recent_current_analysis = None
for analysis in country_data:
if analysis["current_period_dates"]:
most_recent_current_analysis = analysis
break
if most_recent_current_analysis:
country_rows = output["country_rows_latest"] = []
country_rows_wide = output["country_rows_wide_latest"] = []
group_rows = output["group_rows_latest"] = []
group_rows_wide = output["group_rows_wide_latest"] = []
area_rows = output["area_rows_latest"] = []
area_rows_wide = output["area_rows_wide_latest"] = []
self.add_country_rows(most_recent_current_analysis, countryiso3,
time_period, country_rows, country_rows_wide)
self.add_subnational_rows(
most_recent_current_analysis, countryiso3, time_period, group_rows,
group_rows_wide, area_rows, area_rows_wide,
)
self.output["country_rows_latest"].extend(country_rows)
self.output["country_rows_wide_latest"].extend(country_rows_wide)
self.output["group_rows_latest"].extend(group_rows)
self.output["group_rows_wide_latest"].extend(group_rows_wide)
self.output["area_rows_latest"].extend(area_rows)
self.output["area_rows_wide_latest"].extend(area_rows_wide)

country_rows = output["country_rows"] = []
country_rows_wide = output["country_rows_wide"] = []
Expand All @@ -277,6 +284,7 @@ def get_country_data(self, countryiso3):
self.output["group_rows_wide"].extend(group_rows_wide)
self.output["area_rows"].extend(area_rows)
self.output["area_rows_wide"].extend(area_rows_wide)

start_date = time_period["start_date"]
end_date = time_period["end_date"]
output["start_date"] = start_date
Expand Down

0 comments on commit 0b45c7c

Please sign in to comment.