diff options
author | Jason Wray <jason@mapbox.com> | 2016-03-10 03:56:47 -0500 |
---|---|---|
committer | Jason Wray <jason@mapbox.com> | 2016-03-10 13:48:00 -0500 |
commit | 64b163ee5dea3db2c5f6dcfaa4463e8e97e6333b (patch) | |
tree | e5e8ab1386974e97f31938a9323e0a01eb955971 | |
parent | d03e87fa4d8aa9150bb3d5965de09c29f9fec99d (diff) | |
download | qtlocation-mapboxgl-64b163ee5dea3db2c5f6dcfaa4463e8e97e6333b.tar.gz |
[ios] Add description strings to constituent classes
-rw-r--r-- | platform/darwin/include/MGLGeometry.h | 2 | ||||
-rw-r--r-- | platform/darwin/src/MGLMapCamera.mm | 2 | ||||
-rw-r--r-- | platform/darwin/src/MGLMultiPoint.mm | 6 | ||||
-rw-r--r-- | platform/darwin/src/MGLPointAnnotation.m | 9 | ||||
-rw-r--r-- | platform/ios/src/MGLUserLocation.m | 12 |
5 files changed, 29 insertions, 2 deletions
diff --git a/platform/darwin/include/MGLGeometry.h b/platform/darwin/include/MGLGeometry.h index 8cb1da10fc..8231eed442 100644 --- a/platform/darwin/include/MGLGeometry.h +++ b/platform/darwin/include/MGLGeometry.h @@ -80,7 +80,7 @@ NS_INLINE BOOL MGLCoordinateBoundsIsEmpty(MGLCoordinateBounds bounds) { /** Returns a formatted string for the given coordinate bounds. */ NS_INLINE NSString *MGLStringFromCoordinateBounds(MGLCoordinateBounds bounds) { - return [NSString stringWithFormat:@"{{%.1f, %.1f}, {%.1f, %.1f}}", + return [NSString stringWithFormat:@"{ sw = {%.1f, %.1f}, ne = {%.1f, %.1f}}", bounds.sw.latitude, bounds.sw.longitude, bounds.ne.latitude, bounds.ne.longitude]; } diff --git a/platform/darwin/src/MGLMapCamera.mm b/platform/darwin/src/MGLMapCamera.mm index 93f3bd45e0..fafbefd17a 100644 --- a/platform/darwin/src/MGLMapCamera.mm +++ b/platform/darwin/src/MGLMapCamera.mm @@ -94,7 +94,7 @@ - (NSString *)description { - return [NSString stringWithFormat:@"<%@ %p centerCoordinate:%f, %f altitude:%.0fm heading:%.0f° pitch:%.0f°>", + return [NSString stringWithFormat:@"<%@: %p; centerCoordinate = %f, %f; altitude = %.0fm; heading = %.0f°; pitch = %.0f°>", NSStringFromClass([self class]), (void *)self, _centerCoordinate.latitude, _centerCoordinate.longitude, _altitude, _heading, _pitch]; } diff --git a/platform/darwin/src/MGLMultiPoint.mm b/platform/darwin/src/MGLMultiPoint.mm index 3cd0f0c117..a864b7bce7 100644 --- a/platform/darwin/src/MGLMultiPoint.mm +++ b/platform/darwin/src/MGLMultiPoint.mm @@ -128,4 +128,10 @@ mbgl::Color MGLColorObjectFromCGColorRef(CGColorRef cgColor) { return mbgl::ShapeAnnotation::Properties(); } +- (NSString *)description +{ + return [NSString stringWithFormat:@"<%@: %p; count = %lu; bounds = %@>", + NSStringFromClass([self class]), (void *)self, (unsigned long)_count, MGLStringFromCoordinateBounds(_bounds)]; +} + @end diff --git a/platform/darwin/src/MGLPointAnnotation.m b/platform/darwin/src/MGLPointAnnotation.m index 13fbba1083..9495a2c6f8 100644 --- a/platform/darwin/src/MGLPointAnnotation.m +++ b/platform/darwin/src/MGLPointAnnotation.m @@ -4,4 +4,13 @@ @synthesize coordinate; +- (NSString *)description +{ + return [NSString stringWithFormat:@"<%@: %p; title = %@; subtitle = %@; coordinate = %f, %f>", + NSStringFromClass([self class]), (void *)self, + self.title ? [NSString stringWithFormat:@"\"%@\"", self.title] : self.title, + self.subtitle ? [NSString stringWithFormat:@"\"%@\"", self.subtitle] : self.subtitle, + coordinate.latitude, coordinate.longitude]; +} + @end diff --git a/platform/ios/src/MGLUserLocation.m b/platform/ios/src/MGLUserLocation.m index 36d71c13b0..0ee90a3c2c 100644 --- a/platform/ios/src/MGLUserLocation.m +++ b/platform/ios/src/MGLUserLocation.m @@ -71,4 +71,16 @@ NS_ASSUME_NONNULL_END return (_title ? _title : @"You Are Here"); } +- (NSString *)description +{ + return [NSString stringWithFormat:@"<%@: %p; location = %f, %f; updating = %@; altitude = %.0fm; heading = %.0f°; title = %@; subtitle = %@>", + NSStringFromClass([self class]), (void *)self, + self.location.coordinate.latitude, self.location.coordinate.longitude, + self.updating ? @"yes" : @"no", + self.location.altitude, + self.heading.trueHeading, + self.title ? [NSString stringWithFormat:@"\"%@\"", self.title] : self.title, + self.subtitle ? [NSString stringWithFormat:@"\"%@\"", self.subtitle] : self.subtitle]; +} + @end |