From a6004d0a523cdbb745aeda555c35fb301aca9775 Mon Sep 17 00:00:00 2001
From: Connor O'Shea <connor@connoroshea.com>
Date: Sat, 10 Feb 2018 21:30:31 -0500
Subject: [PATCH] Remove trailing zeros from US postal codes (fix #5)

---
 IdParser.Test/DriversLicenseTests.cs | 10 +++++-----
 IdParser/IdentificationCard.cs       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/IdParser.Test/DriversLicenseTests.cs b/IdParser.Test/DriversLicenseTests.cs
index 3943bb4..6c83b8e 100644
--- a/IdParser.Test/DriversLicenseTests.cs
+++ b/IdParser.Test/DriversLicenseTests.cs
@@ -48,7 +48,7 @@ public void TestMA2016License()
             Assert.AreEqual("24 BEACON STREET", idCard.StreetLine1);
             Assert.AreEqual("BOSTON", idCard.City);
             Assert.AreEqual("MA", idCard.IssuerIdentificationNumber.GetAbbreviation());
-            Assert.AreEqual("02133-0000", idCard.FormattedPostalCode);
+            Assert.AreEqual("02133", idCard.FormattedPostalCode);
             Assert.AreEqual(Country.USA, idCard.Country);
 
             Assert.AreEqual(new DateTime(1971, 12, 31), idCard.DateOfBirth);
@@ -124,7 +124,7 @@ public void TestVALicense()
 
             Assert.AreEqual("17 FIRST STREET", idCard.StreetLine1);
             Assert.AreEqual("STAUNTON", idCard.City);
-            Assert.AreEqual("244010000", idCard.PostalCode);
+            Assert.AreEqual("24401", idCard.PostalCode);
 
             Assert.IsInstanceOfType(idCard, typeof(DriversLicense));
 
@@ -148,7 +148,7 @@ public void TestGALicense()
 
             Assert.AreEqual("123 NORTH STATE ST.", idCard.StreetLine1);
             Assert.AreEqual("ANYTOWN", idCard.City);
-            Assert.AreEqual("303340000", idCard.PostalCode);
+            Assert.AreEqual("30334", idCard.PostalCode);
 
             Assert.AreEqual("Georgia", idCard.IssuerIdentificationNumber.GetDescription());
             Assert.AreEqual("GA", idCard.IssuerIdentificationNumber.GetAbbreviation());
@@ -350,8 +350,8 @@ public void TestNHLicense()
             Assert.AreEqual("SOMETOWN", idCard.City);
             Assert.AreEqual("NH", idCard.IssuerIdentificationNumber.GetAbbreviation());
             Assert.AreEqual("NH", idCard.JurisdictionCode);
-            Assert.AreEqual("012340000", idCard.PostalCode);
-            Assert.AreEqual("01234-0000", idCard.FormattedPostalCode);
+            Assert.AreEqual("01234", idCard.PostalCode);
+            Assert.AreEqual("01234", idCard.FormattedPostalCode);
             Assert.AreEqual(Country.USA, idCard.Country);
 
             Assert.AreEqual(new DateTime(1977, 11, 06), idCard.DateOfBirth);
diff --git a/IdParser/IdentificationCard.cs b/IdParser/IdentificationCard.cs
index 81cf034..0708767 100644
--- a/IdParser/IdentificationCard.cs
+++ b/IdParser/IdentificationCard.cs
@@ -191,7 +191,7 @@ private void ParseRecord(string subfileRecord)
                 case "DAK":
                     PostalCode = data == null
                                  ? null
-                                 : new Regex(@"[^\w\d]").Replace(data, "").Replace("00000", "");
+                                 : new Regex(@"[^\w\d]").Replace(data, "").Replace("0000", "");
                     break;
                 case "DAQ":
                     IdNumber = data;