--- a/web/hdalab/models/dataviz.py	Fri Feb 17 13:07:49 2012 +0100
+++ b/web/hdalab/models/dataviz.py	Wed Feb 22 18:55:35 2012 +0100
@@ -26,10 +26,25 @@
     class Meta:
         app_label = 'hdalab'
 
-class CountryCode(models.Model):
+#class CountryCode(models.Model):
+#
+#    label = models.CharField(max_length=1024, unique=True, blank=False, null=False, db_index=True)
+#    isocode = models.CharField(max_length=3, unique=True, blank=False, null=False, db_index=True)
+#    
+#    class Meta:
+#        app_label = 'hdalab'
 
-    label = models.CharField(max_length=1024, unique=True, blank=False, null=False, db_index=True)
-    isocode = models.CharField(max_length=3, unique=True, blank=False, null=False, db_index=True)
+class Country(models.Model):
+    
+    dbpedia_uri = models.URLField(verify_exists=False, max_length=255, blank=False, null=False, db_index=True, unique=True)
+    
+    class Meta:
+        app_label = 'hdalab'
+
+class GeoInclusion(models.Model):
+    
+    tag = models.OneToOneField(Tag, related_name="locatedin", db_index=True)
+    country = models.ForeignKey(Country, blank=False, null=False, related_name="includes", db_index=True)
     
     class Meta:
         app_label = 'hdalab'