Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r1175 -r1183 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1175) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 1183) @@ -1089,20 +1089,26 @@ return translationTable[regionalResultType]; } + public const int SoilTypeClay = 0; + public const int SoilTypeGravel = 1; + public const int SoilTypeLoam = 2; + public const int SoilTypePeat = 3; + public const int SoilTypeSand = 4; + /// /// Converts the input dikeMaterialType to SoilType. /// /// Type of the dike material. /// - public static SoilType ConvertToSoilType(LocationAssesmentRegionalOptionsDikeMaterialType dikeMaterialType) + public static SoilType ConvertToSoilType(int dikeMaterialType) { - var translationTable = new Dictionary() + var translationTable = new Dictionary() { - {LocationAssesmentRegionalOptionsDikeMaterialType.Clay, SoilType.Clay}, - {LocationAssesmentRegionalOptionsDikeMaterialType.Gravel, SoilType.Gravel}, - {LocationAssesmentRegionalOptionsDikeMaterialType.Loam, SoilType.Loam}, - {LocationAssesmentRegionalOptionsDikeMaterialType.Peat, SoilType.Peat}, - {LocationAssesmentRegionalOptionsDikeMaterialType.Sand, SoilType.Sand} + {SoilTypeClay, SoilType.Clay}, + {SoilTypeGravel, SoilType.Gravel}, + {SoilTypeLoam, SoilType.Loam}, + {SoilTypePeat, SoilType.Peat}, + {SoilTypeSand, SoilType.Sand} }; return translationTable[dikeMaterialType]; } @@ -1111,15 +1117,15 @@ /// /// Type of the soil. /// - public static LocationAssesmentRegionalOptionsDikeMaterialType ConvertToInputSoilType(SoilType soilType) + public static int ConvertToInputSoilType(SoilType soilType) { - var translationTable = new Dictionary() + var translationTable = new Dictionary() { - {SoilType.Clay, LocationAssesmentRegionalOptionsDikeMaterialType.Clay}, - {SoilType.Gravel, LocationAssesmentRegionalOptionsDikeMaterialType.Gravel}, - {SoilType.Loam, LocationAssesmentRegionalOptionsDikeMaterialType.Loam}, - {SoilType.Peat, LocationAssesmentRegionalOptionsDikeMaterialType.Peat}, - {SoilType.Sand, LocationAssesmentRegionalOptionsDikeMaterialType.Sand} + {SoilType.Clay, SoilTypeClay}, + {SoilType.Gravel, SoilTypeGravel}, + {SoilType.Loam, SoilTypeLoam}, + {SoilType.Peat, SoilTypePeat}, + {SoilType.Sand, SoilTypeSand} }; return translationTable[soilType]; }