Changeset 677

Timestamp:

01/20/10 12:57:19 (8 weeks ago)

Author:

henri

Message:

Significant update to location controller. Map now responds better to location updates and zooms smoothly with feedback when switching locations.

Location:

apps/iphone/my.tel/trunk/Classes

Files:

• LocationViewController.h (modified) (1 diff)
• LocationViewController.m (modified) (10 diffs)

apps/iphone/my.tel/trunk/Classes/LocationViewController.h

@@ -39 +39 @@
 - (void)resetData;
 - (void)recenterMap;
+- (void)moveFromLocation:(CLLocation *)fromLoc toLocation:(CLLocation *)toLoc accuracy:(CLLocationDistance)accuracy animated:(BOOL)animated;
 - (void)updateUILocationWithJson:(NSDictionary *)parsedJson;
 - (void)getLocation;

apps/iphone/my.tel/trunk/Classes/LocationViewController.m

@@ -9 +9 @@
 #import "LocationViewController.h"
 
+#define kKMapDefaultZoomWidthInMeters 1000.0
+
 @interface LocationViewController (PrivateMethods)
 - (void)setDidPreload:(BOOL)preload;
+- (void)animateZoomIntoRegionUsingNSValue:(NSValue *)aValue;
 @end
 
@@ -34 +37 @@
         [theC resetData];
         if (preload) {
-                theC.view.hidden = NO;          // Force preload of the view
-//              theC.theMap.hidden = NO;        // Enable this to also force map preload. Beware of needless data access!
+                theC.view.hidden = NO;          // Force preload of the view and map
                 [theC getLocation];
         }
@@ -51 +53 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-        theMap.delegate = self;
         [MyCLController sharedInstance].delegate = self;
+        self.theMap.delegate = self;
+        self.theMap.showsUserLocation = YES;
 }
 
@@ -59 +62 @@
         // Don't get the data if we preloaded
         if (didPreload) {
-                didPreload = NO;
         } else {
                 [self getLocation];
@@ -67 +69 @@
 - (void)viewDidAppear:(BOOL)animated {
         [super viewDidAppear:animated];
-        self.theMap.showsUserLocation = YES;
+        // Only if we preloaded:
+        // Recenter to either span all the annotations, or just the user location
+        if (didPreload) {
+                didPreload = NO;
+                if (self.markerTel != nil) {
+                        [self recenterMap];
+                } else {
+                        [self didPressCenterGps:nil];
+                }
+        }
 }
 
@@ -89 +100 @@
         telLocIsAvailable = NO;
         buttonDeleteLoc.enabled = telLocIsAvailable;
+        self.markerTel = nil;
 }
 
 - (void)recenterMap {
         // Center and zoom the map so it has all the annotations in it
-        NSArray *coordinates = [self.theMap valueForKeyPath:@"annotations.coordinate"];
+        
+        // Special case if there's only one annotation
+        if ([theMap.annotations count] == 1) {
+                NSObject <MKAnnotation> *ann = [theMap.annotations objectAtIndex:0];
+                MKCoordinateRegion region = MKCoordinateRegionMakeWithDistance(ann.coordinate, kKMapDefaultZoomWidthInMeters, kKMapDefaultZoomWidthInMeters);
+                [theMap setRegion:[theMap regionThatFits:region] animated:YES];
+                return;
+        }
+        
         CLLocationCoordinate2D maxCoord = {-90.0f, -180.0f};
         CLLocationCoordinate2D minCoord = {90.0f, 180.0f};
-        for (NSValue *value in coordinates) {
-                CLLocationCoordinate2D coord = {0.0f, 0.0f};
-                [value getValue:&coord];
+        NSObject <MKAnnotation> *ann;
+        for (ann in self.theMap.annotations) {
+                CLLocationCoordinate2D coord = ann.coordinate;
                 if(coord.longitude > maxCoord.longitude) {
                         maxCoord.longitude = coord.longitude;
@@ -115 +135 @@
         region.center.longitude = (minCoord.longitude + maxCoord.longitude) / 2.0;
         region.center.latitude = (minCoord.latitude + maxCoord.latitude) / 2.0;
+        region.span.latitudeDelta = 1.3 * (maxCoord.latitude - minCoord.latitude);              // make the region 30% bigger than necessary
         region.span.longitudeDelta = 1.3 * (maxCoord.longitude - minCoord.longitude);   // make the region 30% bigger than necessary
-        region.span.latitudeDelta = 1.3 * (maxCoord.latitude - minCoord.latitude);              // make the region 30% bigger than necessary
+        if ((region.span.latitudeDelta == 0) && (region.span.longitudeDelta == 0))
+                region.span.latitudeDelta = region.span.longitudeDelta = kKMapDefaultZoomWidthInMeters;
         [theMap setRegion:[theMap regionThatFits:region] animated:YES];
 }
 
+- (void)moveFromLocation:(CLLocation *)fromLoc toLocation:(CLLocation *)toLoc accuracy:(CLLocationDistance)accuracy animated:(BOOL)animated {
+        // First zoom out until the new loc is visible, then rezoom back in
+        
+        CLLocationDegrees minLat, maxLat, minLong, maxLong;
+        minLat = MIN(fromLoc.coordinate.latitude, toLoc.coordinate.latitude);
+        maxLat = MAX(fromLoc.coordinate.latitude, toLoc.coordinate.latitude);
+        minLong = MIN(fromLoc.coordinate.longitude, toLoc.coordinate.longitude);
+        maxLong = MAX(fromLoc.coordinate.longitude, toLoc.coordinate.longitude);
+        
+        MKCoordinateRegion region = {{0.0f, 0.0f}, {0.0f, 0.0f}};
+        region.center.longitude = (minLong + maxLong) / 2.0;
+        region.center.latitude = (minLat + maxLat) / 2.0;
+        region.span.longitudeDelta = 1.2 * (maxLong - minLong);         // make the region 20% bigger than necessary
+        region.span.latitudeDelta = 1.2 * (maxLat - minLat);            // make the region 20% bigger than necessary
+        [theMap setRegion:[theMap regionThatFits:region] animated:animated];
+
+        // Now we've got both items in, we zoom back down into the other loc
+        region = MKCoordinateRegionMakeWithDistance(toLoc.coordinate, accuracy, accuracy);
+        if (animated) {
+                NSValue *regionAsValue = [NSValue valueWithBytes:&region objCType:@encode(MKCoordinateRegion)];
+                [self performSelector:@selector(animateZoomIntoRegionUsingNSValue:) withObject:regionAsValue afterDelay:0.1f];
+//              [self performSelectorOnMainThread:@selector(animateZoomIntoRegionUsingNSValue:) withObject:regionAsValue waitUntilDone:NO];
+        } else {
+                [theMap setRegion:[theMap regionThatFits:region] animated:NO];
+        }
+
+}
+
+- (void)animateZoomIntoRegionUsingNSValue:(NSValue *)aValue {
+        // wrapper to pass in a MKCoordinateRegion as an object so we can run it asynchronously
+        MKCoordinateRegion region;
+        [aValue getValue:&region];
+        [theMap setRegion:[theMap regionThatFits:region] animated:YES];
+}
+
 #pragma mark ------ MKMapViewDelegate Methods
 
-- (void)mapView:(MKMapView *)mapView didAddAnnotationViews:(NSArray *)views {
-        MKAnnotationView *aV;
-        for (aV in views) {
-                if (aV.annotation == theMap.userLocation) {
-                        [theMap setCenterCoordinate:theMap.userLocation.location.coordinate animated:YES];
-                        // zoom in (even if it's updating)
-                        CLLocation *theLoc = [MyCLController sharedInstance].myCurrentLoc;
-                        CLLocationDistance radiusAccuracy = 1000;
-                        if (theLoc.horizontalAccuracy > 0.9 * radiusAccuracy)
-                                radiusAccuracy = theLoc.horizontalAccuracy / 0.9;
-                        MKCoordinateRegion aR = MKCoordinateRegionMakeWithDistance(theMap.userLocation.location.coordinate, radiusAccuracy, radiusAccuracy);
-                        [theMap setRegion:[theMap regionThatFits:aR] animated:YES];
-                }
-        }
-}
+//- (void)mapView:(MKMapView *)mapView didAddAnnotationViews:(NSArray *)views {
+//      MKAnnotationView *aV;
+//      for (aV in views) {
+//              if (aV.annotation == mapView.userLocation) {
+//              }
+//      }
+//}
 
 #pragma mark ---- MyCLController delegate methods ----
@@ -143 +192 @@
         if (aLoc) {
                 gpsLocIsAvailable = YES;
+                self.theMap.showsUserLocation = YES;
         } else {
                 gpsLocIsAvailable = NO;
+                self.theMap.showsUserLocation = NO;
         }
 }
@@ -196 +247 @@
 
 - (IBAction)didPressCenterGps:(id)sender {
-        [self.theMap setCenterCoordinate:[[[MyCLController sharedInstance] myCurrentLoc] coordinate]];
+        // Move to current loc, and zoom to 500 meters or the current accuracy of gps, whichever is higher
+        CLLocation *currentCenter = [[CLLocation alloc] initWithCoordinate:theMap.centerCoordinate
+                                                                                                                          altitude:0.0
+                                                                                                        horizontalAccuracy:10.0
+                                                                                                          verticalAccuracy:10.0
+                                                                                                                         timestamp:[NSDate date]];
+        CLLocation *theLoc = theMap.userLocation.location;
+        CLLocationDistance radiusAccuracy = kKMapDefaultZoomWidthInMeters;
+        if (theLoc.horizontalAccuracy > 0.9 * radiusAccuracy)
+                radiusAccuracy = theLoc.horizontalAccuracy / 0.9;
+        [self moveFromLocation:currentCenter toLocation:[MyCLController sharedInstance].myCurrentLoc accuracy:radiusAccuracy animated:YES];
+        [currentCenter release];
 }
 
 - (IBAction)didPressCenterTel:(id)sender {
-        [self.theMap setCenterCoordinate:self.markerTel.coordinate];
+        CLLocation *currentCenter = [[CLLocation alloc] initWithCoordinate:theMap.centerCoordinate
+                                                                                                                          altitude:0.0
+                                                                                                        horizontalAccuracy:10.0
+                                                                                                          verticalAccuracy:10.0
+                                                                                                                         timestamp:[NSDate date]];
+        CLLocation *newCenter = [[CLLocation alloc] initWithCoordinate:self.markerTel.coordinate
+                                                                                                                  altitude:0.0
+                                                                                                horizontalAccuracy:10.0
+                                                                                                  verticalAccuracy:10.0
+                                                                                                                 timestamp:[NSDate date]];
+        [self moveFromLocation:currentCenter toLocation:newCenter accuracy:kKMapDefaultZoomWidthInMeters animated:YES];
+        [currentCenter release];
+        [newCenter release];
 }
 
@@ -226 +300 @@
 - (IBAction)gpsSwitchToggled:(UISwitch *)sender {
         // Use if there's a switch to turn on or off the GPS
+        self.theMap.showsUserLocation = sender.on;
         if (sender.on) {
                 [[MyCLController sharedInstance].locationManager startUpdatingLocation];