Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[HOTFIX] API Credential failed 문제로 다른 API로 변경 #104

Merged
merged 3 commits into from
Jan 31, 2024
Merged

[HOTFIX] API Credential failed 문제로 다른 API로 변경 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8a042f
[HOTFIX] Change API to Horizons API
YoonyoungL Jan 30, 2024
d303d4d
[FIX] Change datformatter timezone to UTC0
YoonyoungL Jan 30, 2024
8bfd56f
[STYLE] Remove print
YoonyoungL Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions Tars/Tars.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@
3726FE022923B02E0062B667 /* CGPoint+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3726FE012923B02E0062B667 /* CGPoint+Extension.swift */; };
3726FE042923B12C0062B667 /* SCNVector3+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3726FE032923B12C0062B667 /* SCNVector3+Extension.swift */; };
374FEE372909597B00E0C56B /* Float+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 374FEE362909597B00E0C56B /* Float+Extension.swift */; };
37EF27032B6922920092C65B /* Detail_Saturn.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 37EF26FA2B6922920092C65B /* Detail_Saturn.mp3 */; };
37EF27042B6922920092C65B /* Detail_Venus.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 37EF26FB2B6922920092C65B /* Detail_Venus.mp3 */; };
37EF27052B6922920092C65B /* Detail_Uranus.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 37EF26FC2B6922920092C65B /* Detail_Uranus.mp3 */; };
37EF27062B6922920092C65B /* Detail_Jupiter.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 37EF26FD2B6922920092C65B /* Detail_Jupiter.mp3 */; };
37EF27072B6922920092C65B /* Detail_Sun.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 37EF26FE2B6922920092C65B /* Detail_Sun.mp3 */; };
37EF27082B6922920092C65B /* Detail_Mars.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 37EF26FF2B6922920092C65B /* Detail_Mars.mp3 */; };
37EF27092B6922920092C65B /* Detail_Neptune.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 37EF27002B6922920092C65B /* Detail_Neptune.mp3 */; };
37EF270A2B6922920092C65B /* Detail_Moon.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 37EF27012B6922920092C65B /* Detail_Moon.mp3 */; };
37EF270B2B6922920092C65B /* Detail_Mercury.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 37EF27022B6922920092C65B /* Detail_Mercury.mp3 */; };
3F3C20FE29375E8F007007C2 /* Detecting_planet.wav in Resources */ = {isa = PBXBuildFile; fileRef = 3F3C20FD29375E8F007007C2 /* Detecting_planet.wav */; };
452F77C5292E28DD0088E684 /* HapticManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 452F77C4292E28DD0088E684 /* HapticManager.swift */; };
5533717729123F17004AD6E8 /* UniverseSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5533717629123F17004AD6E8 /* UniverseSearchViewController.swift */; };
Expand All @@ -30,15 +39,6 @@
599A78D12917FF4E0070CE15 /* Localized.swift in Sources */ = {isa = PBXBuildFile; fileRef = 599A78D02917FF4E0070CE15 /* Localized.swift */; };
59B270782929049800061825 /* CustomOnboardingOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59B270772929049800061825 /* CustomOnboardingOverlayView.swift */; };
59B2707E2929188600061825 /* CustomBackgroundOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59B2707D2929188600061825 /* CustomBackgroundOverlayView.swift */; };
BF58D40A29B5C0C900CC2D98 /* Detail_Saturn.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = BF58D40129B5C0C900CC2D98 /* Detail_Saturn.mp3 */; };
BF58D40B29B5C0C900CC2D98 /* Detail_Sun.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = BF58D40229B5C0C900CC2D98 /* Detail_Sun.mp3 */; };
BF58D40C29B5C0C900CC2D98 /* Detail_Jupiter.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = BF58D40329B5C0C900CC2D98 /* Detail_Jupiter.mp3 */; };
BF58D40D29B5C0C900CC2D98 /* Detail_Neptune.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = BF58D40429B5C0C900CC2D98 /* Detail_Neptune.mp3 */; };
BF58D40E29B5C0C900CC2D98 /* Detail_Uranus.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = BF58D40529B5C0C900CC2D98 /* Detail_Uranus.mp3 */; };
BF58D40F29B5C0C900CC2D98 /* Detail_Venus.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = BF58D40629B5C0C900CC2D98 /* Detail_Venus.mp3 */; };
BF58D41029B5C0C900CC2D98 /* Detail_Mars.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = BF58D40729B5C0C900CC2D98 /* Detail_Mars.mp3 */; };
BF58D41129B5C0C900CC2D98 /* Detail_Mercury.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = BF58D40829B5C0C900CC2D98 /* Detail_Mercury.mp3 */; };
BF58D41229B5C0C900CC2D98 /* Detail_Moon.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = BF58D40929B5C0C900CC2D98 /* Detail_Moon.mp3 */; };
BF6BCBA629090E060042B522 /* URLConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF6BCBA529090E050042B522 /* URLConstants.swift */; };
BF6BCBA829090E0E0042B522 /* APIManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF6BCBA729090E0E0042B522 /* APIManager.swift */; };
BF6BCBAA29090E130042B522 /* Endpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF6BCBA929090E120042B522 /* Endpoint.swift */; };
Expand Down Expand Up @@ -81,6 +81,15 @@
3726FE012923B02E0062B667 /* CGPoint+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGPoint+Extension.swift"; sourceTree = "<group>"; };
3726FE032923B12C0062B667 /* SCNVector3+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SCNVector3+Extension.swift"; sourceTree = "<group>"; };
374FEE362909597B00E0C56B /* Float+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Float+Extension.swift"; sourceTree = "<group>"; };
37EF26FA2B6922920092C65B /* Detail_Saturn.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = Detail_Saturn.mp3; sourceTree = "<group>"; };
37EF26FB2B6922920092C65B /* Detail_Venus.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = Detail_Venus.mp3; sourceTree = "<group>"; };
37EF26FC2B6922920092C65B /* Detail_Uranus.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = Detail_Uranus.mp3; sourceTree = "<group>"; };
37EF26FD2B6922920092C65B /* Detail_Jupiter.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = Detail_Jupiter.mp3; sourceTree = "<group>"; };
37EF26FE2B6922920092C65B /* Detail_Sun.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = Detail_Sun.mp3; sourceTree = "<group>"; };
37EF26FF2B6922920092C65B /* Detail_Mars.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = Detail_Mars.mp3; sourceTree = "<group>"; };
37EF27002B6922920092C65B /* Detail_Neptune.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = Detail_Neptune.mp3; sourceTree = "<group>"; };
37EF27012B6922920092C65B /* Detail_Moon.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = Detail_Moon.mp3; sourceTree = "<group>"; };
37EF27022B6922920092C65B /* Detail_Mercury.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = Detail_Mercury.mp3; sourceTree = "<group>"; };
3F3C20FD29375E8F007007C2 /* Detecting_planet.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = Detecting_planet.wav; sourceTree = "<group>"; };
452F77C4292E28DD0088E684 /* HapticManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HapticManager.swift; sourceTree = "<group>"; };
5533717629123F17004AD6E8 /* UniverseSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UniverseSearchViewController.swift; sourceTree = "<group>"; };
Expand All @@ -100,15 +109,6 @@
599A78D02917FF4E0070CE15 /* Localized.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Localized.swift; sourceTree = "<group>"; };
59B270772929049800061825 /* CustomOnboardingOverlayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomOnboardingOverlayView.swift; sourceTree = "<group>"; };
59B2707D2929188600061825 /* CustomBackgroundOverlayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomBackgroundOverlayView.swift; sourceTree = "<group>"; };
BF58D40129B5C0C900CC2D98 /* Detail_Saturn.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = Detail_Saturn.mp3; path = "../../../../../../../../Audio Universe/DetailView/Detail_Spatial/Detail_mp3/Detail_Saturn.mp3"; sourceTree = "<group>"; };
BF58D40229B5C0C900CC2D98 /* Detail_Sun.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = Detail_Sun.mp3; path = "../../../../../../../../Audio Universe/DetailView/Detail_Spatial/Detail_mp3/Detail_Sun.mp3"; sourceTree = "<group>"; };
BF58D40329B5C0C900CC2D98 /* Detail_Jupiter.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = Detail_Jupiter.mp3; path = "../../../../../../../../Audio Universe/DetailView/Detail_Spatial/Detail_mp3/Detail_Jupiter.mp3"; sourceTree = "<group>"; };
BF58D40429B5C0C900CC2D98 /* Detail_Neptune.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = Detail_Neptune.mp3; path = "../../../../../../../../Audio Universe/DetailView/Detail_Spatial/Detail_mp3/Detail_Neptune.mp3"; sourceTree = "<group>"; };
BF58D40529B5C0C900CC2D98 /* Detail_Uranus.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = Detail_Uranus.mp3; path = "../../../../../../../../Audio Universe/DetailView/Detail_Spatial/Detail_mp3/Detail_Uranus.mp3"; sourceTree = "<group>"; };
BF58D40629B5C0C900CC2D98 /* Detail_Venus.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = Detail_Venus.mp3; path = "../../../../../../../../Audio Universe/DetailView/Detail_Spatial/Detail_mp3/Detail_Venus.mp3"; sourceTree = "<group>"; };
BF58D40729B5C0C900CC2D98 /* Detail_Mars.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = Detail_Mars.mp3; path = "../../../../../../../../Audio Universe/DetailView/Detail_Spatial/Detail_mp3/Detail_Mars.mp3"; sourceTree = "<group>"; };
BF58D40829B5C0C900CC2D98 /* Detail_Mercury.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = Detail_Mercury.mp3; path = "../../../../../../../../Audio Universe/DetailView/Detail_Spatial/Detail_mp3/Detail_Mercury.mp3"; sourceTree = "<group>"; };
BF58D40929B5C0C900CC2D98 /* Detail_Moon.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = Detail_Moon.mp3; path = "../../../../../../../../Audio Universe/DetailView/Detail_Spatial/Detail_mp3/Detail_Moon.mp3"; sourceTree = "<group>"; };
BF6BCBA529090E050042B522 /* URLConstants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLConstants.swift; sourceTree = "<group>"; };
BF6BCBA729090E0E0042B522 /* APIManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = APIManager.swift; sourceTree = "<group>"; };
BF6BCBA929090E120042B522 /* Endpoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Endpoint.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -410,15 +410,15 @@
BFAD1E84292C62290081C4A3 /* SoundSpatial */ = {
isa = PBXGroup;
children = (
BF58D40329B5C0C900CC2D98 /* Detail_Jupiter.mp3 */,
BF58D40729B5C0C900CC2D98 /* Detail_Mars.mp3 */,
BF58D40829B5C0C900CC2D98 /* Detail_Mercury.mp3 */,
BF58D40929B5C0C900CC2D98 /* Detail_Moon.mp3 */,
BF58D40429B5C0C900CC2D98 /* Detail_Neptune.mp3 */,
BF58D40129B5C0C900CC2D98 /* Detail_Saturn.mp3 */,
BF58D40229B5C0C900CC2D98 /* Detail_Sun.mp3 */,
BF58D40529B5C0C900CC2D98 /* Detail_Uranus.mp3 */,
BF58D40629B5C0C900CC2D98 /* Detail_Venus.mp3 */,
37EF26FD2B6922920092C65B /* Detail_Jupiter.mp3 */,
37EF26FF2B6922920092C65B /* Detail_Mars.mp3 */,
37EF27022B6922920092C65B /* Detail_Mercury.mp3 */,
37EF27012B6922920092C65B /* Detail_Moon.mp3 */,
37EF27002B6922920092C65B /* Detail_Neptune.mp3 */,
37EF26FA2B6922920092C65B /* Detail_Saturn.mp3 */,
37EF26FE2B6922920092C65B /* Detail_Sun.mp3 */,
37EF26FC2B6922920092C65B /* Detail_Uranus.mp3 */,
37EF26FB2B6922920092C65B /* Detail_Venus.mp3 */,
);
path = SoundSpatial;
sourceTree = "<group>";
Expand Down Expand Up @@ -519,30 +519,30 @@
files = (
BFAD1EDB2934C9AD0081C4A3 /* InfoPlist.strings in Resources */,
599A78CB2917F75F0070CE15 /* Localizable.strings in Resources */,
BF58D41029B5C0C900CC2D98 /* Detail_Mars.mp3 in Resources */,
BF58D40D29B5C0C900CC2D98 /* Detail_Neptune.mp3 in Resources */,
BFAD1EC8292C80030081C4A3 /* 3dPlanets in Resources */,
BF58D40B29B5C0C900CC2D98 /* Detail_Sun.mp3 in Resources */,
3F3C20FE29375E8F007007C2 /* Detecting_planet.wav in Resources */,
37EF270B2B6922920092C65B /* Detail_Mercury.mp3 in Resources */,
BFAD1EA0292C62F00081C4A3 /* Searching_Neptune.mp3 in Resources */,
BF7B4FD528FE47B200F83158 /* .swiftlint.yml in Resources */,
37EF27062B6922920092C65B /* Detail_Jupiter.mp3 in Resources */,
BF788B8629052230002BF8C0 /* UniverseBackground.scn in Resources */,
BFAD1EA5292C62F00081C4A3 /* Searching_Sun.mp3 in Resources */,
BF58D40C29B5C0C900CC2D98 /* Detail_Jupiter.mp3 in Resources */,
BF58D41129B5C0C900CC2D98 /* Detail_Mercury.mp3 in Resources */,
BF58D40E29B5C0C900CC2D98 /* Detail_Uranus.mp3 in Resources */,
37EF27032B6922920092C65B /* Detail_Saturn.mp3 in Resources */,
BF7B4FC228FE431A00F83158 /* LaunchScreen.storyboard in Resources */,
37EF27072B6922920092C65B /* Detail_Sun.mp3 in Resources */,
37EF27082B6922920092C65B /* Detail_Mars.mp3 in Resources */,
37EF27052B6922920092C65B /* Detail_Uranus.mp3 in Resources */,
BFAD1EA4292C62F00081C4A3 /* Searching_Jupiter.mp3 in Resources */,
BF58D40F29B5C0C900CC2D98 /* Detail_Venus.mp3 in Resources */,
BFAD1EA7292C62F00081C4A3 /* Searching_Saturn.mp3 in Resources */,
BFAD1EA8292C62F00081C4A3 /* Searching_Moon.mp3 in Resources */,
BF58D40A29B5C0C900CC2D98 /* Detail_Saturn.mp3 in Resources */,
37EF27042B6922920092C65B /* Detail_Venus.mp3 in Resources */,
37EF270A2B6922920092C65B /* Detail_Moon.mp3 in Resources */,
BFAD1EA2292C62F00081C4A3 /* Searching_Mercury.mp3 in Resources */,
BF7B4FBF28FE431A00F83158 /* Assets.xcassets in Resources */,
BFAD1EA6292C62F00081C4A3 /* Searching_Venus.mp3 in Resources */,
BFAD1EA3292C62F00081C4A3 /* Searching_Uranus.mp3 in Resources */,
BF58D41229B5C0C900CC2D98 /* Detail_Moon.mp3 in Resources */,
BFAD1EA1292C62F00081C4A3 /* Searching_Mars.mp3 in Resources */,
37EF27092B6922920092C65B /* Detail_Neptune.mp3 in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
15 changes: 15 additions & 0 deletions Tars/Tars/Global/Extensions/String+Extension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,19 @@ extension String {
func toBase64() -> String {
return Data(self.utf8).base64EncodedString()
}

func extractCoord() -> (String, String) {
if let range = self.range(of: "$") {
let firstS = self.firstIndex(of: "$")!
let lastS = self.lastIndex(of: "$")!
let firstExtraction = self[firstS..<lastS]
let arr = firstExtraction.split(separator: "\n")
let main = arr[1].split(separator: " ")

return (String(main[3]), String(main[4]))

} else {
return (self, self)
}
}
}
4 changes: 0 additions & 4 deletions Tars/Tars/Global/Supports/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSCameraUsageDescription</key>
<string>증강현실 기능을 제공하기 위한 카메라 사용 권한이 필요합니다.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>사용자의 위치에 기반해 천체를 배치하기 위해 위치 권한 허용이 필요합니다.</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
Expand Down
61 changes: 61 additions & 0 deletions Tars/Tars/Network/APIService/APIManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import Foundation

// MARK: - Astronomy API
class AstronomyAPIManager: NetworkService {
func requestBodies() async throws -> [Body] {
let parameters = try getBodiesPositionsParameters()
Expand Down Expand Up @@ -41,3 +42,63 @@ extension AstronomyAPIManager {
return parameters
}
}

// MARK: - Horizons API
class HorizonsAPIManager: NetworkService {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

궁금해서 그런건데, 현재 이 horizons API에 대한 코드는 그럼 아예 새로 이 API에 대해서 작성을 새로 하신건가요..?!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

기존에 있던 걸 참고해서 따로 만들었습니다!

func requestBodies() async throws -> [Body] {
var bodiesData: [Body] = []
let siteCoord = try getSiteCoordParameter()
let (startTime, stopTime) = try getTimeParameter()
let majorBodies: [MajorBody] = MajorBody.allCases
for body in majorBodies {
let parameters = try getBodiesPositionsParameters(command: body.command, siteCoord: siteCoord, startTime: startTime, stopTime: stopTime)
let url = HorizonURL.horizonAPI
let endpoint = url.getEndpoint(with: parameters)
guard let request = endpoint.getURLRequest() else { throw NetworkError.invalidURL}
let data: HorizonResponse = try await getRequest(request)
let (azimuth, altitude) = data.result.extractCoord()
bodiesData.append(Body(id: body.id, name: body.name, altitude: altitude, azimuth: azimuth))
}

return bodiesData
}
}
extension HorizonsAPIManager {
func getSiteCoordParameter() throws -> String {
let locationManager = LocationManager.shared
guard let (latitude, longtitude, elevation) = locationManager.getCurrentLocation() else { throw LocationError.currentLocationFailure}
let site_coord = String("'\(longtitude),\(latitude),\(elevation/1000)")

return site_coord
}

func getTimeParameter() throws -> (startTime: String, stopTime: String) {
// Get time now and 1 minute later

let formatter = DateFormatter()
formatter.timeZone = TimeZone(identifier: "Europe/London")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

타임존때문에 값이 낮인 것처럼 나왔던거군요!
받아오는 값이 정확히 일치합니다. 정말 고생하셨어요 제리!!!

formatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
let nowTime = Date()
let afterTime = Date(timeInterval: 60, since: nowTime)
let startTime = formatter.string(from: nowTime)
let stopTime = formatter.string(from: afterTime)

return (String("'\(startTime)'"), String("'\(stopTime)'"))
}

func getBodiesPositionsParameters(command: String, siteCoord: String, startTime: String, stopTime: String) throws -> [String: String] {
var parameters: [String: String] = [:]

parameters["format"] = String("json")
parameters["COMMAND"] = String(command)
parameters["APPARENT"] = String("REFRACTED")
parameters["CENTER"] = String("coord")
parameters["SITE_COORD"] = String(siteCoord)
parameters["START_TIME"] = String(startTime)
parameters["STOP_TIME"] = String(stopTime)
parameters["STEP_SIZE"] = String("1d")
parameters["QUANTITIES"] = String("4")

return parameters
}
}
12 changes: 12 additions & 0 deletions Tars/Tars/Network/APIService/BodiesPositionsResponse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import Foundation

// Mark: - Astronomy API
struct BodiesPositionsResponse: Decodable {
var bodiesData: [Body]

Expand All @@ -23,3 +24,14 @@ extension BodiesPositionsResponse {
bodiesData = try table.decode([Body].self, forKey: .rows)
}
}

// Mark: - Horizons API
struct HorizonResponse: Decodable {
var signature: Signature
var result: String
}

struct Signature: Decodable {
var source: String
var version: String
}
Loading