-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Prevend highly ambigous genera without well defined parents to be mer…
…ged, see #1368
- Loading branch information
Showing
14 changed files
with
137 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
Auchenorrhyncha Duméril, 1805 [suborder] | ||
Fulgoromorpha Evans, 1946 [infraorder] | ||
Fulgoroidea Latreille, 1807 [superfamily] | ||
Dictyopharidae Spinola, 1839 [family] | ||
Dictyopharinae Spinola, 1839 [subfamily] | ||
Dictyopharini Spinola, 1839 [tribe] | ||
Doryphorina Melichar, 1912 [genus] | ||
=Doryphora Melichar, 1912 [genus] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
Coleoptera [order] | ||
Polyphaga [suborder] | ||
Cucujiformia [series] | ||
Chrysomeloidea Latreille, 1802 [superfamily] | ||
Chrysomelidae Latreille, 1802 [family] | ||
Chrysomelinae Latreille, 1802 [subfamily] | ||
Chrysomelini Latreille, 1802 [tribe] | ||
Doryphora Illiger, 1807 [genus] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
ranks: | ||
- superfamily | ||
- family | ||
- subfamily | ||
- genus | ||
- species |
34 changes: 34 additions & 0 deletions
34
webservice/src/test/resources/txtree/doryphora/expected.txtree
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
Biota [unranked] | ||
Animalia [kingdom] | ||
Arthropoda [phylum] | ||
Insecta [class] | ||
Coleoptera [order] | ||
Chrysomeloidea Latreille, 1802 [superfamily] | ||
Chrysomelidae Latreille, 1802 [family] | ||
Chrysomelinae Latreille, 1802 [subfamily] | ||
Doryphora Illiger, 1807 [genus] | ||
Hemiptera Linnaeus, 1758 [order] | ||
Auchenorrhyncha Duméril, 1805 [suborder] | ||
Fulgoromorpha Evans, 1946 [infraorder] | ||
Fulgoroidea [superfamily] | ||
Dictyopharidae Spinola, 1839 [family] | ||
Doryphorina Melichar, 1912 [genus] | ||
=Doryphora Melichar, 1912 [genus] | ||
Lepidoptera [order] | ||
Gelechioidea [superfamily] | ||
Gelechiidae [family] | ||
Anomologinae [subfamily] | ||
Xystophora Wocke, 1876 [genus] | ||
=Doryphora Heinemann, 1870 [genus] | ||
Zygaenoidea Latreille, 1809 [superfamily] | ||
Limacodidae [family] | ||
Doratifera (&Westwood),1841 Duncan [genus] | ||
=Doryphora (&Westwood),1841 Duncan [genus] | ||
Plantae [kingdom] | ||
Pteridobiotina Britton & Brown [subkingdom] | ||
Tracheophyta [phylum] | ||
Magnoliopsida [class] | ||
Laurales Juss. ex Bercht. & J.Presl [order] | ||
Atherospermataceae R.Br. [family] | ||
Doryphora Endl. [genus] | ||
=Doratophora Lem. [genus] |
10 changes: 10 additions & 0 deletions
10
webservice/src/test/resources/txtree/doryphora/pbdb.txtree
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
Life [unranked] | ||
Eukaryota (Chatton, 1925) [unranked] | ||
Plantae (Haeckel, 1866) [kingdom] | ||
Spermatophyta [phylum] | ||
Angiospermae [class] | ||
Mesangiosperms The Angiosperm Phylogeny Group, 2016 [unranked] | ||
Magnoliid Jud, 2011 [unranked] | ||
Laurales Jussieu, 1820 [order] | ||
Atherospermataceae Brown, 1814 [family] | ||
Doryphora Endlicher, 1837 [genus] |
27 changes: 27 additions & 0 deletions
27
webservice/src/test/resources/txtree/doryphora/project.txtree
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
Biota [unranked] | ||
Animalia [kingdom] | ||
Arthropoda [phylum] | ||
Insecta [class] | ||
Coleoptera [order] | ||
Chrysomeloidea Latreille, 1802 [superfamily] | ||
Hemiptera Linnaeus, 1758 [order] | ||
Auchenorrhyncha Duméril, 1805 [suborder] | ||
Fulgoromorpha Evans, 1946 [infraorder] | ||
Fulgoroidea [superfamily] | ||
Dictyopharidae Spinola, 1839 [family] | ||
Lepidoptera [order] | ||
Gelechioidea [superfamily] | ||
Gelechiidae [family] | ||
Anomologinae [subfamily] | ||
Xystophora Wocke, [1876] [genus] | ||
=Doryphora Heinemann, 1870 [genus] | ||
Zygaenoidea Latreille, 1809 [superfamily] | ||
Limacodidae [family] | ||
Doratifera Duncan [& Westwood], 1841 [genus] | ||
=Doryphora Duncan [& Westwood], 1841 [genus] | ||
Plantae [kingdom] | ||
Pteridobiotina Britton & Brown [subkingdom] | ||
Tracheophyta [phylum] | ||
Magnoliopsida [class] | ||
Laurales Juss. ex Bercht. & J. Presl [order] | ||
Atherospermataceae R. Br. [family] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
Avoid adding canonical genus names to the root of the tree, e.g. Biota, which has no taxgroup context. | ||
Algae Doryphora from Bacillariophyceae, Chromista cannot be mapped to the project (we intentionally omitted the Chromista kingdom in this test) | ||
https://github.com/CatalogueOfLife/backend/issues/1368 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
Atherospermataceae [family] | ||
Doryphora Endl. [genus] | ||
=Doratophora Lem. [genus] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
Biota [unranked] | ||
Chromista [kingdom] | ||
Heterokontophyta [phylum] | ||
Bacillariophytina [subphylum] | ||
Bacillariophyceae [class] | ||
Doryphora [genus] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Doryphora Illiger, 1807 sensu Illiger 1807 [genus] |