From da4fbcd44e1077be77a1dd4fcaba68ec23a55ec1 Mon Sep 17 00:00:00 2001 From: Paul Pound Date: Wed, 4 Jul 2018 10:15:04 -0300 Subject: [PATCH] set link length in graph and added input validation for graph parameters --- islandora_herbarium_object.routing.yml | 8 ++++---- js/fdg.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/islandora_herbarium_object.routing.yml b/islandora_herbarium_object.routing.yml index bab01b0..c9714c0 100644 --- a/islandora_herbarium_object.routing.yml +++ b/islandora_herbarium_object.routing.yml @@ -3,8 +3,8 @@ islandora_herbarium_object.graph: defaults: _controller: '\Drupal\islandora_herbarium_object\Controller\GraphController::printFdgGraph' _title: 'Graph' - scientificName: '' - municipality: '' + scientificName: '[a-zA-Z\s]+' + municipality: '[a-zA-Z\s]+' requirements: _permission: 'access content' islandora_herbarium_object.graph-json: @@ -12,7 +12,7 @@ islandora_herbarium_object.graph-json: defaults: _controller: '\Drupal\islandora_herbarium_object\Controller\GraphController::printFdgData' _title: 'Graph Json' - scientificName: '' - municipality: '' + scientificName: '[a-zA-Z\s]+' + municipality: '[a-zA-Z\s]+' requirements: _permission: 'access content' diff --git a/js/fdg.js b/js/fdg.js index 17d97d6..b1468ca 100644 --- a/js/fdg.js +++ b/js/fdg.js @@ -9,7 +9,7 @@ Drupal.behaviors.islandora_herbarium_object_graph = { var simulation = d3.forceSimulation() .force("link", d3.forceLink().id(function (d) { return d.id; - })) + }).distance(100).strength(1)) .force("charge", d3.forceManyBody()) .force("center", d3.forceCenter(width / 2, height / 2)); var dataPath = "/" + settings.path.currentPath.replace('fdg', 'fdg_json');