@abi-software/flatmap-viewer 2.2.10-devel.2 → 2.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmap-viewer",
-  "version": "2.2.10-devel.2",
+  "version": "2.2.10",
   "description": "Flatmap viewer using Maplibre GL",
   "repository": "https://github.com/AnatomicMaps/flatmap-viewer.git",
   "main": "src/main.js",

package/src/controls.js

@@ -22,7 +22,6 @@ limitations under the License.
 
 //==============================================================================
 
-import * as pathways from './pathways.js';
 
 //==============================================================================
 
@@ -91,10 +90,11 @@ export class NavigationControl
 
 export class PathControl
 {
-    constructor(flatmap)
+    constructor(flatmap, pathTypes)
     {
         this._flatmap = flatmap;
         this._map = undefined;
+        this.__pathTypes = pathTypes;
     }
 
     getDefaultPosition()
@@ -117,11 +117,11 @@ export class PathControl
 
         const innerHTML = [];
         innerHTML.push(`<label for="path-all-paths">ALL PATHS:</label><div class="nerve-line"></div><input id="path-all-paths" type="checkbox" checked/>`);
-        for (const path of pathways.PATH_TYPES) {
+        for (const path of this.__pathTypes) {
             innerHTML.push(`<label for="path-${path.type}">${path.label}</label><div class="nerve-line nerve-${path.type}"></div><input id="path-${path.type}" type="checkbox" checked/>`);
         }
         this._legend.innerHTML = innerHTML.join('\n');
-        this.__checkedCount = pathways.PATH_TYPES.length;
+        this.__checkedCount = this.__pathTypes.length;
         this.__halfCount = Math.trunc(this.__checkedCount/2);
 
         this._button = document.createElement('button');
@@ -164,11 +164,11 @@ export class PathControl
                     event.target.indeterminate = false;
                 }
                 if (event.target.checked) {
-                    this.__checkedCount = pathways.PATH_TYPES.length;
+                    this.__checkedCount = this.__pathTypes.length;
                 } else {
                     this.__checkedCount = 0;
                 }
-                for (const path of pathways.PATH_TYPES) {
+                for (const path of this.__pathTypes) {
                     const pathCheckbox = document.getElementById(`path-${path.type}`);
                     if (pathCheckbox) {
                         pathCheckbox.checked = event.target.checked;
@@ -187,7 +187,7 @@ export class PathControl
                 if (this.__checkedCount === 0) {
                     allPathsCheckbox.checked = false;
                     allPathsCheckbox.indeterminate = false;
-                } else if (this.__checkedCount === pathways.PATH_TYPES.length) {
+                } else if (this.__checkedCount === this.__pathTypes.length) {
                     allPathsCheckbox.checked = true;
                     allPathsCheckbox.indeterminate = false;
                 } else {

package/src/interactions.js

@@ -37,7 +37,7 @@ import {ContextMenu} from './contextmenu.js';
 import {displayedProperties} from './info.js';
 import {InfoControl} from './info.js';
 import {LayerManager} from './layers.js';
-import {PATHWAYS_LAYER, Pathways} from './pathways.js';
+import {PATH_TYPES, PATHWAYS_LAYER, Pathways} from './pathways.js';
 import {BackgroundControl, LayerControl, PathControl} from './controls.js';
 import {SearchControl} from './search.js';
 import {VECTOR_TILES_SOURCE} from './styling.js';
@@ -163,7 +163,8 @@ export class UserInteractions
         // Add a control to manage our pathways
 
         if (flatmap.options.pathControls) {
-            this._map.addControl(new PathControl(flatmap));
+            // Restrict to path types that are on the map...
+            this._map.addControl(new PathControl(flatmap, this._pathways.pathTypes));
         }
 
         // Add a control to manage our layers
@@ -672,9 +673,9 @@ export class UserInteractions
                                                   : '';
             if ('hyperlink' in properties) {
                 if (label === '') {
-                    return `<div class='flatmap-feature-label'><a href='{properties.hyperlink}'>${properties.hyperlink}</a></div>`;
+                    return `<div class='flatmap-feature-label'><a href='${properties.hyperlink}'>${properties.hyperlink}</a></div>`;
                 } else {
-                    return `<div class='flatmap-feature-label'><a href='{properties.hyperlink}'>${properties.hyperlink}</a><br/>${label}</div>`;
+                    return `<div class='flatmap-feature-label'><a href='${properties.hyperlink}'>${label}</a></div>`;
                 }
             } else {
                 return `<div class='flatmap-feature-label'>${label}</div>`;

package/src/pathways.js

@@ -38,6 +38,9 @@ export const PATH_TYPES = [
     { type: "other", label: "Other neuron type", colour: "#888"}
 ];
 
+export const PATH_STYLE_RULES =
+    PATH_TYPES.flatMap(pathType => [['==', ['get', 'kind'], pathType.type], pathType.colour]);
+
 //==============================================================================
 
 function reverseMap(mapping)
@@ -138,6 +141,19 @@ export class Pathways
         }
     }
 
+    get pathTypes()
+    //=============
+    {
+        const pathTypes = [];
+        for (const pathType of PATH_TYPES) {
+            if (pathType.type in this.__typePaths
+            && this.__typePaths[pathType.type].length > 0) {
+                pathTypes.push(pathType);
+            }
+        }
+        return pathTypes;
+    }
+
     addPathsToFeatureSet_(paths, featureSet)
     //======================================
     {

package/src/styling.js

@@ -26,6 +26,10 @@ export const VECTOR_TILES_SOURCE = 'vector-tiles';
 
 //==============================================================================
 
+import {PATH_STYLE_RULES} from './pathways.js';
+
+//==============================================================================
+
 class VectorStyleLayer
 {
     constructor(id, suffix, sourceLayer)
@@ -370,24 +374,17 @@ export class PathLineLayer extends VectorStyleLayer
                 ['==', ['get', 'type'], 'bezier'], 'red',
                 ['==', ['get', 'kind'], 'error'], '#FFFE0E',
                 ['==', ['get', 'kind'], 'unknown'], '#888',
-                ['==', ['get', 'kind'], 'cns'], '#9B1FC1',
-                ['==', ['get', 'kind'], 'lcn'], '#F19E38',
-                ['==', ['get', 'kind'], 'para-post'], '#3F8F4A',
-                ['==', ['get', 'kind'], 'para-pre'], '#3F8F4A',
-                ['==', ['get', 'kind'], 'somatic'], '#98561D',
-                ['==', ['get', 'kind'], 'sensory'], '#2A62F6',
-                ['==', ['get', 'kind'], 'symp-post'], '#EA3423',
-                ['==', ['get', 'kind'], 'symp-pre'], '#EA3423',
+                ...PATH_STYLE_RULES,
                 '#888'
             ],
             'line-opacity': [
                 'case',
-                    ['boolean', ['feature-state', 'hidden'], false], 0.1,
+                    ['boolean', ['feature-state', 'hidden'], false], 0.05,
                     ['==', ['get', 'type'], 'bezier'], 1.0,
                     ['boolean', ['get', 'invisible'], false], 0.001,
                     ['boolean', ['feature-state', 'selected'], false], 1.0,
-                    ['boolean', ['feature-state', 'active'], false], 0.8,
-                dimmed ? 0.1 : 0.5
+                    ['boolean', ['feature-state', 'active'], false], 1.0,
+                dimmed ? 0.1 : 0.8
             ],
             'line-width': [
                 'let',
@@ -398,7 +395,7 @@ export class PathLineLayer extends VectorStyleLayer
                         ['==', ['get', 'kind'], 'unknown'], 1,
                         ['boolean', ['get', 'invisible'], false], 0.1,
                         ['boolean', ['feature-state', 'selected'], false], 1.2,
-                        ['boolean', ['feature-state', 'active'], false], 0.9,
+                        ['boolean', ['feature-state', 'active'], false], 1.2,
                     0.8
                     ], [
                     'interpolate',
@@ -570,14 +567,7 @@ export class NervePolygonFill extends VectorStyleLayer
                     'case',
                     ['==', ['get', 'kind'], 'bezier-end'], 'red',
                     ['==', ['get', 'kind'], 'bezier-control'], 'green',
-                    ['==', ['get', 'kind'], 'cns'], '#9B1FC1',
-                    ['==', ['get', 'kind'], 'lcn'], '#F19E38',
-                    ['==', ['get', 'kind'], 'para-post'], '#3F8F4A',
-                    ['==', ['get', 'kind'], 'para-pre'], '#3F8F4A',
-                    ['==', ['get', 'kind'], 'somatic'], '#98561D',
-                    ['==', ['get', 'kind'], 'sensory'], '#2A62F6',
-                    ['==', ['get', 'kind'], 'symp-post'], '#EA3423',
-                    ['==', ['get', 'kind'], 'symp-pre'], '#EA3423',
+                    ...PATH_STYLE_RULES,
                     'white'
                 ],
                 'fill-opacity': [