Rename new CalculationService and associated artifacts

jackkoppa · Feb 25, 2018 · 9bf81ce · 9bf81ce
1 parent 08432cc
commit 9bf81ce
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/src/app/city/city.service.spec.ts b/src/app/city/city.service.spec.ts
@@ -1,6 +1,6 @@
 import { CityService } from './city.service';
 
-import { CalculationService } from '../core/calculation/calculation-new.service';
+import { CalculationService } from '../core/calculation/calculation.service';
 import { StaticMapsHandlerService } from '../core/handlers/static-maps-handler.service';
 import { NamingService } from '../core/naming/naming.service';
 import { LatestHandlerService } from '../core/handlers/latest-handler.service';

diff --git a/src/app/city/city.service.ts b/src/app/city/city.service.ts
@@ -6,7 +6,7 @@ import { Coordinates } from '../core/api/openaq/coordinates.model';
 import { LatestMeasurement } from '../core/api/openaq/latest/latest-measurement.model';
 import { LatestResponse } from '../core/api/openaq/latest/latest-response.model';
 import { Parameter } from '../core/api/openaq/parameter.model';
-import { CalculationService } from '../core/calculation/calculation-new.service';
+import { CalculationService } from '../core/calculation/calculation.service';
 import { CalculationResponse, CalculationMessage } from '../core/calculation/calculation-response.models';
 import { LatestHandlerService } from '../core/handlers/latest-handler.service';
 import { StaticMapsHandlerService } from '../core/handlers/static-maps-handler.service';

diff --git a/src/app/core/calculation/calculation.module.ts b/src/app/core/calculation/calculation.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 
-import { CalculationService } from './calculation-new.service';
+import { CalculationService } from './calculation.service';
 import { PhysicalCalculationService } from './physical/physical-calculation.service';
 
 @NgModule({

diff --git a/...lculation/calculation-new.service.spec.ts → ...e/calculation/calculation.service.spec.ts b/...lculation/calculation-new.service.spec.ts → ...e/calculation/calculation.service.spec.ts
@@ -1,6 +1,6 @@
-import { CalculationService } from './calculation-new.service';
+import { CalculationService } from './calculation.service';
 
-import { CalculateAQICase } from '../../../../test/spreadsheets/calculation-new.service.calculate-aqi.model';
+import { CalculateAQICase } from '../../../../test/spreadsheets/calculation.service.calculate-aqi.model';
 
 import { Parameter } from '../api/openaq/parameter.model';
 import { PhysicalCalculationService } from './physical/physical-calculation.service';
@@ -9,7 +9,7 @@ import { MeasurementUnit } from '../api/openaq/measurement-unit.model';
 
 import { CalculationResponse, CalculationMessage } from './calculation-response.models';
 
-const calculateAQICases: CalculateAQICase[] = require('../../../../test/json/calculation-new.service.calculate-aqi.json');
+const calculateAQICases: CalculateAQICase[] = require('../../../../test/json/calculation.service.calculate-aqi.json');
 
 describe('CalculationService', () => {
     let harness: Harness;

diff --git a/...re/calculation/calculation-new.service.ts → ...p/core/calculation/calculation.service.ts b/...re/calculation/calculation-new.service.ts → ...p/core/calculation/calculation.service.ts
diff --git a/...calculation-new.service.calculate-aqi.csv → ...ets/calculation.service.calculate-aqi.csv b/...calculation-new.service.calculate-aqi.csv → ...ets/calculation.service.calculate-aqi.csv
diff --git a/...lation-new.service.calculate-aqi.model.ts → ...alculation.service.calculate-aqi.model.ts b/...lation-new.service.calculate-aqi.model.ts → ...alculation.service.calculate-aqi.model.ts