From 0e8c80fb5233f8d89dbcd41eafecd615c3a7e0fe Mon Sep 17 00:00:00 2001 From: Paul Pound Date: Thu, 7 Jun 2018 15:59:08 -0300 Subject: [PATCH] refactored fdg js changed label to uri --- js/fdg.js | 20 ++------------------ src/Graph/FdgGraph.php | 4 ++-- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/js/fdg.js b/js/fdg.js index 844abc3..26ffe00 100644 --- a/js/fdg.js +++ b/js/fdg.js @@ -42,17 +42,6 @@ d3.json("/islandora_herbarium_object/fdg_json", function (error, graph) { return d.id; }); - /*var textElement = svg.append('g') - .attr('class', 'text') - .selectAll('text') - .data(graph.nodes) - .enter().append('text') - .text(function(d) {return d.name;}) - .attr('font-size', 10) - .attr('font-weight', 'bolder') - .attr('dx', 15) - .attr('dy', 4)*/ - var uriElement = svg.append('g') .attr('class', 'uri') .attr('x', 8) @@ -62,7 +51,7 @@ d3.json("/islandora_herbarium_object/fdg_json", function (error, graph) { .enter().append('a') .attr("target", "_blank") .attr('xlink:href', function (d) { - return d.label + return d.uri }) .append('text') .text(function (d) { @@ -70,12 +59,7 @@ d3.json("/islandora_herbarium_object/fdg_json", function (error, graph) { }) .attr('font-size', 10) .attr('font-weight', 'bolder'); - //.attr('dx', 15) - //.attr('dy', 28); - //uriElement.select("a") - // .attr("xlink:href", function(d) { - // return d.label; - // }); + simulation .nodes(graph.nodes) diff --git a/src/Graph/FdgGraph.php b/src/Graph/FdgGraph.php index ad036ea..1350c7d 100644 --- a/src/Graph/FdgGraph.php +++ b/src/Graph/FdgGraph.php @@ -41,7 +41,7 @@ class FdgGraph { $outputArr['nodes'][] = [ 'id' => $result['municipality']['value'], 'name' => $result['municipality']['value'], - 'label' => $result['municipalityIRI']['value'], + 'uri' => $result['municipalityIRI']['value'], 'group' => 1, ]; $idArr[$result['municipality']['value']] = ''; @@ -49,7 +49,7 @@ class FdgGraph { $outputArr['nodes'][] = [ 'id' => $result['name']['value'], 'name' => $result['name']['value'], - 'label' => $result['scientificNameIRI']['value'], + 'uri' => $result['scientificNameIRI']['value'], 'group' => 2, ]; $outputArr['links'][] = [