We now longer need the full SPARC anatomical hierarchy, so don't fetch it.

Author: dbrnz

src/flatmap.ts

@@ -58,7 +58,7 @@ import type {MinimapOptions} from './flatmap-types'
 import {FLATMAP_LEGEND} from './legend'
 import type {FlatmapLegendEntry} from './legend'
 import {UserInteractions} from './interactions'
-import {MapTermGraph, SparcTermGraph} from './knowledge'
+import {MapTermGraph} from './knowledge'
 import {KNOWLEDGE_SOURCE_SCHEMA, FlatMapServer} from './mapserver'
 import {loadMarkerIcons} from './markers'
 import {APINATOMY_PATH_PREFIX, PathType} from './pathways'
@@ -188,7 +188,6 @@ export type MapDescription = {
     style: FlatMapStyleSpecification
     options: MapDescriptionOptions
     layers: FlatMapLayer[]
-    sparcTermGraph: SparcTermGraph
     annotations: FlatMapAnnotations
     callback: FlatMapCallback
     pathways: FlatMapPathways
@@ -260,7 +259,7 @@ export class FlatMap
         this.#layers = mapDescription.layers
         this.#options = mapDescription.options
         this.#pathways = mapDescription.pathways
-        this.#mapTermGraph = new MapTermGraph(mapDescription.sparcTermGraph)
+        this.#mapTermGraph = new MapTermGraph()
 
         const sckanProvenance = mapDescription.details.connectivity
         if (!sckanProvenance) {

src/knowledge/index.ts

@@ -32,20 +32,8 @@ export const ANATOMICAL_ROOT = BODY_PROPER
 
 export class MapTermGraph
 {
-    #sparcTermGraph: SparcTermGraph
     #hierarchy: DiGraph = new DiGraph()
 
-    constructor(sparcTermGraph: SparcTermGraph)
-    {
-        this.#sparcTermGraph = sparcTermGraph
-    }
-
-    get sparcTermGraph(): SparcTermGraph
-    //==================================
-    {
-        return this.#sparcTermGraph
-    }
-
     get maxDepth(): number
     //====================
     {
@@ -87,25 +75,4 @@ export class MapTermGraph
 }
 
 //==============================================================================
-
-export class SparcTermGraph
-{
-    #graph: DiGraph = new DiGraph()
-
-    async load(mapServer: FlatMapServer)
-    //==================================
-    {
-        const sparcGraph = await mapServer.sparcTermGraph()
-        if (sparcGraph) {
-            this.#graph.load(sparcGraph)
-        }
-    }
-
-    parents(term: string): string[]
-    //=============================
-    {
-        return this.#graph.parents(term)
-    }
-}
-
 //==============================================================================

src/mapserver.ts

@@ -216,12 +216,6 @@ export class FlatMapServer
         return data.values
     }
 
-    async sparcTermGraph(): Promise<NodeLinkGraph|null>
-    //=================================================
-    {
-        return this.#loadJSON<NodeLinkGraph>('knowledge/sparcterms')
-    }
-
     url(relativePath: string=''): string
     //==================================
     {

src/viewer.ts

@@ -26,7 +26,6 @@ import {
     FlatMapCallback, FlatMapIndex, FlatMapLayer,
     FlatMapMetadata, FlatMapOptions, FlatMapServerIndex
 } from './flatmap-types'
-import {SparcTermGraph} from './knowledge'
 import {FlatMapServer} from './mapserver'
 import {noFlatMapPathways} from './pathways'
 import * as utils from './utils'
@@ -98,7 +97,6 @@ export class MapViewer
     #mapList: MapListEntry[] = []
     #mapServer: FlatMapServer
     #images: PreloadedImage[]
-    #sparcTermGraph = new SparcTermGraph()
 
     readonly mapServerUrl: string
 
@@ -142,7 +140,6 @@ export class MapViewer
                     map.separateLayers = ('version' in map && map.version >= MAP_MAKER_SEPARATE_LAYERS_VERSION)
                     this.#mapList.push(map)
                 }
-                await this.#sparcTermGraph.load(this.#mapServer)
                 this.#initialised = true
             }
         })
@@ -372,7 +369,6 @@ export class MapViewer
                 style: mapStyle,
                 options: mapOptions,
                 layers: mapLayers,
-                sparcTermGraph: this.#sparcTermGraph,
                 annotations,
                 callback,
                 pathways,