diff --git a/src/feature/map/defs/issStats.ts b/src/feature/map/defs/issStats.ts new file mode 100644 index 0000000..bc650bc --- /dev/null +++ b/src/feature/map/defs/issStats.ts @@ -0,0 +1,16 @@ +export interface ISSStats { + "name": string, + "id": number, + "latitude": number, + "longitude": number, + "altitude": number, + "velocity": number, + "visibility": 'daylight' | 'eclipsed', + "footprint": number, + "timestamp": Date, + "daynum": number, + "solar_lat": number, + "solar_lon": number, + "units": 'kilometers' | 'miles' + } + \ No newline at end of file diff --git a/src/feature/map/services/IssService.ts b/src/feature/map/services/IssService.ts index d7d6ddf..7236379 100644 --- a/src/feature/map/services/IssService.ts +++ b/src/feature/map/services/IssService.ts @@ -1,6 +1,6 @@ import { ISS_CURRENT_URL, ISS_FUTURE_URL } from '../../../apis/endpoints'; +import { ISSStats } from '../defs/issStats'; import { calcRiseTime } from '../utils/iss/calcRiseTime'; -import { getLocationCoordinates } from '../utils/iss/getCoords'; import { fetchWithRetries } from './BaseService'; interface Transport { @@ -16,9 +16,9 @@ interface FetchFuturePositionOptions { transport?: Transport; } -export function fetchCurrentPosition(transport: Transport = {}): Promise { +export function fetchCurrentPosition(transport: Transport = {}): Promise { return fetchWithRetries( - { url: ISS_CURRENT_URL, transport, callback: getLocationCoordinates }, + { url: ISS_CURRENT_URL, transport }, 3 ); } diff --git a/src/feature/map/utils/iss/getCoords.ts b/src/feature/map/utils/iss/getCoords.ts deleted file mode 100644 index 18989eb..0000000 --- a/src/feature/map/utils/iss/getCoords.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Coordinates } from '../../defs/coordinates'; - -interface IssPosition { - longitude: string; - latitude: string; - } - - - export function getLocationCoordinates(res: IssPosition): Coordinates { - return { - longitude: parseInt(res.longitude, 10), - latitude: parseInt(res.latitude, 10) - } - } - \ No newline at end of file