Merge pull request #1013 from cmu-delphi/sgratzl/double_unit

fix: avoid percentage of per 100

Author: sgratzl

src/formats.ts

@@ -73,9 +73,17 @@ export function formatPopulation(info: { population?: number }): string {
   return info.population.toLocaleString();
 }
 
-const f = format(',.1f');
-const count = format('~s');
-const basePercentFormatter = format('.2%');
+export const formatSpecifiers = {
+  raw: ',.2f',
+  raw_count: '~s',
+  count: '~s',
+  fraction: ',.2f',
+  percent: '.2f',
+  per100k: ',.1f',
+};
+
+const generic = format(',.1f');
+const fractionAsPercentFormatter = format('.2%');
 const rawFormatter = format(',.2f');
 
 function sign(
@@ -98,34 +106,30 @@ function sign(
 }
 
 export function formatValue(value?: number | null, enforceSign = false): string {
-  return sign(value, f, enforceSign);
-}
-export function formatCount(value?: number | null, enforceSign = false): string {
-  return sign(value, count, enforceSign);
-}
-export function formatPercentage(value?: number | null, enforceSign = false): string {
-  return sign(value, basePercentFormatter, enforceSign, 1 / 100);
+  return sign(value, generic, enforceSign);
 }
 export function formatFraction(value?: number | null, enforceSign = false): string {
-  return sign(value, basePercentFormatter, enforceSign);
+  return sign(value, fractionAsPercentFormatter, enforceSign);
 }
 export function formatRawValue(value?: number | null, enforceSign = false): string {
   return sign(value, rawFormatter, enforceSign);
 }
 
+const count = format(formatSpecifiers.count);
+const per100Formatter = format(formatSpecifiers.percent);
+
+function formatCount(value?: number | null, enforceSign = false): string {
+  return sign(value, count, enforceSign);
+}
+function formatPer100(value?: number | null, enforceSign = false): string {
+  return sign(value, per100Formatter, enforceSign);
+}
+
 export const formatter = {
   raw: formatRawValue,
   raw_count: formatCount,
   count: formatCount,
   fraction: formatRawValue,
-  percent: formatPercentage,
+  percent: formatPer100,
   per100k: formatValue,
 };
-export const formatSpecifiers = {
-  raw: ',.2f',
-  raw_count: '~s',
-  count: '~s',
-  fraction: ',.2f',
-  percent: '.2f',
-  per100k: ',.1f',
-};