-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
[HOTFIX] API Credential failed 문제로 다른 API로 변경 #104
Merged
Merged
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,6 +7,7 @@ | |
|
||
import Foundation | ||
|
||
// MARK: - Astronomy API | ||
class AstronomyAPIManager: NetworkService { | ||
func requestBodies() async throws -> [Body] { | ||
let parameters = try getBodiesPositionsParameters() | ||
|
@@ -41,3 +42,64 @@ extension AstronomyAPIManager { | |
return parameters | ||
} | ||
} | ||
|
||
// MARK: - Horizons API | ||
class HorizonsAPIManager: NetworkService { | ||
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)) | ||
print(body.id, body.name, body.command, azimuth, altitude) | ||
} | ||
|
||
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") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
궁금해서 그런건데, 현재 이 horizons API에 대한 코드는 그럼 아예 새로 이 API에 대해서 작성을 새로 하신건가요..?!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
기존에 있던 걸 참고해서 따로 만들었습니다!