Bug fixes re: route colors, configurable distance to hide stations

propershark · Oct 14, 2017 · c148632 · c148632
1 parent 2787813
commit c148632
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/Proper/Configuration/BartConfig.swift b/Proper/Configuration/BartConfig.swift
@@ -24,6 +24,7 @@ struct BartAgencyConfig: AgencyConfig {
  let name = "BART"
  let region = MKCoordinateRegionMakeWithDistance(
  CLLocationCoordinate2D(latitude: 37.784128, longitude: -122.4570273), 33_000, 20_000)
+ let maxLatitudeSpanForStations: CLLocationDegrees = 10.0/111
  let timeResolution = TimeInterval(30)
 
  let badgeForRoute: (MutableRoute) -> Property<String?> = { _ in .init(value: nil) }

diff --git a/Proper/Configuration/CitybusConfig.swift b/Proper/Configuration/CitybusConfig.swift
@@ -24,6 +24,7 @@ struct CitybusAgencyConfig: AgencyConfig {
  let name = "CityBus"
  let region = MKCoordinateRegionMakeWithDistance(
  CLLocationCoordinate2D(latitude: 40.424758, longitude: -86.913649), 500, 500)
+ let maxLatitudeSpanForStations: CLLocationDegrees = 3.5/111
  let timeResolution = TimeInterval(30)
 
  let badgeForRoute: (MutableRoute) -> Property<String?> = { .init(value: $0.shortName) }

diff --git a/Proper/Configuration/ConfigProtocols.swift b/Proper/Configuration/ConfigProtocols.swift
@@ -27,6 +27,7 @@ protocol AgencyConfig {
  var key: String { get }
  var name: String { get }
  var region: MKCoordinateRegion { get }
+ var maxLatitudeSpanForStations: CLLocationDegrees { get }
  var timeResolution: TimeInterval { get }
  var badgeForRoute: (MutableRoute) -> Property<String?> { get }
  var titleForRoute: (MutableRoute) -> Property<String?> { get }

diff --git a/Proper/Models/MutableModel.swift b/Proper/Models/MutableModel.swift
@@ -109,7 +109,7 @@ extension MutableModel {
 
  func attachOrApply<M: MutableModel>(to property: MutableProperty<M?>, from update: M.FromModel?) throws {
  guard let update = update else { return }
- if let mutable = property.value {
+ if let mutable = property.value, mutable.identifier == update.identifier {
  try mutable.apply(update)
  } else {
  property.value = try attachMutable(from: update) as M

diff --git a/Proper/Views/ArrivalTableViewCell.swift b/Proper/Views/ArrivalTableViewCell.swift
@@ -40,7 +40,7 @@ class ArrivalTableViewCell: UITableViewCell {
  disposable?.dispose()
  }
 
- func apply(arrival: Arrival) {
+ func apply(arrival: Arrival, route: SignalProducer<MutableRoute, NoError>) {
  self.disposable?.dispose()
  let disposable = CompositeDisposable()
 
@@ -51,9 +51,9 @@ class ArrivalTableViewCell: UITableViewCell {
  let title = Config.shared.map({ $0.agency.titleForArrival(arrival) }).flatten(.latest)
  disposable += title.producer
  .startWithValues({ self.routeTitle.text = $0 })
- 
- disposable += arrival.route.color.producer.skipNil().startWithValues({ self.badge.color = $0 })
- disposable += arrival.route.producer.start()
+
+ disposable += route.flatMap(.latest, transform: { $0.color.producer }).skipNil()
+  .startWithValues({ self.badge.color = $0 })
 
  disposable += ArrivalsViewModel.label(for: arrival).startWithValues({ self.routeTimer.text = $0 })
  self.disposable = disposable