diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 61da2ec2..a5874b19 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -15,3 +15,4 @@ Michael Lapuebla Daniel Kostrzynski Christian Ihle Gareth Pearce +Artem Boboshko diff --git a/src/Geometry/GMUGeometryRenderer.h b/src/Geometry/GMUGeometryRenderer.h old mode 100644 new mode 100755 index 17016af4..51d1d776 --- a/src/Geometry/GMUGeometryRenderer.h +++ b/src/Geometry/GMUGeometryRenderer.h @@ -30,6 +30,10 @@ NS_ASSUME_NONNULL_BEGIN */ @interface GMUGeometryRenderer : NSObject +/** + * The overlays array returned from the GMUGeometryRenderer, use after render function. + */ +- (NSArray *)mapOverlays; /** * Initializes a new renderer. * diff --git a/src/Geometry/GMUKMLParser.m b/src/Geometry/GMUKMLParser.m old mode 100644 new mode 100755 index 1c96b51e..b4f474ee --- a/src/Geometry/GMUKMLParser.m +++ b/src/Geometry/GMUKMLParser.m @@ -655,7 +655,10 @@ - (void)parser:(NSXMLParser *)parser range:NSMakeRange(0, elementName.length)] || [_compassRegex firstMatchInString:elementName options:0 - range:NSMakeRange(0, elementName.length)]) { + range:NSMakeRange(0, elementName.length)] || + [_pairAttributeRegex firstMatchInString:elementName + options:0 + range:NSMakeRange(0, elementName.length)]) { [self parseBeginLeafNode]; } } @@ -672,6 +675,12 @@ - (void)parser:(NSXMLParser *)parser options:0 range:NSMakeRange(0, elementName.length)]) { [self parseEndStyleAttribute:elementName]; + } else if ([elementName isEqual:kGMUPairElementName]) { + [self parseEndPair]; + } else if ([_pairAttributeRegex firstMatchInString:elementName + options:0 + range:NSMakeRange(0, elementName.length)]) { + [self parseEndPairAttribute:elementName]; } else if ([elementName isEqual:kGMUPlacemarkElementName]) { [self parseEndPlacemark]; } else if ([elementName isEqual:kGMUGroundOverlayElementName]) {