From 2610b0b57a843c8e92f2a165dd94fd0dfec598c2 Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Fri, 16 Sep 2011 22:41:10 -0500 Subject: [PATCH] Minor refactoring to Location Formatter --- Example/Vendor/TTT/TTTLocationFormatter.m | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Example/Vendor/TTT/TTTLocationFormatter.m b/Example/Vendor/TTT/TTTLocationFormatter.m index 88089df..46894b8 100644 --- a/Example/Vendor/TTT/TTTLocationFormatter.m +++ b/Example/Vendor/TTT/TTTLocationFormatter.m @@ -159,13 +159,12 @@ static inline double CLLocationSpeedToMilesPerHour(CLLocationSpeed speed) { switch (self.unitSystem) { case TTTMetricSystem: { - double meterDistance = distance; - double kilometerDistance = CLLocationDistanceToKilometers(distance); - + double kilometerDistance = CLLocationDistanceToKilometers(distance); if (kilometerDistance > 1) { distanceString = [self.numberFormatter stringFromNumber:[NSNumber numberWithDouble:kilometerDistance]]; unitString = NSLocalizedString(@"km", @"Kilometer Unit"); } else { + double meterDistance = distance; distanceString = [self.numberFormatter stringFromNumber:[NSNumber numberWithDouble:meterDistance]]; unitString = NSLocalizedString(@"m", @"Meter Unit"); } @@ -174,18 +173,19 @@ static inline double CLLocationSpeedToMilesPerHour(CLLocationSpeed speed) { case TTTImperialSystem: { double feetDistance = CLLocationDistanceToFeet(distance); - double yardDistance = CLLocationDistanceToYards(distance); - double milesDistance = CLLocationDistanceToMiles(distance); - if (feetDistance < 300) { distanceString = [self.numberFormatter stringFromNumber:[NSNumber numberWithDouble:feetDistance]]; unitString = NSLocalizedString(@"ft", @"Feet Unit"); - } else if (yardDistance < 500) { - distanceString = [self.numberFormatter stringFromNumber:[NSNumber numberWithDouble:yardDistance]]; - unitString = NSLocalizedString(@"yds", @"Yard Unit"); } else { - distanceString = [self.numberFormatter stringFromNumber:[NSNumber numberWithDouble:milesDistance]]; - unitString = (milesDistance > 1.0 && milesDistance < 1.1) ? NSLocalizedString(@"mile", @"Mile Unit (Singular)") : NSLocalizedString(@"miles", @"Mile Unit (Plural)"); + double yardDistance = CLLocationDistanceToYards(distance); + if (yardDistance < 500) { + distanceString = [self.numberFormatter stringFromNumber:[NSNumber numberWithDouble:yardDistance]]; + unitString = NSLocalizedString(@"yds", @"Yard Unit"); + } else { + double milesDistance = CLLocationDistanceToMiles(distance); + distanceString = [self.numberFormatter stringFromNumber:[NSNumber numberWithDouble:milesDistance]]; + unitString = (milesDistance > 1.0 && milesDistance < 1.1) ? NSLocalizedString(@"mile", @"Mile Unit (Singular)") : NSLocalizedString(@"miles", @"Mile Unit (Plural)"); + } } break; }