gedcom-d3 2.0.5 → 2.0.7

package/README.md

@@ -1,7 +1,7 @@
 # gedcom-d3
 Based on [tmcw/parse-gedcom](https://github.com/tmcw/parse-gedcom), this project seeks to improve d3ize functionality to make Gedom data in more fully-functional d3 capable JSON, specifically for use in plotting with [vasturiano/3d-force-graph](https://github.com/vasturiano/3d-force-graph).
 
-View an implementation at [mister-blanket/roots](https://github.com/mister-blanket/roots)
+View an implementation at [mister-blanket/blood-lines](https://github.com/mister-blanket/blood-lines)
 
 ## Usage
 

package/d3ize.js

@@ -121,11 +121,11 @@ const assignFy = (peopleNodes, links) => {
 
   const convertFy = (peopleNodes) => {
     const fyRatio = peopleNodes => {
-      if (peopleNodes.length < 50) {
+      if (peopleNodes.length <= 50) {
         return 3;
-      } else if (peopleNodes.length > 50 && peopleNodes.length < 150) {
+      } else if (peopleNodes.length > 50 && peopleNodes.length <= 150) {
         return 4;
-      } else if (peopleNodes.length > 150 && peopleNodes.length < 250) {
+      } else if (peopleNodes.length > 150 && peopleNodes.length <= 250) {
         return 5;
       } else if (peopleNodes.length > 250){
         return 6;
@@ -218,8 +218,17 @@ const getSurname = p => {
     // Derive surname from name
     } else {
       nameArr = nameNode.data.split(' ');
-      nameArr[nameArr.length -1] = nameArr[nameArr.length -1].replace(/\//g, '')
-      return nameArr.length > 1 ? nameArr[nameArr.length -1] : "Hrm"
+
+      // Look for forward slashes
+      let isSlashes = nameArr.some(str => str[0] === "/");
+      if (isSlashes) {
+        return nameArr.find(str => str[0] === "/").replace(/\//g, '');
+
+      // no slashes, use final item in array
+      } else {
+        nameArr[nameArr.length -1] = nameArr[nameArr.length -1].replace(/\//g, '')
+        return nameArr.length > 1 ? nameArr[nameArr.length -1] : "Hrm"
+      }
     }
   } else {
     return '?';
@@ -508,7 +517,6 @@ const getBio = (p, notes) => {
         bio += personNote.data;
       }
     });
-    console.log(bio);
     return bio;
   }
 }
@@ -549,7 +557,7 @@ const familyLinks = (family, peopleNodes) => {
 
   // Filter only individual objects from family tree
   let memberSet = family.tree.filter(function(member) {
-    return member.data && (member.data[1] === 'I' || member.data[1] === 'P');
+    return member.tag && (member.tag === 'HUSB' || member.tag === 'WIFE' || member.tag === 'CHIL');
   })
 
   // Filter marital status events

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gedcom-d3",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "A GEDCOM parser, which translates GEDCOM (.ged) files into D3 capable JSON. This package is specifically designed to prepare data for use in https://github.com/mister-blanket/kin-cloud",
   "main": "index.js",
   "scripts": {