From e2dd5f5157ce09de87f22b1403504e5ceb9b8f41 Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Thu, 16 May 2019 09:52:59 -0400
Subject: [PATCH] Corrected the wiring command (adjustment to recent change for
 centering wires on grid lines when using a snap grid) so that the wire width
 is maintained when switching from one layer to another, when the wire width
 is larger than the minimum for the route layer.

---
 commands/CmdTZ.c | 2 +-
 wiring/wireOps.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/commands/CmdTZ.c b/commands/CmdTZ.c
index af3467ec..3065450d 100644
--- a/commands/CmdTZ.c
+++ b/commands/CmdTZ.c
@@ -1411,7 +1411,7 @@ CmdWire(w, cmd)
 		else
 		{
 		    width = DRCGetDefaultLayerWidth(type);
-		    WireAddContact(type, width);
+		    WireAddContact(type, (WireWidth < width) ? width : WireWidth);
 		}
 	    }
 	    else if (!strcmp(cmd->tx_argv[2], "width"))
diff --git a/wiring/wireOps.c b/wiring/wireOps.c
index 8c4de863..41a249cd 100644
--- a/wiring/wireOps.c
+++ b/wiring/wireOps.c
@@ -816,22 +816,22 @@ WireAddContact(newType, newWidth)
     switch (oldDir)
     {
 	case GEO_NORTH:
-	    i = contactArea.r_ytop - totalSize;
+	    i = contactArea.r_ytop - WireWidth;
 	    if (i > contactArea.r_ybot)
 		contactArea.r_ybot = i;
 	    break;
 	case GEO_SOUTH:
-	    i = contactArea.r_ybot + totalSize;
+	    i = contactArea.r_ybot + WireWidth;
 	    if (i < contactArea.r_ytop)
 		contactArea.r_ytop = i;
 	    break;
 	case GEO_EAST:
-	    i = contactArea.r_xtop - totalSize;
+	    i = contactArea.r_xtop - WireWidth;
 	    if (i > contactArea.r_xbot)
 		contactArea.r_xbot = i;
 	    break;
 	case GEO_WEST:
-	    i = contactArea.r_xbot + totalSize;
+	    i = contactArea.r_xbot + WireWidth;
 	    if (i < contactArea.r_xtop)
 		contactArea.r_xtop = i;
 	    break;