From 5c6768bd4a687b2957ec4d25d799a80b2d6378d8 Mon Sep 17 00:00:00 2001
From: Peter Markewitz <peter@markewitz.org>
Date: Tue, 10 Oct 2023 07:08:53 +0000
Subject: [PATCH 1/2] add new vaccine "Comirnaty Omicron XBB.1.5" mapped to
 "biontechBivalent"

---
 src/data-requests/vaccination.ts | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/data-requests/vaccination.ts b/src/data-requests/vaccination.ts
index cb11cc1a..370d111f 100644
--- a/src/data-requests/vaccination.ts
+++ b/src/data-requests/vaccination.ts
@@ -72,22 +72,23 @@ enum UVD {
   V10 = "deltaVidPrevtynBeta",
 }
 
-// VaccineNameReverse
+// VaccineNameMapping
 enum VNR {
-  "Vaxzevria" = "astraZeneca",
-  "Comirnaty" = "biontech",
-  "Jcovden" = "janssen",
-  "Spikevax" = "moderna",
-  "Nuvaxovid" = "novavax",
-  "Valneva" = "valneva",
-  "Comirnaty bivalent (Original/Omikron)" = "biontechBivalent",
-  "Spikevax bivalent (Original/Omikron)" = "modernaBivalent",
-  "Comirnaty-Kleinkinder" = "biontechInfant",
-  "Comirnaty Original/Omicron BA.1" = "biontechBivalent",
-  "Comirnaty Original/Omicron BA.4-5" = "biontechBivalent",
-  "Spikevax bivalent Original/Omicron BA.1" = "modernaBivalent",
-  "Spikevax bivalent Original/Omicron BA.4-5" = "modernaBivalent",
-  "VidPrevtyn Beta" = "vidPrevtynBeta",
+  "Vaxzevria" = UV.V1,
+  "Comirnaty" = UV.V2,
+  "Jcovden" = UV.V3,
+  "Spikevax" = UV.V4,
+  "Nuvaxovid" = UV.V5,
+  "Valneva" = UV.V6,
+  "Comirnaty bivalent (Original/Omikron)" = UV.V7,
+  "Spikevax bivalent (Original/Omikron)" = UV.V8,
+  "Comirnaty-Kleinkinder" = UV.V9,
+  "Comirnaty Original/Omicron BA.1" = UV.V7,
+  "Comirnaty Original/Omicron BA.4-5" = UV.V7,
+  "Spikevax bivalent Original/Omicron BA.1" = UV.V8,
+  "Spikevax bivalent Original/Omicron BA.4-5" = UV.V8,
+  "VidPrevtyn Beta" = UV.V10,
+  "Comirnaty Omicron XBB.1.5" = UV.V7
 }
 
 // UsedAgeGroups

From dd6eb3ac9469d22d965b5e29202139382d469df7 Mon Sep 17 00:00:00 2001
From: Peter Markewitz <peter@markewitz.org>
Date: Tue, 10 Oct 2023 07:31:15 +0000
Subject: [PATCH 2/2] fix linting

---
 src/data-requests/vaccination.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data-requests/vaccination.ts b/src/data-requests/vaccination.ts
index 370d111f..b97d49d0 100644
--- a/src/data-requests/vaccination.ts
+++ b/src/data-requests/vaccination.ts
@@ -88,7 +88,7 @@ enum VNR {
   "Spikevax bivalent Original/Omicron BA.1" = UV.V8,
   "Spikevax bivalent Original/Omicron BA.4-5" = UV.V8,
   "VidPrevtyn Beta" = UV.V10,
-  "Comirnaty Omicron XBB.1.5" = UV.V7
+  "Comirnaty Omicron XBB.1.5" = UV.V7,
 }
 
 // UsedAgeGroups