Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSoilProfileReader.cs =================================================================== diff -u -rd514ce187a1ce571355fd92ca1edf822d943ba39 -rb270a71e8e53ef6d702120af0915825ce427a3bd --- Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSoilProfileReader.cs (.../PipingSoilProfileReader.cs) (revision d514ce187a1ce571355fd92ca1edf822d943ba39) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSoilProfileReader.cs (.../PipingSoilProfileReader.cs) (revision b270a71e8e53ef6d702120af0915825ce427a3bd) @@ -103,7 +103,6 @@ private ISoilProfileBuilder ReadPipingProfile1D() { - var profileName = Read(profileNameColumn); var layerCount = Read(layerCountColumn); var bottom = Read(bottomColumn); @@ -121,7 +120,6 @@ private ISoilProfileBuilder ReadPipingProfile2D() { - var profileName = Read(profileNameColumn); var layerCount = Read(layerCountColumn); var intersectionX = Read(intersectionXColumn); @@ -158,17 +156,15 @@ MoveNext(); } - private bool TryRead(string columnName, out T value) + private void TryRead(string columnName, out T value) { try { value = (T) dataReader[columnName]; - return true; } catch (InvalidCastException e) { value = default(T); - return false; } } @@ -205,17 +201,11 @@ private PipingSoilLayer ReadPipingSoilLayer() { - double topValue; double isAquiferValue; - var columnValueRead = TryRead(topColumn, out topValue); - var isAquiferValueRead = TryRead(isAquiferColumn, out isAquiferValue); + var topValue = Read(topColumn); + TryRead(isAquiferColumn, out isAquiferValue); - if (!columnValueRead || !isAquiferValueRead) - { - return null; - } - var pipingSoilLayer = new PipingSoilLayer(topValue) { IsAquifer = isAquiferValue.Equals(1.0) @@ -226,16 +216,10 @@ private SoilLayer2D ReadPiping2DSoilLayer() { double isAquiferValue; - byte[] geometryValue; - var geometryRead = TryRead(layerGeometryColumn, out geometryValue); - var isAquiferValueRead = TryRead(isAquiferColumn, out isAquiferValue); + var geometryValue = Read(layerGeometryColumn); + TryRead(isAquiferColumn, out isAquiferValue); - if (!geometryRead || !isAquiferValueRead) - { - return null; - } - SoilLayer2D pipingSoilLayer = new PipingSoilLayer2DReader(geometryValue).Read(); pipingSoilLayer.IsAquifer = isAquiferValue.Equals(1.0);