Added info text on buttons
authorveltr
Fri, 07 Sep 2012 12:26:16 +0200
changeset 38 092fc99f7558
parent 37 db991a757015
child 39 84eea249ce7e
Added info text on buttons
client/js/i18n.js
client/js/paper-renderer.js
client/js/renkan-publish.js
client/render-test.html
crea/buttons.psd
crea/search-logos.psd
metadataplayer/json/renkan.json
--- a/client/js/i18n.js	Thu Sep 06 17:21:11 2012 +0200
+++ b/client/js/i18n.js	Fri Sep 07 12:26:16 2012 +0200
@@ -14,6 +14,9 @@
         created_by: "Created by:",
         zoom_in: "Zoom In",
         zoom_out: "Zoom Out",
+        caption_edit: "Edit",
+        caption_remove: "Remove",
+        caption_link: "Link to another node",
         notif_add_node: "Click on the background canvas to add a node",
         notif_start_edge: "Click on a first node to start the edge",
         notif_end_edge: "Click on a second node to complete the edge",
@@ -39,6 +42,9 @@
         created_by: "Créé par :",
         zoom_in: "Agrandir l’échelle",
         zoom_out: "Rapetisser l’échelle",
+        caption_edit: "Éditer",
+        caption_remove: "Supprimer",
+        caption_link: "Créer un lien",
         notif_add_node: "Cliquer sur le fond du graphe pour rajouter un nœud",
         notif_start_edge: "Cliquer sur un premier nœud pour commencer le lien",
         notif_end_edge: "Cliquer sur un second nœud pour terminer le lien",
--- a/client/js/paper-renderer.js	Thu Sep 06 17:21:11 2012 +0200
+++ b/client/js/paper-renderer.js	Fri Sep 07 12:26:16 2012 +0200
@@ -67,7 +67,7 @@
             top: (Rkns.Renderer._EDITOR_PADDING + _top)
         });
     },
-    sector : function(_repr, _inR, _outR, _startAngle, _endAngle, _padding, _imgsrc) {
+    sector : function(_repr, _inR, _outR, _startAngle, _endAngle, _padding, _imgsrc, _caption) {
         var _startRads = _startAngle * Math.PI / 180,
             _endRads = _endAngle * Math.PI / 180,
             _img = new Image(),
@@ -91,6 +91,8 @@
             _centerRads = (_startRads + _endRads) / 2,
             _centerX = Math.cos(_centerRads) * _centerR,
             _centerY = Math.sin(_centerRads) * _centerR,
+            _textX = Math.cos(_centerRads) * (_outR + 3),
+            _textY = Math.sin(_centerRads) * (_outR + 3),
             _segments = [];
         _segments.push([[_startXIn, _startYIn], [0, 0], [ _kin * _startdx, _kin * _startdy ]]);
         for (var i = 1; i < 4; i++) {
@@ -118,12 +120,31 @@
         _path.opacity = .5;
         _path.closed = true;
         _path.__representation = _repr;
+        if (_textX >= -2 && _textX <= 2) {
+            if (_textY > 0) {
+                _textY += 6;
+            }
+        }
+        var _text = new paper.PointText(_textX,_textY);
+        _text.characterStyle = {
+            fontSize: 9,
+            fillColor: '#c000c0'
+        };
+        if (_textX > 2) {
+            _text.paragraphStyle.justification = 'left';
+        } else if (_textX < -2) {
+            _text.paragraphStyle.justification = 'right';
+        } else {
+            _text.paragraphStyle.justification = 'center';
+        }
+        _text.visible = false;
         var _visible = false,
             _restPos = new paper.Point(-200, -200),
-            _grp = new paper.Group([_path]),
+            _grp = new paper.Group([_path, _text]),
             _delta = _grp.position,
             _imgdelta = new paper.Point([_centerX, _centerY]),
             _currentPos = new paper.Point(0,0);
+        _text.content = _caption;
         _grp.visible = false;
         _grp.position = _restPos;
         var _res = {
@@ -145,17 +166,18 @@
             },
             select: function() {
                 _path.opacity = .8;
+                _text.visible = true;
             },
             unselect: function() {
                 _path.opacity = .5;
+                _text.visible = false;
             },
             destroy: function() {
                 _grp.remove();
             }
         }
         _img.onload = function() {
-            var _w = _img.width,
-                _h = _img.height;
+            var _h = _img.height;
             var _raster = new paper.Raster(_img);
             _raster.position = _imgdelta.add(_grp.position).subtract(_delta);
             _grp.addChild(_raster);
@@ -232,10 +254,13 @@
             _raster.scale(_ratio);
             _this.node_image = new paper.Group(_clip, _raster);
             _this.node_image.opacity = .9;
-            /* This is a workaround to allow clipping at group level */
+            /* This is a workaround to allow clipping at group level
+             * If opacity was set to 1, paper.js would merge all clipping groups in one (known bug).
+            */
             _this.node_image.clipped = true;
             _this.node_image.position = _this.paper_coords;
             _this.node_image.__representation = _this;
+            _clip.__representation = _this;
             paper.view.draw();
         }
         _image.src = _img;
@@ -580,6 +605,9 @@
         _model.set(_data);
         _this.redraw();
     });
+    this.editor_$.find("img").load(function() {
+        _this.redraw();
+    })
     this.editor_$.find(".Rk-Edit-Title")[0].focus();
 }
 
@@ -679,7 +707,7 @@
 Rkns.Renderer.NodeEditButton.prototype._init = function() {
     this.renderer.overlay_layer.activate();
     this.type = "Node-edit-button";
-    this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._NODE_BUTTON_INNER, Rkns.Renderer._NODE_BUTTON_OUTER, - 90, 30, 1, 'img/edit.png');
+    this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._NODE_BUTTON_INNER, Rkns.Renderer._NODE_BUTTON_OUTER, - 90, 30, 1, 'img/edit.png', this.renderer.renkan.l10n.caption_edit);
 }
 
 Rkns.Renderer.NodeEditButton.prototype.moveTo = function(_pos) {
@@ -722,7 +750,7 @@
 Rkns.Renderer.NodeRemoveButton.prototype._init = function() {
     this.renderer.overlay_layer.activate();
     this.type = "Node-remove-button";
-    this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._NODE_BUTTON_INNER, Rkns.Renderer._NODE_BUTTON_OUTER, -210, -90, 1, 'img/remove.png');
+    this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._NODE_BUTTON_INNER, Rkns.Renderer._NODE_BUTTON_OUTER, -210, -90, 1, 'img/remove.png', this.renderer.renkan.l10n.caption_remove);
 }
 
 Rkns.Renderer.NodeRemoveButton.prototype.moveTo = function(_pos) {
@@ -766,7 +794,7 @@
 Rkns.Renderer.NodeLinkButton.prototype._init = function() {
     this.renderer.overlay_layer.activate();
     this.type = "Node-link-button";
-    this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._NODE_BUTTON_INNER, Rkns.Renderer._NODE_BUTTON_OUTER, 30, 150, 1, 'img/link.png');
+    this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._NODE_BUTTON_INNER, Rkns.Renderer._NODE_BUTTON_OUTER, 30, 150, 1, 'img/link.png', this.renderer.renkan.l10n.caption_link);
 }
 
 Rkns.Renderer.NodeLinkButton.prototype.moveTo = function(_pos) {
@@ -803,7 +831,7 @@
 Rkns.Renderer.EdgeEditButton.prototype._init = function() {
     this.renderer.overlay_layer.activate();
     this.type = "Edge-edit-button";
-    this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._EDGE_BUTTON_INNER, Rkns.Renderer._EDGE_BUTTON_OUTER, - 90, 90, 1, 'img/edit.png');
+    this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._EDGE_BUTTON_INNER, Rkns.Renderer._EDGE_BUTTON_OUTER, - 90, 90, 1, 'img/edit.png', this.renderer.renkan.l10n.caption_edit);
 }
 
 Rkns.Renderer.EdgeEditButton.prototype.moveTo = function(_pos) {
@@ -846,7 +874,7 @@
 Rkns.Renderer.EdgeRemoveButton.prototype._init = function() {
     this.renderer.overlay_layer.activate();
     this.type = "Edge-remove-button";
-    this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._EDGE_BUTTON_INNER, Rkns.Renderer._EDGE_BUTTON_OUTER, - 270, -90, 1, 'img/remove.png');
+    this.sector = Rkns.Renderer.Utils.sector(this, Rkns.Renderer._EDGE_BUTTON_INNER, Rkns.Renderer._EDGE_BUTTON_OUTER, - 270, -90, 1, 'img/remove.png', this.renderer.renkan.l10n.caption_remove);
 }
 Rkns.Renderer.EdgeRemoveButton.prototype.moveTo = function(_pos) {
     this.sector.moveTo(_pos);
--- a/client/js/renkan-publish.js	Thu Sep 06 17:21:11 2012 +0200
+++ b/client/js/renkan-publish.js	Fri Sep 07 12:26:16 2012 +0200
@@ -632,7 +632,7 @@
 
 Rkns.Renderer.NodeTooltip.prototype.redraw = function() {
     var _coords = this.node_representation.paper_coords;
-    Rkns.Renderer.Utils.drawTooltip(_coords, this.tooltip_block, 250, 10, this.tooltip_$);
+    Rkns.Renderer.Utils.drawTooltip(_coords, this.tooltip_block, 250, 15, this.tooltip_$);
     this.tooltip_$.show();
 }
 
--- a/client/render-test.html	Thu Sep 06 17:21:11 2012 +0200
+++ b/client/render-test.html	Fri Sep 07 12:26:16 2012 +0200
@@ -25,7 +25,6 @@
             var _proj;
             $(function() {
                 _renkan = new Rkns.Renkan({
-                    language: "fr",
                     url: "data/simple-persist.php",
                     bins: [
                         {
Binary file crea/buttons.psd has changed
Binary file crea/search-logos.psd has changed
--- a/metadataplayer/json/renkan.json	Thu Sep 06 17:21:11 2012 +0200
+++ b/metadataplayer/json/renkan.json	Fri Sep 07 12:26:16 2012 +0200
@@ -1,19 +1,19 @@
 {
     "users": [
         {
-            "id": "u-anonymous",
+            "_id": "u-anonymous",
             "title": "anonymous",
             "uri": "",
             "description": "",
             "color": "#dd00dd"
         }, {
-            "id": "u-cybunk",
+            "_id": "u-cybunk",
             "title": "Samuel",
             "uri": "http://twitter.com/cybunk",
             "description": "",
             "color": "#e00000"
         }, {
-            "id": "u-raphv",
+            "_id": "u-raphv",
             "title": "Raphael",
             "uri": "http://twitter.com/raphv",
             "description": "",
@@ -22,7 +22,7 @@
     ],
     "nodes": [
         {
-            "id": "node-2012-08-22-9da6eef6c6391d05-0001",
+            "_id": "node-2012-08-22-9da6eef6c6391d05-0001",
             "title": "Chocs technologiques et tâches de l’université...",
             "uri": "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/player/e328e188-ff2f-11e0-b9e1-00145ea49a02/#id=s_6C326EED-B91A-AEDF-032D-40D9A60AAD7E",
             "description": "Bernard Stiegler:\nChocs technologiques et tâches de l’université. L'époque des digital studies\nベルナール・スティグレールによるプレゼンテーション『テクノロジーの衝撃と大学の諸課題――デジタル・スタディーズの時代』 (langue française フランス語)",
@@ -30,39 +30,43 @@
                 "x": 35.50145330596697,
                 "y": -79.8809523809524
             },
+            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/ldt-segment.png",
             "created_by": "u-cybunk"
         }, {
-            "id": "node-2012-08-22-9da6eef6c6391d05-0002",
+            "_id": "node-2012-08-22-9da6eef6c6391d05-0002",
             "title": "Wiki: ベルナール・スティグレール",
             "uri": "http://ja.wikipedia.org/wiki/%E3%83%99%E3%83%AB%E3%83%8A%E3%83%BC%E3%83%AB%E3%83%BB%E3%82%B9%E3%83%86%E3%82%A3%E3%82%B0%E3%83%AC%E3%83%BC%E3%83%AB",
             "description": "|image_name = Bernard-Stiegler.jpg\n'''ベルナール・スティグレール'''('''Bernard Stiegler''',[[1952年]][[4月1日]] - )は、[[フランス]]の[[哲学者]]。\n",
             "position": {
-                "x": -196.21861947454883,
-                "y": -149.00697345010028
+                "x": -212.89325104742056,
+                "y": -142.05921029473706
             },
+            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/wikipedia.png",
             "created_by": "u-raphv"
         }, {
-            "id": "node-2012-08-22-9da6eef6c6391d05-0003",
+            "_id": "node-2012-08-22-9da6eef6c6391d05-0003",
             "title": "Wiki: Bernard Stiegler",
             "uri": "http://fr.wikipedia.org/wiki/Bernard_Stiegler",
             "description": "Bernard Stiegler, né le 1 | avril | 1952, est un philosophe  français  qui axe sa réflexion sur les enjeux des mutations actuelles —  ... ",
             "position": {
-                "x": -203.78187077358191,
-                "y": -298.3662919065874
+                "x": -199.613212880364,
+                "y": -297.6715155910511
             },
+            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/wikipedia.png",
             "created_by": "u-raphv"
         }, {
-            "id": "node-2012-08-22-9da6eef6c6391d05-0004",
+            "_id": "node-2012-08-22-9da6eef6c6391d05-0004",
             "title": "Tag: Stiegler",
             "uri": "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/search/?search=Stiegler&field=all",
             "description": "Tag 'Stiegler'",
             "position": {
-                "x": -82.30326393358813,
-                "y": -220.3518547582561
+                "x": -68.40773762286169,
+                "y": -205.76155213199334
             },
+            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/ldt-tag.png",
             "created_by": "u-raphv"
         }, {
-            "id": "node-2012-08-22-9da6eef6c6391d05-0009",
+            "_id": "node-2012-08-22-9da6eef6c6391d05-0009",
             "title": "Wiki: Humanités numériques",
             "uri": "http://fr.wikipedia.org/wiki/Humanit%C3%A9s_num%C3%A9riques",
             "description": "une proposition de définition a été élaborée lors du THATCamp des 18 et 19 mai 2010 sous la forme d'un « Manifeste des digital humanities : ... ",
@@ -70,9 +74,10 @@
                 "x": -227.84295519248332,
                 "y": 91.1816115015538
             },
+            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/wikipedia.png",
             "created_by": "u-raphv"
         }, {
-            "id": "node-2012-08-22-9da6eef6c6391d05-000a",
+            "_id": "node-2012-08-22-9da6eef6c6391d05-000a",
             "title": "Wiki: デジタル・ヒューマニティーズ",
             "uri": "http://ja.wikipedia.org/wiki/%E3%83%87%E3%82%B8%E3%82%BF%E3%83%AB%E3%83%BB%E3%83%92%E3%83%A5%E3%83%BC%E3%83%9E%E3%83%8B%E3%83%86%E3%82%A3%E3%83%BC%E3%82%BA",
             "description": "...(digital humanities)は、コンピューティングと人文科学(humanities)諸分野と間の接点に関して調査、研究、教育、および�\n* Centre for Computing in the Humanities\n",
@@ -80,19 +85,20 @@
                 "x": -221.48701615763574,
                 "y": 242.80740052545508
             },
+            "image": "http://www.iri.centrepompidou.fr/dev/~veltr/hitachi-tests/img/wikipedia.png",
             "created_by": "u-raphv"
         }, {
-            "id": "node-2012-08-22-9da6eef6c6391d05-000b",
+            "_id": "node-2012-08-22-9da6eef6c6391d05-000b",
             "title": "Digital studies",
             "uri": "",
             "description": "",
             "position": {
-                "x": -55.85113246487888,
-                "y": 51.55194408866958
+                "x": -62.798895620242085,
+                "y": 32.09820725365255
             },
             "created_by": "u-raphv"
         }, {
-            "id": "node-2012-08-22-9da6eef6c6391d05-000c",
+            "_id": "node-2012-08-22-9da6eef6c6391d05-000c",
             "title": "Digital Humanities",
             "uri": "",
             "description": "",
@@ -102,7 +108,7 @@
             },
             "created_by": "u-raphv"
         }, {
-            "id": "node-2012-08-22-b778a9fc31296d6b-0008",
+            "_id": "node-2012-08-22-b778a9fc31296d6b-0008",
             "title": "Les rétentions (Tweet)",
             "uri": "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/player/e328e188-ff2f-11e0-b9e1-00145ea49a02/#id=a924b90c-46a1-4f0a-9e13-bcf69f7b5de0-127750274034049024",
             "description": "Tweet by Vincent Puig: #tfcem Les rétentions primaires (perception) s'aggrégent et forment des rétentions secondaires (mémoire), gravées sur rétentions tertiaires",
@@ -110,52 +116,57 @@
                 "x": 186.15055288633457,
                 "y": -184.66836073709257
             },
+            "image": "http://a1.twimg.com/profile_images/379424006/PortaitVP120Ko_normal.jpg",
             "created_by": "u-cybunk"
         }, {
-            "id": "node-2012-08-22-b778a9fc31296d6b-0009",
+            "_id": "node-2012-08-22-b778a9fc31296d6b-0009",
             "title": "L'origine de la géométrie (Tweet)",
             "uri": "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/player/e328e188-ff2f-11e0-b9e1-00145ea49a02/#id=5b34ae61-ffb1-4535-a479-007cb0ef57e8-127752118743474177",
             "description": "Tweet by Vincent Puig: #tfcem L'origine de la géométrie: l'écriture est processus long de transindividuation. Nos tweets quasi temps réel sont de même nature++",
             "position": {
-                "x": 109.36171738186508,
-                "y": -322.7405203211109
+                "x": 87.82365160023906,
+                "y": -280.3591650733953
             },
+            "image": "http://a1.twimg.com/profile_images/379424006/PortaitVP120Ko_normal.jpg",
             "created_by": "u-cybunk"
         }, {
-            "id": "node-2012-08-22-b778a9fc31296d6b-000a",
+            "_id": "node-2012-08-22-b778a9fc31296d6b-000a",
             "title": "Polemictweet : un outil Digital Studies (Tweet)",
             "uri": "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/player/e328e188-ff2f-11e0-b9e1-00145ea49a02/#id=4b34e895-221b-467b-a0f2-8ff4ae87cae4-127758736415666177",
             "description": "Tweet by Vincent Puig:\n#tfcem Polemictweet : un outil Digital Studies pensé à l'IRI comme rétention tertiaire numérique avec les même armes que l'industrie",
             "position": {
-                "x": 174.8441677339912,
-                "y": 69.79052957489553
+                "x": 168.59118089416432,
+                "y": 57.97933221077804
             },
+            "image": "http://a1.twimg.com/profile_images/379424006/PortaitVP120Ko_normal.jpg",
             "created_by": "u-cybunk"
         }, {
-            "id": "node-2012-08-22-b778a9fc31296d6b-000f",
+            "_id": "node-2012-08-22-b778a9fc31296d6b-000f",
             "title": "Rétention (Définition AI)",
             "uri": "http://arsindustrialis.org/vocabulaire-ars-industrialis/r%C3%A9tention",
             "description": "Les rétentions sont ce qui est retenu ou recueilli par la conscience. Ce terme est emprunté à Husserl ; mais les rétentions tertiaires sont propres à la philosophie de Bernard Stiegler.\n\nLes rétentions sont des sélections : dans le flux de conscience que vous êtes vous ne pouvez pas tout retenir, ce que vous retenez est ce que vous êtes, mais ce que vous retenez dépend ce que vous avez déjà retenu.\n\nL’espèce humaine, étant originairement constituée par sa prothéticité, dispose d’une troisième mémoire, ni génétique, ni épigénétique : le milieu épiphylogénétique, comme ensemble des rétentions tertiaires formant des dispositifs rétentionels.",
             "position": {
-                "x": 240.98461723225768,
-                "y": -53.794373087027985
+                "x": 276.41820932461013,
+                "y": -62.82646518900019
             },
+            "image": "http://www.arsindustrialis.org/sites/default/files/userfiles/user3/Logovocabulairenoir.JPG",
             "created_by": "u-cybunk"
         }, {
-            "id": "node-2012-08-22-5b349e49066c1b01-0001",
+            "_id": "node-2012-08-22-5b349e49066c1b01-0001",
             "title": "Polemic Tweet",
             "uri": "http://polemictweet.com/",
             "description": "Polemic Tweet Web Site",
             "position": {
-                "x": 220.27339862010322,
-                "y": 209.95821750254615
+                "x": 220.96817493563964,
+                "y": 196.75746750735607
             },
+            "image": "http://www.polemictweet.com/images/ENMI_2010_logo.gif",
             "created_by": "u-cybunk"
         }
     ],
     "edges": [
         {
-            "id": "edge-2012-08-22-9da6eef6c6391d05-0005",
+            "_id": "edge-2012-08-22-9da6eef6c6391d05-0005",
             "title": "is about",
             "uri": "",
             "description": "",
@@ -163,7 +174,7 @@
             "to": "node-2012-08-22-9da6eef6c6391d05-0004",
             "created_by": "u-raphv"
         }, {
-            "id": "edge-2012-08-22-9da6eef6c6391d05-0006",
+            "_id": "edge-2012-08-22-9da6eef6c6391d05-0006",
             "title": "is about",
             "uri": "",
             "description": "",
@@ -171,7 +182,7 @@
             "to": "node-2012-08-22-9da6eef6c6391d05-0004",
             "created_by": "u-raphv"
         }, {
-            "id": "edge-2012-08-22-9da6eef6c6391d05-0007",
+            "_id": "edge-2012-08-22-9da6eef6c6391d05-0007",
             "title": "speech by",
             "uri": "",
             "description": "",
@@ -179,7 +190,7 @@
             "to": "node-2012-08-22-9da6eef6c6391d05-0004",
             "created_by": "u-raphv"
         }, {
-            "id": "edge-2012-08-22-b778a9fc31296d6b-0001",
+            "_id": "edge-2012-08-22-b778a9fc31296d6b-0001",
             "title": "is about",
             "uri": "",
             "description": "",
@@ -187,23 +198,7 @@
             "to": "node-2012-08-22-9da6eef6c6391d05-000b",
             "created_by": "u-raphv"
         }, {
-            "id": "edge-manual-001",
-            "title": "theme of",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-08-22-9da6eef6c6391d05-000b",
-            "to": "node-2012-08-22-9da6eef6c6391d05-0001",
-            "created_by": "u-cybunk"
-        }, {
-            "id": "edge-manual-002",
-            "title": "example of",
-            "uri": "",
-            "description": "",
-            "from": "node-2012-08-22-b778a9fc31296d6b-000a",
-            "to": "node-2012-08-22-9da6eef6c6391d05-000b",
-            "created_by": "u-cybunk"
-        }, {
-            "id": "edge-2012-08-22-b778a9fc31296d6b-0002",
+            "_id": "edge-2012-08-22-b778a9fc31296d6b-0002",
             "title": "Are related to",
             "uri": "",
             "description": "",
@@ -211,7 +206,7 @@
             "to": "node-2012-08-22-9da6eef6c6391d05-000c",
             "created_by": "u-raphv"
         }, {
-            "id": "edge-2012-08-22-b778a9fc31296d6b-0003",
+            "_id": "edge-2012-08-22-b778a9fc31296d6b-0003",
             "title": "is about",
             "uri": "",
             "description": "",
@@ -219,7 +214,7 @@
             "to": "node-2012-08-22-9da6eef6c6391d05-000c",
             "created_by": "u-raphv"
         }, {
-            "id": "edge-2012-08-22-b778a9fc31296d6b-0004",
+            "_id": "edge-2012-08-22-b778a9fc31296d6b-0004",
             "title": "is about",
             "uri": "",
             "description": "",
@@ -227,7 +222,7 @@
             "to": "node-2012-08-22-9da6eef6c6391d05-000c",
             "created_by": "u-raphv"
         }, {
-            "id": "edge-2012-08-22-b778a9fc31296d6b-000b",
+            "_id": "edge-2012-08-22-b778a9fc31296d6b-000b",
             "title": "is about",
             "uri": "",
             "description": "",
@@ -235,7 +230,7 @@
             "to": "node-2012-08-22-9da6eef6c6391d05-000b",
             "created_by": "u-raphv"
         }, {
-            "id": "edge-2012-08-22-b778a9fc31296d6b-000c",
+            "_id": "edge-2012-08-22-b778a9fc31296d6b-000c",
             "title": "tweeted during",
             "uri": "",
             "description": "",
@@ -243,7 +238,7 @@
             "to": "node-2012-08-22-9da6eef6c6391d05-0001",
             "created_by": "u-cybunk"
         }, {
-            "id": "edge-2012-08-22-b778a9fc31296d6b-000d",
+            "_id": "edge-2012-08-22-b778a9fc31296d6b-000d",
             "title": "tweeted during",
             "uri": "",
             "description": "",
@@ -251,7 +246,7 @@
             "to": "node-2012-08-22-9da6eef6c6391d05-0001",
             "created_by": "u-cybunk"
         }, {
-            "id": "edge-2012-08-22-b778a9fc31296d6b-000e",
+            "_id": "edge-2012-08-22-b778a9fc31296d6b-000e",
             "title": "tweeted during",
             "uri": "",
             "description": "",
@@ -259,7 +254,7 @@
             "to": "node-2012-08-22-9da6eef6c6391d05-0001",
             "created_by": "u-cybunk"
         }, {
-            "id": "edge-2012-08-22-b778a9fc31296d6b-0011",
+            "_id": "edge-2012-08-22-b778a9fc31296d6b-0011",
             "title": "is about",
             "uri": "",
             "description": "",
@@ -267,7 +262,7 @@
             "to": "node-2012-08-22-b778a9fc31296d6b-000f",
             "created_by": "u-cybunk"
         }, {
-            "id": "edge-2012-08-22-b778a9fc31296d6b-0012",
+            "_id": "edge-2012-08-22-b778a9fc31296d6b-0012",
             "title": "is about",
             "uri": "",
             "description": "",
@@ -275,13 +270,29 @@
             "to": "node-2012-08-22-b778a9fc31296d6b-000f",
             "created_by": "u-cybunk"
         }, {
-            "id": "edge-2012-08-22-5b349e49066c1b01-0002",
+            "_id": "edge-2012-08-22-5b349e49066c1b01-0002",
             "title": "is about",
             "uri": "",
             "description": "",
             "from": "node-2012-08-22-b778a9fc31296d6b-000a",
             "to": "node-2012-08-22-5b349e49066c1b01-0001",
             "created_by": "u-cybunk"
+        }, {
+            "_id": "edge-2012-09-06-70cc0c2d5e1112d3-0001",
+            "title": "is an example of",
+            "uri": "",
+            "description": "",
+            "from": "node-2012-08-22-b778a9fc31296d6b-000a",
+            "to": "node-2012-08-22-9da6eef6c6391d05-000b",
+            "created_by": "u-anonymous"
+        }, {
+            "_id": "edge-2012-09-06-70cc0c2d5e1112d3-0002",
+            "title": "tool used",
+            "uri": "",
+            "description": "",
+            "from": "node-2012-08-22-5b349e49066c1b01-0001",
+            "to": "node-2012-08-22-b778a9fc31296d6b-000a",
+            "created_by": "u-anonymous"
         }
     ]
 }
\ No newline at end of file