49566dc7263cab04bca529355999e4a4e7acfa78 angie Tue Jul 6 10:19:05 2021 -0700 Update to latest Nextstrain clade coloring. diff --git src/hg/hgPhyloPlace/treeToAuspiceJson.c src/hg/hgPhyloPlace/treeToAuspiceJson.c index e94b5c3..4e206de 100644 --- src/hg/hgPhyloPlace/treeToAuspiceJson.c +++ src/hg/hgPhyloPlace/treeToAuspiceJson.c @@ -26,36 +26,42 @@ int sampleCount = slCount(subtreeUserSampleIds); if (sampleCount > 10) fprintf(outF, " and %d other uploaded samples", sampleCount - 1); else { struct slName *sln; for (sln = subtreeUserSampleIds->next; sln != NULL; sln = sln->next) fprintf(outF, ", %s", sln->name); } fputs("\", " "\"panels\": [ \"tree\"] , " "\"colorings\": [ " " { \"key\": \"pango_lineage\", " " \"title\": \"Pango lineage\", \"type\": \"categorical\" }," " { \"key\": \"Nextstrain_clade\"," - " \"scale\": [ [ \"19B\", \"#EC676D\" ], [ \"19A\", \"#F79E43\" ]," - " [ \"20A\", \"#B6D77A\" ], [ \"20C\", \"#8FD4ED\" ]," - " [ \"20B\", \"#A692C3\" ], [ \"20D\", \"#8020A0\" ]," - " [ \"20E (EU1)\", \"#44CC44\" ], [ \"20F\", \"#8822AA\" ]," - " [ \"20G\", \"#8888FF\" ], [ \"20H/501Y.V2\", \"#6666FF\" ]," - " [ \"20I/501Y.V1\", \"#CC44EE\" ], [ \"20A.EU2\", \"#448844\" ], " + " \"scale\": [ " + " [ \"20H (Beta, V2)\", \"#3F47C9\" ]," + " [ \"20I (Alpha, V1)\", \"#4274CE\" ]," + " [ \"20J (Gamma, V3)\", \"#4F97BB\" ]," + " [ \"21A (Delta)\", \"#64AC99\" ]," + " [ \"21B (Kappa)\", \"#7EB976\" ]," + " [ \"21C (Epsilon)\", \"#9EBE5A\" ]," + " [ \"21D (Eta)\", \"#BEBB48\" ]," + " [ \"21E (Theta)\", \"#D9AE3E\" ]," + " [ \"21F (Iota)\", \"#E69036\" ]," + " [ \"21G (Lambda)\", \"#E35F2D\" ]," + " [ \"21H\", \"#DB2823\" ]," " [ \"uploaded sample\", \"#FF0000\" ] ]," " \"title\": \"Nextstrain Clade\", \"type\": \"categorical\" }," , outF); if (sameString(source, "GISAID")) fputs(" { \"key\": \"GISAID_clade\"," " \"scale\": [ [ \"S\", \"#EC676D\" ], [ \"L\", \"#F79E43\" ], [ \"O\", \"#F9D136\" ]," " [ \"V\", \"#FAEA95\" ], [ \"G\", \"#B6D77A\" ], [ \"GH\", \"#8FD4ED\" ]," " [ \"GR\", \"#A692C3\" ] ]," " \"title\": \"GISAID Clade\", \"type\": \"categorical\" }," , outF); fprintf(outF, " { \"key\": \"userOrOld\", " " \"scale\": [ [ \"uploaded sample\", \"#CC0000\"] , [ \"%s\", \"#000000\"] ]," " \"title\": \"Sample type\", \"type\": \"categorical\" }," " {\"key\": \"gt\", \"title\": \"Genotype\", \"type\": \"categorical\"}," " {\"key\": \"country\", \"title\": \"Country\", \"type\": \"categorical\"}"