Add diameter threads support

2 files changed, 18 insertions, 7 deletions

diff --git a/RhSolutions.Parsers/DrinkingWaterHeatingFittings/Adapter.cs b/RhSolutions.Parsers/DrinkingWaterHeatingFittings/Adapter.cs
index 8ef4f33..3600cc8 100644
--- a/RhSolutions.Parsers/DrinkingWaterHeatingFittings/Adapter.cs
+++ b/RhSolutions.Parsers/DrinkingWaterHeatingFittings/Adapter.cs
@@ -15,24 +15,35 @@ public abstract class Adapter : DrinkingWaterHeatingFitting
 		["63"] = "2"
 	};
 	public override bool TryParse(string input, out string output)
-	{		
+	{
 		output = string.Empty;
-		Match diameter = _diameter.Match(input);
-		if (!diameter.Success)
+		MatchCollection diameters = _diameter.Matches(input);
+		if (diameters.Count < 1)
 		{
 			return false;
 		}
 		Match thread = _thread.Match(input);
 		string threadValue;
-		if (!thread.Success)
+		if (!thread.Success && diameters.Count >= 2)
+		{
+			var diameterThread = diameters[1].Groups["Diameter"];
+			threadValue = diameterThread.Value switch
+			{
+				"15" => "1/2",
+				"20" => "3/4",
+				"25" => "1",
+				_ => string.Empty
+			};
+		}
+		else if (!thread.Success)
 		{
-			threadValue = _defaultThreads[diameter.Groups["Diameter"].Value];
+			threadValue = _defaultThreads[diameters[0].Groups["Diameter"].Value];
 		}
 		else
 		{
 			threadValue = thread.Groups["Thread"].Value;
 		}
-		output = $"{_title} {diameter.Groups["Diameter"]} {threadValue}";
+		output = $"{_title} {diameters[0].Groups["Diameter"]} {threadValue}";
 		return true;
 	}
 }
diff --git a/RhSolutions.Parsers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs b/RhSolutions.Parsers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs
index 5658766..fcd2544 100644
--- a/RhSolutions.Parsers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs
+++ b/RhSolutions.Parsers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs
@@ -5,7 +5,7 @@ namespace RhSolutions.Parsers.Fittings;
 public abstract class DrinkingWaterHeatingFitting : IProductParser
 {
 	protected static readonly Regex _diameter =
-		new(@"(?<!^)[\b\D]?(?<Diameter>16|20|25|32|40|50|63)[\b\D]?");
+		new(@"(?<!^)[\b\D]?(?<Diameter>16|20|25|32|40|50|63|15)[\b\D]?");
 	protected static readonly Regex _angle =
 		new(@"(?<!^)([\b\D])(?<Angle>45|90)([\b\D]|$)");
 	protected static readonly Regex _thread =