molstar 3.0.0 → 3.2.0

package/lib/mol-model/structure/export/categories/atom_site.js

@@ -5,6 +5,8 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 import { CifWriter } from '../../../../mol-io/writer/cif';
+import { MmcifFormat } from '../../../../mol-model-formats/structure/mmcif';
+import { SIFTSMapping } from '../../../../mol-model-props/sequence/sifts-mapping';
 import { StructureProperties as P } from '../../structure';
 var CifField = CifWriter.Field;
 var E = CifWriter.Encodings;
@@ -22,6 +24,61 @@ function atom_site_auth_asym_id(e) {
         return l;
     return l + suffix;
 }
+var atom_site_pdbx_label_index = {
+    shouldInclude: function (s) {
+        var _a;
+        return !!((_a = s.atom_site) === null || _a === void 0 ? void 0 : _a.pdbx_label_index.isDefined);
+    },
+    value: function (e, d) {
+        var srcIndex = d.sourceIndex.value(e.element);
+        return d.atom_site.pdbx_label_index.value(srcIndex);
+    },
+};
+var SIFTS = {
+    shouldInclude: function (s) {
+        return SIFTSMapping.isAvailable(s.structure.models[0]);
+    },
+    pdbx_sifts_xref_db_name: {
+        value: function (e, d) {
+            var srcIndex = d.sourceIndex.value(e.element);
+            return d.atom_site.pdbx_sifts_xref_db_name.value(srcIndex);
+        },
+        valueKind: function (e, d) {
+            var srcIndex = d.sourceIndex.value(e.element);
+            return d.atom_site.pdbx_sifts_xref_db_name.valueKind(srcIndex);
+        },
+    },
+    pdbx_sifts_xref_db_acc: {
+        value: function (e, d) {
+            var srcIndex = d.sourceIndex.value(e.element);
+            return d.atom_site.pdbx_sifts_xref_db_acc.value(srcIndex);
+        },
+        valueKind: function (e, d) {
+            var srcIndex = d.sourceIndex.value(e.element);
+            return d.atom_site.pdbx_sifts_xref_db_acc.valueKind(srcIndex);
+        },
+    },
+    pdbx_sifts_xref_db_num: {
+        value: function (e, d) {
+            var srcIndex = d.sourceIndex.value(e.element);
+            return d.atom_site.pdbx_sifts_xref_db_num.value(srcIndex);
+        },
+        valueKind: function (e, d) {
+            var srcIndex = d.sourceIndex.value(e.element);
+            return d.atom_site.pdbx_sifts_xref_db_num.valueKind(srcIndex);
+        },
+    },
+    pdbx_sifts_xref_db_res: {
+        value: function (e, d) {
+            var srcIndex = d.sourceIndex.value(e.element);
+            return d.atom_site.pdbx_sifts_xref_db_res.value(srcIndex);
+        },
+        valueKind: function (e, d) {
+            var srcIndex = d.sourceIndex.value(e.element);
+            return d.atom_site.pdbx_sifts_xref_db_res.valueKind(srcIndex);
+        },
+    }
+};
 var atom_site_fields = function () { return CifWriter.fields()
     .str('group_PDB', P.residue.group_PDB)
     .index('id')
@@ -53,6 +110,12 @@ var atom_site_fields = function () { return CifWriter.fields()
     .int('auth_seq_id', P.residue.auth_seq_id, { encoder: E.deltaRLE })
     .str('auth_asym_id', atom_site_auth_asym_id)
     .int('pdbx_PDB_model_num', P.unit.model_num, { encoder: E.deltaRLE })
+    .int('pdbx_label_index', atom_site_pdbx_label_index.value, { shouldInclude: atom_site_pdbx_label_index.shouldInclude })
+    // SIFTS
+    .str('pdbx_sifts_xref_db_name', SIFTS.pdbx_sifts_xref_db_name.value, { shouldInclude: SIFTS.shouldInclude, valueKind: SIFTS.pdbx_sifts_xref_db_name.valueKind })
+    .str('pdbx_sifts_xref_db_acc', SIFTS.pdbx_sifts_xref_db_acc.value, { shouldInclude: SIFTS.shouldInclude, valueKind: SIFTS.pdbx_sifts_xref_db_acc.valueKind })
+    .str('pdbx_sifts_xref_db_num', SIFTS.pdbx_sifts_xref_db_num.value, { shouldInclude: SIFTS.shouldInclude, valueKind: SIFTS.pdbx_sifts_xref_db_num.valueKind })
+    .str('pdbx_sifts_xref_db_res', SIFTS.pdbx_sifts_xref_db_res.value, { shouldInclude: SIFTS.shouldInclude, valueKind: SIFTS.pdbx_sifts_xref_db_res.valueKind })
     // .str('operator_name', P.unit.operator_name, {
     //     shouldInclude: structure => structure.units.some(u => !u.conformation.operator.isIdentity)
     // })
@@ -64,7 +127,11 @@ export var _atom_site = {
         return {
             fields: atom_site_fields(),
             source: structures.map(function (s) { return ({
-                data: s,
+                data: {
+                    structure: s,
+                    sourceIndex: s.model.atomicHierarchy.atomSourceIndex,
+                    atom_site: MmcifFormat.is(s.model.sourceData) ? s.model.sourceData.data.db.atom_site : void 0
+                },
                 rowCount: s.elementCount,
                 keys: function () { return s.elementLocations(); }
             }); })

package/lib/mol-model/structure/export/categories/secondary-structure.js

@@ -59,13 +59,13 @@ function findElements(ctx, kind) {
     var key = secondaryStructure.key, elements = secondaryStructure.elements;
     var ssElements = [];
     var structure = ctx.structures[0];
-    for (var _i = 0, _a = structure.units; _i < _a.length; _i++) {
-        var unit = _a[_i];
-        // currently can only support this for "identity" operators.
-        if (!Unit.isAtomic(unit) || !unit.conformation.operator.isIdentity)
+    for (var _i = 0, _a = structure.unitSymmetryGroups; _i < _a.length; _i++) {
+        var units = _a[_i].units;
+        var u = units[0];
+        if (!Unit.isAtomic(u))
             continue;
-        var segs = unit.model.atomicHierarchy.residueAtomSegments;
-        var residues = Segmentation.transientSegments(segs, unit.elements);
+        var segs = u.model.atomicHierarchy.residueAtomSegments;
+        var residues = Segmentation.transientSegments(segs, u.elements);
         var current = void 0, move = true;
         while (residues.hasNext) {
             if (move)
@@ -84,8 +84,8 @@ function findElements(ctx, kind) {
                 if (startIdx !== key[current.index]) {
                     move = false;
                     ssElements[ssElements.length] = {
-                        start: StructureElement.Location.create(structure, unit, segs.offsets[start]),
-                        end: StructureElement.Location.create(structure, unit, segs.offsets[prev]),
+                        start: StructureElement.Location.create(structure, u, segs.offsets[start]),
+                        end: StructureElement.Location.create(structure, u, segs.offsets[prev]),
                         length: prev - start + 1,
                         element: element
                     };

package/lib/mol-model/structure/model/properties/coarse/hierarchy.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>

package/lib/mol-model/structure/model/properties/coarse/hierarchy.js

@@ -1,11 +1,33 @@
 /**
- * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
+import { Column } from '../../../../../mol-data/db';
+import { Segmentation } from '../../../../../mol-data/int';
+import { SortedRanges } from '../../../../../mol-data/int/sorted-ranges';
+var EmptyCoarseElements = {
+    chainKey: [],
+    entityKey: [],
+    findSequenceKey: function () { return -1; },
+    findChainKey: function () { return -1; },
+    getEntityFromChain: function () { return -1; },
+    count: 0,
+    entity_id: Column.Undefined(0, Column.Schema.str),
+    asym_id: Column.Undefined(0, Column.Schema.str),
+    seq_id_begin: Column.Undefined(0, Column.Schema.int),
+    seq_id_end: Column.Undefined(0, Column.Schema.int),
+    chainElementSegments: Segmentation.create([]),
+    polymerRanges: SortedRanges.ofSortedRanges([]),
+    gapRanges: SortedRanges.ofSortedRanges([]),
+};
 export var CoarseHierarchy;
 (function (CoarseHierarchy) {
-    CoarseHierarchy.Empty = { isDefined: false };
+    CoarseHierarchy.Empty = {
+        isDefined: false,
+        spheres: EmptyCoarseElements,
+        gaussians: EmptyCoarseElements
+    };
 })(CoarseHierarchy || (CoarseHierarchy = {}));
 //# sourceMappingURL=hierarchy.js.map

package/lib/mol-model/structure/structure/element/loci.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>

package/lib/mol-model/structure/structure/element/loci.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
@@ -487,7 +487,9 @@ export function Loci(structure, elements) {
             if (!elementIndices)
                 continue;
             var indices = getUnitIndices(unit.elements, elementIndices);
-            elements[elements.length] = { unit: unit, indices: indices };
+            if (OrderedSet.size(indices)) {
+                elements[elements.length] = { unit: unit, indices: indices };
+            }
         }
         return Loci(loci.structure, elements);
     }

package/lib/mol-model/structure/structure/util/superposition-sifts-mapping.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2021-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author David Sehnal <david.sehnal@gmail.com>
+ * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
+ */
+import { MinimizeRmsd } from '../../../../mol-math/linear-algebra/3d/minimize-rmsd';
+import { Structure } from '../structure';
+export interface AlignmentResultEntry {
+    transform: MinimizeRmsd.Result;
+    pivot: number;
+    other: number;
+}
+export interface AlignmentResult {
+    entries: AlignmentResultEntry[];
+    zeroOverlapPairs: [number, number][];
+    failedPairs: [number, number][];
+}
+export declare function alignAndSuperposeWithSIFTSMapping(structures: Structure[], options?: {
+    traceOnly?: boolean;
+}): AlignmentResult;

package/lib/mol-model/structure/structure/util/{superposition-db-mapping.js → superposition-sifts-mapping.js}

@@ -1,29 +1,41 @@
 /**
- * Copyright (c) 2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2021-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
+ * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
  */
 import { Segmentation } from '../../../../mol-data/int';
-import { Mat4 } from '../../../../mol-math/linear-algebra';
 import { MinimizeRmsd } from '../../../../mol-math/linear-algebra/3d/minimize-rmsd';
-import { BestDatabaseSequenceMapping } from '../../../../mol-model-props/sequence/best-database-mapping';
-export function alignAndSuperposeWithBestDatabaseMapping(structures) {
+import { SIFTSMapping } from '../../../../mol-model-props/sequence/sifts-mapping';
+export function alignAndSuperposeWithSIFTSMapping(structures, options) {
+    var _a;
     var indexMap = new Map();
     for (var i = 0; i < structures.length; i++) {
-        buildIndex(structures[i], indexMap, i);
+        buildIndex(structures[i], indexMap, i, (_a = options === null || options === void 0 ? void 0 : options.traceOnly) !== null && _a !== void 0 ? _a : true);
     }
     var index = Array.from(indexMap.values());
     // TODO: support non-first structure pivots
     var pairs = findPairs(structures.length, index);
-    var ret = [];
+    var zeroOverlapPairs = [];
+    var failedPairs = [];
+    var entries = [];
     for (var _i = 0, pairs_1 = pairs; _i < pairs_1.length; _i++) {
         var p = pairs_1[_i];
-        var _a = getPositionTables(index, p.i, p.j, p.count), a = _a[0], b = _a[1];
-        var transform = MinimizeRmsd.compute({ a: a, b: b });
-        console.log(Mat4.makeTable(transform.bTransform), transform.rmsd);
-        ret.push({ transform: transform, pivot: p.i, other: p.j });
+        if (p.count === 0) {
+            zeroOverlapPairs.push([p.i, p.j]);
+        }
+        else {
+            var _b = getPositionTables(index, p.i, p.j, p.count), a = _b[0], b = _b[1];
+            var transform = MinimizeRmsd.compute({ a: a, b: b });
+            if (Number.isNaN(transform.rmsd)) {
+                failedPairs.push([p.i, p.j]);
+            }
+            else {
+                entries.push({ transform: transform, pivot: p.i, other: p.j });
+            }
+        }
     }
-    return ret;
+    return { entries: entries, zeroOverlapPairs: zeroOverlapPairs, failedPairs: failedPairs };
 }
 function getPositionTables(index, pivot, other, N) {
     var xs = MinimizeRmsd.Positions.empty(N);
@@ -36,7 +48,6 @@ function getPositionTables(index, pivot, other, N) {
         if (!a || !b)
             continue;
         var l = Math.min(a[2] - a[1], b[2] - b[1]);
-        // TODO: allow to use just backbone atoms?
         // TODO: check if residue types match?
         for (var i = 0; i < l; i++) {
             var eI = (a[1] + i);
@@ -90,19 +101,20 @@ function findPairs(N, index) {
     // }
     return ret;
 }
-function buildIndex(structure, index, sI) {
+function buildIndex(structure, index, sI, traceOnly) {
     var _a;
     for (var _i = 0, _b = structure.units; _i < _b.length; _i++) {
         var unit = _b[_i];
         if (unit.kind !== 0 /* Atomic */)
             continue;
         var elements = unit.elements, model = unit.model;
-        var map = BestDatabaseSequenceMapping.Provider.get(model).value;
+        var map = SIFTSMapping.Provider.get(model).value;
         if (!map)
             return;
         var dbName = map.dbName, accession = map.accession, num = map.num;
         var chainsIt = Segmentation.transientSegments(unit.model.atomicHierarchy.chainAtomSegments, elements);
         var residuesIt = Segmentation.transientSegments(unit.model.atomicHierarchy.residueAtomSegments, elements);
+        var traceElementIndex = unit.model.atomicHierarchy.derived.residue.traceElementIndex;
         while (chainsIt.hasNext) {
             var chainSegment = chainsIt.move();
             residuesIt.setSegment(chainSegment);
@@ -111,8 +123,17 @@ function buildIndex(structure, index, sI) {
                 var rI = residueSegment.index;
                 if (!dbName[rI])
                     continue;
-                var start = elements[residueSegment.start];
-                var end = elements[residueSegment.end - 1] + 1;
+                var start = void 0, end = void 0;
+                if (traceOnly) {
+                    start = traceElementIndex[rI];
+                    if (start === -1)
+                        continue;
+                    end = start + 1;
+                }
+                else {
+                    start = elements[residueSegment.start];
+                    end = elements[residueSegment.end - 1] + 1;
+                }
                 var key = "".concat(dbName[rI], "-").concat(accession[rI], "-").concat(num[rI]);
                 if (!index.has(key)) {
                     index.set(key, { key: key, pivots: (_a = {}, _a[sI] = [unit, start, end], _a) });
@@ -126,6 +147,5 @@ function buildIndex(structure, index, sI) {
             }
         }
     }
-    console.log(index);
 }
-//# sourceMappingURL=superposition-db-mapping.js.map
+//# sourceMappingURL=superposition-sifts-mapping.js.map

package/lib/mol-model/volume/volume.d.ts

@@ -48,6 +48,13 @@ export declare namespace Volume {
         function toRelative(value: IsoValue, stats: Grid['stats']): Relative;
         function toString(value: IsoValue): string;
     }
+    function adjustedIsoValue(volume: Volume, value: number, kind: 'absolute' | 'relative'): Readonly<{
+        kind: "absolute";
+        absoluteValue: number;
+    }> | Readonly<{
+        kind: "relative";
+        relativeValue: number;
+    }>;
     function createIsoValueParam(defaultValue: Volume.IsoValue, stats?: Grid['stats']): PD.Conditioned<Readonly<{
         kind: "absolute";
         absoluteValue: number;

package/lib/mol-model/volume/volume.js

@@ -13,6 +13,7 @@ import { equalEps } from '../../mol-math/linear-algebra/3d/common';
 import { CustomProperties } from '../custom-property';
 import { ParamDefinition as PD } from '../../mol-util/param-definition';
 import { toPrecision } from '../../mol-util/number';
+import { DscifFormat } from '../../mol-model-formats/volume/density-server';
 export var Volume;
 (function (Volume) {
     function is(x) {
@@ -57,6 +58,23 @@ export var Volume;
         }
         IsoValue.toString = toString;
     })(IsoValue = Volume.IsoValue || (Volume.IsoValue = {}));
+    // Converts iso value to relative if using downsample VolumeServer data
+    function adjustedIsoValue(volume, value, kind) {
+        if (kind === 'relative')
+            return IsoValue.relative(value);
+        var absolute = IsoValue.absolute(value);
+        if (DscifFormat.is(volume.sourceData)) {
+            var stats = {
+                min: volume.sourceData.data.volume_data_3d_info.min_source.value(0),
+                max: volume.sourceData.data.volume_data_3d_info.max_source.value(0),
+                mean: volume.sourceData.data.volume_data_3d_info.mean_source.value(0),
+                sigma: volume.sourceData.data.volume_data_3d_info.sigma_source.value(0),
+            };
+            return Volume.IsoValue.toRelative(absolute, stats);
+        }
+        return absolute;
+    }
+    Volume.adjustedIsoValue = adjustedIsoValue;
     var defaultStats = { min: -1, max: 1, mean: 0, sigma: 0.1 };
     function createIsoValueParam(defaultValue, stats) {
         var sts = stats || defaultStats;

package/lib/mol-model-formats/structure/basic/schema.d.ts

@@ -125,6 +125,11 @@ export declare const BasicSchema: {
         pdbx_PDB_ins_code: import("../../../mol-data/db/column").Column.Schema.Str;
         pdbx_PDB_model_num: import("../../../mol-data/db/column").Column.Schema.Int;
         pdbx_formal_charge: import("../../../mol-data/db/column").Column.Schema.Int;
+        pdbx_label_index: import("../../../mol-data/db/column").Column.Schema.Int;
+        pdbx_sifts_xref_db_name: import("../../../mol-data/db/column").Column.Schema.Str;
+        pdbx_sifts_xref_db_acc: import("../../../mol-data/db/column").Column.Schema.Str;
+        pdbx_sifts_xref_db_num: import("../../../mol-data/db/column").Column.Schema.Str;
+        pdbx_sifts_xref_db_res: import("../../../mol-data/db/column").Column.Schema.Str;
         ihm_model_id: import("../../../mol-data/db/column").Column.Schema.Int;
     };
     ihm_sphere_obj_site: {

package/lib/mol-model-formats/structure/common/property.d.ts

@@ -1,7 +1,8 @@
 /**
- * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ * @author David Sehnal <david.sehnal@gmail.com>
  */
 import { Model } from '../../../mol-model/structure';
 import { ModelFormat } from '../../format';
@@ -24,5 +25,7 @@ interface FormatPropertyProvider<T> {
     delete(model: Model): void;
 }
 declare namespace FormatPropertyProvider {
-    function create<T>(descriptor: CustomPropertyDescriptor): FormatPropertyProvider<T>;
+    function create<T>(descriptor: CustomPropertyDescriptor, options?: {
+        asDynamic?: boolean;
+    }): FormatPropertyProvider<T>;
 }

package/lib/mol-model-formats/structure/common/property.js

@@ -1,7 +1,8 @@
 /**
- * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ * @author David Sehnal <david.sehnal@gmail.com>
  */
 var FormatRegistry = /** @class */ (function () {
     function FormatRegistry() {
@@ -29,7 +30,7 @@ var FormatRegistry = /** @class */ (function () {
 export { FormatPropertyProvider };
 var FormatPropertyProvider;
 (function (FormatPropertyProvider) {
-    function create(descriptor) {
+    function create(descriptor, options) {
         var name = descriptor.name;
         var formatRegistry = new FormatRegistry();
         return {
@@ -39,22 +40,33 @@ var FormatPropertyProvider;
                 return formatRegistry.isApplicable(model);
             },
             get: function (model) {
-                if (model._staticPropertyData[name])
-                    return model._staticPropertyData[name];
+                var store = (options === null || options === void 0 ? void 0 : options.asDynamic) ? model._dynamicPropertyData : model._staticPropertyData;
+                if (store[name])
+                    return store[name];
                 if (model.customProperties.has(descriptor))
                     return;
                 var obtain = formatRegistry.get(model.sourceData.kind);
                 if (!obtain)
                     return;
-                model._staticPropertyData[name] = obtain(model);
+                store[name] = obtain(model);
                 model.customProperties.add(descriptor);
-                return model._staticPropertyData[name];
+                return store[name];
             },
             set: function (model, value) {
-                model._staticPropertyData[name] = value;
+                if (options === null || options === void 0 ? void 0 : options.asDynamic) {
+                    model._dynamicPropertyData[name] = value;
+                }
+                else {
+                    model._staticPropertyData[name] = value;
+                }
             },
             delete: function (model) {
-                delete model._staticPropertyData[name];
+                if (options === null || options === void 0 ? void 0 : options.asDynamic) {
+                    delete model._dynamicPropertyData[name];
+                }
+                else {
+                    delete model._staticPropertyData[name];
+                }
             }
         };
     }

package/lib/mol-model-formats/structure/property/bonds/index-pair.d.ts

@@ -2,6 +2,7 @@
  * Copyright (c) 2019-2022 Mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ * @author David Sehnal <david.sehnal@gmail.com>
  */
 import { CustomPropertyDescriptor } from '../../../../mol-model/custom-property';
 import { IntAdjacencyGraph } from '../../../../mol-math/graph';

package/lib/mol-model-formats/structure/property/bonds/index-pair.js

@@ -2,6 +2,7 @@
  * Copyright (c) 2019-2022 Mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ * @author David Sehnal <david.sehnal@gmail.com>
  */
 import { __assign } from "tslib";
 import { IntAdjacencyGraph } from '../../../../mol-math/graph';
@@ -26,7 +27,7 @@ export var IndexPairBonds;
     IndexPairBonds.Descriptor = {
         name: 'index_pair_bonds',
     };
-    IndexPairBonds.Provider = FormatPropertyProvider.create(IndexPairBonds.Descriptor);
+    IndexPairBonds.Provider = FormatPropertyProvider.create(IndexPairBonds.Descriptor, { asDynamic: true });
     IndexPairBonds.DefaultProps = {
         /**
          * If negative, test using element-based threshold, otherwise distance in Angstrom.

package/lib/mol-model-props/computed/interactions/common.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2019-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */

package/lib/mol-model-props/computed/interactions/common.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2019-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -62,29 +62,21 @@ var InteractionsInterContacts = /** @class */ (function (_super) {
     __extends(InteractionsInterContacts, _super);
     function InteractionsInterContacts(map, unitsFeatures) {
         var _this = _super.call(this, map) || this;
-        var count = 0;
-        var elementKeyIndex = new Map();
-        var add = function (index, unitId) {
-            var vertexKey = _this.getElementKey(index, unitId);
-            var e = elementKeyIndex.get(vertexKey);
-            if (e === undefined)
-                elementKeyIndex.set(vertexKey, [count]);
-            else
-                e.push(count);
-        };
-        _this.map.forEach(function (pairEdgesArray) {
-            pairEdgesArray.forEach(function (_a) {
-                var unitA = _a.unitA, connectedIndices = _a.connectedIndices;
-                connectedIndices.forEach(function (indexA) {
-                    var _a = unitsFeatures.get(unitA), offsetsA = _a.offsets, membersA = _a.members;
-                    for (var j = offsetsA[indexA], jl = offsetsA[indexA + 1]; j < jl; ++j) {
-                        add(membersA[j], unitA);
-                    }
-                    count += 1;
-                });
-            });
-        });
-        _this.elementKeyIndex = elementKeyIndex;
+        _this.elementKeyIndex = new Map();
+        for (var i = 0, il = _this.edges.length; i < il; ++i) {
+            var _a = _this.edges[i], unitA = _a.unitA, indexA = _a.indexA;
+            var _b = unitsFeatures.get(unitA), offsets = _b.offsets, members = _b.members;
+            for (var j = offsets[indexA], jl = offsets[indexA + 1]; j < jl; ++j) {
+                var vertexKey = _this.getElementKey(members[j], unitA);
+                var e = _this.elementKeyIndex.get(vertexKey);
+                if (e === undefined) {
+                    _this.elementKeyIndex.set(vertexKey, [i]);
+                }
+                else {
+                    e.push(i);
+                }
+            }
+        }
         return _this;
     }
     InteractionsInterContacts.prototype.getContactIndicesForElement = function (index, unit) {

package/lib/mol-model-props/computed/representations/interactions-inter-unit-cylinder.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2019-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */