✨ (grapher) pull in data types from metadata (#3375)

* ✨ (grapher) pull in data types from metadata * ✨ (grapher) use Integer column for int types * 🐛 (grapher) update column type when conversion factor is applied * ✨ (grapher) only convert column type if necessary * 🐛 fix typo Co-authored-by: Marcel Gerber <[email protected]> --------- Co-authored-by: Marcel Gerber <[email protected]>
owid · Apr 3, 2024 · d6dfeda · d6dfeda
1 parent 33c9a3d
commit d6dfeda
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/packages/@ourworldindata/grapher/src/core/LegacyToOwidTable.ts b/packages/@ourworldindata/grapher/src/core/LegacyToOwidTable.ts
@@ -22,6 +22,7 @@ import {
     getYearFromISOStringAndDayOffset,
     intersection,
     isNumber,
+    isInteger,
     makeAnnotationsSlug,
     trimObject,
     uniqBy,
@@ -145,6 +146,14 @@ export const legacyToOwidTableAndDimensions = (
             values = values.map((value) =>
                 isNumber(value) ? value * conversionFactor : value
             )
+
+            // If a non-int conversion factor is applied to an integer column,
+            // we end up with a numeric column.
+            if (
+                valueColumnDef.type === ColumnTypeNames.Integer &&
+                !isInteger(conversionFactor)
+            )
+                valueColumnDef.type = ColumnTypeNames.Numeric
         }
 
         const columnStore: { [key: string]: any[] } = {
@@ -551,13 +560,13 @@ const variableTypeToColumnType = (type: OwidVariableType): ColumnTypeNames => {
     switch (type) {
         case "ordinal":
             return ColumnTypeNames.Ordinal
-        // TODO
-        // case "string":
-        //     return ColumnTypeNames.String
-        // case "float":
-        // case "int":
-        //     return ColumnTypeNames.Numeric
-        // case "mixed":
+        case "string":
+            return ColumnTypeNames.String
+        case "int":
+            return ColumnTypeNames.Integer
+        case "float":
+            return ColumnTypeNames.Numeric
+        case "mixed":
         default:
             return ColumnTypeNames.NumberOrString
     }

diff --git a/packages/@ourworldindata/utils/src/Util.ts b/packages/@ourworldindata/utils/src/Util.ts
@@ -23,6 +23,7 @@ import {
     isBoolean,
     isEmpty,
     isEqual,
+    isInteger,
     isNil,
     isNull,
     isNumber,
@@ -94,6 +95,7 @@ export {
     isBoolean,
     isEmpty,
     isEqual,
+    isInteger,
     isNil,
     isNull,
     isNumber,

diff --git a/packages/@ourworldindata/utils/src/index.ts b/packages/@ourworldindata/utils/src/index.ts
@@ -161,6 +161,7 @@ export {
     isBoolean,
     isEmpty,
     isEqual,
+    isInteger,
     isNil,
     isNull,
     isNumber,