working on JSON merger

phylogeography · Nov 17, 2015 · 906fd9a · 906fd9a
1 parent db423d3
commit 906fd9a
Show file tree

Hide file tree

Showing 17 changed files with 651,333 additions and 381,318 deletions.
diff --git a/d3renderer/data/antigenic_merged.json b/d3renderer/data/antigenic_merged.json
diff --git a/d3renderer/script.js b/d3renderer/script.js
@@ -494,9 +494,13 @@ d3.json("data/antigenic_merged.json", function ready(error, json) {
 	var pointAttributes = json.pointAttributes;
 	if (typeof pointAttributes != 'undefined') {
 		populatePointPanels(pointAttributes);
-		populateAreaPanels(pointAttributes);
 	}
 
+	var areaAttributes = json.areaAttributes;
+	if (typeof pointAttributes != 'undefined') {
+		populateAreaPanels(areaAttributes);
+	}
+
 	var mapAttributes = json.mapAttributes;
 	if (typeof mapAttributes != 'undefined') {
 		populateMapPanels(mapAttributes);