Removed items that had no id in JSON

removed 4 country limit on ExploreData

hunchworks/templates/explore/explore.html

@@ -48,7 +48,6 @@ <h1>Explore Data</h1>
         });
         $("#id_country").tokenInput( {{ countries|safe }}, {
           prePopulate: {{ countries_prepop|safe }},
-          tokenLimit: 4,
           minChars: 2
         });
       });

hunchworks/utils/data/worldbank.py

@@ -40,13 +40,15 @@ def _value(value):
 
 def chart(data):
   all_country_data = {}
-  country = ""
+  country = None
 
   for item in reversed(data):
 
     if country != item["country"]["value"]:
-      country = item["country"]["value"]
-      all_country_data[country] = {}
+      if item["country"].get("id", "") != "":
+        print item["country"].get("id", "")
+        country = item["country"]["value"]
+        all_country_data[country] = {}
 
     all_country_data[country][item["date"]] = _value(item["value"])
 
@@ -58,6 +60,7 @@ def chart(data):
 
   # country_keys are the unique country names for all countries in the data.
   country_keys = all_country_data.keys()
+  print country_keys
 
   # final_country_data will be an array of arrays looking like this:
   # [ ["1998", 13000, 14000], ["1999", 15000, 16000], ["2000", 17000, 20000] ]

hunchworks/views/explore.py

@@ -27,11 +27,12 @@ def _format_for_tokeninput(key):
 
     for item in data:
       thing = item[key].copy()
-      thing["name"] = thing["value"]
-      del thing["value"]
+      if thing.get("id", "") != "":
+        thing["name"] = thing["value"]
+        del thing["value"]
 
-      if not thing in things:
-        things.append(thing)
+        if not thing in things:
+          things.append(thing)
 
     return things