Merge pull request stephent#14 from stephent/development/WMM2015

Development/wmm2015
NasH5169 · Nov 17, 2015 · e6c676d · e6c676d
2 parents d965df8 + 260a1e2
commit e6c676d
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 18 deletions.
diff --git a/ObjectiveWMM.xcodeproj/project.pbxproj b/ObjectiveWMM.xcodeproj/project.pbxproj
@@ -217,7 +217,7 @@
 		DC71D8C8197E067F00C665CB /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0600;
+				LastUpgradeCheck = 0710;
 				ORGANIZATIONNAME = "Crookneck Consulting LLC";
 				TargetAttributes = {
 					DC71D8D0197E067F00C665CB = {
@@ -318,6 +318,7 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -332,7 +333,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				METAL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -371,7 +372,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				METAL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -396,10 +397,11 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/ObjectiveWMM/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = mh_dylib;
 				ONLY_ACTIVE_ARCH = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.crookneckconsulting.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = ObjectiveWMM;
 				PROVISIONING_PROFILE = "";
 				SKIP_INSTALL = YES;
@@ -421,10 +423,11 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/ObjectiveWMM/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = mh_dylib;
 				ONLY_ACTIVE_ARCH = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.crookneckconsulting.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = ObjectiveWMM;
 				PROVISIONING_PROFILE = "";
 				SKIP_INSTALL = YES;
@@ -445,6 +448,7 @@
 				INFOPLIST_FILE = ObjectiveWMMTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				METAL_ENABLE_DEBUG_INFO = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.crookneckconsulting.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = ObjectiveWMMTests;
 			};
 			name = Debug;
@@ -459,6 +463,7 @@
 				INFOPLIST_FILE = ObjectiveWMMTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				METAL_ENABLE_DEBUG_INFO = NO;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.crookneckconsulting.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = ObjectiveWMMTests;
 			};
 			name = Release;

diff --git a/ObjectiveWMM/CCMagneticDeclination.h b/ObjectiveWMM/CCMagneticDeclination.h
@@ -11,12 +11,13 @@
 
 @interface CCMagneticDeclination : NSObject <NSCopying, NSCoding>
 
-- (id) initWithCoordinate:(CLLocationCoordinate2D)coordinate elevation:(CLLocationDistance)elevation date:(NSDate *)date magneticDeclination:(CLLocationDirection)magneticDeclination;
+- (id) initWithCoordinate:(CLLocationCoordinate2D)coordinate elevation:(CLLocationDistance)elevation date:(NSDate *)date magneticDeclination:(CLLocationDirection)magneticDeclination fieldStrength:(double)fieldStrength;
 
 @property (readonly, nonatomic) CLLocationCoordinate2D coordinate;
 @property (readonly, nonatomic) CLLocationDistance elevation;
 @property (readonly, nonatomic, strong) NSDate *date;
 @property (readonly, nonatomic) CLLocationDirection magneticDeclination;
+@property (readonly, nonatomic) double fieldStrength; // in μT
 
 - (CLLocationDirection) trueHeadingFromMagneticHeading:(CLLocationDirection)magneticHeading;
 - (CLLocationDirection) magneticHeadingFromTrueHeading:(CLLocationDirection)trueHeading;

diff --git a/ObjectiveWMM/CCMagneticDeclination.m b/ObjectiveWMM/CCMagneticDeclination.m
@@ -18,29 +18,38 @@ @interface CCMagneticDeclination()
 @property (readwrite, nonatomic) CLLocationDistance elevation;
 @property (readwrite, nonatomic, strong) NSDate *date;
 @property (readwrite, nonatomic) CLLocationDirection magneticDeclination;
+@property (readwrite, nonatomic) double fieldStrength;
 
 @end
 
 @implementation CCMagneticDeclination
 
-- (id) initWithCoordinate:(CLLocationCoordinate2D)coordinate elevation:(CLLocationDistance)elevation date:(NSDate *)date magneticDeclination:(CLLocationDirection)magneticDeclination {
+- (id) initWithCoordinate:(CLLocationCoordinate2D)coordinate elevation:(CLLocationDistance)elevation date:(NSDate *)date magneticDeclination:(CLLocationDirection)magneticDeclination  fieldStrength:(double)fieldStrength {
 
     self = [super init];
     if (self) {
-        self.coordinate = coordinate;
-        self.elevation = elevation;
-        self.date = date;
-        self.magneticDeclination = magneticDeclination;
+        _coordinate = coordinate;
+        _elevation = elevation;
+        _date = date;
+        _magneticDeclination = magneticDeclination;
+        _fieldStrength = fieldStrength;
     }
 
     return self;
 }
 
+- (NSString *) description {
+
+    NSString *desc = [NSString stringWithFormat:@"%1.3f°,%1.3f° / %1.2fm at %@: decl: %1.2f° F: %1.2fμT", self.coordinate.latitude, self.coordinate.longitude, self.elevation, self.date.description, self.magneticDeclination, self.fieldStrength];
+
+    return desc;
+}
+
 #pragma mark - NSCopying
 
 - (id)copyWithZone:(NSZone *)zone {
 
-    CCMagneticDeclination *magneticDeclination = [[CCMagneticDeclination allocWithZone:zone] initWithCoordinate:self.coordinate elevation:self.elevation date:self.date magneticDeclination:self.magneticDeclination];
+    CCMagneticDeclination *magneticDeclination = [[CCMagneticDeclination allocWithZone:zone] initWithCoordinate:self.coordinate elevation:self.elevation date:self.date magneticDeclination:self.magneticDeclination fieldStrength:self.fieldStrength];
 
     return magneticDeclination;
 }
@@ -53,8 +62,9 @@ - (id)initWithCoder:(NSCoder *)aDecoder {
     CLLocationDistance elevation = [aDecoder decodeDoubleForKey:@"elevation"];
     NSDate *date = [aDecoder decodeObjectForKey:@"date"];
     CLLocationDirection magneticDeclination = [aDecoder decodeDoubleForKey:@"magneticDeclination"];
+    double fieldStrength = [aDecoder decodeDoubleForKey:@"fieldStrength"];
 
-    self = [self initWithCoordinate:coord elevation:elevation date:date magneticDeclination:magneticDeclination];
+    self = [self initWithCoordinate:coord elevation:elevation date:date magneticDeclination:magneticDeclination fieldStrength:fieldStrength];
     if (!self) {
         return nil;
     }
@@ -69,6 +79,7 @@ - (void)encodeWithCoder:(NSCoder *)aCoder {
     [aCoder encodeDouble:self.elevation forKey:@"elevation"];
     [aCoder encodeObject:self.date forKey:@"date"];
     [aCoder encodeDouble:self.magneticDeclination forKey:@"magneticDeclination"];
+    [aCoder encodeDouble:self.fieldStrength forKey:@"fieldStrength"];
 }
 
 #pragma mark - Public

diff --git a/ObjectiveWMM/CCMagneticModel.m b/ObjectiveWMM/CCMagneticModel.m
@@ -139,7 +139,7 @@ - (CCMagneticDeclination *) declinationForCoordinate:(CLLocationCoordinate2D)coo
 
         MAG_CalculateGridVariation(coordGeodetic, &geoMagneticElements);
 
-        CCMagneticDeclination *result = [[CCMagneticDeclination alloc] initWithCoordinate:coordinate elevation:elevation date:date magneticDeclination:geoMagneticElements.Decl];
+        CCMagneticDeclination *result = [[CCMagneticDeclination alloc] initWithCoordinate:coordinate elevation:elevation date:date magneticDeclination:geoMagneticElements.Decl fieldStrength:geoMagneticElements.F/1000.0];
 
         return result;
     }

diff --git a/ObjectiveWMM/Info.plist b/ObjectiveWMM/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.crookneckconsulting.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/ObjectiveWMM/WMM/GeomagnetismLibrary.c b/ObjectiveWMM/WMM/GeomagnetismLibrary.c
@@ -1208,7 +1208,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;
@@ -1232,7 +1232,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);

diff --git a/ObjectiveWMMTests/Info.plist b/ObjectiveWMMTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.crookneckconsulting.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>