Temp fix for user defined name types (fix #550)

Serg-Norseman · May 26, 2024 · c59e87e · c59e87e
1 parent 155780e
commit c59e87e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/projects/GKCore/GDModel/GDMPersonalName.cs b/projects/GKCore/GDModel/GDMPersonalName.cs
@@ -26,6 +26,7 @@ namespace GDModel
     public enum GDMNameType
     {
         ntNone,
+        ntAdoption, // FIXME: user defined name types (gh#550)
         ntAka,
         ntBirth,
         ntImmigrant,

diff --git a/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMUtils.cs b/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMUtils.cs
@@ -1337,7 +1337,7 @@ public static string GetLanguageStr(GDMLanguageID value)
 
 
         public static readonly string[] NameTypes = new string[] {
-            "", "aka", "birth", "immigrant", "maiden", "married" };
+            "", "adoption", "aka", "birth", "immigrant", "maiden", "married" };
 
         public static GDMNameType GetNameTypeVal(string str)
         {

diff --git a/projects/GKCore/GKCore/GKData.cs b/projects/GKCore/GKCore/GKData.cs
@@ -535,6 +535,7 @@ static GKData()
 
             NameTypes = new LSID[] {
                 LSID.DefaultValue,
+                LSID.Adoption, // FIXME: user defined name types (gh#550)
                 LSID.NTAka,
                 LSID.NTBirth,
                 LSID.NTImmigrant,

diff --git a/projects/GKTests/GDModel/Providers/GEDCOM/GEDCOMUtilsTests.cs b/projects/GKTests/GDModel/Providers/GEDCOM/GEDCOMUtilsTests.cs
@@ -196,6 +196,7 @@ public void Test_GEDCOMEnumNT()
         {
             Assert.AreEqual(GDMNameType.ntNone, GEDCOMUtils.GetNameTypeVal("unk"));
             Assert.AreEqual(GDMNameType.ntNone, GEDCOMUtils.GetNameTypeVal(GEDCOMUtils.GetNameTypeStr(GDMNameType.ntNone)));
+            Assert.AreEqual(GDMNameType.ntAdoption, GEDCOMUtils.GetNameTypeVal(GEDCOMUtils.GetNameTypeStr(GDMNameType.ntAdoption)));
             Assert.AreEqual(GDMNameType.ntAka, GEDCOMUtils.GetNameTypeVal(GEDCOMUtils.GetNameTypeStr(GDMNameType.ntAka)));
             Assert.AreEqual(GDMNameType.ntBirth, GEDCOMUtils.GetNameTypeVal(GEDCOMUtils.GetNameTypeStr(GDMNameType.ntBirth)));
             Assert.AreEqual(GDMNameType.ntImmigrant, GEDCOMUtils.GetNameTypeVal(GEDCOMUtils.GetNameTypeStr(GDMNameType.ntImmigrant)));