@@ -26,7 +26,6 @@ + (instancetype) fromCLLocation:(CLLocation*)location;
2626 instance.altitudeAccuracy = [NSNumber numberWithDouble: location.verticalAccuracy];
2727 instance.speed = [NSNumber numberWithDouble: location.speed];
2828 instance.heading = [NSNumber numberWithDouble: location.course]; // will be deprecated
29- instance.bearing = [NSNumber numberWithDouble: location.course];
3029 instance.altitude = [NSNumber numberWithDouble: location.altitude];
3130 instance.latitude = [NSNumber numberWithDouble: location.coordinate.latitude];
3231 instance.longitude = [NSNumber numberWithDouble: location.coordinate.longitude];
@@ -99,8 +98,8 @@ - (NSMutableDictionary*) toDictionary
9998 if (accuracy != nil ) [dict setObject: accuracy forKey: @" accuracy" ];
10099 if (altitudeAccuracy != nil ) [dict setObject: altitudeAccuracy forKey: @" altitudeAccuracy" ];
101100 if (speed != nil ) [dict setObject: speed forKey: @" speed" ];
102- if (heading != nil ) [dict setObject: heading forKey: @" heading" ];
103- if (bearing != nil ) [dict setObject: bearing forKey: @" bearing" ];
101+ if (heading != nil ) [dict setObject: heading forKey: @" heading" ]; // @deprecated
102+ if (heading != nil ) [dict setObject: heading forKey: @" bearing" ];
104103 if (altitude != nil ) [dict setObject: altitude forKey: @" altitude" ];
105104 if (latitude != nil ) [dict setObject: latitude forKey: @" latitude" ];
106105 if (longitude != nil ) [dict setObject: longitude forKey: @" longitude" ];
@@ -202,7 +201,7 @@ - (BOOL) hasTime
202201
203202- (NSString *) description
204203{
205- return [NSString stringWithFormat: @" Location: id=%ld time=%ld lat=%@ lon=%@ accu=%@ aaccu=%@ speed=%@ head =%@ alt=%@ type=%@ " , (long )id , (long )time, latitude, longitude, accuracy, altitudeAccuracy, speed, bearing , altitude, type];
204+ return [NSString stringWithFormat: @" Location: id=%ld time=%ld lat=%@ lon=%@ accu=%@ aaccu=%@ speed=%@ bear =%@ alt=%@ type=%@ " , (long )id , (long )time, latitude, longitude, accuracy, altitudeAccuracy, speed, heading , altitude, type];
206205}
207206
208207- (BOOL ) postAsJSON : (NSString *)url withHttpHeaders : (NSMutableDictionary *)httpHeaders error : (NSError * __autoreleasing *)outError ;
@@ -246,7 +245,6 @@ -(id) copyWithZone: (NSZone *) zone
246245 copy.altitudeAccuracy = altitudeAccuracy;
247246 copy.speed = speed;
248247 copy.heading = heading;
249- copy.bearing = bearing;
250248 copy.altitude = altitude;
251249 copy.latitude = latitude;
252250 copy.longitude = longitude;
0 commit comments