removed getMetricData method

OurPlanscape · May 22, 2024 · 6e8a340 · 6e8a340
1 parent 6d55db2
commit 6e8a340
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 29 deletions.
diff --git a/src/interface/src/app/plan/create-scenarios/create-scenarios.component.spec.ts b/src/interface/src/app/plan/create-scenarios/create-scenarios.component.spec.ts
@@ -114,7 +114,6 @@ describe('CreateScenariosComponent', () => {
       'PlanStateService',
       {
         getScenario: fakeGetScenario,
-        getMetricData: of(null),
         updateStateWithShapes: undefined,
       },
       {

diff --git a/src/interface/src/app/plan/scenario-helpers.ts b/src/interface/src/app/plan/scenario-helpers.ts
@@ -8,12 +8,12 @@ export function processScenarioResultsToChartData(
 ): ChartData[] {
   const {
     scenario_priorities: priorities = [],
-    scenario_output_fields: outputFields = [],
+    scenario_output_fields: secondary = [],
   } = scenarioConfig;
-  const relevantFields = new Set([...outputFields, ...priorities]);
+  const outputFields = new Set([...secondary, ...priorities]);
 
   return metrics.reduce((acc: ChartData[], metric) => {
-    if (relevantFields.has(metric.metric_name)) {
+    if (outputFields.has(metric.metric_name)) {
       const metricData = scenarioResults.result.features.map(
         (featureCollection) => featureCollection.properties[metric.metric_name]
       );

diff --git a/src/interface/src/app/services/metrics.service.ts b/src/interface/src/app/services/metrics.service.ts
@@ -20,6 +20,10 @@ export class MetricsService {
 
   constructor(private http: HttpClient) {}
 
+  /**
+   * gets a flat list of metrics for a given region
+   * @param region
+   */
   public getMetricsForRegion(region: Region) {
     if (this.conditions[region] !== null) {
       return of(this.conditions[region] as MetricConfig[]);

diff --git a/src/interface/src/app/services/plan-state.service.ts b/src/interface/src/app/services/plan-state.service.ts
@@ -157,13 +157,6 @@ export class PlanStateService {
     );
   }
 
-  getMetricData(metric_paths: any) {
-    return this.scenarioService.getMetricData(
-      metric_paths,
-      this.planRegion$.value
-    );
-  }
-
   /**
    * Updates planRegion and treatmentGoalsConfig if value is a valid Region
    */

diff --git a/src/interface/src/app/services/scenario.service.ts b/src/interface/src/app/services/scenario.service.ts
@@ -1,13 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { catchError, Observable, take } from 'rxjs';
-import {
-  Region,
-  regionToString,
-  Scenario,
-  SCENARIO_STATUS,
-  ScenarioConfig,
-} from '@types';
+import { Scenario, SCENARIO_STATUS, ScenarioConfig } from '@types';
 import { CreateScenarioError } from './errors';
 import { environment } from '../../environments/environment';
 
@@ -145,17 +139,6 @@ export class ScenarioService {
     );
   }
 
-  /** Gets Metric Data For Scenario Output Fields */
-  getMetricData(metric_paths: any, region: Region): Observable<any> {
-    const url = environment.backend_endpoint.concat(
-      '/conditions/metrics/?region_name=' +
-        `${regionToString(region)}` +
-        '&metric_paths=' +
-        JSON.stringify(metric_paths)
-    );
-    return this.http.get<any>(url).pipe(take(1));
-  }
-
   private convertConfigToScenario(config: ScenarioConfig): any {
     return {
       question_id: config.treatment_question!.id,