Add ML Modifiers with attribute

29 files changed, 540 insertions, 0 deletions

diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Adapter.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Adapter.cs
new file mode 100644
index 0000000..78cb9a2
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Adapter.cs
@@ -0,0 +1,23 @@
+using System.Text.RegularExpressions;
+
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+public abstract class Adapter : DrinkingWaterHeatingFitting
+{
+	public override bool TryQueryModify(string input, out string output)
+	{		
+		output = string.Empty;
+		Match diameter = _diameter.Match(input);
+		if (!diameter.Success)
+		{
+			return false;
+		}
+		Match thread = _thread.Match(input);
+		if (!thread.Success)
+		{
+			return false;
+		}
+		output = $"{_title} {diameter.Groups["Diameter"]} {thread.Groups["Thread"]}";
+		return true;
+	}
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/AdapterExternal.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/AdapterExternal.cs
new file mode 100644
index 0000000..2aeb63e
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/AdapterExternal.cs
@@ -0,0 +1,7 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Переходник на наружную резьбу")]
+public class AdapterExternal : Adapter
+{
+	protected override string _title => "Переходник с наружной резьбой";
+}
\ No newline at end of file
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/AdapterInternal.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/AdapterInternal.cs
new file mode 100644
index 0000000..52954bd
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/AdapterInternal.cs
@@ -0,0 +1,7 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Переходник на внутреннюю резьбу")]
+public class AdapterInternal : Adapter
+{
+	protected override string _title => "Переходник с внутренней резьбой -угольник-переходник";
+}
\ No newline at end of file
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/AdapterScrewcap.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/AdapterScrewcap.cs
new file mode 100644
index 0000000..543fb8a
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/AdapterScrewcap.cs
@@ -0,0 +1,7 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Переходник с накидной гайкой")]
+public class AdapterScrewcap : Adapter
+{
+	protected override string _title => "Переходник с накидной гайкой";
+}
\ No newline at end of file
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/BendFormerHeating.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/BendFormerHeating.cs
new file mode 100644
index 0000000..9507ea0
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/BendFormerHeating.cs
@@ -0,0 +1,25 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Фиксатор поворота отопление")]
+public class BendFormerHeating : DrinkingWaterHeatingFitting
+{
+	protected override string _title => "Фиксатор поворота";
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = string.Empty;
+		var diameterMatch = _diameter.Match(input);
+		if (!diameterMatch.Success)
+		{
+			return false;
+		}
+		string diameter = diameterMatch.Groups["Diameter"].Value;
+		if (diameter == "16")
+		{
+			diameter += "/17";
+		}
+		var angleMatch = _angle.Match(input);
+		string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90";
+		output = $"{_title} {diameter}/{angle}°";
+		return true;
+	}
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/BendFormerSanitary.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/BendFormerSanitary.cs
new file mode 100644
index 0000000..74bcc09
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/BendFormerSanitary.cs
@@ -0,0 +1,22 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Фиксатор поворота водоснабжение")]
+public class BendFormerSanitary : DrinkingWaterHeatingFitting
+{
+	protected override string _title => "Фиксатор поворота с кольцами";
+
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = string.Empty;
+		var diameterMatch = _diameter.Match(input);
+		if (!diameterMatch.Success)
+		{
+			return false;
+		}
+		string diameter = diameterMatch.Groups["Diameter"].Value;
+		var angleMatch = _angle.Match(input);
+		string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90";
+		output = $"{_title} {angle}° {diameter}";
+		return true;
+	}
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ConnectionBend.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ConnectionBend.cs
new file mode 100644
index 0000000..4bdadef
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ConnectionBend.cs
@@ -0,0 +1,27 @@
+using System.Text.RegularExpressions;
+
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Трубка Г-образная")]
+public class ConnectionBend : DrinkingWaterHeatingFitting
+{
+	private static readonly int[] lengths = [250, 500, 1000];
+	private static readonly Regex _pattern = 
+		new(@"([\b\D]|^)?(?<Diameter>16|20|25)(\D+|.*15.*)(?<Length>\b\d{3,4})([\b\D]|$)");
+	protected override string _title => "Трубка Г-образная";
+
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = string.Empty;
+		var match = _pattern.Match(input);
+		if (!match.Success)
+		{
+			return false;
+		}
+		string diameter =  match.Groups["Diameter"].Value;
+		int length = int.Parse(match.Groups["Length"].Value);
+		int nearest = lengths.OrderBy(x => Math.Abs(x - length)).First();
+		output = $"{_title} {diameter}/{nearest}";
+		return true;
+	}
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ConnectionTee.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ConnectionTee.cs
new file mode 100644
index 0000000..64b5243
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ConnectionTee.cs
@@ -0,0 +1,7 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Трубка Т-образная")]
+public class ConnectionTee : ConnectionBend
+{
+	protected override string _title => "Трубка Т-образная";
+}
\ No newline at end of file
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Coupling.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Coupling.cs
new file mode 100644
index 0000000..8f12566
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Coupling.cs
@@ -0,0 +1,30 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Муфта соединительная")]
+public class Coupling : DrinkingWaterHeatingFitting
+{
+	protected override string _title => "Муфта соединительная";
+
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = string.Empty;
+		var diametersMatches = _diameter.Matches(input);			
+		if (diametersMatches.Count == 0)		
+		{
+			return false;
+		}
+		var diameters = diametersMatches.Select(x => x.Groups["Diameter"].Value)
+			.Take(2)
+			.OrderByDescending(x => int.Parse(x))
+			.ToArray();			
+		if (diameters.Length == 1 || diameters[0] == diameters[1])
+		{
+			output = $"{_title} равнопроходная {diameters[0]}";
+		}
+		else
+		{
+			output = $"{_title} переходная {diameters[0]}-{diameters[1]}";
+		}
+		return true;
+	}
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs
new file mode 100644
index 0000000..50a9943
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/DrinkingWaterHeatingFitting.cs
@@ -0,0 +1,30 @@
+using System.Text.RegularExpressions;
+
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+public abstract class DrinkingWaterHeatingFitting : IProductMLModifier
+{
+	protected static readonly Regex _diameter =
+		new(@"([\b\D]|^)?(?<Diameter>16|20|25|32|40|50|63)([\b\D]|$)");
+	protected static readonly Regex _angle =
+		new(@"([\b\D])(?<Angle>45|90)([\b\D]|$)");
+	protected static readonly Regex _thread =
+		new(@"([\b\D])(?<Thread>1\s+1/4|1\s+1/2|1/2|3/4|2|1)([\b\D]|$)");
+
+	protected virtual string _title { get; } = string.Empty;
+
+	public virtual bool TryQueryModify(string input, out string output)
+	{
+		var match = _diameter.Match(input);
+		if (match.Success)
+		{
+			output = $"{_title} {match.Groups["Diameter"]}";
+			return true;
+		}
+		else
+		{
+			output = string.Empty;
+			return false;
+		}
+	}
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/DummyPlug.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/DummyPlug.cs
new file mode 100644
index 0000000..9cf4ba8
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/DummyPlug.cs
@@ -0,0 +1,7 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Заглушка труб RAUTITAN")]
+public class DummyPlug : DrinkingWaterHeatingFitting
+{
+	protected override string _title => "Заглушка для полимерн. трубы";
+}
\ No newline at end of file
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Elbow.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Elbow.cs
new file mode 100644
index 0000000..c762936
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Elbow.cs
@@ -0,0 +1,22 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Угольник RAUTITAN")]
+public class Elbow : DrinkingWaterHeatingFitting
+{
+	protected override string _title { get; } = "Угольник -PLATINUM";
+	
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = string.Empty;
+		var diameterMatch = _diameter.Match(input);
+		if (!diameterMatch.Success)
+		{
+			return false;
+		}
+		string diameter = diameterMatch.Groups["Diameter"].Value;
+		var angleMatch = _angle.Match(input);
+		string angle = angleMatch.Success ? angleMatch.Groups["Angle"].Value : "90";
+		output = $"{_title} {angle} {diameter}";
+		return true;
+	}
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Eurocone.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Eurocone.cs
new file mode 100644
index 0000000..4aaa812
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Eurocone.cs
@@ -0,0 +1,22 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+public abstract class Eurocone : DrinkingWaterHeatingFitting
+{
+	protected virtual Dictionary<string, string> _titles { get; } = new();
+
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = string.Empty;
+		var diameterMatch = _diameter.Match(input);
+		if (diameterMatch.Success)
+		{
+			string diameter = diameterMatch.Groups["Diameter"].Value;
+			if (_titles.TryGetValue(diameter, out string? title))
+			{
+				output = title;
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/EuroconeAdapter.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/EuroconeAdapter.cs
new file mode 100644
index 0000000..b9a4e09
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/EuroconeAdapter.cs
@@ -0,0 +1,20 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Переходник на евроконус")]
+public class EuroconeAdapter : DrinkingWaterHeatingFitting
+{
+	protected override string _title => "Переходник на евроконус";
+
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = string.Empty;
+		var diameterMatch = _diameter.Match(input);
+		if (diameterMatch.Success)
+		{
+			string diameter = diameterMatch.Groups["Diameter"].Value;
+			output = $"{_title} {diameter}-G 3/4";
+			return true;
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/EuroconeConnectionBend.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/EuroconeConnectionBend.cs
new file mode 100644
index 0000000..a011f01
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/EuroconeConnectionBend.cs
@@ -0,0 +1,11 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Резьбозажимное для трубки")]
+public class EuroconeConnectionBend : DrinkingWaterHeatingFitting
+{
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = "Резьбозажимное соединение для металлической трубки G 3/4 -15";
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/EuroconeFlex.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/EuroconeFlex.cs
new file mode 100644
index 0000000..d84a92c
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/EuroconeFlex.cs
@@ -0,0 +1,11 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Резьбозажимное flex")]
+public class EuroconeFlex : Eurocone
+{
+	protected override Dictionary<string, string> _titles => new()
+	{
+		["16"] = "Резьбозажимное соединение flex/pink 16х2,2xG3/4",
+		["20"] = "Резьбозажимное соединение flex/pink 20х2,8xG3/4"
+	};
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/EuroconeStabil.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/EuroconeStabil.cs
new file mode 100644
index 0000000..5b8c700
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/EuroconeStabil.cs
@@ -0,0 +1,11 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Резьбозажимное stabil")]
+public class EuroconeStabil : Eurocone
+{
+	protected override Dictionary<string, string> _titles => new()
+	{
+		["16"] = "Резьбозажимное соединение stabil 16,2x2,6xG3/4",
+		["20"] = "Резьбозажимное соединение stabil 20x2,9xG3/4"
+	};
+}
\ No newline at end of file
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Nippel.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Nippel.cs
new file mode 100644
index 0000000..12ffa72
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Nippel.cs
@@ -0,0 +1,11 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Ниппель")]
+public class Nippel : DrinkingWaterHeatingFitting
+{
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = "К-т двух резьбозажим. нипелей с нар.резьбой 1/2х3/4";
+		return true;
+	}
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ScrewcapElbow.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ScrewcapElbow.cs
new file mode 100644
index 0000000..d0f494c
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ScrewcapElbow.cs
@@ -0,0 +1,7 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Угольник с накидной гайкой")]
+public class ScrewcapElbow : Adapter
+{
+	protected override string _title => "Угольник-переходник с накидной гайкой";
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Sleeve.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Sleeve.cs
new file mode 100644
index 0000000..facb4c6
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/Sleeve.cs
@@ -0,0 +1,7 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Монтажная гильза")]
+public class Sleeve : DrinkingWaterHeatingFitting 
+{
+	protected override string _title => "Монтажная гильза";
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/SupportingClip.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/SupportingClip.cs
new file mode 100644
index 0000000..955a515
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/SupportingClip.cs
@@ -0,0 +1,24 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Желоб")]
+public class SupportingClip : DrinkingWaterHeatingFitting
+{
+	protected override string _title => "Фиксирующий желоб для ПЭ-трубы";
+
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = string.Empty;		
+		var diameterMatch = _diameter.Match(input);
+		if (diameterMatch.Success)
+		{
+			string diameter = diameterMatch.Groups["Diameter"].Value;
+			if (diameter == "16")
+			{
+				diameter += "/17";
+			}
+			output = $"{_title} {diameter}";
+			return true;
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/TPiece.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/TPiece.cs
new file mode 100644
index 0000000..274fd3d
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/TPiece.cs
@@ -0,0 +1,28 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Тройник RAUTITAN")]
+public class TPiece : DrinkingWaterHeatingFitting
+{
+	protected override string _title => "Тройник -PLATINUM";
+
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = string.Empty;
+		var diameters = _diameter.Matches(input)
+			.Select(match => match.Groups["Diameter"].Value)
+			.ToArray();
+		if (diameters.Length == 1)
+		{
+			output = $"{_title} {diameters[0]}-{diameters[0]}-{diameters[0]}";
+		}
+		else if (diameters.Length >= 3)
+		{
+			output = $"{_title} {diameters[0]}-{diameters[1]}-{diameters[2]}";
+		}
+		else
+		{
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowDoubleWallInternal.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowDoubleWallInternal.cs
new file mode 100644
index 0000000..aaeca67
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowDoubleWallInternal.cs
@@ -0,0 +1,32 @@
+using System.Text.RegularExpressions;
+
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Проточный настенный угольник")]
+public class ThreadElbowDoubleWallInternal : DrinkingWaterHeatingFitting
+{
+	protected override string _title => "Проточный настенный угольник";
+	private Regex _type = new(@"([\b\Wу])(?<Type>длин)([\b\w\.\s])");
+
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = string.Empty;
+		var diameterMatches = _diameter.Matches(input);
+		if (diameterMatches.Count == 0)
+		{
+			return false;
+		}
+		var threadMatch = _thread.Match(input);
+		if (!threadMatch.Success)
+		{
+			return false;
+		}
+		var typeMatch = _type.Match(input);
+		string[] diameters = diameterMatches.Select(x => x.Groups["Diameter"].Value).ToArray();
+		string thread = threadMatch.Groups["Thread"].Value;
+		string type = typeMatch.Success ? "длинный" : "короткий";
+		
+		output = $"{_title} {diameters[0]}/{(diameters.Length > 1 ? diameters[1] : diameters[0])}-Rp {thread} {type}";
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowExternal.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowExternal.cs
new file mode 100644
index 0000000..6cebc22
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowExternal.cs
@@ -0,0 +1,7 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Угольник с наружной резьбой")]
+public class ThreadElbowExternal : Adapter
+{
+	protected override string _title => "Угольник-переходник с наружной резьбой";
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowInternal.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowInternal.cs
new file mode 100644
index 0000000..4a7e5f4
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowInternal.cs
@@ -0,0 +1,7 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Угольник с внутренней резьбой")]
+public class ThreadElbowInternal : Adapter
+{
+	protected override string _title => "Угольник-переходник с внутренней резьбой";
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallExternal.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallExternal.cs
new file mode 100644
index 0000000..4df2e3e
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallExternal.cs
@@ -0,0 +1,26 @@
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Угольник настенный наружный")]
+public class ThreadElbowWallExternal : DrinkingWaterHeatingFitting
+{
+	protected override string _title => "Угольник настенный с наружной резьбой";
+
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = string.Empty;
+		var diameterMatch = _diameter.Match(input);
+		if (!diameterMatch.Success)
+		{
+			return false;
+		}
+		var threadMatch = _thread.Match(input);
+		if (!threadMatch.Success)
+		{
+			return false;
+		}
+		string diameter = diameterMatch.Groups["Diameter"].Value;
+		string thread = threadMatch.Groups["Thread"].Value;
+		output = $"{_title} {diameter}-R {thread}";
+		return true;
+	}
+}
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallInternal.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallInternal.cs
new file mode 100644
index 0000000..8a4edb3
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadElbowWallInternal.cs
@@ -0,0 +1,30 @@
+using System.Text.RegularExpressions;
+
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Угольник настенный внутренний")]
+public class ThreadElbowWallInternal : DrinkingWaterHeatingFitting
+{
+	protected override string _title => "Угольник настенный внутр. резьба";
+	private Regex _type = new(@"([\b\Wу])(?<Type>длин)([\b\w\.\s])");
+
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = string.Empty;
+		var diameterMatch = _diameter.Match(input);
+		if (!diameterMatch.Success)
+		{
+			return false;
+		}
+		var threadMatch = _thread.Match(input);
+		if (!threadMatch.Success)
+		{
+			return false;
+		}
+		var typeMatch = _type.Match(input);
+		string diameter = diameterMatch.Groups["Diameter"].Value;
+		string thread = threadMatch.Groups["Thread"].Value;
+		output = $"{_title} {(typeMatch.Success ? "длинный " : string.Empty)}{diameter}-Rp {thread}";
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadTPieceExternal.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadTPieceExternal.cs
new file mode 100644
index 0000000..30b35c3
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadTPieceExternal.cs
@@ -0,0 +1,30 @@
+using System.Text.RegularExpressions;
+
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Тройник RAUTITAN резьбовой наружный")]
+public class ThreadTPieceExternal : DrinkingWaterHeatingFitting
+{
+	protected override string _title => "Тройник с наружной резьбой";
+
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = string.Empty;
+		MatchCollection diametersMatches = _diameter.Matches(input);
+		if (diametersMatches.Count == 0)
+		{
+			return false;
+		}
+		string thread = _thread.Match(input).Groups["Thread"].Value;
+		int[] diameters = diametersMatches.Select(match => int.Parse(match.Groups["Diameter"].Value)).ToArray();
+		if (diameters.Length == 1)
+		{
+			output = $"{_title} {diameters[0]}-{diameters[0]}-R {thread}";
+		}
+		else
+		{
+			output = $"{_title} {diameters[0]}-{diameters[1]}-R {thread}";
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadTPieceInternal.cs b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadTPieceInternal.cs
new file mode 100644
index 0000000..b57fffc
--- /dev/null
+++ b/RhSolutions.MLModifiers/DrinkingWaterHeatingFittings/ThreadTPieceInternal.cs
@@ -0,0 +1,42 @@
+using System.Text.RegularExpressions;
+
+namespace RhSolutions.MLModifiers.DrinkingWaterHeatingFittings;
+
+[MLModifierKey("Тройник RAUTITAN резьбовой внутренний")]
+public class ThreadTPieceInternal : DrinkingWaterHeatingFitting
+{
+	public override bool TryQueryModify(string input, out string output)
+	{
+		output = string.Empty;
+		MatchCollection diametersMatches = _diameter.Matches(input);
+		if (diametersMatches.Count == 0)
+		{
+			return false;
+		}
+		string thread = _thread.Match(input).Groups["Thread"].Value;
+		int[] diameters = diametersMatches.Select(match => int.Parse(match.Groups["Diameter"].Value)).ToArray();
+		if (diameters.Length == 1)
+		{
+			if (diameters[0] < 25)
+			{
+				output = $"Тройник настенный с внутренней резьбой {diameters[0]}-Rp{thread}-{diameters[0]}";
+			}
+			else
+			{
+				output = $"Тройник с внутр. резьбой на боков. проходе {diameters[0]}-Rp {thread}-{diameters[0]}";
+			}
+		}
+		else
+		{
+			if (diameters[0] < 25)
+			{
+				output = $"Тройник настенный с внутренней резьбой {diameters[0]}-Rp{thread}-{diameters[1]}";
+			}
+			else
+			{
+				output = $"Тройник с внутр. резьбой на боков. проходе {diameters[0]}-Rp {thread}-{diameters[1]}";
+			}
+		}
+		return true;
+	}
+}