From 8d6607c307fd918d6e25647422b89ca91c25fde7 Mon Sep 17 00:00:00 2001
From: Alisa Mylnikova <f3dm76@gmail.com>
Date: Thu, 28 May 2020 16:15:53 +0700
Subject: [PATCH] Fix #688: Review fixes

---
 Source/utils/CGMappings.swift | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Source/utils/CGMappings.swift b/Source/utils/CGMappings.swift
index 1f727bd8..a7a35173 100644
--- a/Source/utils/CGMappings.swift
+++ b/Source/utils/CGMappings.swift
@@ -154,9 +154,18 @@ public extension Node {
 
 }
 
-extension CGPath {
+extension UIBezierPath {
 
     public func toMacaw() -> Path {
+        let fillRule: FillRule = self.usesEvenOddFillRule ? .evenodd : .nonzero
+        return self.cgPath.toMacaw(fillRule: fillRule)
+    }
+
+}
+
+extension CGPath {
+
+    public func toMacaw(fillRule: FillRule = .nonzero) -> Path {
 
         func createPathSegment(type: PathSegmentType, points: UnsafeMutablePointer<CGPoint>, count: Int) -> PathSegment {
 
@@ -184,7 +193,7 @@ extension CGPath {
             case .closeSubpath:
                 segment = PathSegment(type: .z)
             @unknown default:
-                fatalError()
+                fatalError("Unknown element type: \(element.type)")
             }
             segments.append(segment)
         })