From 9e9d5ce9620182747c3202e4cbacd5099d695c43 Mon Sep 17 00:00:00 2001
From: Russell Johnson <47639332+Russ4262@users.noreply.github.com>
Date: Mon, 13 Apr 2020 15:00:26 -0500
Subject: [PATCH] Path: Fix weakness in face analysis for unique OuterWire
 cases

synced with PathSurface module
---
 src/Mod/Path/PathScripts/PathWaterline.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Mod/Path/PathScripts/PathWaterline.py b/src/Mod/Path/PathScripts/PathWaterline.py
index 80fe121553..1953af31ee 100644
--- a/src/Mod/Path/PathScripts/PathWaterline.py
+++ b/src/Mod/Path/PathScripts/PathWaterline.py
@@ -1107,10 +1107,24 @@ class ObjectWaterline(PathOp.ObjectOp):
             PathLog.debug(' -number of wires found is {}'.format(nf))
             if nf == 1:
                 (area, W, raised) = WIRES[0]
-                return [(W, raised)]
+                owLen = fc.OuterWire.Length
+                wLen = W.Length
+                if abs(owLen - wLen) > 0.0000001:
+                    OW = Part.Wire(Part.__sortEdges__(fc.OuterWire.Edges))
+                    return [(OW, False), (W, raised)]
+                else:
+                    return [(W, raised)]
             else:
                 sortedWIRES = sorted(WIRES, key=index0, reverse=True)
-                return [(W, raised) for (area, W, raised) in sortedWIRES]  # outer, then inner by area size
+                WRS = [(W, raised) for (area, W, raised) in sortedWIRES]  # outer, then inner by area size
+                # Check if OuterWire is larger than largest in WRS list
+                (W, raised) = WRS[0]
+                owLen = fc.OuterWire.Length
+                wLen = W.Length
+                if abs(owLen - wLen) > 0.0000001:
+                    OW = Part.Wire(Part.__sortEdges__(fc.OuterWire.Edges))
+                    WRS.insert(0, (OW, False))
+                return WRS
         
         return False