Refactor diameter handling to normalize values across fittings and pipesHEADmaster

1 files changed, 5 insertions, 2 deletions

diff --git a/RhSolutions.Parsers/DrinkingWaterHeatingFittings/Adapter.cs b/RhSolutions.Parsers/DrinkingWaterHeatingFittings/Adapter.cs
index 3600cc8..b60a543 100644
--- a/RhSolutions.Parsers/DrinkingWaterHeatingFittings/Adapter.cs
+++ b/RhSolutions.Parsers/DrinkingWaterHeatingFittings/Adapter.cs
@@ -22,6 +22,9 @@ public abstract class Adapter : DrinkingWaterHeatingFitting
 		{
 			return false;
 		}
+		string[] normalizedDiameters = diameters.Select(d => NormalizeDiameter(d.Groups["Diameter"].Value))
+			.ToArray();
+
 		Match thread = _thread.Match(input);
 		string threadValue;
 		if (!thread.Success && diameters.Count >= 2)
@@ -37,13 +40,13 @@ public abstract class Adapter : DrinkingWaterHeatingFitting
 		}
 		else if (!thread.Success)
 		{
-			threadValue = _defaultThreads[diameters[0].Groups["Diameter"].Value];
+			threadValue = _defaultThreads[normalizedDiameters[0]];
 		}
 		else
 		{
 			threadValue = thread.Groups["Thread"].Value;
 		}
-		output = $"{_title} {diameters[0].Groups["Diameter"]} {threadValue}";
+		output = $"{_title} {normalizedDiameters[0]} {threadValue}";
 		return true;
 	}
 }