Merge pull request #1135 from cmu-delphi/sgatzl/exxtended_hosp

feat: extended color scale generalization

Author: sgratzl

src/data/meta.ts

@@ -136,7 +136,7 @@ function deriveMetaSensors(metadata: EpiDataMetaSourceInfo[]): {
             m.format === 'per100k' ? 'per 100k' : m.format === 'percent' ? 'per 100' : units[m.format] || units.raw,
           colorScale: colorScales[m.high_values_are],
           vegaColorScale: vegaColorScales[m.high_values_are],
-          useExtendedColorScale: isCasesSignal(key),
+          extendedColorScale: isCasesSignal(key),
           links: sm.link.map((d) => `<a href="${d.href}">${d.alt}</a>`),
           credits: credits,
           formatValue: formatter[m.format] || formatter.raw,

src/data/sensor.ts

@@ -68,7 +68,7 @@ export interface Sensor {
   readonly signalTooltip: string; // short text description
   readonly colorScale: (this: void, v: number) => string;
   readonly vegaColorScale: string;
-  readonly useExtendedColorScale: boolean;
+  readonly extendedColorScale: boolean;
 
   readonly links: readonly string[]; // more information links
   readonly credits?: string; // credit text
@@ -134,7 +134,7 @@ export function ensureSensorStructure(sensor: Partial<Sensor> & { name: string;
     signalTooltip: sensor.signalTooltip || 'No description available',
     colorScale: colorScales[highValuesAre],
     vegaColorScale: vegaColorScales[highValuesAre],
-    useExtendedColorScale: isCasesSignal(key),
+    extendedColorScale: isCasesSignal(key),
 
     links: [],
     credits: 'We are happy for you to use this data in products and publications.',

src/stores/constants.ts

@@ -14,6 +14,7 @@ export interface SensorConfig {
   signal: string;
   signalTooltip: string;
   description: string;
+  extendedColorScale?: boolean;
 
   unit?: string;
   unitShort?: string;

src/stores/descriptions.raw.txt

@@ -78,6 +78,7 @@ Name: COVID Cases
 Id: jhu-csse
 Signal: confirmed_7dav_incidence_prop
 Highlight: [default]
+ExtendedColorScale: true
 
 
 SignalTooltip: Newly reported COVID-19 cases per 100,000 people, based on data from Johns Hopkins University
@@ -88,6 +89,7 @@ Description: This data shows the number of COVID-19 confirmed cases newly report
 Name: COVID Hospital Admissions
 Id: hhs
 Signal: confirmed_admissions_covid_1d_prop_7dav
+ExtendedColorScale: true
 
 
 SignalTooltip: Confirmed COVID-19 hospital admissions per 100,000 people

src/stores/params.ts

@@ -166,7 +166,7 @@ export class SensorParam {
   }
 
   vegaSchemeDomain(level: RegionLevel = 'county'): { domain: [number, number]; scheme: string; domainMid?: number } {
-    if (!this.value.useExtendedColorScale) {
+    if (!this.value.extendedColorScale) {
       return {
         domain: this.domain(level),
         scheme: this.value.vegaColorScale,
@@ -181,12 +181,12 @@ export class SensorParam {
   }
 
   createValueScale(level: RegionLevel = 'county'): (v: number) => number {
-    const domain = this.domain(level, this.value.useExtendedColorScale);
+    const domain = this.domain(level, this.value.extendedColorScale);
     return scaleLinear().domain([domain[0], domain[domain.length - 1]]);
   }
 
   createColorScale(level: RegionLevel = 'county'): (v: number) => string {
-    const extended = this.value.useExtendedColorScale;
+    const extended = this.value.extendedColorScale;
     const domain = this.domain(level, extended);
     if (!extended) {
       return scaleSequential(this.value.colorScale).domain(domain).clamp(true);

src/stores/questions.raw.txt

@@ -29,7 +29,7 @@ Category: Symptoms
 Question: |
   Do you personally know someone in your local community who has COVID-like symptoms?
 Signal: smoothed_whh_cmnty_cli
-AddedInWave: 1
+AddedInWave: 2
 
 
 ---