From c2979ce5ab5dc7cba0a92d3e94f09d4e26e0abc2 Mon Sep 17 00:00:00 2001 From: Alexander Rose <alex.rose@rcsb.org> Date: Tue, 24 Sep 2019 12:06:55 -0700 Subject: [PATCH] StructureSequence, handle empty coarse hierarchies --- src/mol-model/structure/model/properties/sequence.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mol-model/structure/model/properties/sequence.ts b/src/mol-model/structure/model/properties/sequence.ts index 547be8179..aa0970fad 100644 --- a/src/mol-model/structure/model/properties/sequence.ts +++ b/src/mol-model/structure/model/properties/sequence.ts @@ -24,6 +24,8 @@ namespace StructureSequence { readonly sequence: Sequence } + const Empty: StructureSequence = { byEntityKey: {}, sequences: [] } + function merge(...entitySeqs: StructureSequence[]): StructureSequence { const sequences: StructureSequence.Entity[] = [] const byEntityKey: { [key: number]: StructureSequence.Entity } = {} @@ -37,7 +39,7 @@ namespace StructureSequence { export function fromHierarchy(entities: Entities, atomicHierarchy: AtomicHierarchy, coarseHierarchy: CoarseHierarchy, modResMap?: ReadonlyMap<string, string>): StructureSequence { const atomic = fromAtomicHierarchy(entities, atomicHierarchy, modResMap) - const coarse = fromCoarseHierarchy(entities, coarseHierarchy) + const coarse = coarseHierarchy.isDefined ? fromCoarseHierarchy(entities, coarseHierarchy) : Empty return merge(atomic, coarse) } -- GitLab