upgrades to OpenFTTH.Events 1.0.8

DAXGRID · Aug 28, 2020 · 83f282d · 83f282d
1 parent 9c1947b
commit 83f282d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/OpenFTTH.GDBIntegrator.Integrator/OpenFTTH.GDBIntegrator.Integrator.csproj b/src/OpenFTTH.GDBIntegrator.Integrator/OpenFTTH.GDBIntegrator.Integrator.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="MediatR" Version="8.1.0" />
-    <PackageReference Include="OpenFTTH.Events" Version="1.0.7-alpha" />
+    <PackageReference Include="OpenFTTH.Events" Version="1.0.8" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OpenFTTH.GDBIntegrator.RouteNetwork/Mapping/InfoMapper.cs b/src/OpenFTTH.GDBIntegrator.RouteNetwork/Mapping/InfoMapper.cs
@@ -75,10 +75,20 @@ public class InfoMapper : IInfoMapper
                     return RouteNodeKindEnum.CentralOfficeSmall;
                 case "ConduitClosure":
                     return RouteNodeKindEnum.ConduitClosure;
+                case "ConduitClosureBranchOff":
+                    return RouteNodeKindEnum.ConduitClosureBranchOff;
+                case "ConduitClosureFork":
+                    return RouteNodeKindEnum.ConduitClosureFork;
+                case "ConduitClosureStraight":
+                    return RouteNodeKindEnum.ConduitClosureStraight;
+                case "ConduitConnector":
+                    return RouteNodeKindEnum.ConduitConnector;
+                case "ConduitConnectorBranchOff":
+                    return RouteNodeKindEnum.ConduitConnectorBranchOff;
+                case "ConduitConnectorStraight":
+                    return RouteNodeKindEnum.ConduitConnectorStraight;
                 case "ConduitEnd":
                     return RouteNodeKindEnum.ConduitEnd;
-                case "ConduitSimpleJunction":
-                    return RouteNodeKindEnum.ConduitSimpleJunction;
                 case "HandHole":
                     return RouteNodeKindEnum.HandHole;
                 case "ManHole":

diff --git a/src/OpenFTTH.GDBIntegrator.RouteNetwork/OpenFTTH.GDBIntegrator.RouteNetwork.csproj b/src/OpenFTTH.GDBIntegrator.RouteNetwork/OpenFTTH.GDBIntegrator.RouteNetwork.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.3" />
     <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="2.0.3" />
-    <PackageReference Include="OpenFTTH.Events" Version="1.0.7-alpha" />
+    <PackageReference Include="OpenFTTH.Events" Version="1.0.8" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/OpenFTTH.GDBIntegrator.RouteNetwork.Tests/Mapper/SerializationMapperTest.cs b/test/OpenFTTH.GDBIntegrator.RouteNetwork.Tests/Mapper/SerializationMapperTest.cs
@@ -65,8 +65,13 @@ public void MapMappingMethod_ShouldThrowArgumentException_OnBeingPassedInvalidSt
         [InlineData("CentralOfficeMedium", RouteNodeKindEnum.CentralOfficeMedium)]
         [InlineData("CentralOfficeSmall", RouteNodeKindEnum.CentralOfficeSmall)]
         [InlineData("ConduitClosure", RouteNodeKindEnum.ConduitClosure)]
+        [InlineData("ConduitClosureBranchOff", RouteNodeKindEnum.ConduitClosureBranchOff)]
+        [InlineData("ConduitClosureFork", RouteNodeKindEnum.ConduitClosureFork)]
+        [InlineData("ConduitClosureStraight", RouteNodeKindEnum.ConduitClosureStraight)]
+        [InlineData("ConduitConnector", RouteNodeKindEnum.ConduitConnector)]
+        [InlineData("ConduitConnectorBranchOff", RouteNodeKindEnum.ConduitConnectorBranchOff)]
+        [InlineData("ConduitConnectorStraight", RouteNodeKindEnum.ConduitConnectorStraight)]
         [InlineData("ConduitEnd", RouteNodeKindEnum.ConduitEnd)]
-        [InlineData("ConduitSimpleJunction", RouteNodeKindEnum.ConduitSimpleJunction)]
         [InlineData("HandHole", RouteNodeKindEnum.HandHole)]
         [InlineData("ManHole", RouteNodeKindEnum.ManHole)]
         [InlineData("MultiDwellingUnit", RouteNodeKindEnum.MultiDwellingUnit)]