Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions Sources/Command/Measure.swift
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@ extension LCLCLI {
#if DEBUG
print(configuration ?? "Empty configuration")
#endif
let siteMap = Dictionary(uniqueKeysWithValues: sites.map { ($0.name, $0) })
guard let cellSiteName = configuration?.cellSiteName else {
throw CLIError.invalidConfiguration("Missing cellular site name.")
let siteMap = Dictionary(uniqueKeysWithValues: sites.map { ($0._id, $0) })
guard let cellSiteId = configuration?.cellSiteId else {
throw CLIError.invalidConfiguration("Missing cellular site ID.")
}

guard let ss = siteMap[cellSiteName] else {
throw CLIError.invalidConfiguration("Invalid cellular site name.")
guard let ss = siteMap[cellSiteId] else {
throw CLIError.invalidConfiguration("Invalid cellular site ID.")
}
selectedSite = ss
}
Expand Down
4 changes: 3 additions & 1 deletion Sources/Models/CellularSite.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ import Foundation
import SwiftyTextTable

struct CellularSite: Decodable, Identifiable {
var id: String { name }
var id: String { _id }

let _id: String
let address: String
let cellId: [String]
let latitude: Double
Expand All @@ -27,6 +28,7 @@ struct CellularSite: Decodable, Identifiable {

extension CellularSite {
enum CodingKeys: String, CodingKey {
case _id = "_id"
case name = "name"
case latitude = "latitude"
case longitude = "longitude"
Expand Down
2 changes: 1 addition & 1 deletion Sources/Models/Configuration.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
import Foundation

struct Configuration: Decodable {
let cellSiteName: String
let cellSiteId: String
let deviceName: String
}
2 changes: 1 addition & 1 deletion example_config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"cellSiteName": "ICTD Lab Testbed",
"cellSiteId": "6897d0a3cab397620dbda931",
"deviceName": "test device"
}