Use naming consistent with HAPI

analysis_dates.txt

@@ -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

config/project_configuration.yaml

@@ -35,33 +35,33 @@ wide_hxltags:
   "Phase 4 percentage current": "#affected+pct+ipc+current+phase4"
   "Phase 5 number current": "#affected+num+ipc+current+phase5"
   "Phase 5 percentage current": "#affected+pct+ipc+current+phase5"
-  "Projection from": "#date+start+projected"
-  "Projection to": "#date+end+projected"
-  "Population analyzed projection": "#affected+num+ipc+projected+total"
-  "Phase 3+ number projection": "#affected+num+ipc+projected+p3plus"
-  "Phase 3+ percentage projection": "#affected+pct+ipc+projected+p3plus"
-  "Phase 1 number projection": "#affected+num+ipc+projected+phase1"
-  "Phase 1 percentage projection": "#affected+pct+ipc+projected+phase1"
-  "Phase 2 number projection": "#affected+num+ipc+projected+phase2"
-  "Phase 2 percentage projection": "#affected+pct+ipc+projected+phase2"
-  "Phase 3 number projection": "#affected+num+ipc+projected+phase3"
-  "Phase 3 percentage projection": "#affected+pct+ipc+projected+phase3"
-  "Phase 4 number projection": "#affected+num+ipc+projected+phase4"
-  "Phase 4 percentage projection": "#affected+pct+ipc+projected+phase4"
-  "Phase 5 number projection": "#affected+num+ipc+projected+phase5"
-  "Phase 5 percentage projection": "#affected+pct+ipc+projected+phase5"
-  "Second projection from": "#date+start+second_projected"
-  "Second projection to": "#date+end+second_projected"
-  "Population analyzed second projection": "#affected+num+ipc+second_projected+total"
-  "Phase 3+ number second projection": "#affected+num+ipc+second_projected+p3plus"
-  "Phase 3+ percentage second projection": "#affected+pct+ipc+second_projected+p3plus"
-  "Phase 1 number second projection": "#affected+num+ipc+second_projected+phase1"
-  "Phase 1 percentage second projection": "#affected+pct+ipc+second_projected+phase1"
-  "Phase 2 number second projection": "#affected+num+ipc+second_projected+phase2"
-  "Phase 2 percentage second projection": "#affected+pct+ipc+second_projected+phase2"
-  "Phase 3 number second projection": "#affected+num+ipc+second_projected+phase3"
-  "Phase 3 percentage second projection": "#affected+pct+ipc+second_projected+phase3"
-  "Phase 4 number second projection": "#affected+num+ipc+second_projected+phase4"
-  "Phase 4 percentage second projection": "#affected+pct+ipc+second_projected+phase4"
-  "Phase 5 number second projection": "#affected+num+ipc+second_projected+phase5"
-  "Phase 5 percentage second projection": "#affected+pct+ipc+second_projected+phase5"
+  "First projection from": "#date+start+first_projection"
+  "First projection to": "#date+end+first_projection"
+  "Population analyzed first projection": "#affected+num+ipc+first_projection+total"
+  "Phase 3+ number first projection": "#affected+num+ipc+first_projection+p3plus"
+  "Phase 3+ percentage first projection": "#affected+pct+ipc+first_projection+p3plus"
+  "Phase 1 number first projection": "#affected+num+ipc+first_projection+phase1"
+  "Phase 1 percentage first projection": "#affected+pct+ipc+first_projection+phase1"
+  "Phase 2 number first projection": "#affected+num+ipc+first_projection+phase2"
+  "Phase 2 percentage first projection": "#affected+pct+ipc+first_projection+phase2"
+  "Phase 3 number first projection": "#affected+num+ipc+first_projection+phase3"
+  "Phase 3 percentage first projection": "#affected+pct+ipc+first_projection+phase3"
+  "Phase 4 number first projection": "#affected+num+ipc+first_projection+phase4"
+  "Phase 4 percentage first projection": "#affected+pct+ipc+first_projection+phase4"
+  "Phase 5 number first projection": "#affected+num+ipc+first_projection+phase5"
+  "Phase 5 percentage first projection": "#affected+pct+ipc+first_projection+phase5"
+  "Second projection from": "#date+start+second_projection"
+  "Second projection to": "#date+end+second_projection"
+  "Population analyzed second projection": "#affected+num+ipc+second_projection+total"
+  "Phase 3+ number second projection": "#affected+num+ipc+second_projection+p3plus"
+  "Phase 3+ percentage second projection": "#affected+pct+ipc+second_projection+p3plus"
+  "Phase 1 number second projection": "#affected+num+ipc+second_projection+phase1"
+  "Phase 1 percentage second projection": "#affected+pct+ipc+second_projection+phase1"
+  "Phase 2 number second projection": "#affected+num+ipc+second_projection+phase2"
+  "Phase 2 percentage second projection": "#affected+pct+ipc+second_projection+phase2"
+  "Phase 3 number second projection": "#affected+num+ipc+second_projection+phase3"
+  "Phase 3 percentage second projection": "#affected+pct+ipc+second_projection+phase3"
+  "Phase 4 number second projection": "#affected+num+ipc+second_projection+phase4"
+  "Phase 4 percentage second projection": "#affected+pct+ipc+second_projection+phase4"
+  "Phase 5 number second projection": "#affected+num+ipc+second_projection+phase5"
+  "Phase 5 percentage second projection": "#affected+pct+ipc+second_projection+phase5"

ipc.py

@@ -30,7 +30,7 @@ def __init__(self, configuration, retriever, state, ch_countries):
         self.state = state
         self.default_start_date = state["DEFAULT"]
         self.base_url = configuration["base_url"]
-        self.projection_names = ["Current", "Projection", "Second projection"]
+        self.projection_names = ["Current", "First projection", "Second projection"]
         self.projection_suffixes = ["", "_projected", "_second_projected"]
         self.projections = ["current", "projected", "second_projected"]
         self.phasemapping = {
@@ -123,13 +123,14 @@ def add_country_subnational_rows(
                                                                  time_period)
             else:
                 period_start = period_end = None
-            projection_row["Validity period"] = projection
+            projection_name = self.projection_names[i]
+            projection_name_l = projection_name.lower()
+            projection_row["Validity period"] = projection_name_l
             projection_row["From"] = period_start
             projection_row["To"] = period_end
-            projection_name = self.projection_names[i]
-            projection_suffix = self.projection_suffixes[i]
             row_wide[f"{projection_name} from"] = period_start
             row_wide[f"{projection_name} to"] = period_end
+            projection_suffix = self.projection_suffixes[i]
             location[f"estimated_percentage{projection_suffix}"] = 1.0
             for prefix, phase in self.phasemapping.items():
                 row = deepcopy(projection_row)