Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineMetaImporter.cs =================================================================== diff -u -r1537ed6c8364e79f9b4c869c95e3d9398a55a572 -r2715f4b30426f7295453b30cd7c1af97f060bcaa --- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineMetaImporter.cs (.../ReferenceLineMetaImporter.cs) (revision 1537ed6c8364e79f9b4c869c95e3d9398a55a572) +++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineMetaImporter.cs (.../ReferenceLineMetaImporter.cs) (revision 2715f4b30426f7295453b30cd7c1af97f060bcaa) @@ -75,7 +75,7 @@ /// public IEnumerable GetReferenceLineMetas() { - var referenceLineMetas = ReadReferenceLineMetas(); + ICollection referenceLineMetas = ReadReferenceLineMetas(); ValidateReferenceLineMetas(referenceLineMetas); @@ -87,8 +87,7 @@ var files = GetShapeFilesInFolder(folderpath); if (files.Length == 0) { - var message = new FileReaderErrorMessageBuilder( - Path.Combine(folderpath, "*.shp")) + var message = new FileReaderErrorMessageBuilder(folderpath) .Build(RingtoetsCommonIOResources.ReferenceLineMetaImporter_ValidateAndConnectTo_No_shape_file_found); throw new CriticalFileReadException(message); } @@ -132,8 +131,9 @@ } } - private IEnumerable ReadReferenceLineMetas() + private ICollection ReadReferenceLineMetas() { + var referenceLinesMetas = new List(); using (var reader = new ReferenceLinesMetaReader(shapeFilePath)) { ReferenceLineMeta referenceLinesMeta; @@ -142,15 +142,16 @@ referenceLinesMeta = reader.ReadReferenceLinesMeta(); if (referenceLinesMeta != null) { - yield return referenceLinesMeta; + referenceLinesMetas.Add(referenceLinesMeta); } } while (referenceLinesMeta != null); } + return referenceLinesMetas; } - private void ValidateReferenceLineMetas(IEnumerable referenceLineMetas) + private void ValidateReferenceLineMetas(ICollection referenceLineMetas) { - var referenceLineMetasCount = referenceLineMetas.Select(rlm => rlm.AssessmentSectionId).Count(); + var referenceLineMetasCount = referenceLineMetas.Count; var referenceLineMetasDistinctCount = referenceLineMetas.Select(rlm => rlm.AssessmentSectionId).Distinct().Count(); if (referenceLineMetasCount != referenceLineMetasDistinctCount)