From dd81d1ad2bab8444d9de8aa72fdefc0aa468f15a Mon Sep 17 00:00:00 2001
From: Alexander Rose <alexander.rose@weirdbyte.de>
Date: Mon, 20 May 2019 08:13:53 -0700
Subject: [PATCH] updated carb entity type
---
src/mol-model/structure/model/types.ts | 4 ++--
src/mol-script/language/symbol-table/structure-query.ts | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mol-model/structure/model/types.ts b/src/mol-model/structure/model/types.ts
index 64cb0bac2..226a47a2f 100644
--- a/src/mol-model/structure/model/types.ts
+++ b/src/mol-model/structure/model/types.ts
@@ -35,7 +35,7 @@ export function ElementSymbol(s: string): ElementSymbol {
/** Entity types as defined in the mmCIF dictionary */
export const enum EntityType {
- 'unknown', 'polymer', 'non-polymer', 'macrolide', 'water'
+ 'unknown', 'polymer', 'non-polymer', 'macrolide', 'water', 'branched'
}
export const enum MoleculeType {
@@ -224,7 +224,7 @@ export function getEntityType(compId: string): mmCIF_Schema['entity']['type']['T
if (AminoAcidNames.has(compId) || RnaBaseNames.has(compId) || DnaBaseNames.has(compId)) {
return 'polymer'
} else if (SaccharideCompIdMap.has(compId)) {
- return 'polymer' // TODO will be 'branched' in the future
+ return 'branched'
} else if (WaterNames.has(compId)) {
return 'water'
} else {
diff --git a/src/mol-script/language/symbol-table/structure-query.ts b/src/mol-script/language/symbol-table/structure-query.ts
index f7d81aa44..3a6ed1846 100644
--- a/src/mol-script/language/symbol-table/structure-query.ts
+++ b/src/mol-script/language/symbol-table/structure-query.ts
@@ -20,7 +20,7 @@ export namespace Types {
export const SecondaryStructureFlags = Core.Types.Flags(SecondaryStructureFlag, 'SecondaryStructureFlag');
export const RingFingerprint = Type.Value('Structure', 'RingFingerprint');
- export const EntityType = Type.OneOf('Structure', 'EntityType', Type.Str, ['polymer', 'non-polymer', 'water', 'unknown']);
+ export const EntityType = Type.OneOf('Structure', 'EntityType', Type.Str, ['polymer', 'non-polymer', 'water', 'branched', 'unknown']);
export const ResidueId = Type.Value('Structure', 'ResidueId');
export const ElementSet = Type.Value('Structure', 'ElementSet');
--
GitLab