Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilProfile2DReader.cs
===================================================================
diff -u -r751aaf9b7623bac357cbacf4e6ddae87b2b69f1f -rcb6877f670bacc7a6a896ab132d592eeef1107b5
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilProfile2DReader.cs (.../SoilProfile2DReader.cs) (revision 751aaf9b7623bac357cbacf4e6ddae87b2b69f1f)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilProfile2DReader.cs (.../SoilProfile2DReader.cs) (revision cb6877f670bacc7a6a896ab132d592eeef1107b5)
@@ -100,7 +100,7 @@
var geometryValue = ReadGeometryFrom(reader, profileName);
pipingSoilLayer = new SoilLayer2DReader().Read(geometryValue);
}
- catch (SoilLayer2DConversionException e)
+ catch (SoilLayerConversionException e)
{
throw CreatePipingSoilProfileReadException(reader.Path, profileName, e);
}
@@ -166,92 +166,6 @@
return new PipingSoilProfileReadException(profileName, message, innerException);
}
- private class LayerProperties
- {
- internal readonly double? IsAquifer;
- internal readonly string MaterialName;
- internal readonly double? Color;
- internal readonly double? AbovePhreaticLevel;
- internal readonly double? DryUnitWeight;
-
- internal readonly double? BelowPhreaticLevelDistribution;
- internal readonly double? BelowPhreaticLevelShift;
- internal readonly double? BelowPhreaticLevelMean;
- internal readonly double? BelowPhreaticLevelDeviation;
-
- internal readonly double? DiameterD70Distribution;
- internal readonly double? DiameterD70Shift;
- internal readonly double? DiameterD70Mean;
- internal readonly double? DiameterD70Deviation;
-
- internal readonly double? PermeabilityDistribution;
- internal readonly double? PermeabilityShift;
- internal readonly double? PermeabilityMean;
- internal readonly double? PermeabilityDeviation;
-
-
- ///
- /// Creates a new instance of , which contains properties
- /// that are required to create a complete . If these properties
- /// cannot be read, then the reader can proceed to the next profile.
- ///
- /// The to read the required layer property values from.
- /// The profile name used in generating exceptions messages if casting failed.
- /// Thrown when the values in the database could not be
- /// casted to the expected column types.
- internal LayerProperties(IRowBasedDatabaseReader reader, string profileName)
- {
- string readColumn = SoilProfileDatabaseColumns.IsAquifer;
- try
- {
- IsAquifer = reader.ReadOrDefault(readColumn);
-
- readColumn = SoilProfileDatabaseColumns.MaterialName;
- MaterialName = reader.ReadOrDefault(readColumn);
-
- readColumn = SoilProfileDatabaseColumns.Color;
- Color = reader.ReadOrDefault(readColumn);
-
- readColumn = SoilProfileDatabaseColumns.AbovePhreaticLevel;
- AbovePhreaticLevel = reader.ReadOrDefault(readColumn);
- readColumn = SoilProfileDatabaseColumns.DryUnitWeight;
- DryUnitWeight = reader.ReadOrDefault(readColumn);
-
- readColumn = SoilProfileDatabaseColumns.BelowPhreaticLevelDistribution;
- BelowPhreaticLevelDistribution = reader.ReadOrDefault(readColumn);
- readColumn = SoilProfileDatabaseColumns.BelowPhreaticLevelShift;
- BelowPhreaticLevelShift = reader.ReadOrDefault(readColumn);
- readColumn = SoilProfileDatabaseColumns.BelowPhreaticLevelMean;
- BelowPhreaticLevelMean = reader.ReadOrDefault(readColumn);
- readColumn = SoilProfileDatabaseColumns.BelowPhreaticLevelDeviation;
- BelowPhreaticLevelDeviation = reader.ReadOrDefault(readColumn);
-
- readColumn = SoilProfileDatabaseColumns.DiameterD70Distribution;
- DiameterD70Distribution = reader.ReadOrDefault(readColumn);
- readColumn = SoilProfileDatabaseColumns.DiameterD70Shift;
- DiameterD70Shift = reader.ReadOrDefault(readColumn);
- readColumn = SoilProfileDatabaseColumns.DiameterD70Mean;
- DiameterD70Mean = reader.ReadOrDefault(readColumn);
- readColumn = SoilProfileDatabaseColumns.DiameterD70Deviation;
- DiameterD70Deviation = reader.ReadOrDefault(readColumn);
-
- readColumn = SoilProfileDatabaseColumns.PermeabilityDistribution;
- PermeabilityDistribution = reader.ReadOrDefault(readColumn);
- readColumn = SoilProfileDatabaseColumns.PermeabilityShift;
- PermeabilityShift = reader.ReadOrDefault(readColumn);
- readColumn = SoilProfileDatabaseColumns.PermeabilityMean;
- PermeabilityMean = reader.ReadOrDefault(readColumn);
- readColumn = SoilProfileDatabaseColumns.PermeabilityDeviation;
- PermeabilityDeviation = reader.ReadOrDefault(readColumn);
- }
- catch (InvalidCastException e)
- {
- var message = string.Format(Resources.PipingSoilProfileReader_Profile_has_invalid_value_on_Column_0_, readColumn);
- throw CreatePipingSoilProfileReadException(reader.Path, profileName, message, e);
- }
- }
- }
-
private class RequiredProfileProperties
{
internal readonly double IntersectionX;