From 9cc08e07651a3f0532287584f5d4c059086c44dd Mon Sep 17 00:00:00 2001 From: Artem Boboshko Date: Fri, 19 Apr 2019 16:57:16 +0300 Subject: [PATCH 1/3] Fix problem with parse pair element ("key") --- CONTRIBUTORS.txt | 1 + src/Geometry/GMUKMLParser.m | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/Geometry/GMUKMLParser.m diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index a7119aed..fa13eda0 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -9,6 +9,7 @@ # Names should be added to this file as: # Name +Artem Boboshko Brett Morgan Christian Ihle Christopher Arriola 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]) { From 79615a83cdbaa8882ab7f7af33ca675392be305a Mon Sep 17 00:00:00 2001 From: Artem Boboshko Date: Wed, 24 Apr 2019 16:47:37 +0300 Subject: [PATCH 2/3] make mapOverlays function public --- src/Geometry/GMUGeometryRenderer.h | 4 ++++ 1 file changed, 4 insertions(+) mode change 100644 => 100755 src/Geometry/GMUGeometryRenderer.h 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. * From 84c235c73b1e74c1effb3f2132d708dc98ecdd63 Mon Sep 17 00:00:00 2001 From: Chris Arriola Date: Fri, 17 Jan 2020 15:03:58 -0800 Subject: [PATCH 3/3] Reverting change to make mapOverlays public --- src/Geometry/GMUGeometryRenderer.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Geometry/GMUGeometryRenderer.h b/src/Geometry/GMUGeometryRenderer.h index 51d1d776..17016af4 100755 --- a/src/Geometry/GMUGeometryRenderer.h +++ b/src/Geometry/GMUGeometryRenderer.h @@ -30,10 +30,6 @@ NS_ASSUME_NONNULL_BEGIN */ @interface GMUGeometryRenderer : NSObject -/** - * The overlays array returned from the GMUGeometryRenderer, use after render function. - */ -- (NSArray *)mapOverlays; /** * Initializes a new renderer. *