439c90e9ae6471a5e575cdc1a35a722ac040c745 angie Mon Mar 1 00:55:54 2021 -0800 Don't offer GISAID clade coloring for public trees since we don't have GISAID clade info for them. diff --git src/hg/hgPhyloPlace/treeToAuspiceJson.c src/hg/hgPhyloPlace/treeToAuspiceJson.c index 81cfacf..6fdd045 100644 --- src/hg/hgPhyloPlace/treeToAuspiceJson.c +++ src/hg/hgPhyloPlace/treeToAuspiceJson.c @@ -34,31 +34,33 @@ } fputs("\", " "\"panels\": [ \"tree\"] , " "\"colorings\": [ " " { \"key\": \"pangolin_lineage\", " " \"title\": \"Pangolin 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\" ], " " [ \"uploaded sample\", \"#FF0000\" ] ]," " \"title\": \"Nextstrain Clade\", \"type\": \"categorical\" }," - " { \"key\": \"GISAID_clade\"," + , 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\" }" , source); fputs(" ] , " //#*** Filters didn't seem to work... maybe something about the new fetch feature, or do I need to spcify in some other way? //#*** "\"filters\": [ \"GISAID_clade\", \"region\", \"country\", \"division\", \"author\" ], " "\"display_defaults\": { " " \"branch_label\": \"none\", " " \"color_by\": \"userOrOld\" "