Added related individuals

Author: FlorianCassayre

src/gedcom/actions.js

@@ -1,5 +1,5 @@
 import { readGedcom } from 'read-gedcom';
-import { computeAncestors, computeDescendants, createInitialSettings } from '../util';
+import { computeAncestors, computeDescendants, computeRelated, createInitialSettings } from '../util';
 
 export const LOADING = 'gedcomFile/LOADING';
 export const SUCCESS = 'gedcomFile/SUCCESS';
@@ -99,13 +99,15 @@ const initializeAllFields = root => {
 const computeDependantFields = (root, rootIndividual) => {
     const ancestors = rootIndividual ? computeAncestors(root, rootIndividual) : null;
     const descendants = rootIndividual ? computeDescendants(root, rootIndividual) : null;
-    const statistics = computeStatistics(root, ancestors, descendants);
-    return { ancestors, descendants, statistics };
+    const related = rootIndividual ? computeRelated(root, ancestors) : null;
+    const statistics = computeStatistics(root, ancestors, descendants, related);
+    return { ancestors, descendants, related, statistics };
 };
 
-const computeStatistics = (root, ancestors, descendants) => {
-     const totalIndividuals = root.getIndividualRecord().count();
-     const totalAncestors = ancestors !== null ? ancestors.size - 1 : null;
+const computeStatistics = (root, ancestors, descendants, related) => {
+    const totalIndividuals = root.getIndividualRecord().count();
+    const totalAncestors = ancestors !== null ? ancestors.size - 1 : null;
     const totalDescendants = descendants !== null ? descendants.size - 1 : null;
-    return { totalIndividuals, totalAncestors, totalDescendants };
+    const totalRelated = related !== null ? related.size - 1 : null;
+    return { totalIndividuals, totalAncestors, totalDescendants, totalRelated };
 };

src/i18n/locales/en.json

@@ -54,6 +54,7 @@
   "page.home.statistics.individuals": "Individuals:",
   "page.home.statistics.ancestors": "Ancestors:",
   "page.home.statistics.descendants": "Descendants:",
+  "page.home.statistics.related": "Related:",
   "page.home.metadata.title": "File metadata",
   "page.home.metadata.name": "Name:",
   "page.home.metadata.provider": "Provider:",

src/i18n/locales/fr.json

@@ -54,6 +54,7 @@
   "page.home.statistics.individuals": "Individus :",
   "page.home.statistics.ancestors": "Ancêtres :",
   "page.home.statistics.descendants": "Descendants :",
+  "page.home.statistics.related": "Apparentés :",
   "page.home.metadata.title": "Métadonnées du fichier",
   "page.home.metadata.name": "Nom :",
   "page.home.metadata.provider": "Éditeur :",

src/pages/private/PageHome/PageHome.js

@@ -112,6 +112,12 @@ export class PageHome extends Component {
                                             <td><strong><FormattedNumber value={statistics.totalDescendants}/></strong></td>
                                         </tr>
                                     )}
+                                    {statistics.totalRelated !== null && (
+                                        <tr>
+                                            <td><FormattedMessage id="page.home.statistics.related"/></td>
+                                            <td><strong><FormattedNumber value={statistics.totalRelated}/></strong></td>
+                                        </tr>
+                                    )}
                                     </tbody>
                                 </Table>
                             </Col>

src/util/graph.js

@@ -1,6 +1,6 @@
-function breadthFirstSearch(root, initialIndividual, neighboursOf) {
-    const visited = new Set([initialIndividual.pointer().one()]);
-    let current = new Set([initialIndividual]);
+function breadthFirstSearch(root, initialIndividuals, neighboursOf) {
+    const visited = new Set(initialIndividuals.map(individual => individual.pointer().one()));
+    let current = new Set(initialIndividuals);
     while (current.size > 0) {
         const next = new Set();
         for(const individual of current.values()) {
@@ -19,22 +19,28 @@ function breadthFirstSearch(root, initialIndividual, neighboursOf) {
     return visited;
 }
 
+const ancestorRelation = individual =>
+    individual
+        .getFamilyAsChild()
+        .array()
+        .flatMap(ind => [ind.getHusband(), ind.getWife()])
+        .map(ref => ref.getIndividualRecord());
+
+const descendantRelation = individual =>
+    individual
+        .getFamilyAsSpouse()
+        .getChild()
+        .getIndividualRecord()
+        .array();
+
 export function computeAncestors(root, initialIndividual) {
-    return breadthFirstSearch(root, initialIndividual, individual =>
-        individual
-            .getFamilyAsChild()
-            .array()
-            .flatMap(ind => [ind.getHusband(), ind.getWife()])
-            .map(ref => ref.getIndividualRecord())
-    );
+    return breadthFirstSearch(root, [initialIndividual], ancestorRelation);
 }
 
 export function computeDescendants(root, initialIndividual) {
-    return breadthFirstSearch(root, initialIndividual, individual =>
-        individual
-            .getFamilyAsSpouse()
-            .getChild()
-            .getIndividualRecord()
-            .array()
-    );
+    return breadthFirstSearch(root, [initialIndividual], descendantRelation);
+}
+
+export function computeRelated(root, ancestorsIdSet) {
+    return breadthFirstSearch(root, Array.from(ancestorsIdSet).map(id => root.getIndividualRecord(id)), descendantRelation);
 }