summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Guerra Soto <fabian.guerra@mapbox.com>2019-01-22 15:42:28 -0800
committerGitHub <noreply@github.com>2019-01-22 15:42:28 -0800
commitca129e0c79c60db57c7ad3144aad3f4293dab8cd (patch)
tree05a70518818bff547225ef629e9a9c695af906ea
parentb460efdf00092797446570389a6c9afa230da162 (diff)
downloadqtlocation-mapboxgl-ca129e0c79c60db57c7ad3144aad3f4293dab8cd.tar.gz
[ios, macos] MGLMapView logging improvements. (#13776)
Added NSEdgeInsets to NSString function to improve the debugging on macOS. Added debug logs to MGLMapView.
-rw-r--r--platform/darwin/src/MGLLoggingConfiguration_Private.h6
-rw-r--r--platform/ios/src/MGLMapView.mm5
-rw-r--r--platform/macos/src/MGLMapView.mm4
3 files changed, 14 insertions, 1 deletions
diff --git a/platform/darwin/src/MGLLoggingConfiguration_Private.h b/platform/darwin/src/MGLLoggingConfiguration_Private.h
index 34e999ca72..3acc0291c0 100644
--- a/platform/darwin/src/MGLLoggingConfiguration_Private.h
+++ b/platform/darwin/src/MGLLoggingConfiguration_Private.h
@@ -4,6 +4,12 @@ NS_INLINE NSString *MGLStringFromBOOL(BOOL value) {
return value ? @"YES" : @"NO";
}
+#if TARGET_OS_OSX
+NS_INLINE NSString *MGLStringFromNSEdgeInsets(NSEdgeInsets insets) {
+ return [NSString stringWithFormat:@"{ top: %f, left: %f, bottom: %f, right: %f", insets.top, insets.left, insets.bottom, insets.right];
+}
+#endif
+
#ifdef MGL_LOGGING_DISABLED
#define MGLLogInfo(...)
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 258f6eea87..b3b8c8777d 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -1109,11 +1109,13 @@ public:
- (void)setContentInset:(UIEdgeInsets)contentInset
{
+ MGLLogDebug(@"Setting contentInset: %@", NSStringFromUIEdgeInsets(contentInset));
[self setContentInset:contentInset animated:NO];
}
- (void)setContentInset:(UIEdgeInsets)contentInset animated:(BOOL)animated
{
+ MGLLogDebug(@"Setting contentInset: %@ animated:", NSStringFromUIEdgeInsets(contentInset), MGLStringFromBOOL(animated));
if (UIEdgeInsetsEqualToEdgeInsets(contentInset, self.contentInset))
{
return;
@@ -1275,6 +1277,7 @@ public:
- (void)setPreferredFramesPerSecond:(MGLMapViewPreferredFramesPerSecond)preferredFramesPerSecond
{
+ MGLLogDebug(@"Setting preferredFramesPerSecond: %ld", preferredFramesPerSecond);
if (_preferredFramesPerSecond == preferredFramesPerSecond)
{
return;
@@ -5322,11 +5325,13 @@ public:
- (void)setTargetCoordinate:(CLLocationCoordinate2D)targetCoordinate
{
+ MGLLogDebug(@"Setting targetCoordinate: %@", MGLStringFromCLLocationCoordinate2D(targetCoordinate));
[self setTargetCoordinate:targetCoordinate animated:YES];
}
- (void)setTargetCoordinate:(CLLocationCoordinate2D)targetCoordinate animated:(BOOL)animated
{
+ MGLLogDebug(@"Setting targetCoordinate: %@ animated: %@", MGLStringFromCLLocationCoordinate2D(targetCoordinate), MGLStringFromBOOL(animated));
if (targetCoordinate.latitude != self.targetCoordinate.latitude
|| targetCoordinate.longitude != self.targetCoordinate.longitude)
{
diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
index 56e768584d..482333a26c 100644
--- a/platform/macos/src/MGLMapView.mm
+++ b/platform/macos/src/MGLMapView.mm
@@ -1389,14 +1389,16 @@ public:
}
- (void)setContentInsets:(NSEdgeInsets)contentInsets {
+ MGLLogDebug(@"Setting contentInset: %@", MGLStringFromNSEdgeInsets(contentInsets));
[self setContentInsets:contentInsets animated:NO];
}
- (void)setContentInsets:(NSEdgeInsets)contentInsets animated:(BOOL)animated {
+
if (NSEdgeInsetsEqual(contentInsets, self.contentInsets)) {
return;
}
-
+ MGLLogDebug(@"Setting contentInset: %@ animated:", MGLStringFromNSEdgeInsets(contentInsets), MGLStringFromBOOL(animated));
// After adjusting the content insets, move the center coordinate from the
// old frame of reference to the new one represented by the newly set
// content insets.