fix(resources): allow two-part hybrid names

identification-resources · Mar 20, 2024 · 8e3b836 · 8e3b836
1 parent 4c85c5b
commit 8e3b836
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/resources/parse-text.ts b/src/resources/parse-text.ts
@@ -245,8 +245,8 @@ function parseName (name: string, rank: Rank, parent: WorkingTaxon): WorkingTaxo
     }
 
     // Hybrids
-    if (rank === 'species' && /^x /.test(name)) {
-        name = '\u00D7' + name.slice(2)
+    if (rank === 'species' && /(^| )x /.test(name)) {
+        name = name.replace(/(^| )x /, '\u00D7')
     }
 
     // Divide the name into the main scientific name (only the epithet for taxa

diff --git a/test/resources.js b/test/resources.js
@@ -124,4 +124,16 @@ Microdynerus Thomson, 1874
 `, 'T1')
         assert.strictEqual(resource.taxa['T1:1:3'].scientificName, 'Microdynerus microdynerus (Dalla Torre, 1889)')
     })
+
+    await t.test('parses hybrids', (t) => {
+        const [resource] = resources.parseTextFile(`---
+levels: [species]
+---
+
+Rumex conglomeratus x maritimus
+Tilia x vulgaris
+`, 'T1')
+        assert.strictEqual(resource.taxa['T1:1:1'].scientificName, 'Rumex conglomeratus×maritimus')
+        assert.strictEqual(resource.taxa['T1:1:2'].scientificName, 'Tilia ×vulgaris')
+    })
 })