@abi-software/flatmap-viewer 2.3.3-b.4 → 2.4.0-a.1

package/README.rst

@@ -38,7 +38,7 @@ The map server endpoint is specified as ``MAP_ENDPOINT`` in ``src/main.js``. It
 Package Installation
 ====================
 
-* ``npm install @abi-software/flatmap-viewer@2.3.3-b.4``
+* ``npm install @abi-software/flatmap-viewer@2.4.0-a.1``
 
 Documentation
 -------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmap-viewer",
-  "version": "2.3.3-b.4",
+  "version": "2.4.0-a.1",
   "description": "Flatmap viewer using Maplibre GL",
   "repository": "https://github.com/AnatomicMaps/flatmap-viewer.git",
   "main": "src/main.js",

package/src/annotation.js

@@ -508,7 +508,7 @@ export class Annotator
             border: '2px solid #080',
             borderRadius: '.5rem',
             panelSize: 'auto auto',
-            position: 'left-top',
+            position: 'left-top 50 70',
             content: panelContent,
             data: features[0].properties,
             closeOnEscape: true,
@@ -588,7 +588,7 @@ export class Annotator
             border: '2px solid #080',
             borderRadius: '.5rem',
             panelSize: '725px auto',
-            position: 'left-top',
+            position: 'left-top 50 70',
             data: {
                 flatmap: this.__flatmap
             },

package/src/controls/info.js

@@ -25,8 +25,10 @@ import { indexedProperties } from '../search.js';
 export const displayedProperties = [
     'id',
     'class',
+    'cd-class',
     'fc-class',
     'fc-kind',
+    'name',
     ...indexedProperties
 ];
 
@@ -137,6 +139,7 @@ export class InfoControl
                 this._active = true;
                 button.classList.add('control-button-active');
             } else {
+                this.reset();
                 this._active = false;
                 button.classList.remove('control-button-active');
             }
@@ -194,7 +197,7 @@ export class InfoControl
             const featureIds = [];
             const displayFeatures = [];
             for (const feat of featureList) {
-                if (featureIds.indexOf(feat.id) < 0) {
+                if (!featureIds.includes(feat.id)) {
                     featureIds.push(feat.id);
                     const displayFeat = {};
                     displayProperties.forEach(prop => {

package/src/controls/minimap.js

@@ -132,7 +132,7 @@ export class MinimapControl
         let width = DEFAULTS.width;
         if (typeof this._options.width === 'string') {
             width = parseInt(this._options.width);
-            if (this._options.width.indexOf('%') > 0) {
+            if (this._options.width.includes('%')) {
                 width = width*mapCanvasElement.width/100;
             }
         } else if (typeof this._options.width === 'number') {

package/src/flatmap-viewer.js

@@ -33,7 +33,7 @@ import '../static/css/flatmap-viewer.css';
 
 //==============================================================================
 
-import {MapServer} from './mapserver.js';
+import {MapServer, loadJSON} from './mapserver.js';
 import {SearchIndex} from './search.js';
 import {UserInteractions} from './interactions.js';
 
@@ -77,11 +77,15 @@ class FlatMap
         this.__datasetToFeatureIds = new Map();
         this.__modelToFeatureIds = new Map();
         this.__mapSourceToFeatureIds = new Map();
+        this.__annIdToFeatureId = new Map();
 
         for (const [featureId, annotation] of Object.entries(mapDescription.annotations)) {
             this.__addAnnotation(featureId, annotation);
             this.__searchIndex.indexMetadata(featureId, annotation);
         }
+        if (this.options.annotator) {
+            this.__addAnnotatedComments();
+        }
 
         // Set base of source URLs in map's style
 
@@ -165,7 +169,7 @@ class FlatMap
         if (mapDescription.options.navigationControl) {
             const value = mapDescription.options.navigationControl;
             const position = ((typeof value === 'string')
-                           && (['top-left', 'top-right', 'bottom-right', 'bottom-left'].indexOf(value) >= 0))
+                           && ['top-left', 'top-right', 'bottom-right', 'bottom-left'].includes(value))
                            ? value : 'bottom-right';
             this._map.addControl(new NavigationControl(this), position);
         }
@@ -207,6 +211,25 @@ class FlatMap
         });
     }
 
+    async __addAnnotatedComments()
+    //============================
+    {
+        const url = this.makeServerUrl('', 'annotator/')
+        const annotatedFeatures = await loadJSON(url);
+        for (const annotatedId of annotatedFeatures) {
+            const featureId = this.__annIdToFeatureId.get(annotatedId);
+            if (featureId) {
+                const url = this.makeServerUrl(annotatedId, 'annotator/')
+                const annotations = await loadJSON(url);
+                for (const annotation of annotations) {   // In order of most recent to oldest
+                    if ('rdfs:comment' in annotation) {
+                        this.__searchIndex.indexText(featureId, annotation['rdfs:comment']);
+                    }
+                }
+            }
+        }
+    }
+
     async setupUserInteractions_()
     //============================
     {
@@ -498,6 +521,7 @@ class FlatMap
         this.__updateFeatureIdMap('dataset', this.__datasetToFeatureIds, ann);
         this.__updateFeatureIdMap('models', this.__modelToFeatureIds, ann);
         this.__updateFeatureIdMap('source', this.__mapSourceToFeatureIds, ann);
+        this.__annIdToFeatureId.set(ann.id, featureId);
     }
 
     modelFeatureIds(anatomicalId)
@@ -943,7 +967,7 @@ class FlatMap
             if (property in properties) {
                 const value = properties[property];
                 if (value !== undefined) {
-                    if (jsonProperties.indexOf(property) >= 0) {
+                    if (jsonProperties.includes(property)) {
                         data[property] = JSON.parse(properties[property])
                     } else {
                         data[property] = properties[property];

package/src/interactions.js

@@ -261,7 +261,7 @@ export class UserInteractions
             const feature = this.mapFeature(mapId);
             if (feature !== undefined) {
                 this._map.setFeatureState(feature, { 'map-annotation': true });
-                if (annotated_features.indexOf(ann.id) >= 0) {
+                if (annotated_features.includes(ann.id)) {
                     this._map.setFeatureState(feature, { 'annotated': true });
                 }
             }
@@ -402,19 +402,36 @@ export class UserInteractions
     selectFeature(featureId, dim=true)
     //================================
     {
-        featureId = +featureId;   // Ensure numeric
-        if (this._selectedFeatureIds.size === 0) {
-            this._layerManager.setPaint({...this.__colourOptions, dimmed: dim});
+        const ann = this._flatmap.annotation(featureId);
+        if ('sckan' in ann) {
+            const sckanState = this._layerManager.sckanState;
+            if (sckanState === 'none'
+             || sckanState === 'valid' && !ann.sckan
+             || sckanState === 'invalid' && ann.sckan) {
+                return false;
+            }
         }
+        featureId = +featureId;   // Ensure numeric
+        let result = false;
+        const noSelection = (this._selectedFeatureIds.size === 0);
         if (this._selectedFeatureIds.has(featureId)) {
             this._selectedFeatureIds.set(featureId, this._selectedFeatureIds.get(featureId) + 1);
+            result = true;
         } else {
             const feature = this.mapFeature(featureId);
             if (feature !== undefined) {
-                this._map.setFeatureState(feature, { 'selected': true });
-                this._selectedFeatureIds.set(featureId, 1);
+                const state = this._map.getFeatureState(feature);
+                if (state !== undefined && (!('hidden' in state) || !state.hidden)) {
+                    this._map.setFeatureState(feature, { 'selected': true });
+                    this._selectedFeatureIds.set(featureId, 1);
+                    result = true;
+                }
             }
         }
+        if (result && noSelection) {
+            this._layerManager.setPaint({...this.__colourOptions, dimmed: dim});
+        }
+        return result;
     }
 
     unselectFeature(featureId)
@@ -566,10 +583,11 @@ export class UserInteractions
             for (const featureId of featureIds) {
                 const annotation = this._flatmap.annotation(featureId);
                 if (annotation) {
-                    this.selectFeature(featureId);
-                    if ('type' in annotation && annotation.type.startsWith('line')) {
-                        for (const pathFeatureId of this.__pathManager.lineFeatureIds([featureId])) {
-                            this.selectFeature(pathFeatureId);
+                    if (this.selectFeature(featureId)) {
+                        if ('type' in annotation && annotation.type.startsWith('line')) {
+                            for (const pathFeatureId of this.__pathManager.lineFeatureIds([featureId])) {
+                                this.selectFeature(pathFeatureId);
+                            }
                         }
                     }
                 }
@@ -609,13 +627,15 @@ export class UserInteractions
             for (const featureId of featureIds) {
                 const annotation = this._flatmap.annotation(featureId);
                 if (annotation) {
-                    this.selectFeature(featureId);
-                    bbox = expandBounds(bbox, annotation.bounds);
-                    if ('type' in annotation && annotation.type.startsWith('line')) {
-                        for (const pathFeatureId of this.__pathManager.lineFeatureIds([featureId])) {
-                            this.selectFeature(pathFeatureId);
-                            const pathAnnotation = this._flatmap.annotation(pathFeatureId)
-                            bbox = expandBounds(bbox, pathAnnotation.bounds);
+                    if (this.selectFeature(featureId)) {
+                        bbox = expandBounds(bbox, annotation.bounds);
+                        if ('type' in annotation && annotation.type.startsWith('line')) {
+                            for (const pathFeatureId of this.__pathManager.lineFeatureIds([featureId])) {
+                                if (this.selectFeature(pathFeatureId)) {
+                                    const pathAnnotation = this._flatmap.annotation(pathFeatureId)
+                                    bbox = expandBounds(bbox, pathAnnotation.bounds);
+                                }
+                            }
                         }
                     }
                 }
@@ -882,7 +902,7 @@ export class UserInteractions
                     const htmlList = [];
                     const featureIds = [];
                     for (const feature of labelledFeatures) {
-                        if (featureIds.indexOf(feature.id) < 0) {
+                        if (!featureIds.includes(feature.id)) {
                             featureIds.push(feature.id);
                             for (const prop of debugProperties) {
                                 if (prop in feature.properties) {
@@ -918,26 +938,34 @@ export class UserInteractions
     //=======================================
     {
         // Show a tooltip
-        if (html !== '') {
-            this._tooltip = new maplibre.Popup({
-                closeButton: false,
-                closeOnClick: false,
-                maxWidth: 'none',
-                className: 'flatmap-tooltip-popup'
-            });
+        if (html !== '' || this._flatmap.options.showId && feature !== null) {
+            let header = '';
             if (this._flatmap.options.showPosition) {
                 const pt = turf.point(lngLat.toArray());
                 const gps = turfProjection.toMercator(pt);
                 const coords = gps.geometry.coordinates;
-                const header = (feature === null)
+                header = (feature === null)
                              ? JSON.stringify(coords)
-                             : `${JSON.stringify(coords)} (${feature.id} ${feature.properties['id']})`;
+                             : `${JSON.stringify(coords)} (${feature.id})`;
+            }
+            if (this._flatmap.options.showId && feature !== null && 'id' in feature.properties) {
+                header = `${header} ${feature.properties.id}`;
+            }
+            if (header !== '') {
                 html = `<span>${header}</span><br/>${html}`;
             }
-            this._tooltip
-                .setLngLat(lngLat)
-                .setHTML(html)
-                .addTo(this._map);
+            if (html !== '') {
+                this._tooltip = new maplibre.Popup({
+                    closeButton: false,
+                    closeOnClick: false,
+                    maxWidth: 'none',
+                    className: 'flatmap-tooltip-popup'
+                });
+                this._tooltip
+                    .setLngLat(lngLat)
+                    .setHTML(html)
+                    .addTo(this._map);
+            }
         }
     }
 
@@ -948,7 +976,7 @@ export class UserInteractions
             const clickedFeatureId = feature.id;
             const dim = !('properties' in feature
                        && 'kind' in feature.properties
-                       && ['cell-type', 'scaffold', 'tissue'].indexOf(feature.properties.kind) >= 0);
+                       && ['cell-type', 'scaffold', 'tissue'].includes(feature.properties.kind));
             if (!(event.ctrlKey || event.metaKey)) {
                 let selecting = true;
                 for (const featureId of this._selectedFeatureIds.keys()) {
@@ -1149,7 +1177,7 @@ export class UserInteractions
 
         for (const featureId of featureIds) {
             const annotation = this._flatmap.annotation(featureId);
-            if (annotation.geometry.indexOf('Polygon') < 0) {
+            if (!annotation.geometry.includes('Polygon')) {
                 continue;
             }
             if (!('marker' in annotation)) {
@@ -1230,7 +1258,7 @@ export class UserInteractions
         for (const [marker, id] of this.__markerIdByMarker.entries()) {
             if (visibleBounds.contains(marker.getLngLat())) {
                 const annotation = this.__annotationByMarkerId.get(id);
-                if (anatomicalIds.indexOf(annotation.models) < 0) {
+                if (!anatomicalIds.includes(annotation.models)) {
                     anatomicalIds.push(annotation.models);
                 }
             }
@@ -1247,7 +1275,7 @@ export class UserInteractions
             return;
         }
 
-        if (['mouseenter', 'mouseleave', 'click'].indexOf(event.type) >= 0) {
+        if (['mouseenter', 'mouseleave', 'click'].includes(event.type)) {
             this.__activeMarker = marker;
 
             // Remove any existing tooltips
@@ -1257,7 +1285,7 @@ export class UserInteractions
             // Reset cursor
             marker.getElement().style.cursor = 'default';
 
-            if (['mouseenter', 'click'].indexOf(event.type) >= 0) {
+            if (['mouseenter', 'click'].includes(event.type)) {
                 const markerId = this.__markerIdByMarker.get(marker);
                 const annotation = this.__annotationByMarkerId.get(markerId);
                 // The marker's feature

package/src/layers.js

@@ -115,8 +115,7 @@ class MapFeatureLayers extends MapStylingLayers
         // if no image layers then make feature borders (and lines?) more visible...??
         if (haveVectorLayers) {
             const featuresVectorSource = this.vectorSourceId(FEATURES_LAYER);
-            const vectorFeatures = vectorTileSource.vectorLayerIds
-                                                   .indexOf(featuresVectorSource) >= 0;
+            const vectorFeatures = vectorTileSource.vectorLayerIds.includes(featuresVectorSource);
             if (vectorFeatures) {
                 this.__addStyleLayer(style.FeatureFillLayer);
                 this.__addStyleLayer(style.FeatureDashLineLayer);
@@ -152,7 +151,7 @@ class MapFeatureLayers extends MapStylingLayers
         const pathwaysVectorSource = this.vectorSourceId(PATHWAYS_LAYER);
         if (this.__map.getSource('vector-tiles')
                 .vectorLayerIds
-                .indexOf(pathwaysVectorSource) >= 0) {
+                .includes(pathwaysVectorSource)) {
             this.__addStyleLayer(style.AnnotatedPathLayer, PATHWAYS_LAYER);
 
             this.__addStyleLayer(style.CentrelineEdgeLayer, PATHWAYS_LAYER);
@@ -298,6 +297,12 @@ export class LayerManager
         return layers;
     }
 
+    get sckanState()
+    //==============
+    {
+        return this.__layerOptions.sckan;
+    }
+
     activate(layerId, enable=true)
     //============================
     {
@@ -337,8 +342,8 @@ export class LayerManager
     //=======================================
     {
         const currentState = this.__layerOptions.sckan;
-        const validEnabled = ['valid', 'all'].indexOf(currentState) >= 0;
-        const invalidEnabled = ['invalid', 'all'].indexOf(currentState) >= 0;
+        const validEnabled = ['valid', 'all'].includes(currentState);
+        const invalidEnabled = ['invalid', 'all'].includes(currentState);
         let newState = sckanState.toLowerCase();
         if (newState === 'valid') {
             if (enable && !validEnabled) {

package/src/main.js

@@ -59,6 +59,7 @@ export async function standaloneViewer(map_endpoint=null, options={})
         background: defaultBackground,
         debug: false,
         minimap: false,
+        showId: true,
         showPosition: false,
         standalone: true,
         annotator: true

package/src/mapserver.js

@@ -22,6 +22,24 @@ limitations under the License.
 
 //==============================================================================
 
+export async function loadJSON(url)
+//=================================
+{
+    const response = await fetch(url, {
+        method: 'GET',
+        headers: {
+            "Accept": "application/json; charset=utf-8",
+            "Cache-Control": "no-store"
+        }
+    });
+    if (!response.ok) {
+        throw new Error(`Cannot access ${url}`);
+    }
+    return response.json();
+}
+
+//==============================================================================
+
 export class MapServer
 {
     constructor(url)
@@ -39,18 +57,7 @@ export class MapServer
     async loadJSON(relativePath)
     //==========================
     {
-        const url = this.url(relativePath);
-        const response = await fetch(url, {
-            method: 'GET',
-            headers: {
-                "Accept": "application/json; charset=utf-8",
-                "Cache-Control": "no-store"
-            }
-        });
-        if (!response.ok) {
-            throw new Error(`Cannot access ${url}`);
-        }
-        return response.json();
+        return loadJSON(this.url(relativePath));
     }
 }
 

package/src/pathways.js

@@ -42,7 +42,7 @@ const PATH_TYPES = [
     { type: "arterial", label: "Arterial blood vessel", colour: "#F00", enabled: false},
     { type: "venous", label: "Venous blood vessel", colour: "#2F6EBA", enabled: false},
     { type: "centreline", label: "Nerve centrelines", colour: "#CCC", enabled: false},
-    { type: "error", label: "Paths with errors or warnings", colour: "#FF0"}
+    { type: "error", label: "Paths with errors or warnings", colour: "#FF0", enabled: false}
 ];
 
 export const PATH_STYLE_RULES =
@@ -65,12 +65,11 @@ export class PathManager
                 }
             }
         }
-        this.__pathModelPaths = {};                                  // pathModelId: [pathIds]
-        this.__pathToPathModel = {};
-
-        this.__paths = {};
-        const pathLines = {};                                    // pathId: [lineIds]
-        const pathNerves = {};                                   // pathId: [nerveIds]
+        this.__pathModelPaths = {};                             // pathModelId: [pathIds]
+        this.__pathToPathModel = {};                            // pathId: pathModelId
+        this.__paths = {};                                      // pathId: path
+        const pathLines = {};                                   // pathId: [lineIds]
+        const pathNerves = {};                                  // pathId: [nerveIds]
         if ('paths' in flatmap.pathways) {
             for (const [pathId, path] of Object.entries(flatmap.pathways.paths)) {
                 pathLines[pathId] = path.lines;

package/src/search.js

@@ -56,18 +56,19 @@ export class SearchIndex
             if (prop in metadata) {
                 const text = metadata[prop];
                 if (!textSeen.includes(text)) {
-                    this.addTerm_(featureId, text);
+                    this.indexText(featureId, text);
                     textSeen.push(text);
                 }
             }
         }
     }
 
-    addTerm_(featureId, text)
-    //=======================
+    indexText(featureId, text)
+    //========================
     {
         text = text.replace(new RegExp('<br/>', 'g'), ' ')
-                   .replace('\n', ' ');
+                   .replace(new RegExp('\n', 'g'), ' ')
+                   ;
         if (text) {
             this._searchEngine.add({
                 id: this._featureIds.length,
@@ -95,7 +96,7 @@ export class SearchIndex
         const options = {};
         let results = [];
         text = text.trim()
-        if (text.length > 2 && ["'", '"'].indexOf(text.slice(0, 1)) >= 0) {
+        if (text.length > 2 && ["'", '"'].includes(text.slice(0, 1))) {
             text = text.replaceAll(text.slice(0, 1), '');
             results = this._searchEngine.search(text, {prefix: true, combineWith: 'AND'});
         } else if (text.length > 1) {

package/src/styling.js

@@ -31,7 +31,7 @@ import {PATH_STYLE_RULES} from './pathways.js';
 //==============================================================================
 
 const COLOUR_ACTIVE    = 'blue';
-const COLOUR_ANNOTATED = '#0F0';
+const COLOUR_ANNOTATED = '#C8F';
 const COLOUR_SELECTED  = '#0F0';
 const COLOUR_HIDDEN    = '#D8D8D8';
 
@@ -418,15 +418,18 @@ export class AnnotatedPathLayer extends VectorStyleLayer
 
     paintStyle(options={}, changes=false)
     {
+        const dimmed = 'dimmed' in options && options.dimmed;
         const exclude = 'excludeAnnotated' in options && options.excludeAnnotated;
         const paintStyle = {
             'line-color': COLOUR_ANNOTATED,
             'line-dasharray': [5, 0.5, 3, 0.5],
             'line-opacity': [
                 'case',
+                    ['boolean', ['feature-state', 'active'], false], 0.8,
+                    ['boolean', ['feature-state', 'selected'], false], 0.8,
                     ['boolean', ['feature-state', 'hidden'], false], 0.05,
                     ['boolean', ['feature-state', 'annotated'], false],
-                        (exclude ? 0.05 : 0.8),
+                        ((exclude || dimmed) ? 0.05 : 0.8),
                     0.6
                 ],
             'line-width': [
@@ -435,7 +438,11 @@ export class AnnotatedPathLayer extends VectorStyleLayer
                     ['case',
                     ['boolean', ['feature-state', 'hidden'], false], 0.0,
                     ['boolean', ['feature-state', 'annotated'], false],
-                        exclude ? 0.0 : (['*', 1.2, ['case', ['has', 'stroke-width'], ['get', 'stroke-width'], 1.0]]),
+                        exclude ? 0.0 : (['*', 1.1, ['case',
+                            ['has', 'stroke-width'], ['get', 'stroke-width'],
+                            ['boolean', ['feature-state', 'active'], false], 1.1,
+                            ['boolean', ['feature-state', 'active'], false], 1.1,
+                            1.0]]),
                         0.0
                     ],
                 STROKE_INTERPOLATION
@@ -446,7 +453,6 @@ export class AnnotatedPathLayer extends VectorStyleLayer
 
     style(options)
     {
-        const dimmed = 'dimmed' in options && options.dimmed;
         return {
             ...super.style(),
             'type': 'line',

package/src/systems.js

@@ -16,18 +16,26 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
-**/
+******************************************************************************/
+
+const FC_KIND = {
+    SYSTEM: ['fc:System', 'fc-class:System'],
+    ORGAN:  ['fc:Organ', 'fc-class:Organ'],
+    FTU:    ['fc:Ftu', 'fc-class:Ftu']
+};
+
 //==============================================================================
 
 export class SystemsManager
 {
     constructor(flatmap, ui, enabled=false)
     {
+        this.__flatmap = flatmap;
         this.__ui = ui;
         this.__systems = new Map();
         this.__enabledChildren = new Map();
-        for (const [id, ann] of flatmap.annotations) {
-            if (ann['fc-class'] === 'fc-class:System') {
+        for (const [_, ann] of flatmap.annotations) {
+            if (FC_KIND.SYSTEM.includes(ann['fc-class'])) {
                 const systemId = ann.name.replaceAll(' ', '_');
                 if (this.__systems.has(systemId)) {
                     this.__systems.get(systemId).featureIds.push(ann.featureId)
@@ -37,7 +45,8 @@ export class SystemsManager
                         colour: ann.colour,
                         featureIds: [ ann.featureId ],
                         enabled: false,
-                        pathIds: ('path-ids' in ann) ? ann['path-ids'] : []
+                        pathIds: ('path-ids' in ann) ? ann['path-ids'] : [],
+                        organs: this.__children(ann.children, FC_KIND.ORGAN)
                     });
                 this.__ui.enableFeature(ann.featureId, false, true);
                 }
@@ -57,6 +66,26 @@ export class SystemsManager
         }
     }
 
+    __children(childFeatureIds, childClass)
+    //=====================================
+    {
+        const children = [];
+        for (const childFeatureId of childFeatureIds || []) {
+            const childAnnotation = this.__flatmap.annotation(childFeatureId);
+            if (childAnnotation !== undefined && childClass.includes(childAnnotation['fc-class'])) {
+                const child = {
+                    label: childAnnotation.label,
+                    models: childAnnotation.models
+                };
+                if (childClass === FC_KIND.ORGAN) {
+                    child.ftus = this.__children(childAnnotation.children, FC_KIND.FTU)
+                };
+                children.push(child);
+            }
+        }
+        return children;
+    }
+
     get systems()
     //===========
     {
@@ -66,7 +95,8 @@ export class SystemsManager
                 id: systemId,
                 name: system.name,
                 colour: system.colour,
-                enabled: system.enabled
+                enabled: system.enabled,
+                organs: system.organs
             });
         }
         return systems;

package/src/utils.js

@@ -35,7 +35,7 @@ export class List extends Array {
     }
 
     contains(element) {
-        return (super.indexOf(element) >= 0);
+        return (super.includes(element));
     }
 
     extend(other) {
@@ -96,12 +96,12 @@ export class Mutex
 
 export function normaliseId(id)
 {
-    if (id.indexOf(':') < 0) {
+    if (!id.includes(':')) {
         return id;
     }
     const parts = id.split(':')
     const lastPart = parts[parts.length - 1]
-    if (['http', 'https', 'urn'].indexOf(parts[0]) >= 0 || '0123456789'.indexOf(lastPart[0]) < 0) {
+    if (['http', 'https', 'urn'].includes(parts[0]) || !'0123456789'.includes(lastPart[0])) {
         return id;
     }
     parts[parts.length - 1] = lastPart.padStart(8, '0');