Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs =================================================================== diff -u -r594e0982c648dcb6072a3837762ec8c2516cb070 -rc4e07ab35c95f94b0df14b474db8497eae0f6322 --- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs (.../HydraulicLocationConfigurationDatabaseReader.cs) (revision 594e0982c648dcb6072a3837762ec8c2516cb070) +++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs (.../HydraulicLocationConfigurationDatabaseReader.cs) (revision c4e07ab35c95f94b0df14b474db8497eae0f6322) @@ -156,6 +156,7 @@ while (MoveNext(dataReader)) { readTracks.Add(new ReadTrack(dataReader.Read(TracksTableDefinitions.TrackId), + dataReader.Read(TracksTableDefinitions.HrdFileName), isUsePreprocessorClosureColumnPresent && dataReader.Read(RegionsTableDefinitions.UsePreprocessorClosure))); } } Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadTrack.cs =================================================================== diff -u -r594e0982c648dcb6072a3837762ec8c2516cb070 -rc4e07ab35c95f94b0df14b474db8497eae0f6322 --- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadTrack.cs (.../ReadTrack.cs) (revision 594e0982c648dcb6072a3837762ec8c2516cb070) +++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadTrack.cs (.../ReadTrack.cs) (revision c4e07ab35c95f94b0df14b474db8497eae0f6322) @@ -30,10 +30,12 @@ /// Creates a new instance of . /// /// The track id. + /// The hydraulic boundary database file name. /// Indicator whether to use preprocessor closure. - internal ReadTrack(long trackId, bool usePreprocessorClosure) + internal ReadTrack(long trackId, string hrdFileName, bool usePreprocessorClosure) { TrackId = trackId; + HrdFileName = hrdFileName; UsePreprocessorClosure = usePreprocessorClosure; } @@ -43,6 +45,11 @@ public long TrackId { get; } /// + /// Gets the hydraulic boundary database file name. + /// + public string HrdFileName { get; } + + /// /// Gets the indicator whether to use preprocessor closure. /// public bool UsePreprocessorClosure { get; } Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/TracksTableDefinitions.cs =================================================================== diff -u -r594e0982c648dcb6072a3837762ec8c2516cb070 -rc4e07ab35c95f94b0df14b474db8497eae0f6322 --- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/TracksTableDefinitions.cs (.../TracksTableDefinitions.cs) (revision 594e0982c648dcb6072a3837762ec8c2516cb070) +++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/TracksTableDefinitions.cs (.../TracksTableDefinitions.cs) (revision c4e07ab35c95f94b0df14b474db8497eae0f6322) @@ -30,5 +30,6 @@ public const string TableName = "Tracks"; public const string TrackId = "TrackId"; public const string RegionId = "RegionId"; + public const string HrdFileName = "HRDFileName"; } } \ No newline at end of file Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs =================================================================== diff -u -r594e0982c648dcb6072a3837762ec8c2516cb070 -rc4e07ab35c95f94b0df14b474db8497eae0f6322 --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision 594e0982c648dcb6072a3837762ec8c2516cb070) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision c4e07ab35c95f94b0df14b474db8497eae0f6322) @@ -286,8 +286,10 @@ ReadTrack[] readTracks = readHydraulicLocationConfigurationDatabase.ReadTracks.ToArray(); Assert.AreEqual(290, readTracks.Length); Assert.IsNotNull(readTracks.SingleOrDefault(rt => rt.TrackId == 18169 + && rt.HrdFileName == "WBI2017_Bovenmaas_hoge_keringen_36-5_v02.sqlite" && !rt.UsePreprocessorClosure)); Assert.IsNotNull(readTracks.SingleOrDefault(rt => rt.TrackId == 1000 + && rt.HrdFileName == "WBI2017_Bovenrijn_aslocaties_v02.sqlite" && !rt.UsePreprocessorClosure)); } } Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadTrackTest.cs =================================================================== diff -u -r594e0982c648dcb6072a3837762ec8c2516cb070 -rc4e07ab35c95f94b0df14b474db8497eae0f6322 --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadTrackTest.cs (.../ReadTrackTest.cs) (revision 594e0982c648dcb6072a3837762ec8c2516cb070) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadTrackTest.cs (.../ReadTrackTest.cs) (revision c4e07ab35c95f94b0df14b474db8497eae0f6322) @@ -35,13 +35,15 @@ // Setup var random = new Random(21); long trackId = random.Next(); + var hrdFileName = random.Next().ToString(); bool usePreprocessorClosure = random.NextBoolean(); // Call - var readTrack = new ReadTrack(trackId, usePreprocessorClosure); + var readTrack = new ReadTrack(trackId, hrdFileName, usePreprocessorClosure); // Assert Assert.AreEqual(trackId, readTrack.TrackId); + Assert.AreEqual(hrdFileName, readTrack.HrdFileName); Assert.AreEqual(usePreprocessorClosure, readTrack.UsePreprocessorClosure); } } Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/TracksTableDefinitionsTest.cs =================================================================== diff -u -r594e0982c648dcb6072a3837762ec8c2516cb070 -rc4e07ab35c95f94b0df14b474db8497eae0f6322 --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/TracksTableDefinitionsTest.cs (.../TracksTableDefinitionsTest.cs) (revision 594e0982c648dcb6072a3837762ec8c2516cb070) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/TracksTableDefinitionsTest.cs (.../TracksTableDefinitionsTest.cs) (revision c4e07ab35c95f94b0df14b474db8497eae0f6322) @@ -33,6 +33,7 @@ Assert.AreEqual("Tracks", TracksTableDefinitions.TableName); Assert.AreEqual("TrackId", TracksTableDefinitions.TrackId); Assert.AreEqual("RegionId", TracksTableDefinitions.RegionId); + Assert.AreEqual("HRDFileName", TracksTableDefinitions.HrdFileName); } } } \ No newline at end of file Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs =================================================================== diff -u -r594e0982c648dcb6072a3837762ec8c2516cb070 -rc4e07ab35c95f94b0df14b474db8497eae0f6322 --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs (.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs) (revision 594e0982c648dcb6072a3837762ec8c2516cb070) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs (.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs) (revision c4e07ab35c95f94b0df14b474db8497eae0f6322) @@ -116,7 +116,7 @@ { return new ReadHydraulicLocationConfigurationDatabase(locationIds.Select(locationId => new ReadHydraulicLocation(locationId + 100, locationId, tracks.First().Key)), settings, - tracks.Select(t => new ReadTrack(t.Key, t.Value))); + tracks.Select(t => new ReadTrack(t.Key, "hrdFile.sqlite", t.Value))); } } } \ No newline at end of file