Merge branch 'clade-aa-labels'

* clade-aa-labels:
  [bugfix] correctly export aa and clade labels

Author: jameshadfield

augur/export_v2.py

@@ -519,15 +519,18 @@ def _transfer_mutations(node, raw_data):
                 #convert mutations into a label
                 if aa:
                     aa_lab = '; '.join("{!s}: {!s}".format(key,', '.join(val)) for (key,val) in aa.items())
-                    node["branch_attrs"]["labels"] = { "aa": aa_lab }
+                    if 'labels' in node["branch_attrs"]:
+                        node["branch_attrs"]["labels"]["aa"] = aa_lab
+                    else:
+                        node["branch_attrs"]["labels"] = { "aa": aa_lab }
 
     def _transfer_vaccine_info(node, raw_data):
         if raw_data.get("vaccine"):
             node["node_attrs"]['vaccine'] = raw_data['vaccine']
 
     def _transfer_labels(node, raw_data):
         if "clade_annotation" in raw_data and is_valid(raw_data["clade_annotation"]):
-            if 'labels' in node:
+            if 'labels' in node["branch_attrs"]:
                 node["branch_attrs"]["labels"]['clade'] = raw_data["clade_annotation"]
             else:
                 node["branch_attrs"]["labels"] = { "clade": raw_data["clade_annotation"] }