Timetable bug fixes, ensure search processing is done on a worker thread

Proper/Controllers/POIViewController.swift

@@ -130,7 +130,8 @@ class POIViewController: UIViewController, ProperViewController, UISearchControl
  bar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
  }
 
- let searchProducer = point.producer.combineLatest(with: zoom.producer.map({ $0 * 2 })) // widen search radius
+ let searchProducer = point.producer.combineLatest(with: zoom.producer.map({ $0 * 1.3 })) // widen search radius
+ .observe(on: searchScheduler)
  .throttle(0.5, on: searchScheduler)
  .logEvents(identifier: "NearbyStationsViewModel.chain input",
  logger: logSignalEvent)
@@ -139,6 +140,7 @@ class POIViewController: UIViewController, ProperViewController, UISearchControl
  disposable += NearbyStationsViewModel.chain(connection: connection, producer: searchProducer)
  .observe(on: UIScheduler())
  .startWithResult() { result in
+ assert(Thread.isMainThread)
  switch result {
  case let .success(stations): self.stations.swap(stations)
  case let .failure(error): self.displayError(error)

Proper/Services/Timetable.swift

@@ -100,6 +100,7 @@ struct Timetable {
  let args: WampArgs = [route?.identifier, station.identifier].flatMap({ $0 })
  + timestamps(for: timing) as [Any]
  + [count] as [Any]
+ NSLog("[Timetable] call args: \(args)")
  let results = connection.call(proc, with: args)
  |> decodeArrivalTimes(connection: connection)
  |> { $0.on(value: { advanced = timing.advancedBy(arrivals: $0) }) }
@@ -238,7 +239,7 @@ extension Timetable {
  struct Meta: Argo.Decodable {
  let realtime: Bool
  static func decode(_ json: JSON) -> Decoded<Timetable.Response.Meta> {
- return self.init <^> json <| "realtime"
+ return self.init <^> (json <| "realtime").or(.success(false))
  }
  }
 
@@ -253,7 +254,7 @@ extension Timetable {
  <*> Date.decode(args[1])
  <*> Route.decode(args[2])
  <*> Optional<String>.decode(args[3])
- <*> Meta.decode(args[4])
+ <*> Meta.decode(args[safe: 4] ?? JSON.null)
  })
  }
  func makeArrival(using connection: ConnectionType) throws -> Arrival {

Proper/View Models/NearbyStationsViewModel.swift

@@ -84,6 +84,12 @@ struct NearbyStationsViewModel: SignalChain {
  })
  }
 
+ static func limit(producer: SignalProducer<[MutableStation], ProperError>) ->
+ SignalProducer<[MutableStation], ProperError>
+ {
+ return producer.map({ Array($0.prefix(15)) })
+ }
+
  static func orderedList(producer: SignalProducer<[MutableStation: Distance], ProperError>) ->
  SignalProducer<[(MutableStation, Distance)], ProperError>
  {
@@ -98,9 +104,11 @@ struct NearbyStationsViewModel: SignalChain {
  static func chain(connection: ConnectionType, producer: SignalProducer<(Point, SearchRadius), ProperError>) ->
  SignalProducer<[MutableStation], ProperError>
  {
+ let worker = QueueScheduler(qos: .userInitiated, name: "NearbyStationsViewModel worker")
  let producer = SignalProducer.combineLatest(getStations(connection: connection),
- producer |> searchArea)
+ producer |> searchArea).observe(on: worker)
  |> curry(filterNearby)(connection)
+ |> limit
  return producer.logEvents(identifier: "NearbyStationsViewModel.chain", logger: logSignalEvent)
  }
 }