Merge branch 'develop' into release/2.52.0

minvws · Jul 21, 2022 · a60d4d3 · a60d4d3
2 parents c5ac600 + c9f6cd0
commit a60d4d3
Show file tree

Hide file tree

Showing 131 changed files with 1,026 additions and 19,094 deletions.
diff --git a/docs/feature-flags.md b/docs/feature-flags.md
@@ -39,11 +39,7 @@ export interface Feature {
   metricProperties?: string[];
 }
 
-export type JsonDataScope =
-  | DataScopeKey
-  | 'in_collection'
-  | 'vr_collection'
-  | 'gm_collection';
+export type JsonDataScope = DataScopeKey | 'vr_collection' | 'gm_collection';
 ```
 
 ## Usage

diff --git a/docs/get-static-props.md b/docs/get-static-props.md
@@ -92,15 +92,14 @@ This does exactly the same as `selectNl` and `selectVr` except it selects data f
 
 #### createGetChoroplethData
 
-This selects choropleth data from **GM_COLLECTION.json**, **VR_COLLECTION.json** or **IN_COLLECTION.json**.
+This selects choropleth data from **GM_COLLECTION.json** or **VR_COLLECTION.json**.
 The object it returns is of this shape:
 
 ```ts
 {
     choropleth: {
         vr: VrCollection;
         gm: GmCollection
-        in: InCollection;
     },
 }
 ```

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -43,7 +43,6 @@
     "http-proxy-middleware": "^2.0.1",
     "intercept-stdout": "^0.1.2",
     "konva": "^7.2.5",
-    "konva-node": "^0.11.2",
     "lodash": "^4.17.21",
     "match-sorter": "^6.3.1",
     "next": "^12.0.4",

diff --git a/packages/app/schema/in/__index.json b/packages/app/schema/in/__index.json
diff --git a/packages/app/schema/in/__named_difference.json b/packages/app/schema/in/__named_difference.json
diff --git a/packages/app/schema/in/tested_overall.json b/packages/app/schema/in/tested_overall.json
diff --git a/packages/app/schema/in/variants.json b/packages/app/schema/in/variants.json
diff --git a/packages/app/schema/in_collection/__index.json b/packages/app/schema/in_collection/__index.json
diff --git a/packages/app/schema/nl/__index.json b/packages/app/schema/nl/__index.json
@@ -37,6 +37,8 @@
     "tested_ggd_archived",
     "tested_overall",
     "tested_per_age_group",
+    "vaccine_campaigns",
+    "vaccine_planned",
     "vaccine_vaccinated_or_support",
     "vaccine_delivery_estimate",
     "vaccine_administered",
@@ -195,6 +197,12 @@
     "vaccine_administered_planned": {
       "$ref": "vaccine_administered_planned.json"
     },
+    "vaccine_campaigns": {
+      "$ref": "vaccine_campaigns.json"
+    },
+    "vaccine_planned": {
+      "$ref": "vaccine_planned.json"
+    },
     "vaccine_coverage_per_age_group": {
       "$ref": "vaccine_coverage_per_age_group.json"
     },