Work on Changesets in API transmission #86
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| // | ||
| // ChangesetService.swift | ||
| // IOSAccessAssessment | ||
| // | ||
| // Created by Mariana Piz on 11.11.2024. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct NodeData { | ||
| let latitude: Double | ||
| let longitude: Double | ||
| } | ||
|
|
||
| class ChangesetService { | ||
|
|
||
| private enum Constants { | ||
| static let baseUrl = "https://osm.workspaces-stage.sidewalks.washington.edu/api/0.6" | ||
| static let workspaceId = "168" | ||
| } | ||
|
|
||
| static let shared = ChangesetService() | ||
|
Collaborator
There was a problem hiding this comment. I like the idea of using singletons, and imo we should have used something like that for the SharedImageData as well (along with adding it to a global store, instead of passing it to every view) |
||
| private init() {} | ||
|
|
||
| private let accessToken = KeychainService().getValue(for: .accessToken) | ||
| private(set) var changesetId: String? | ||
|
|
||
| func openChangeset(completion: @escaping (Result<String, Error>) -> Void) { | ||
| guard let url = URL(string: "\(Constants.baseUrl)/changeset/create"), | ||
|
Collaborator
There was a problem hiding this comment. So the fact that we now have two Constants structs will lead to confusion.
Contributor
Author
There was a problem hiding this comment. This is not a problem because the Constants enum is private for each struct |
||
| let accessToken | ||
| else { return } | ||
|
|
||
| var request = URLRequest(url: url) | ||
| request.httpMethod = "PUT" | ||
| request.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization") | ||
| request.setValue(Constants.workspaceId, forHTTPHeaderField: "X-Workspace") | ||
| request.setValue("application/xml", forHTTPHeaderField: "Content-Type") | ||
|
|
||
| guard let xmlData = """ | ||
| <osm> | ||
| <changeset> | ||
| <tag k="created_by" v="GIG 1.0(4)" /> | ||
|
Collaborator
There was a problem hiding this comment. In the new PR that we raise for change sets (I think we will have to considering the conflicts), we should change this to match our own arguments.
Contributor
Author
There was a problem hiding this comment. Both "created_by" and "comment" are according to the documentation (4 b Open a changeset): https://docs.google.com/document/d/1qPSW5pYmVb-RXOiryBm452sLfTvFl38f_TCO4SElkSY/edit?tab=t.0
Contributor
Author
There was a problem hiding this comment. I resolved merge conflicts
Collaborator
There was a problem hiding this comment. Yes, but that example input is for GoInfoGame. We are a different creator, so we should be having our own identifier.
Collaborator
There was a problem hiding this comment. Ah cool. Let's proceed with this PR then |
||
| <tag k="comment" v="iOS OSM client" /> | ||
| </changeset> | ||
| </osm> | ||
| """ | ||
| .data(using: .utf8) | ||
| else { | ||
| print("Failed to create XML data.") | ||
| return | ||
| } | ||
|
|
||
| request.httpBody = xmlData | ||
|
|
||
| URLSession.shared.dataTask(with: request) { data, response, error in | ||
| if let error = error { | ||
| completion(.failure(error)) | ||
| return | ||
| } | ||
|
|
||
| if let data = data, let changesetId = String(data: data, encoding: .utf8) { | ||
| self.changesetId = changesetId | ||
| completion(.success(changesetId)) | ||
| } else { | ||
| completion(.failure(NSError(domain: "ChangesetError", | ||
| code: -1, | ||
| userInfo: [NSLocalizedDescriptionKey: "Failed to open changeset"]))) | ||
| } | ||
| }.resume() | ||
| } | ||
|
|
||
| func uploadChanges(nodeData: NodeData, completion: @escaping (Result<Void, Error>) -> Void) { | ||
| guard let changesetId, | ||
| let accessToken, | ||
| let url = URL(string: "\(Constants.baseUrl)/changeset/\(changesetId)/upload") | ||
| else { return } | ||
|
|
||
| let xmlContent = | ||
| """ | ||
| <osmChange version="0.6" generator="GIG Change generator"> | ||
| <create> | ||
| <node id="-1" lat="\(nodeData.latitude)" lon="\(nodeData.longitude)" changeset="\(changesetId)" /> | ||
|
Collaborator
There was a problem hiding this comment. We will have to of course, work on generalizing this on any kind of output that we get from the post-processed output of AnnotationView. |
||
| </create> | ||
| </osmChange> | ||
| """ | ||
|
|
||
| var request = URLRequest(url: url) | ||
| request.httpMethod = "POST" | ||
| request.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization") | ||
| request.setValue(Constants.workspaceId, forHTTPHeaderField: "X-Workspace") | ||
| request.setValue("application/xml", forHTTPHeaderField: "Content-Type") | ||
| request.httpBody = xmlContent.data(using: .utf8) | ||
|
|
||
| URLSession.shared.dataTask(with: request) { data, response, error in | ||
| if let error = error { | ||
| completion(.failure(error)) | ||
| return | ||
| } | ||
| completion(.success(())) | ||
| }.resume() | ||
| } | ||
|
|
||
| func closeChangeset(completion: @escaping (Result<Void, Error>) -> Void) { | ||
|
Collaborator
There was a problem hiding this comment. I think if we should be closing the ChangeSet in the ContentView as well, every time the back button is clicked.
Collaborator
There was a problem hiding this comment. Nevermind. Change sets are generally closed automatically when this happens |
||
| guard let changesetId, let accessToken else { return } | ||
|
|
||
| guard let url = URL(string: "\(Constants.baseUrl)/changeset/\(changesetId)/close") else { return } | ||
|
|
||
| var request = URLRequest(url: url) | ||
| request.httpMethod = "PUT" | ||
| request.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization") | ||
| request.setValue("application/json", forHTTPHeaderField: "Content-Type") | ||
|
|
||
| URLSession.shared.dataTask(with: request) { data, response, error in | ||
| if let error = error { | ||
| completion(.failure(error)) | ||
| return | ||
| } | ||
| self.changesetId = nil | ||
|
|
||
| completion(.success(())) | ||
| }.resume() | ||
| } | ||
|
|
||
| } | ||
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.
Just a small point, but we can later move the constants to the global constants file, for better centralization, or at least in a common folder for constants.