comparison src/app/feature-extraction-menu/feature-extraction-menu.component.ts @ 441:55e17af8a0ee

Small refactor.

 import {
   FeatureExtractionService
 } from '../services/feature-extraction/feature-extraction.service';
 import {ListResponse} from 'piper';
 import {Subscription} from 'rxjs/Subscription';
-import {HigherLevelFeatureShape} from "../visualisations/FeatureUtilities";
+import {HigherLevelFeatureShape} from '../visualisations/FeatureUtilities';
 
 export interface ExtractorOutputInfo {
   extractorKey: string;
   combinedKey: string;
   outputId: string;
   name: string;
-  iconName?: string;
+  typeUri?: string;
 }
 
 interface ExtractorInfo {
   name: string;
   outputs: ExtractorOutputInfo[];

   'http://purl.org/ontology/af/TonalOnset': 'instants',
   'http://purl.org/ontology/af/Note': 'notes',
   'http://purl.org/ontology/af/ChordSegment': 'instants',
   'http://purl.org/ontology/af/MusicSegment': 'instants',
   'http://purl.org/ontology/af/Pitch': 'tracks'
-};
-
-const featureIconMap = {
-  vector: 'show_chart',
-  matrix: 'grid_on',
-  tracks: 'multiline_chart',
-  instants: 'view_week',
-  notes: 'audiotrack',
 };
 
 @Component({
   selector: 'ugly-feature-extraction-menu',
   templateUrl: './feature-extraction-menu.component.html',

       this.extractors = available.available.reduce((acc, staticData) => {
         const name = staticData.basic.name;
         const outputs: ExtractorOutputInfo[] =
           staticData.basicOutputInfo.map(output => {
             const combinedKey = `${staticData.key}:${output.identifier}`;
-            const hasTypeInfo = staticData.staticOutputInfo &&
+            const maybeTypeInfo = staticData.staticOutputInfo &&
               staticData.staticOutputInfo.get(output.identifier) &&
               staticData.staticOutputInfo.get(output.identifier).typeURI;
-            const getIcon = () => featureIconMap[crudeTypeUriMap[
-              staticData.staticOutputInfo.get(output.identifier).typeURI
-              ]];
-            const hasIcon = hasTypeInfo && getIcon();
             return Object.assign({
                 extractorKey: staticData.key,
                 combinedKey: combinedKey,
                 name: output.name,
                 outputId: output.identifier
               },
-              hasIcon ? {iconName: getIcon()} : {}
+              maybeTypeInfo ? {typeUri: maybeTypeInfo} : {}
             );
           });
         acc.push({name, outputs});
         return acc;
       }, [] as ExtractorInfo[]);

   load(): void {
     this.isLoading = true;
     this.piperService.updateAvailableLibraries();
   }
 
+  getFeatureIconName(outputInfo: ExtractorOutputInfo): string {
+    const featureIconMap = {
+      vector: 'show_chart',
+      matrix: 'grid_on',
+      tracks: 'multiline_chart',
+      instants: 'view_week',
+      notes: 'audiotrack',
+    };
+    const maybeIcon = featureIconMap[crudeTypeUriMap[outputInfo.typeUri]];
+    return maybeIcon ? maybeIcon : 'extension';
+  }
+
   ngOnDestroy(): void {
     this.librariesUpdatedSubscription.unsubscribe();
   }
 }