From 767044420d32f6030d25b6b0c979feac2fa1ff60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Thu, 18 Aug 2016 18:01:19 -0700 Subject: [PATCH] [ios, macos] Added debug descriptions for runtime styling classes --- platform/darwin/src/MGLForegroundStyleLayer.m | 7 +++++++ platform/darwin/src/MGLGeoJSONSource.mm | 6 ++++++ platform/darwin/src/MGLRasterSource.mm | 8 ++++++++ platform/darwin/src/MGLSource.mm | 5 +++++ platform/darwin/src/MGLStyleLayer.mm | 7 +++++++ platform/darwin/src/MGLTileSet.mm | 6 ++++++ platform/darwin/src/MGLVectorSource.mm | 6 ++++++ platform/darwin/src/MGLVectorStyleLayer.m | 9 +++++++++ 8 files changed, 54 insertions(+) diff --git a/platform/darwin/src/MGLForegroundStyleLayer.m b/platform/darwin/src/MGLForegroundStyleLayer.m index e3af96331..b7a0379af 100644 --- a/platform/darwin/src/MGLForegroundStyleLayer.m +++ b/platform/darwin/src/MGLForegroundStyleLayer.m @@ -10,4 +10,11 @@ return self; } +- (NSString *)description { + return [NSString stringWithFormat: + @"<%@: %p; identifier = %@; sourceIdentifier = %@; visible = %@>", + NSStringFromClass([self class]), (void *)self, self.identifier, + self.sourceIdentifier, self.visible ? @"YES" : @"NO"]; +} + @end diff --git a/platform/darwin/src/MGLGeoJSONSource.mm b/platform/darwin/src/MGLGeoJSONSource.mm index 0213b6a27..f7cd6be7d 100644 --- a/platform/darwin/src/MGLGeoJSONSource.mm +++ b/platform/darwin/src/MGLGeoJSONSource.mm @@ -192,4 +192,10 @@ const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionSimplificationTolerance = @"M _features = MGLFeaturesFromMBGLFeatures(featureCollection); } +- (NSString *)description +{ + return [NSString stringWithFormat:@"<%@: %p; identifier = %@; URL = %@; geoJSONData = %@; features = %@>", + NSStringFromClass([self class]), (void *)self, self.identifier, self.URL, self.geoJSONData, self.features]; +} + @end diff --git a/platform/darwin/src/MGLRasterSource.mm b/platform/darwin/src/MGLRasterSource.mm index 92494febf..53caae5af 100644 --- a/platform/darwin/src/MGLRasterSource.mm +++ b/platform/darwin/src/MGLRasterSource.mm @@ -73,4 +73,12 @@ self.rawSource = _pendingSource.get(); } +- (NSString *)description +{ + return [NSString stringWithFormat: + @"<%@: %p; identifier = %@; URL = %@; tileSet = %@; tileSize = %lu>", + NSStringFromClass([self class]), (void *)self, self.identifier, self.URL, + self.tileSet, (unsigned long)self.tileSize]; +} + @end diff --git a/platform/darwin/src/MGLSource.mm b/platform/darwin/src/MGLSource.mm index 1b889d44d..4f9cfb014 100644 --- a/platform/darwin/src/MGLSource.mm +++ b/platform/darwin/src/MGLSource.mm @@ -12,4 +12,9 @@ return self; } +- (NSString *)description { + return [NSString stringWithFormat:@"<%@: %p; identifier = %@>", + NSStringFromClass([self class]), (void *)self, self.identifier]; +} + @end diff --git a/platform/darwin/src/MGLStyleLayer.mm b/platform/darwin/src/MGLStyleLayer.mm index 7f29041f8..d1943cd46 100644 --- a/platform/darwin/src/MGLStyleLayer.mm +++ b/platform/darwin/src/MGLStyleLayer.mm @@ -51,4 +51,11 @@ return self.rawLayer->getMinZoom(); } +- (NSString *)description +{ + return [NSString stringWithFormat:@"<%@: %p; identifier = %@; visible = %@>", + NSStringFromClass([self class]), (void *)self, self.identifier, + self.visible ? @"YES" : @"NO"]; +} + @end diff --git a/platform/darwin/src/MGLTileSet.mm b/platform/darwin/src/MGLTileSet.mm index b2359bb92..f795545ee 100644 --- a/platform/darwin/src/MGLTileSet.mm +++ b/platform/darwin/src/MGLTileSet.mm @@ -84,4 +84,10 @@ return tileset; } +- (NSString *)description +{ + return [NSString stringWithFormat:@"<%@: %p; tileURLTemplates = %@>", + NSStringFromClass([self class]), (void *)self, self.tileURLTemplates]; +} + @end diff --git a/platform/darwin/src/MGLVectorSource.mm b/platform/darwin/src/MGLVectorSource.mm index 2c7b529d7..1b3406e5e 100644 --- a/platform/darwin/src/MGLVectorSource.mm +++ b/platform/darwin/src/MGLVectorSource.mm @@ -72,4 +72,10 @@ static NSString *MGLVectorSourceType = @"vector"; self.rawSource = _pendingSource.get(); } +- (NSString *)description +{ + return [NSString stringWithFormat:@"<%@: %p; identifier = %@; URL = %@; tileSet = %@>", + NSStringFromClass([self class]), (void *)self, self.identifier, self.URL, self.tileSet]; +} + @end diff --git a/platform/darwin/src/MGLVectorStyleLayer.m b/platform/darwin/src/MGLVectorStyleLayer.m index 174256cbd..d8146f424 100644 --- a/platform/darwin/src/MGLVectorStyleLayer.m +++ b/platform/darwin/src/MGLVectorStyleLayer.m @@ -13,4 +13,13 @@ return nil; } +- (NSString *)description { + return [NSString stringWithFormat: + @"<%@: %p; identifier = %@; sourceIdentifier = %@; " + @"sourceLayerIdentifier = %@; predicate = %@; visible = %@>", + NSStringFromClass([self class]), (void *)self, self.identifier, + self.sourceIdentifier, self.sourceLayerIdentifier, self.predicate, + self.visible ? @"YES" : @"NO"]; +} + @end