From 9bf81cece1e97ed81d9c0910332229d88995f504 Mon Sep 17 00:00:00 2001
From: Jack Koppa <hello@jackkoppa.com>
Date: Sun, 25 Feb 2018 08:40:21 -0600
Subject: [PATCH] Rename new CalculationService and associated artifacts

---
 src/app/city/city.service.spec.ts                           | 2 +-
 src/app/city/city.service.ts                                | 2 +-
 src/app/core/calculation/calculation.module.ts              | 2 +-
 ...tion-new.service.spec.ts => calculation.service.spec.ts} | 6 +++---
 .../{calculation-new.service.ts => calculation.service.ts}  | 0
 ...culate-aqi.csv => calculation.service.calculate-aqi.csv} | 0
 ....model.ts => calculation.service.calculate-aqi.model.ts} | 0
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename src/app/core/calculation/{calculation-new.service.spec.ts => calculation.service.spec.ts} (93%)
 rename src/app/core/calculation/{calculation-new.service.ts => calculation.service.ts} (100%)
 rename test/spreadsheets/{calculation-new.service.calculate-aqi.csv => calculation.service.calculate-aqi.csv} (100%)
 rename test/spreadsheets/{calculation-new.service.calculate-aqi.model.ts => calculation.service.calculate-aqi.model.ts} (100%)

diff --git a/src/app/city/city.service.spec.ts b/src/app/city/city.service.spec.ts
index eb3d598..c2f41b7 100644
--- 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
index e13a6b9..093386d 100644
--- 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
index 8f28547..ba5dea5 100644
--- 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/src/app/core/calculation/calculation-new.service.spec.ts b/src/app/core/calculation/calculation.service.spec.ts
similarity index 93%
rename from src/app/core/calculation/calculation-new.service.spec.ts
rename to src/app/core/calculation/calculation.service.spec.ts
index 58b28ea..7bf037d 100644
--- a/src/app/core/calculation/calculation-new.service.spec.ts
+++ b/src/app/core/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/src/app/core/calculation/calculation-new.service.ts b/src/app/core/calculation/calculation.service.ts
similarity index 100%
rename from src/app/core/calculation/calculation-new.service.ts
rename to src/app/core/calculation/calculation.service.ts
diff --git a/test/spreadsheets/calculation-new.service.calculate-aqi.csv b/test/spreadsheets/calculation.service.calculate-aqi.csv
similarity index 100%
rename from test/spreadsheets/calculation-new.service.calculate-aqi.csv
rename to test/spreadsheets/calculation.service.calculate-aqi.csv
diff --git a/test/spreadsheets/calculation-new.service.calculate-aqi.model.ts b/test/spreadsheets/calculation.service.calculate-aqi.model.ts
similarity index 100%
rename from test/spreadsheets/calculation-new.service.calculate-aqi.model.ts
rename to test/spreadsheets/calculation.service.calculate-aqi.model.ts