enhance: with MissingDataStrategy.auto, drop entities with single n…

…on-error data point
owid · Aug 15, 2024 · e2ef106 · e2ef106
1 parent 2e42646
commit e2ef106
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/packages/@ourworldindata/core-table/src/OwidTable.ts b/packages/@ourworldindata/core-table/src/OwidTable.ts
@@ -277,6 +277,20 @@ export class OwidTable extends CoreTable<OwidRow, OwidColumnDef> {
         )
     }
 
+    dropRowsWithAtLeastThisManyErrorValuesForColumns(
+        slugs: ColumnSlug[],
+        minErrorValues: number
+    ): this {
+        return this.rowFilter(
+            (row) =>
+                slugs.filter((slug) => !isNotErrorValue(row[slug])).length >=
+                minErrorValues,
+            `Drop rows with at least ${minErrorValues} ErrorValues in every column: ${slugs.join(
+                ", "
+            )}`
+        )
+    }
+
     // Drop _all rows_ for an entity if there is any column that has no valid values for that entity.
     dropEntitiesThatHaveNoDataInSomeColumn(columnSlugs: ColumnSlug[]): this {
         const indexesByEntityName = this.rowIndicesByEntityName

diff --git a/packages/@ourworldindata/grapher/src/stackedCharts/StackedDiscreteBarChart.tsx b/packages/@ourworldindata/grapher/src/stackedCharts/StackedDiscreteBarChart.tsx
@@ -125,6 +125,23 @@ export class StackedDiscreteBarChart
 {
     base: React.RefObject<SVGGElement> = React.createRef()
 
+    private applyMissingDataStrategy(table: OwidTable): OwidTable {
+        if (this.missingDataStrategy === MissingDataStrategy.hide) {
+            // If MissingDataStrategy is explicitly set to hide, drop rows (= times) where one of
+            // the y columns has no data
+            return table.dropRowsWithErrorValuesForAnyColumn(this.yColumnSlugs)
+        } else if (this.missingDataStrategy === MissingDataStrategy.auto) {
+            // If MissingDataStrategy is set to auto, drop rows where there is only a single non-error value
+            if (this.yColumnSlugs.length > 1) {
+                return table.dropRowsWithAtLeastThisManyErrorValuesForColumns(
+                    this.yColumnSlugs,
+                    this.yColumnSlugs.length - 1
+                )
+            }
+        }
+        return table
+    }
+
     transformTable(table: OwidTable): OwidTable {
         if (!this.yColumnSlugs.length) return table
 
@@ -144,11 +161,7 @@ export class StackedDiscreteBarChart
             table = table.interpolateColumnWithTolerance(slug)
         })
 
-        // If MissingDataStrategy is explicitly set to hide, drop rows (= times) where one of
-        // the y columns has no data
-        if (this.missingDataStrategy === MissingDataStrategy.hide) {
-            table = table.dropRowsWithErrorValuesForAnyColumn(this.yColumnSlugs)
-        }
+        table = this.applyMissingDataStrategy(table)
 
         if (this.manager.isRelativeMode) {
             table = table.toPercentageFromEachColumnForEachEntityAndTime(
@@ -165,9 +178,7 @@ export class StackedDiscreteBarChart
             .replaceNegativeCellsWithErrorValues(this.yColumnSlugs)
             .dropRowsWithErrorValuesForAllColumns(this.yColumnSlugs)
 
-        if (this.missingDataStrategy === MissingDataStrategy.hide) {
-            table = table.dropRowsWithErrorValuesForAnyColumn(this.yColumnSlugs)
-        }
+        table = this.applyMissingDataStrategy(table)
 
         return table
     }