@abi-software/flatmap-viewer 2.3.0-a.1 → 2.3.0-a.2

package/src/pathways.js

@@ -26,18 +26,25 @@ export const PATHWAYS_LAYER = 'pathways';
 
 //==============================================================================
 
-const PATH_TYPES = {
-    "cns": {label: "CNS", colour: "#9B1FC1"},
-    "lcn": {label: "Local circuit neuron", colour: "#F19E38"},
-    "para-pre": {label: "Parasympathetic pre-ganglionic", colour: "#3F8F4A"},
-    "para-post": {label: "Parasympathetic post-ganglionic", colour: "#3F8F4A"},
-    "sensory": {label: "Sensory (afferent) neuron", colour: "#2A62F6"},
-    "somatic": {label: "Somatic lower motor", colour: "#98561D"},
-    "symp-pre": {label: "Sympathetic pre-ganglionic", colour: "#EA3423"},
-    "symp-post": {label: "Sympathetic post-ganglionic", colour: "#EA3423"},
-    "other": {label: "Other neuron type", colour: "#888"},
-    "centreline": {label: "Nerve centrelines", colour: "#CC0"}
-};
+const PATH_TYPES = [
+    { type: "cns", label: "CNS", colour: "#9B1FC1"},
+    { type: "intracardiac", label: "Local circuit neuron", colour: "#F19E38"},
+    { type: "para-pre", label: "Parasympathetic pre-ganglionic", colour: "#3F8F4A"},
+    { type: "para-post", label: "Parasympathetic post-ganglionic", colour: "#3F8F4A", dashed: true},
+    { type: "sensory", label: "Sensory (afferent) neuron", colour: "#2A62F6"},
+    { type: "motor", label: "Somatic lower motor", colour: "#98561D"},
+    { type: "somatic", label: "Somatic lower motor", colour: "#98561D"},
+    { type: "symp-pre", label: "Sympathetic pre-ganglionic", colour: "#EA3423"},
+    { type: "symp-post", label: "Sympathetic post-ganglionic", colour: "#EA3423", dashed: true},
+    { type: "other", label: "Other neuron type", colour: "#888"},
+    { type: "arterial", label: "Arterial blood vessel", colour: "#F00"},
+    { type: "venous", label: "Venous blood vessel", colour: "#2F6EBA"},
+    { type: "centreline", label: "Nerve centrelines", colour: "#CCC", enabled: false},
+    { type: "error", label: "Paths with errors or warnings", colour: "#FF0"}
+];
+
+export const PATH_STYLE_RULES =
+    PATH_TYPES.flatMap(pathType => [['==', ['get', 'kind'], pathType.type], pathType.colour]);
 
 //==============================================================================
 
@@ -122,27 +129,46 @@ export class Pathways
         }
         this._allFeatureIds = featureIds;
 
+        // Construct a list of path types we know about
+        const pathTypes = [];
+        for (const pathType of PATH_TYPES) {
+            pathTypes.push(pathType.type);
+        }
         // Map unknown path types to ``other``
         this.__typePaths = {};
         this.__typePaths['other'] = [];
-        this.__knownPathTypes = [];
         for (const [pathType, paths] of Object.entries(flatmap.pathways['type-paths'])) {
-            if (pathType in PATH_TYPES && pathType !== 'other') {
+            if (pathTypes.indexOf(pathType) >= 0) {
                 this.__typePaths[pathType] = paths;
-                this.__knownPathTypes.push({'type': pathType, ...PATH_TYPES[pathType]});
             } else {
                 this.__typePaths['other'].push(...paths);
             }
         }
-        if ('other' in this.__typePaths) {
-            this.__knownPathTypes.push({'type': 'other', ...PATH_TYPES['other']});
-        }
+        // Nerve centrelines are a special case with their own controls
+        this.__haveCentrelines = false;
     }
 
-    get pathTypes()
-    //=============
+    get haveCentrelines()
+    //===================
+    {
+        return this.__haveCentrelines;
+    }
+
+    pathTypes()
+    //=========
     {
-        return this.__knownPathTypes;
+        const pathTypes = [];
+        for (const pathType of PATH_TYPES) {
+            if (pathType.type in this.__typePaths
+            && this.__typePaths[pathType.type].length > 0) {
+                if (pathType.type === 'centreline') {
+                    this.__haveCentrelines = true;
+                } else {
+                    pathTypes.push(pathType);
+                }
+            }
+        }
+        return pathTypes;
     }
 
     addPathsToFeatureSet_(paths, featureSet)

package/src/search.js

@@ -158,7 +158,10 @@ export class SearchIndex
 
     addTerm_(featureId, text)
     //=======================
-    {    if (text) {
+    {
+        text = text.replace(new RegExp('<br/>', 'g'), ' ')
+                   .replace('\n', ' ');
+        if (text) {
             this._searchEngine.add({
                 id: this._featureIds.length,
                 text: text