--- a/src/hdalab/views/renkan.py	Wed Jul 09 12:26:11 2014 +0200
+++ b/src/hdalab/views/renkan.py	Thu Jul 10 16:17:00 2014 +0200
@@ -49,15 +49,36 @@
         # Tags arrive with french label, countries with dbpedia uri
         label_list = [t for t in labels if t!=""]
         country_list = [c for c in countries if c!=""]
-        all_tags = Tag.objects.filter( Q(label__in=label_list) | Q(dbpedia_uri__in=country_list) )
+        all_tags = Tag.objects.filter( Q(label__in=label_list) | Q(dbpedia_uri__in=country_list) ).select_related("dbpedia_fields")
         
         # Get datasheets from ajax filter search
         filter_output = filter_generic(request.GET.get('lang',request.LANGUAGE_CODE), None, ",".join(label_list), ",".join(country_list))
         filter_output = json.loads(filter_output)
+        #logger.debug("COUCOU")
+        #logger.debug(json.dumps(filter_output, indent=2))
+        #return HttpResponse(json.dumps(filter_output, indent=2), content_type="application/json")
+        
+        # Prepare other tags
+        related_tags = []
+        all_labels = [t.label for t in all_tags]
+        related_tags_dict = {}
+        for c in filter_output["contents"]:
+            c["id"] = unicode(uuid.uuid1())
+            related_tags_dict[c["id"]] = []
+            for t in c["tags"]:
+                if t["label"] not in all_labels and t["order"]<6:
+                    thumbnail_url = ""
+                    for tt in filter_output["tags"]:
+                        if tt["label"]==t["label"]:
+                            thumbnail_url = tt["thumbnail"]
+                    related_tags.append({"label": t["label"], "thumbnail":thumbnail_url, "id":t["id"]})
+                    all_labels.append(t["label"])
+                    related_tags_dict[c["id"]].append(t["id"])
+        #return HttpResponse(json.dumps({"t":related_tags_label}, indent=2), content_type="application/json")
         
         # Prepare Node placer :
         np = LineNodePlacer()
-        np.init({"tags": len(all_tags), "datasheet":len(filter_output["contents"])})
+        np.init({"tags": (1, len(all_tags)), "datasheet": (2, len(filter_output["contents"])), "related": (3, len(related_tags))})
         
         project_id = unicode(uuid.uuid1())
         
@@ -68,15 +89,16 @@
               "description": t.dbpedia_uri,
               "uri": t.dbpedia_uri,
               "position": np.get_place("tags"),
-              "image": None,
+              "image": t.dbpedia_fields.thumbnail if hasattr(t, 'dbpedia_fields') and t.dbpedia_fields and t.dbpedia_fields.thumbnail else None,
               "size": 0,
               "project_id": project_id,
+              "color": None,
               #"created_by": "roster_user-84fe909f-ba37-48e6-a25f-9d2f129a95b7"
             })
         
-        for c in filter_output["contents"]  :
+        for c in filter_output["contents"]:
             content["nodes"].append({
-              "id": unicode(uuid.uuid1()),
+              "id": c["id"],
               "title": c["title"],
               "description": c["description"],
               "uri": c["url"],
@@ -84,9 +106,38 @@
               "image": None,
               "size": 0,
               "project_id": project_id,
+              "color": "#FF0033",
               #"created_by": "roster_user-84fe909f-ba37-48e6-a25f-9d2f129a95b7"
             })
         
+        for t in related_tags:
+            content["nodes"].append({
+              "id": t["id"],
+              "title": t["label"],
+              "description": "",
+              "uri": "",
+              "position": np.get_place("related"),
+              "image": t["thumbnail"],
+              "size": 0,
+              "project_id": project_id,
+              "color": "#00FF33",
+              #"created_by": "roster_user-84fe909f-ba37-48e6-a25f-9d2f129a95b7"
+            })
+        
+        for c_id in related_tags_dict:
+            for tag_id in related_tags_dict[c_id]:
+                content["edges"].append({
+                    "id": unicode(uuid.uuid1()),
+                    "title": "",
+                    "description": "",
+                    "uri": "",
+                    "color": None,
+                    "from": c_id,
+                    "to": tag_id,
+                    "project_id": project_id,
+                    #"created_by": "de68xf75y6hs5rgjhgghxbm217xk"
+                })
+        
         
         
         return HttpResponse(json.dumps(content), content_type="application/json")