COR-1128 Restructure collection schemas

packages/app/schema/gm/vaccine_coverage_per_age_group.json

@@ -18,42 +18,53 @@
       "additionalProperties": false,
       "type": "object",
       "required": [
-        "age_group_range",
-        "autumn_2022_vaccinated_percentage",
-        "fully_vaccinated_percentage",
-        "autumn_2022_vaccinated_percentage_label",
-        "fully_vaccinated_percentage_label",
-        "birthyear_range",
+        "vaccination_type",
+        "birthyear_range_12_plus",
+        "birthyear_range_18_plus",
+        "birthyear_range_60_plus",
+        "vaccinated_percentage_12_plus",
+        "vaccinated_percentage_12_plus_label",
+        "vaccinated_percentage_18_plus",
+        "vaccinated_percentage_18_plus_label",
+        "vaccinated_percentage_60_plus",
+        "vaccinated_percentage_60_plus_label",
         "date_of_insertion_unix",
         "date_unix"
       ],
       "properties": {
-        "age_group_range": {
-          "type": "string",
-          "enum": ["12+", "18+", "60+"]
-        },
-        "autumn_2022_vaccinated_percentage": {
-          "type": ["integer", "null"]
-        },
-        "fully_vaccinated_percentage": {
-          "type": ["integer", "null"]
+        "vaccination_type": {
+          "type": "string"
         },
-        "booster_shot_percentage": {
-          "type": ["integer", "null"]
+        "birthyear_range_12_plus": {
+          "type": "string",
+          "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
         },
-        "birthyear_range": {
+        "birthyear_range_18_plus": {
           "type": "string",
           "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
         },
-        "autumn_2022_vaccinated_percentage_label": {
+        "birthyear_range_60_plus": {
+          "type": ["string", "null"],
+          "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
+        },
+        "vaccinated_percentage_12_plus": {
+          "type": ["number", "null"]
+        },
+        "vaccinated_percentage_12_plus_label": {
           "type": ["string", "null"],
           "pattern": "^([><][=][0-9]{1,2})$"
         },
-        "fully_vaccinated_percentage_label": {
+        "vaccinated_percentage_18_plus": {
+          "type": ["number", "null"]
+        },
+        "vaccinated_percentage_18_plus_label": {
           "type": ["string", "null"],
           "pattern": "^([><][=][0-9]{1,2})$"
         },
-        "booster_shot_percentage_label": {
+        "vaccinated_percentage_60_plus": {
+          "type": ["number", "null"]
+        },
+        "vaccinated_percentage_60_plus_label": {
           "type": ["string", "null"],
           "pattern": "^([><][=][0-9]{1,2})$"
         },

packages/app/schema/gm_collection/__index.json

@@ -57,8 +57,8 @@
     },
     "vaccine_coverage_per_age_group": {
       "type": "array",
-      "minItems": 1032,
-      "maxItems": 1032,
+      "minItems": 688,
+      "maxItems": 688,
       "items": {
         "$ref": "vaccine_coverage_per_age_group.json"
       }

packages/app/schema/gm_collection/vaccine_coverage_per_age_group.json

@@ -5,12 +5,16 @@
   "additionalProperties": false,
   "required": [
     "gmcode",
-    "age_group_range",
-    "birthyear_range",
-    "autumn_2022_vaccinated_percentage",
-    "autumn_2022_vaccinated_percentage_label",
-    "fully_vaccinated_percentage",
-    "fully_vaccinated_percentage_label",
+    "vaccination_type",
+    "birthyear_range_12_plus",
+    "birthyear_range_18_plus",
+    "birthyear_range_60_plus",
+    "vaccinated_percentage_12_plus",
+    "vaccinated_percentage_12_plus_label",
+    "vaccinated_percentage_18_plus",
+    "vaccinated_percentage_18_plus_label",
+    "vaccinated_percentage_60_plus",
+    "vaccinated_percentage_60_plus_label",
     "date_of_insertion_unix",
     "date_unix"
   ],
@@ -19,25 +23,39 @@
       "type": "string",
       "pattern": "^GM[0-9]+$"
     },
-    "age_group_range": {
-      "type": "string",
-      "enum": ["12+", "18+", "60+"]
-    },
-    "autumn_2022_vaccinated_percentage": {
-      "type": ["integer", "null"]
+    "vaccination_type": {
+      "type": "string"
     },
-    "fully_vaccinated_percentage": {
-      "type": ["integer", "null"]
+    "birthyear_range_12_plus": {
+      "type": "string",
+      "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
     },
-    "birthyear_range": {
+    "birthyear_range_18_plus": {
       "type": "string",
       "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
     },
-    "autumn_2022_vaccinated_percentage_label": {
+    "birthyear_range_60_plus": {
+      "type": ["string", "null"],
+      "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
+    },
+    "vaccinated_percentage_12_plus": {
+      "type": ["number", "null"]
+    },
+    "vaccinated_percentage_12_plus_label": {
+      "type": ["string", "null"],
+      "pattern": "^([><][=][0-9]{1,2})$"
+    },
+    "vaccinated_percentage_18_plus": {
+      "type": ["number", "null"]
+    },
+    "vaccinated_percentage_18_plus_label": {
       "type": ["string", "null"],
       "pattern": "^([><][=][0-9]{1,2})$"
     },
-    "fully_vaccinated_percentage_label": {
+    "vaccinated_percentage_60_plus": {
+      "type": ["number", "null"]
+    },
+    "vaccinated_percentage_60_plus_label": {
       "type": ["string", "null"],
       "pattern": "^([><][=][0-9]{1,2})$"
     },

packages/app/schema/vr/vaccine_coverage_per_age_group.json

@@ -18,42 +18,53 @@
       "additionalProperties": false,
       "type": "object",
       "required": [
-        "age_group_range",
-        "autumn_2022_vaccinated_percentage",
-        "fully_vaccinated_percentage",
-        "autumn_2022_vaccinated_percentage_label",
-        "fully_vaccinated_percentage_label",
-        "birthyear_range",
+        "vaccination_type",
+        "birthyear_range_12_plus",
+        "birthyear_range_18_plus",
+        "birthyear_range_60_plus",
+        "vaccinated_percentage_12_plus",
+        "vaccinated_percentage_12_plus_label",
+        "vaccinated_percentage_18_plus",
+        "vaccinated_percentage_18_plus_label",
+        "vaccinated_percentage_60_plus",
+        "vaccinated_percentage_60_plus_label",
         "date_of_insertion_unix",
         "date_unix"
       ],
       "properties": {
-        "age_group_range": {
-          "type": "string",
-          "enum": ["12+", "18+", "60+"]
-        },
-        "autumn_2022_vaccinated_percentage": {
-          "type": ["integer", "null"]
-        },
-        "fully_vaccinated_percentage": {
-          "type": ["integer", "null"]
+        "vaccination_type": {
+          "type": "string"
         },
-        "booster_shot_percentage": {
-          "type": ["integer", "null"]
+        "birthyear_range_12_plus": {
+          "type": "string",
+          "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
         },
-        "birthyear_range": {
+        "birthyear_range_18_plus": {
           "type": "string",
           "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
         },
-        "autumn_2022_vaccinated_percentage_label": {
+        "birthyear_range_60_plus": {
+          "type": ["string", "null"],
+          "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
+        },
+        "vaccinated_percentage_12_plus": {
+          "type": ["number", "null"]
+        },
+        "vaccinated_percentage_12_plus_label": {
           "type": ["string", "null"],
           "pattern": "^([><][=][0-9]{1,2})$"
         },
-        "fully_vaccinated_percentage_label": {
+        "vaccinated_percentage_18_plus": {
+          "type": ["number", "null"]
+        },
+        "vaccinated_percentage_18_plus_label": {
           "type": ["string", "null"],
           "pattern": "^([><][=][0-9]{1,2})$"
         },
-        "booster_shot_percentage_label": {
+        "vaccinated_percentage_60_plus": {
+          "type": ["number", "null"]
+        },
+        "vaccinated_percentage_60_plus_label": {
           "type": ["string", "null"],
           "pattern": "^([><][=][0-9]{1,2})$"
         },

packages/app/schema/vr_collection/__index.json

@@ -105,8 +105,8 @@
     },
     "vaccine_coverage_per_age_group": {
       "type": "array",
-      "minItems": 75,
-      "maxItems": 75,
+      "minItems": 50,
+      "maxItems": 50,
       "items": {
         "$ref": "vaccine_coverage_per_age_group.json"
       }

packages/app/schema/vr_collection/vaccine_coverage_per_age_group.json

@@ -5,12 +5,16 @@
   "additionalProperties": false,
   "required": [
     "vrcode",
-    "age_group_range",
-    "birthyear_range",
-    "autumn_2022_vaccinated_percentage",
-    "autumn_2022_vaccinated_percentage_label",
-    "fully_vaccinated_percentage_label",
-    "fully_vaccinated_percentage",
+    "vaccination_type",
+    "birthyear_range_12_plus",
+    "birthyear_range_18_plus",
+    "birthyear_range_60_plus",
+    "vaccinated_percentage_12_plus",
+    "vaccinated_percentage_12_plus_label",
+    "vaccinated_percentage_18_plus",
+    "vaccinated_percentage_18_plus_label",
+    "vaccinated_percentage_60_plus",
+    "vaccinated_percentage_60_plus_label",
     "date_of_insertion_unix",
     "date_unix"
   ],
@@ -19,25 +23,39 @@
       "type": "string",
       "pattern": "^VR[0-9]+$"
     },
-    "age_group_range": {
-      "type": "string",
-      "enum": ["12+", "18+", "60+"]
-    },
-    "autumn_2022_vaccinated_percentage": {
-      "type": ["integer", "null"]
+    "vaccination_type": {
+      "type": "string"
     },
-    "fully_vaccinated_percentage": {
-      "type": ["integer", "null"]
+    "birthyear_range_12_plus": {
+      "type": "string",
+      "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
     },
-    "birthyear_range": {
+    "birthyear_range_18_plus": {
       "type": "string",
       "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
     },
-    "autumn_2022_vaccinated_percentage_label": {
+    "birthyear_range_60_plus": {
+      "type": ["string", "null"],
+      "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
+    },
+    "vaccinated_percentage_12_plus": {
+      "type": ["number", "null"]
+    },
+    "vaccinated_percentage_12_plus_label": {
+      "type": ["string", "null"],
+      "pattern": "^([><][=][0-9]{1,2})$"
+    },
+    "vaccinated_percentage_18_plus": {
+      "type": ["number", "null"]
+    },
+    "vaccinated_percentage_18_plus_label": {
       "type": ["string", "null"],
       "pattern": "^([><][=][0-9]{1,2})$"
     },
-    "fully_vaccinated_percentage_label": {
+    "vaccinated_percentage_60_plus": {
+      "type": ["number", "null"]
+    },
+    "vaccinated_percentage_60_plus_label": {
       "type": ["string", "null"],
       "pattern": "^([><][=][0-9]{1,2})$"
     },

packages/app/src/components/choropleth/logic/thresholds.ts

@@ -1,9 +1,6 @@
 import { colors } from '@corona-dashboard/common';
 import { MapType } from '~/components/choropleth/logic';
-import {
-  BehaviorIdentifier,
-  behaviorIdentifiers,
-} from '~/domain/behavior/logic/behavior-types';
+import { BehaviorIdentifier, behaviorIdentifiers } from '~/domain/behavior/logic/behavior-types';
 
 const positiveTestedThresholds: ChoroplethThresholdsValue[] = [
   {
@@ -376,21 +373,21 @@ type Thresholds = Record<MapType, Record<string, ChoroplethThresholdsValue[]>>;
 export const thresholds: Thresholds = {
   gm: {
     infected_per_100k: positiveTestedThresholds,
-    admissions_on_date_of_admission_per_100000:
-      hospitalAdmissionsPer100000Thresholds,
+    admissions_on_date_of_admission_per_100000: hospitalAdmissionsPer100000Thresholds,
     admissions_on_date_of_admission: hospitalAdmissionsThresholds,
     elderly_at_home: elderlyAtHomeThresholds,
     average: sewerThresholds,
     fully_vaccinated_percentage: vaccineCoveragePercentageThresholds,
-    has_one_shot_percentage: vaccineCoveragePercentageThresholds,
-    booster_shot_percentage: vaccineCoveragePercentageThresholds,
+    primary_series_percentage: vaccineCoveragePercentageThresholds,
     autumn_2022_vaccinated_percentage: vaccineCoveragePercentageThresholds,
+    vaccinated_percentage_12_plus: vaccineCoveragePercentageThresholds,
+    vaccinated_percentage_18_plus: vaccineCoveragePercentageThresholds,
+    vaccinated_percentage_60_plus: vaccineCoveragePercentageThresholds,
   },
   vr: {
     infected_per_100k: positiveTestedThresholds,
     admissions_on_date_of_admission: vrHospitalAdmissionsThresholds,
-    admissions_on_date_of_admission_per_100000:
-      hospitalAdmissionsPer100000Thresholds,
+    admissions_on_date_of_admission_per_100000: hospitalAdmissionsPer100000Thresholds,
     infected_locations_percentage: infectedLocationsPercentageThresholds,
     average: sewerThresholds,
     positive_tested_daily_per_100k: elderlyAtHomeThresholds,
@@ -404,22 +401,17 @@ export const thresholds: Thresholds = {
     travel: situationsThreshold,
     hospitality: situationsThreshold,
     fully_vaccinated_percentage: vaccineCoveragePercentageThresholds,
-    has_one_shot_percentage: vaccineCoveragePercentageThresholds,
-    booster_shot_percentage: vaccineCoveragePercentageThresholds,
+    primary_series_percentage: vaccineCoveragePercentageThresholds,
     autumn_2022_vaccinated_percentage: vaccineCoveragePercentageThresholds,
+    vaccinated_percentage_12_plus: vaccineCoveragePercentageThresholds,
+    vaccinated_percentage_18_plus: vaccineCoveragePercentageThresholds,
+    vaccinated_percentage_60_plus: vaccineCoveragePercentageThresholds,
     other: situationsThreshold,
-    ...(Object.fromEntries(
-      behaviorIdentifiers.map((key) => [
-        `${key}_support`,
-        behaviorSupportThresholds,
-      ])
-    ) as Record<`${BehaviorIdentifier}_support`, ChoroplethThresholdsValue[]>),
-    ...(Object.fromEntries(
-      behaviorIdentifiers.map((key) => [
-        `${key}_compliance`,
-        behaviorComplianceThresholds,
-      ])
-    ) as Record<
+    ...(Object.fromEntries(behaviorIdentifiers.map((key) => [`${key}_support`, behaviorSupportThresholds])) as Record<
+      `${BehaviorIdentifier}_support`,
+      ChoroplethThresholdsValue[]
+    >),
+    ...(Object.fromEntries(behaviorIdentifiers.map((key) => [`${key}_compliance`, behaviorComplianceThresholds])) as Record<
       `${BehaviorIdentifier}_compliance`,
       ChoroplethThresholdsValue[]
     >),