@dra2020/dra-types 1.8.109 → 1.8.111

package/dist/datasets.d.ts

@@ -5,9 +5,6 @@ export interface DatasetField {
     order?: number;
     isCombo?: boolean;
     colorBy?: boolean;
-    invert?: boolean;
-    colorBySum?: boolean;
-    colorLabel?: string;
     sumOf?: string[];
 }
 export declare function sortFields(f1: DatasetField, f2: DatasetField): number;
@@ -20,14 +17,20 @@ export declare function isColorBy(colorby: string): boolean;
 export type DatasetFields = {
     [key: string]: DatasetField;
 };
-export type DatasetColor = {
-    intensity: string;
+export interface DatasetColor {
+    shortCaption: string;
+    longCaption: string;
+    expr: string;
     colors: string;
     stops: string;
-};
-export type DatasetColors = {
-    [key: string]: DatasetColor;
-};
+}
+export type DatasetColors = DatasetColor[];
+export interface DatasetFormat {
+    shortCaption: string;
+    longCaption: string;
+    expr: string;
+}
+export type DatasetFormats = DatasetFormat[];
 export interface DatasetMeta {
     type: string;
     year: number;
@@ -42,9 +45,8 @@ export interface DatasetMeta {
         [key: number]: string;
     };
     fields?: DatasetFields;
-    detailFormat?: string;
-    detailTooltip?: string;
     colors?: DatasetColors;
+    formats?: DatasetFormats;
 }
 export type DatasetsMeta = {
     [dataset: string]: DatasetMeta;
@@ -63,6 +65,7 @@ export interface Dataset {
     datasource?: string;
     dotmap?: boolean;
     blobid?: string;
+    dataid?: string;
     meta?: DatasetsMeta;
     groups?: G.GroupMapIndex;
 }

package/dist/dra-types.js

@@ -159,17 +159,17 @@ exports.ColorByGoodD = 5;
 exports.ColorByGreatD = 6;
 // ****************** Colors, Color Stops and Color Functions for "classic" palettes *******************
 const PartisanFewStops = [
-    0.00,
-    0.20,
-    0.30,
-    0.40,
-    0.45,
-    0.50,
-    0.50,
-    0.55,
-    0.60,
-    0.70,
-    0.80,
+    0.00, // Carmine
+    0.20, // 
+    0.30, // 
+    0.40, // 
+    0.45, //
+    0.50, // pale red
+    0.50, // pale blue
+    0.55, // 
+    0.60, // 
+    0.70, // 
+    0.80, // 
     1.00, // Dark blue
 ];
 // Like PartisanFewStops, but lose the gradient at two buckets at each edge to focus on competitive district differentiation
@@ -184,17 +184,17 @@ exports.PartisanDistrictStops = [
     //{ stop: 0.00,  color: '#C21807' },  // Chilli Red
     //{ stop: 0.40,  color: '#C21807' },  // .00 <= .40
     // Carmine
-    0.00,
-    0.40,
-    0.40,
-    0.45,
-    0.45,
-    0.50,
-    0.50,
-    0.55,
-    0.55,
-    0.60,
-    0.60,
+    0.00, // Carmine
+    0.40, // .00 <= .40
+    0.40, // 
+    0.45, // .40 <= .45
+    0.45, //
+    0.50, // .45 <= .50
+    0.50, // 
+    0.55, // .50 <= .55
+    0.55, // 
+    0.60, // .55 <= .60
+    0.60, // 
     1.00, // .60 <= 1.0
 ];
 /*export let PartisanCustomStops = [
@@ -214,9 +214,9 @@ exports.PartisanDistrictStops = [
 ];*/
 exports.PartisanPrecinctStops = PartisanFewStops;
 exports.EthnicFewStops = [
-    0.00,
-    0.40,
-    0.50,
+    0.00, // 
+    0.40, // 
+    0.50, //
     1.00, // 
 ];
 exports.DefaultPaletteDefaults = {
@@ -574,36 +574,56 @@ function allGroups16Colors(palette, colors) {
     return modColors;
 }
 exports.allGroups16Colors = allGroups16Colors;
+function safeNumber(n) { n = Number(n); return typeof n !== 'number' || isNaN(n) ? 0 : n; }
+function safeStops(s) {
+    if (!s)
+        return exports.EthnicFewStops;
+    return s.split(',').map(safeNumber);
+}
+function safeColors(s) {
+    if (!s)
+        return ['#fafafa', '#aaaaaa', '#666666', '#111111'];
+    return s.split(',').map(s => s.trim());
+}
 function ToExtendedColor(agg, dc, colorBy) {
-    var _a;
     // compute pct
     const { datasetid, field } = (0, datasets_1.parseColorBy)(colorBy);
-    if (!datasetid || !field || !dc.dsMeta || !dc.dsMeta[datasetid] || !((_a = dc.dsMeta[datasetid]) === null || _a === void 0 ? void 0 : _a.fields[field]))
+    if (!datasetid || !field || !dc.dsMeta || !dc.dsMeta[datasetid])
         return '#ffffff';
     const meta = dc.dsMeta[datasetid];
-    let getter = PF.ToGetter(agg, dc, datasetid, datasetid);
-    let fields = PF.sortedFieldList(meta);
-    let den = 0;
-    if (meta.fields['Tot'])
-        den = getter('Tot');
-    else
-        fields.forEach(f => { den += getter(f); });
-    let num = 0;
-    let dfield = meta.fields[field];
-    if (dfield.colorBySum)
-        for (let i = 0; i < fields.length; i++) {
-            num += getter(fields[i]);
-            if (fields[i] === field)
-                break;
-        }
-    else
-        num = getter(field);
-    // Careful...
-    if (den == 0 || den === undefined || isNaN(den) || num === undefined || isNaN(num))
+    const dsfield = meta.fields ? meta.fields[field] : null;
+    const dscolor = meta.colors ? meta.colors.find((c) => c.shortCaption === field) : null;
+    if (!dsfield && !dscolor)
         return '#ffffff';
-    const pct = dfield.invert ? 1 - (num / den) : num / den;
-    const color = baseclient_1.Util.execGradient(makeStops(exports.EthnicFewStops, baseclient_1.Colors.EthnicFewClassicColors), pct);
-    return color;
+    if (dscolor) {
+        let stops = safeStops(dscolor.stops);
+        let colors = safeColors(dscolor.colors);
+        if (stops.length != colors.length) {
+            stops = exports.EthnicFewStops;
+            colors = safeColors('');
+        }
+        let o = {};
+        let getter = PF.ToGetter(agg, dc, datasetid, datasetid);
+        Object.keys(meta.fields).forEach(f => o[f] = getter(f));
+        let formatter = new baseclient_1.Detail.FormatDetail(dscolor.expr);
+        let result = formatter.format(baseclient_1.Detail.FormatDetail.prepare(o));
+        let intensity = Math.min(Math.max(result.n || 0, 0), 1);
+        return baseclient_1.Util.execGradient(makeStops(stops, colors), intensity);
+    }
+    else {
+        let getter = PF.ToGetter(agg, dc, datasetid, datasetid);
+        let fields = PF.sortedFieldList(meta);
+        let den = 0;
+        if (meta.fields['Tot'])
+            den = getter('Tot');
+        else
+            fields.forEach(f => { den += getter(f); });
+        let num = getter(field);
+        // Careful...
+        if (den == 0 || den === undefined || isNaN(den) || num === undefined || isNaN(num))
+            return '#ffffff';
+        return baseclient_1.Util.execGradient(makeStops(exports.EthnicFewStops, baseclient_1.Colors.EthnicFewClassicColors), num / den);
+    }
 }
 exports.ToExtendedColor = ToExtendedColor;
 function computeDistrictColors(params) {
@@ -662,22 +682,22 @@ exports.BinDarkViolet = 14;
 exports.BinMagenta = 15;
 exports.BinDeepPink = 16;
 exports.BinColorLookup = [
-    { r: 0xff, g: 0x00, b: 0x00 },
-    { r: 0xff, g: 0x45, b: 0x00 },
-    { r: 0x99, g: 0x66, b: 0x33 },
-    { r: 0xff, g: 0xaa, b: 0x00 },
-    { r: 0xff, g: 0xd7, b: 0x00 },
-    { r: 0xff, g: 0xd7, b: 0x00 },
-    { r: 0x9f, g: 0xd4, b: 0x00 },
-    { r: 0x7f, g: 0xff, b: 0x00 },
-    { r: 0x00, g: 0xff, b: 0x00 },
-    { r: 0x00, g: 0xfa, b: 0x9a },
-    { r: 0x00, g: 0xff, b: 0xff },
-    { r: 0x73, g: 0xb2, b: 0xff },
-    { r: 0x00, g: 0x00, b: 0xff },
-    { r: 0x8a, g: 0x2b, b: 0xe2 },
-    { r: 0x94, g: 0x00, b: 0xd3 },
-    { r: 0xff, g: 0x00, b: 0xff },
+    { r: 0xff, g: 0x00, b: 0x00 }, // 0 - red
+    { r: 0xff, g: 0x45, b: 0x00 }, // 1 - orange red
+    { r: 0x99, g: 0x66, b: 0x33 }, // 2 - brown
+    { r: 0xff, g: 0xaa, b: 0x00 }, // 3 - orange
+    { r: 0xff, g: 0xd7, b: 0x00 }, // 4 - gold
+    { r: 0xff, g: 0xd7, b: 0x00 }, // 5 - yellow
+    { r: 0x9f, g: 0xd4, b: 0x00 }, // 6 - greenish
+    { r: 0x7f, g: 0xff, b: 0x00 }, // 7 - chartreuse
+    { r: 0x00, g: 0xff, b: 0x00 }, // 8 - lime
+    { r: 0x00, g: 0xfa, b: 0x9a }, // 9 - medium spring green
+    { r: 0x00, g: 0xff, b: 0xff }, // 10 - cyan
+    { r: 0x73, g: 0xb2, b: 0xff }, // 11 - light blue
+    { r: 0x00, g: 0x00, b: 0xff }, // 12 - blue
+    { r: 0x8a, g: 0x2b, b: 0xe2 }, // 13 - blue violet
+    { r: 0x94, g: 0x00, b: 0xd3 }, // 14 - dark violet
+    { r: 0xff, g: 0x00, b: 0xff }, // 15 - magenta
     { r: 0xff, g: 0x14, b: 0x93 }, // 16 - deep pink
 ];
 // Map ordering to Bin* lookup values
@@ -1391,6 +1411,8 @@ function isColorBy(colorby) {
     return !!datasetid && !!field;
 }
 exports.isColorBy = isColorBy;
+;
+;
 
 
 /***/ }),