Skip to content

Added an example of defaults as styling without all fields is still #4

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

Open
darbysauter wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added an example of defaults as styling without all fields is still #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 10 additions & 11 deletions KMLParser/Classes/KMLParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ open class KMLParser: NSObject, XMLParserDelegate {
_ = features.compactMap { [weak self] feature -> [MKAnnotation]? in

///guard let `self` = self else { return annotations

let styles = self?.styles(with: feature.styleId)

let annotations = feature.annotation(styles: styles)
Expand Down Expand Up @@ -266,14 +265,14 @@ open class KMLParser: NSObject, XMLParserDelegate {
kmlObjectLookup.removeValue(forKey: .width)
kmlObjectLookup.removeValue(forKey: .color)
}
guard
let width = kmlObjectLookup[.width] as? KMLFloatValue,
let color = kmlObjectLookup[.color] as? KMLColorValue,
let id = currentStyleId
else {
return
}

let width: KMLFloatValue = kmlObjectLookup[.width] as? KMLFloatValue ?? KMLFloatValue(value: 1.0)
let color: KMLColorValue = kmlObjectLookup[.color] as? KMLColorValue ?? KMLColorValue(value: UIColor.init(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0))
if currentStyleId == nil {
let styleID = ""
currentStyleId = styleID
styles[styleID] = []
}
let id: String = currentStyleId ?? ""
styles[id]?.append(KMLStyle.line(color: color.value, width: width.value))
case .polyStyle:
defer {
Expand Down Expand Up @@ -405,7 +404,7 @@ open class KMLParser: NSObject, XMLParserDelegate {
return coordinates
}

///
///
private static func findParentGeometryElement(in path: KMLElementPath) -> KMLElement? {
let reversedPath = path.reversed()
for i in reversedPath.indices {
Expand All @@ -419,7 +418,7 @@ open class KMLParser: NSObject, XMLParserDelegate {
///
private func styles(with styleId: String?) -> [KMLStyle]? {

guard let styleId = styleId else { return nil }
let styleId = styleId ?? ""

let style = styleMaps[styleId]?["normal"] ?? styleId

Expand Down