Remove distance class

.gitignore

@@ -58,3 +58,5 @@ typings/
 .env
 
 build/
+
+.DS_Store

src/data/Location.js

@@ -1,10 +1,11 @@
 import { Record } from 'immutable';
 
-import Coordinate from './Coordinate';
-
 const defaults = {
   name: '',
-  coordinate: new Coordinate(),
+  coordinate: {
+    latitude: 0,
+    longitude: 0,
+  },
 };
 
 export default class Location extends Record(defaults) {

src/data/PriceEstimate.js

@@ -1,12 +1,15 @@
 import { Record } from 'immutable';
 
-import Distance from './Distance';
+import DistanceUnit from './DistanceUnit';
 import Duration from './Duration';
 import PriceRange from './PriceRange';
 
 const defaults = {
   productName: '',
-  distance: new Distance(),
+  distance: {
+    value: 0,
+    unit: DistanceUnit.MILE,
+  },
   range: new PriceRange(),
   duration: new Duration(),
   // wont show up unless > 1

src/data/TripPriceEstimate.js

@@ -1,12 +1,15 @@
 import { Record } from 'immutable';
 
-import Distance from './Distance';
+import DistanceUnit from './DistanceUnit';
 import Duration from './Duration';
 import PriceRange from './PriceRange';
 
 const defaults = {
   productName: '',
-  distance: new Distance(),
+  distance: {
+    value: 0,
+    unit: DistanceUnit.MILE,
+  },
   range: new PriceRange(),
   duration: new Duration(),
   // wont show up unless > 1

src/services/DistanceConverter.js

@@ -1,7 +1,6 @@
 import convert from 'convert-units';
 import { Map } from 'immutable';
 
-import Distance from '../data/Distance';
 import DistanceUnit from '../data/DistanceUnit';
 
 export default class DistanceConverter {
@@ -21,17 +20,17 @@ export default class DistanceConverter {
     switch (toUnit) {
       case DistanceUnit.KILOMETER: {
         // Note divided by 1000 because convert library does not have kilometers, so using meters
-        return new Distance({
+        return {
           value: convertedValue / 1000,
           unit: DistanceUnit.KILOMETER,
-        });
+        };
       }
 
       case DistanceUnit.MILE: {
-        return new Distance({
+        return {
           value: convertedValue,
           unit: DistanceUnit.MILE,
-        });
+        };
       }
 
       default: {

src/services/translators/estimates/TripPriceEstimateTranslator.js

@@ -1,6 +1,5 @@
 import { Map } from 'immutable';
 
-import Distance from '../../../data/Distance';
 import DistanceUnit from '../../../data/DistanceUnit';
 import Duration from '../../../data/Duration';
 import PriceRange from '../../../data/PriceRange';
@@ -14,10 +13,10 @@ export default class TripPriceEstimateTranslator {
       throw new Error(`invalid estimate: ${estimate}`);
     }
 
-    const distance = new Distance({
+    const distance = {
       value: estimate[TripPriceEstimateTranslator.getDistanceFieldName()],
       unit: DistanceUnit.MILE,
-    });
+    };
 
     // Uber returns duration in seconds
     const duration = new Duration({

src/services/translators/geocode/LocationTranslator.js

@@ -1,4 +1,3 @@
-import Coordinate from '../../../data/Coordinate';
 import Location from '../../../data/Location';
 import Utilities from '../../Utilities';
 
@@ -19,10 +18,10 @@ export default class LocationTranslator {
     const location = json[this.GEOMETRY_ADDRESS_FIELD_NAME][this.LOCATION_FIELD_NAME];
     return new Location({
       name: json[this.FORMATTED_ADDRESS_FIELD_NAME],
-      coordinate: new Coordinate({
+      coordinate: {
         latitude: location[this.LATITUDE_FIELD_NAME],
         longitude: location[this.LONGITUDE_FIELD_NAME],
-      }),
+      },
     });
   }
 

test/DistanceConverterTest.js

@@ -2,7 +2,6 @@ import chai from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 
-import Distance from '../src/data/Distance';
 import DistanceUnit from '../src/data/DistanceUnit';
 
 import DistanceConverter from '../src/services/DistanceConverter';
@@ -34,14 +33,14 @@ describe('Distance converter', () => {
   });
 
   const distance = 1.234;
-  const distanceInMiles = new Distance({
+  const distanceInMiles = {
     value: distance,
     unit: DistanceUnit.MILE,
-  });
-  const distanceInKilometers = new Distance({
+  };
+  const distanceInKilometers = {
     value: distance / 1000,
     unit: DistanceUnit.KILOMETER,
-  });
+  };
 
   describe('converts successfully', () => {
     it('converts miles', () => {

test/GeocodeServiceTest.js

@@ -4,7 +4,6 @@ import chaiImmutable from 'chai-immutable';
 
 import { List } from 'immutable';
 
-import Coordinate from '../src/data/Coordinate';
 import GeocodeService from '../src/services/GeocodeService';
 import Location from '../src/data/Location';
 
@@ -19,10 +18,10 @@ describe('Test Geocode Service', () => {
   const address = '25 first street cambridge ma';
   const location = new Location({
     name: '25 First St, Cambridge, MA 02141, USA',
-    coordinate: new Coordinate({
+    coordinate: {
       latitude: 42.369695,
       longitude: -71.07800569999999,
-    }),
+    },
   });
   const locations = List.of(location);
 

test/services/translators/estimates/TripPriceEstimateTranslatorTest.js

@@ -4,7 +4,6 @@ import sinonChai from 'sinon-chai';
 
 import { Map } from 'immutable';
 
-import Distance from '../../../../src/data/Distance';
 import DistanceUnit from '../../../../src/data/DistanceUnit';
 import Duration from '../../../../src/data/Duration';
 import PriceRange from '../../../../src/data/PriceRange';
@@ -133,10 +132,10 @@ describe('Trip Price Estimate Translation', () => {
   describe('Translate Estimate', () => {
     const args = Map({
       productName,
-      distance: new Distance({
+      distance: {
         value: distance,
         unit: DistanceUnit.MILE,
-      }),
+      },
       duration: new Duration({
         length: duration,
         unit: TimeUnit.SECOND,

test/services/translators/geocode/LocationTranslatorTest.js

@@ -4,7 +4,6 @@ import chai from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 
-import Coordinate from '../../../../src/data/Coordinate';
 import Location from '../../../../src/data/Location';
 
 import LocationTranslator from '../../../../src/services/translators/geocode/LocationTranslator';
@@ -78,10 +77,10 @@ describe('Location Translation', () => {
     it('translates valid json', () => {
       const expected = new Location({
         name: 'foo',
-        coordinate: new Coordinate({
+        coordinate: {
           latitude: 1.234,
           longitude: 5.678,
-        }),
+        },
       });
       const isValid = sinon.stub(translator, 'isValid').returns(true);
       expect(translator.translate(json)).to.eql(expected);