Skip to content

Fix problem with parse pair element ("key") and make mapOverlays function public #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix problem with parse pair element ("key") and make mapOverlays function public #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31f40b3
Fix problem with parse pair element ("key")
Apr 19, 2019
92086dc
make mapOverlays function public
Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CONTRIBUTORS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ Michael Lapuebla <[email protected]>
Daniel Kostrzynski <[email protected]>
Christian Ihle <[email protected]>
Gareth Pearce <[email protected]>
Artem Boboshko <[email protected]>
Copy link
Contributor

@arriolac arriolac Jan 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there are some conflicts in this file that need to be addressed.

4 changes: 4 additions & 0 deletions src/Geometry/GMUGeometryRenderer.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ NS_ASSUME_NONNULL_BEGIN
*/
@interface GMUGeometryRenderer : NSObject

/**
* The overlays array returned from the GMUGeometryRenderer, use after render function.
*/
- (NSArray<GMSOverlay *> *)mapOverlays;
Copy link
Contributor

@arriolac arriolac Jan 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert this change. The mapOverlays function defined in GMUGeometryRenderer.m was not designed to be exposed in the public interface.

If you need access to this, I recommend creating a class extension similar to GMUGeometryRenderer+Testing.h to expose this method.

/**
* Initializes a new renderer.
*
Expand Down
11 changes: 10 additions & 1 deletion src/Geometry/GMUKMLParser.m
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
}
Expand All @@ -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]) {
Expand Down