@@ -26,7 +26,6 @@ #import "SDTideFactory.h" #import "SDTide.h" #import "SDTideEvent.h" -#import "SDStationOffset.h" #import "RootViewController.h" @interface MainViewController (PrivateMethods) @@ -85,13 +84,7 @@ [date setText: [formatter stringFromDate:[sdTide startTime]]]; [formatter release]; - SDStationOffset *offset = [[sdTide tideStation] stationOffset]; - if (offset != nil) { - [locationLabel setText:[offset shortRefStationName]]; - [correctionLabel setText:[NSString stringWithFormat:@"Events corrected for %@", [sdTide shortLocationName]]]; - } else { - [locationLabel setText:[sdTide shortLocationName]]; - } + [locationLabel setText:[sdTide shortLocationName]]; int minutesSinceMidnight = [self currentTimeInMinutes:sdTide]; if (minutesSinceMidnight > 0) { @@ -99,6 +92,12 @@ } else { [presentHeight setText:@""]; } + + if ([[sdTide events] count] > 4) { + // there shouldn't be more than 4 tide events in a day -- 2 high, 2 low + [correctionLabel setText:@"Too many events predicted"]; + return nil; + } int index = 0; for (SDTideEvent *event in [sdTide events]) { Classes/Controllers/MainViewController.m @@ -50,6 +50,7 @@ - (NSData *)applicationDataFromFile:(NSString *)fileName; - (void)replaceSubview:(UIView *)oldView withSubview:(UIView *)newView transition:(NSString *)transition direction:(NSString *)direction duration:(NSTimeInterval)duration; -(void)refreshLocationTable; +-(void)setDefaultLocation; @end static NSUInteger kNumberOfPages = 5; @@ -76,19 +77,31 @@ static NSUInteger kNumberOfPages = 5; - (void)viewDidLoad { NSString *lastLocation = [self lastLocation]; + if (lastLocation) { [self setLocation:lastLocation]; self.tideStation = [SDTideFactory tideStationWithName:lastLocation]; + if (self.tideStation.name == nil) { + NSString *message = [NSString stringWithFormat:@"%@ is no longer a supported location. Please choose another location.",lastLocation]; + UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Sorry" message:message delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil]; + [alert show]; + [alert release]; + [self setDefaultLocation]; + } } else { - NSString *defaultLocation = @"La Jolla, Scripps Pier, California"; - [self setLocation:defaultLocation]; - self.tideStation = [SDTideFactory tideStationWithName:defaultLocation]; + [self setDefaultLocation]; } self.currentCalendar = [NSCalendar currentCalendar]; [self createMainViews]; } +- (void)setDefaultLocation { + NSString *defaultLocation = @"La Jolla, Scripps Pier, California"; + [self setLocation:defaultLocation]; + self.tideStation = [SDTideFactory tideStationWithName:defaultLocation]; +} + - (void)createMainViews { NSMutableArray *controllers = [[NSMutableArray alloc] init]; for (unsigned i = 0; i < kNumberOfPages; i++) { @@ -347,12 +360,20 @@ static NSUInteger kNumberOfPages = 5; [nameDescriptor release]; [self stopWaitIndicator]; + if (flipsideViewController) { [self refreshLocationTable]; } else { [self loadFlipsideViewController]; } - [self toggleView]; + + if ([locations count] > 0) { + [self toggleView]; + } else { + UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Sorry" message:@"There are no tide stations in your area. You may select a location manually by pressing the globe icon." delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil]; + [alert show]; + [alert release]; + } } -(IBAction)chooseFromAllTideStations { @@ -762,6 +783,15 @@ static NSUInteger kNumberOfPages = 5; [manager stopUpdatingLocation]; } +#if TARGET_IPHONE_SIMULATOR + [newLocation release]; + //newLocation = [[CLLocation alloc] initWithLatitude:48.4500 longitude:-123.3000]; // victoria, bc + //newLocation = [[CLLocation alloc] initWithLatitude:-33.867707 longitude: 151.225777]; sydney, aus + //newLocation = [[CLLocation alloc] initWithLatitude:-36.846581 longitude: 174.77809]; // aukland, nz + //newLocation = [[CLLocation alloc] initWithLatitude:35.570922 longitude:140.331673]; // chiba, jp + newLocation = [[CLLocation alloc] initWithLatitude:41.855242 longitude:-87.618713]; // chicago, il +#endif + if (signbit(newLocation.horizontalAccuracy)) { // Negative accuracy means an invalid or unavailable measurement UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Sorry" message:@"Unable to determine your location at this time." delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil]; Classes/Controllers/RootViewController.m @@ -24,12 +24,10 @@ #import "SDTide.h" #import "SDTideInterval.h" #import "SDTideEvent.h" -#import "SDStationOffset.h" @interface SDTide(PrivateMethods) -(int)findPreviousInterval:(int) minutesFromMidnight; -(int)findNearestInterval:(int) minutesFromMidnight; --(void)applyEventCorrections; @end @implementation SDTide @@ -48,38 +46,10 @@ intervals = [tideIntervals retain]; events = [tideEvents retain]; self.tideStation = station; - - if (tideStation.stationOffset != nil) { - [self applyEventCorrections]; - } return self; } --(void)applyEventCorrections -{ - SDStationOffset *offset = [[self tideStation] stationOffset]; - for (SDTideEvent *event in events) { - NSDate *time = [event eventTime]; - switch ([event eventType]) { - case SDTideStateHightTide: - // add high minutes to event time - [event setEventTime:[time addTimeInterval: [offset highTideMinutesOffset] * 60]]; - // multiply high by correction factor - float correctedHi = [event eventHeight] * [offset highTideHeightCorrection]; - [event setEventHeight:correctedHi]; - break; - case SDTideStateLowTide: - // add low min to event time - [event setEventTime: [time addTimeInterval: [offset lowTideMinutesOffset] * 60]]; - // multiply low by correction factor - float correctedLo = [event eventHeight] * [offset lowTideHeightCorrection]; - [event setEventHeight:correctedLo]; - break; - } - } -} - -(NSString*)shortLocationName { NSString *name = [tideStation name]; NSArray *parts = [name componentsSeparatedByString:@","]; Classes/Model/SDTide.m @@ -24,7 +24,6 @@ #import "SDTideFactory.h" #include "everythi.h" #import "SDTideStation.h" -#import "SDStationOffset.h" @interface SDTideFactory (PrivateMethods) +(void)mapTideStation:(SDTideStation*)station fromResultSet:(FMResultSet*)rs; @@ -40,12 +39,7 @@ char cEnd[30]; time_t stoptime = 0; - NSString *stationName = nil; - if (station.stationOffset) { - stationName = station.stationOffset.referenceStationName; - } else { - stationName = station.name; - } + NSString *stationName = station.name; //strcpy(location,[stationName cStringUsingEncoding:NSISOLatin2StringEncoding]); strcpy(location, [stationName cStringUsingEncoding:NSISOLatin1StringEncoding]); @@ -214,7 +208,7 @@ NSLog(@"Could not open db."); } - FMResultSet *rs = [db executeQuery:@"select s.name, s.unit, s.lat, s.long, s.disp_name, s.disp_state, o.high_minutes, o.low_minutes, o.high_const, o.low_const, rs.name as ref_station_name from station s left outer join station_offset o on s.offset_id = o.offset_id left outer join station rs on o.ref_station_id = rs.id"]; + FMResultSet *rs = [db executeQuery:@"select s.name, s.unit, s.lat, s.long, s.disp_name, s.disp_state from station s"]; if ([db hadError]) { NSLog(@"Err %d: %@", [db lastErrorCode], [db lastErrorMessage]); @@ -247,7 +241,7 @@ NSLog(@"Could not open db."); } - FMResultSet *rs = [db executeQuery:@"select s.name, s.unit, s.lat, s.long, s.disp_name, s.disp_state, o.high_minutes, o.low_minutes, o.high_const, o.low_const, rs.name as ref_station_name from station s left outer join station_offset o on s.offset_id = o.offset_id left outer join station rs on o.ref_station_id = rs.id where s.lat between ? and ? and s.long between ? and ?", + FMResultSet *rs = [db executeQuery:@"select s.name, s.unit, s.lat, s.long, s.disp_name, s.disp_state from station s where s.lat between ? and ? and s.long between ? and ?", minLatitude, maxLatitude, minLongitude, @@ -276,7 +270,7 @@ NSLog(@"Could not open db."); } - FMResultSet *rs = [db executeQuery:@"select s.name, s.unit, s.lat, s.long, s.disp_name, s.disp_state, o.high_minutes, o.low_minutes, o.high_const, o.low_const, rs.name as ref_station_name from station s left outer join station_offset o on s.offset_id = o.offset_id left outer join station rs on o.ref_station_id = rs.id where s.name = ?", name]; + FMResultSet *rs = [db executeQuery:@"select s.name, s.unit, s.lat, s.long, s.disp_name, s.disp_state from station s where s.name = ?", name]; [rs next]; @@ -297,19 +291,6 @@ station.displayName = [rs stringForColumn:@"disp_name"]; station.displayState = [rs stringForColumn:@"disp_state"]; station.units = [rs stringForColumn:@"unit"]; - - NSString* refStationName = [rs stringForColumn:@"ref_station_name"]; - - if (refStationName != nil) { - int hiMinutes = [rs intForColumn:@"high_minutes"]; - int loMinutes = [rs intForColumn:@"low_minutes"]; - float highCorrection = [rs doubleForColumn:@"high_const"]; - float lowCorrection = [rs doubleForColumn:@"low_const"]; - - SDStationOffset *offset = [[SDStationOffset alloc] initWithStation:refStationName deltaHighMinutes:hiMinutes deltaLow:loMinutes highCorrection:highCorrection lowCorrection:lowCorrection]; - station.stationOffset = offset; - [offset release]; - } } @end Classes/Model/SDTideFactory.m @@ -21,8 +21,6 @@ along with ShralpTide. If not, see <http://www.gnu.org/licenses/>. */ -@class SDStationOffset; - @interface SDTideStation : NSObject { NSString *name; NSNumber *latitude; @@ -31,10 +29,8 @@ NSString *units; NSString *displayName; NSString *displayState; - SDStationOffset *stationOffset; } @property (retain, readwrite) NSString *name, *units, *displayName, *displayState; @property (retain, readwrite) NSNumber *distance, *latitude, *longitude; -@property (retain, readwrite) SDStationOffset *stationOffset; @end Classes/Model/SDTideStation.h @@ -32,7 +32,6 @@ @synthesize longitude; @synthesize displayName; @synthesize displayState; -@synthesize stationOffset; -(void)dealloc { [name release]; @@ -42,7 +41,6 @@ [longitude release]; [displayName release]; [displayState release]; - [stationOffset release]; [super dealloc]; } Classes/Model/SDTideStation.m @@ -21,7 +21,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>1.1.0</string> + <string>1.1.1</string> <key>LSRequiresIPhoneOS</key> <true/> <key>NSMainNibFile</key> Info.plist Resources/tidestations.sqlite @@ -37,7 +37,6 @@ DC8ED80C0F0D8C3B009EAF2F /* Decreasing.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8ED8080F0D8C3B009EAF2F /* Decreasing.png */; }; DC8ED80D0F0D8C3B009EAF2F /* Increasing.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8ED8090F0D8C3B009EAF2F /* Increasing.png */; }; DC8EDBB20F107814009EAF2F /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = DC8EDBB10F107814009EAF2F /* Default.png */; }; - DC9B14A90F524BED006B89FD /* SDStationOffset.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9B14A80F524BED006B89FD /* SDStationOffset.m */; }; DCA935600EDF722B0050113B /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCA9355F0EDF722B0050113B /* CoreLocation.framework */; }; DCA9379B0EE1B3910050113B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCA9379A0EE1B3910050113B /* CoreGraphics.framework */; }; DCC7EB6A0F20622800E6904E /* CONTRIBUTORS.txt in Resources */ = {isa = PBXBuildFile; fileRef = DCC7EB670F20622800E6904E /* CONTRIBUTORS.txt */; }; @@ -107,8 +106,6 @@ DC8ED8080F0D8C3B009EAF2F /* Decreasing.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Decreasing.png; path = Resources/Decreasing.png; sourceTree = "<group>"; }; DC8ED8090F0D8C3B009EAF2F /* Increasing.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Increasing.png; path = Resources/Increasing.png; sourceTree = "<group>"; }; DC8EDBB10F107814009EAF2F /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/Default.png; sourceTree = "<group>"; }; - DC9B14A70F524BED006B89FD /* SDStationOffset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDStationOffset.h; path = Classes/Model/SDStationOffset.h; sourceTree = "<group>"; }; - DC9B14A80F524BED006B89FD /* SDStationOffset.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDStationOffset.m; path = Classes/Model/SDStationOffset.m; sourceTree = "<group>"; }; DCA9355F0EDF722B0050113B /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; DCA9379A0EE1B3910050113B /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; DCC7EB670F20622800E6904E /* CONTRIBUTORS.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CONTRIBUTORS.txt; path = FMDB/CONTRIBUTORS.txt; sourceTree = "<group>"; }; @@ -320,8 +317,6 @@ DCFD59460E39A93D00B7B1B8 /* SDTideEvent.m */, DC328D100EE30652004F45C4 /* SDTideStation.h */, DC328D110EE30652004F45C4 /* SDTideStation.m */, - DC9B14A70F524BED006B89FD /* SDStationOffset.h */, - DC9B14A80F524BED006B89FD /* SDStationOffset.m */, ); name = objctidelib; sourceTree = "<group>"; @@ -427,7 +422,6 @@ DC328D120EE30652004F45C4 /* SDTideStation.m in Sources */, DCE897DB0EEE3CAE00BF2357 /* CursorView.m in Sources */, DCCAD90E0F1DBC4600141002 /* FMResultSet.m in Sources */, - DC9B14A90F524BED006B89FD /* SDStationOffset.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -438,7 +432,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Michael Parlee"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Michael Parlee"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -459,7 +453,7 @@ ); OTHER_LDFLAGS = "-lsqlite3"; PRODUCT_NAME = ShralpTide; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "D465FCAA-FFB5-44A7-A0B4-A979106139DB"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "093283FB-ACFE-4306-A72E-10A3B958AF82"; SDKROOT = iphoneos2.2; STRIP_INSTALLED_PRODUCT = NO; WARNING_CFLAGS = "-Wl,-M"; ShralpTide.xcodeproj/project.pbxproj Classes/Model/SDStationOffset.h Classes/Model/SDStationOffset.m 839fa261c785c869fa18631f7c4bb8c10c313513 Michael Parlee shralpmeister@me.com http://github.com/shralpmeister/shralptide/commit/e21d33b8c209080ef628ec09d9cda41ee25f7fc4 e21d33b8c209080ef628ec09d9cda41ee25f7fc4 2009-03-28T20:33:01-07:00 2009-03-28T20:33:01-07:00 Removes currents and station offsets, handles last saved location not found and shows warning if more than four tide events returned instead of crashing. c4207418ee69a07414a457f302b1f740d6635a3e Michael Parlee shralpmeister@me.com