Move traffic setting to map delegate

Author: newmanw

Mage/MapDelegate.m

@@ -404,7 +404,10 @@ - (void) setMapView:(MKMapView *)mapView {
 
 - (void) ensureMapLayout {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    _mapView.mapType = [defaults integerForKey:@"mapType"];
+    self.mapView.mapType = [defaults integerForKey:@"mapType"];
+    
+    BOOL showTraffic = [defaults boolForKey:@"mapShowTraffic"];
+    self.mapView.showsTraffic = showTraffic && self.mapView.mapType != MKMapTypeSatellite;
 
     [self updateCacheOverlaysSynchronized:[[CacheOverlays getInstance] getOverlays]];
 

Mage/MapViewController.m

@@ -142,9 +142,6 @@ - (void) viewWillAppear:(BOOL)animated {
     self.mapDelegate.hideLocations = [defaults boolForKey:@"hidePeople"];
     self.mapDelegate.hideObservations = [defaults boolForKey:@"hideObservations"];
 
-    Boolean showTraffic = [defaults boolForKey:@"mapShowTraffic"];
-    self.mapView.showsTraffic = showTraffic;
-    
     [self setNavBarTitle];
 
     [defaults addObserver:self