Merge pull request stephent#9 from ckhsponge/master

Warnings and helper
NasH5169 · Mar 30, 2014 · 081ab08 · 081ab08
2 parents f40aaf8 + ef84d62
commit 081ab08
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/ObjectiveWMM/CCMagneticModel.h b/ObjectiveWMM/CCMagneticModel.h
@@ -15,6 +15,7 @@
 
 + (CCMagneticModel *) instance;
 
++(CLLocationDirection) declinationForLocation:(CLLocation *) location;
 - (CCMagneticDeclination *) declinationForCoordinate:(CLLocationCoordinate2D)coordinate elevation:(CLLocationDistance)elevation date:(NSDate *)date;
 - (BOOL) dateIsWithinModelBounds:(NSDate *) date;
 - (NSDate *) modelValidityStart;

diff --git a/ObjectiveWMM/CCMagneticModel.m b/ObjectiveWMM/CCMagneticModel.m
@@ -98,6 +98,12 @@ - (void) dealloc {
     MAG_FreeMagneticModelMemory(_magneticModels[0]);
 }
 
++(CLLocationDirection) declinationForLocation:(CLLocation *) location {
+    CCMagneticModel *instance = [CCMagneticModel instance];
+    CCMagneticDeclination *declination = [instance declinationForCoordinate:location.coordinate elevation:location.altitude date:location.timestamp];
+    return declination.magneticDeclination;
+}
+
 - (CCMagneticDeclination *) declinationForCoordinate:(CLLocationCoordinate2D)coordinate elevation:(CLLocationDistance)elevation date:(NSDate *)date {
 
     MAGtype_CoordSpherical coordSpherical;

diff --git a/ObjectiveWMM/WMM/GeomagnetismLibrary.c b/ObjectiveWMM/WMM/GeomagnetismLibrary.c
@@ -1062,7 +1062,7 @@ CALLS: 	MAG_DMSstringToDegree(buffer, &CoordGeodetic->lambda); (The program uses
             sscanf(buffer, "%d/%d/%d", &MagneticDate->Month, &MagneticDate->Day, &MagneticDate->Year);
             if(!MAG_DateToYear(MagneticDate, Error_Message))
             {
-                printf(Error_Message);
+                printf("%s",Error_Message);
                 printf("\nPlease re-enter Date in MM/DD/YYYY or MM DD YYYY format, or as a decimal year\n");
                 fgets(buffer, 40, stdin);
                 i = 0;
@@ -1086,7 +1086,7 @@ CALLS: 	MAG_DMSstringToDegree(buffer, &CoordGeodetic->lambda); (The program uses
             {
                 if(!MAG_DateToYear(MagneticDate, Error_Message))
                 {
-                    printf(Error_Message);
+                    printf("%s",Error_Message);
                     strcpy(buffer, "");
                     printf("\nError encountered, please re-enter Date in MM/DD/YYYY or MM DD YYYY format, or as a decimal year\n");
                     fgets(buffer, 40, stdin);