Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios.csv (revision 2609) @@ -0,0 +1,3 @@ +location_id;location_scenario_id;water_height +TPL_Hempolder_0010;1;55 +TPL_Hempolder_0020;1;66 Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/Lijnscenarios.defx =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/Lijnscenarios.defx (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/Lijnscenarios.defx (revision 2609) @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Locations.qpj =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Locations.qpj (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Locations.qpj (revision 2609) @@ -0,0 +1 @@ +GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]] Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/soilprofiles.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/soilprofiles.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/soilprofiles.csv (revision 2609) @@ -0,0 +1,7 @@ +soilprofile_id;top_level;soil_name +Segment_235_1D1;30;HHNK1_kade +Segment_235_1D1;-1;HHNK1_Tfo +Segment_235_1D1;-1.5;HHNK1_Ppp +Segment_235_1D1;-4;HHNK1_Tfg +Segment_235_1D1;-5.5;HHNK1_Tcs +Segment_235_1D1;-24;HHNK1_Bss Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Segments.shp =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Crosssection.sbn =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Segments.qpj =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Segments.qpj (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Segments.qpj (revision 2609) @@ -0,0 +1 @@ +GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]] Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/LijnScenario.prj =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/LijnScenario.prj (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/LijnScenario.prj (revision 2609) @@ -0,0 +1 @@ +GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]] \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs =================================================================== diff -u -r2597 -r2609 --- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 2597) +++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 2609) @@ -112,6 +112,165 @@ dataPluginImporter.SetDataSources("", srcDataSources); } + private const string HemPolderLocationId1 = "TPL_Hempolder_0010"; + private const string HemPolderLocationId2 = "TPL_Hempolder_0020"; + private void SetupInvoerHemPolderWithShapeFiles(string folder, string shapefile) + { + srcDataSources = new List + { + new DataSource + { + DataSourceType = DataSourceType.CsvFiles, + DataLocation = folder + }, + new DataSource + { + DataSourceType = DataSourceType.DataShapeFiles, + DataLocation = folder + } + }; + dataPluginImporter = new DataPluginImporter + { + Attributes = new[] + { + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.LocationAttributeId, + AttributeName = "LocationId", + DataSource = "Locations.shp" + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.DikeRingAttributeId, + AttributeName = "DikeRingId", + DataSource = "Locations.shp" + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.HeadPl3AttributeId, + AttributeName = "HEADPL3", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.HeadPl4AttributeId, + AttributeName = "HEADPL4", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.PlLineOffsetBelowDikeTopAtRiverAttributeId, + AttributeName = "PLOBDTOPR", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.PlLineOffsetBelowDikeTopAtPolderAttributeId, + AttributeName = "PLOBDTOPP", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.PlLineOffsetBelowShoulderBaseInsideAttributeId, + AttributeName = "PLOBSB", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.PlLineOffsetBelowDikeToeAtPolderAttributeId, + AttributeName = "PLOBDTOEP", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.UsePlLineOffsetBelowDikeCrestMiddleAttributeId, + AttributeName = "USEPLOBDCM", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.PlLineOffsetBelowDikeCrestMiddleAttributeId, + AttributeName = "PLOBDCM", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.UsePlLineOffsetFactorBelowShoulderCrestAttributeId, + AttributeName = "USEPLOFBSC", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.PlLineOffsetFactorBelowShoulderCrestAttributeId, + AttributeName = "PLOFBSC", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.UpliftCriterionStabilityAttributeId, + AttributeName = "UPLSTAB", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.UpliftCriterionPipingAttributeId, + AttributeName = "UPLPIPING", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.DikeTableHeightAttributeId, + AttributeName = "DTH", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.RiverLevelAttributeId, + AttributeName = "WHEIGHT", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.RiverLevelLowAttributeId, + AttributeName = "WHEIGHTLOW", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.RequiredSafetyFactorPipingAttributeId, + AttributeName = "FPIPING", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.RequiredSafetyFactorStabilityInnerSlopeAttributeId, + AttributeName = "FSTABIN", + DataSource = shapefile + }, + new DataAttribute + { + AttributeId = LocationShapeFileAttributeMap.RequiredSafetyFactorStabilityOuterSlopeAttributeId, + AttributeName = "FSTABOUT", + DataSource = shapefile + }, + } + }; + dataPluginImporter.SetDataSources("", srcDataSources); + } + private void SetupInvoerHemPolderWithoutShapeFiles(string folder) + { + srcDataSources = new List + { + new DataSource + { + DataSourceType = DataSourceType.CsvFiles, + DataLocation = folder + }, + }; + dataPluginImporter = new DataPluginImporter(); + dataPluginImporter.SetDataSources("", srcDataSources); + } + [Test] public void CanDefineDataSources() { @@ -167,13 +326,15 @@ Assert.AreEqual("Waterschap", info.Description); } + /// + /// Some parameters for location can be read from either locations.csv or shapefile + /// The value from shapefile overwrites the value from locations.csv + /// In this test the values for headpl2 in the import files are: + /// In shapefiles: -5.37 for both locations + /// In locations.csv: -99 for both locations + /// Expected value in location will be -5.37 for both locations + /// [Test] - // Some parameters for location can be read from either locations.csv or shapefile - // The value from shapefile overwrites the value from locations.csv - // In this test the values for headpl2 in the import files are: - // In shapefiles: -5.37 for both locations - // In locations.csv: -99 for both locations - // Expected value in location will be -5.37 for both locations public void ValuesFromShapeFileOverwriteValuesFromLocationsCsv() { SetupInvoer1WithShapeFiles(); @@ -189,14 +350,16 @@ Assert.AreEqual("-5.37", locationDetails.First(x => x.ParameterName.Equals("HeadPL2")).ParameterValue); } + /// + /// Some parameters for scenario can be read from either locations.csv, shapefile or scenarios.csv + /// The value from scenarios.csv overwrites the value from shapefile, which overwrites the value from locations.csv + /// In this test the values for headpl3 in the import files are: + /// In scenarios.csv: not defined + /// In shapefiles: not defined + /// In locations.csv: -99 for both locations + /// Expected value in scenario will be -99 + /// [Test] - // Some parameters for scenario can be read from either locations.csv, shapefile or scenarios.csv - // The value from scenarios.csv overwrites the value from shapefile, which overwrites the value from locations.csv - // In this test the values for headpl3 in the import files are: - // In scenarios.csv: not defined - // In shapefiles: not defined - // In locations.csv: -99 for both locations - // Expected value in scenario will be -99 public void ValuesFromLocationsCsvAreCopiedToScenarioIfNotDefinedInScenariosCsvOrShapeFile() { SetupInvoer1WithoutShapeFiles(); @@ -213,14 +376,16 @@ Assert.AreEqual("-99", scenarioDetails.First(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); } + /// + /// Some parameters for scenario can be read from either locations.csv, shapefile or scenarios.csv + /// The value from scenarios.csv overwrites the value from shapefile, which overwrites the value from locations.csv + /// In this test the values for headpl3 in the import files are: + /// In scenarios.csv: not defined + /// In shapefiles: -3.651 for location 1, -3.632 for location 2 + /// In locations.csv: -99 for both locations + /// Expected value in scenario will be -3.651 for location 1, -3.632 for location 2 + /// [Test] - // Some parameters for scenario can be read from either locations.csv, shapefile or scenarios.csv - // The value from scenarios.csv overwrites the value from shapefile, which overwrites the value from locations.csv - // In this test the values for headpl3 in the import files are: - // In scenarios.csv: not defined - // In shapefiles: -3.651 for location 1, -3.632 for location 2 - // In locations.csv: -99 for both locations - // Expected value in scenario will be -3.651 for location 1, -3.632 for location 2 public void ValuesFromShapeFileAreCopiedToScenarioIfNotDefinedInScenariosCsv() { SetupInvoer1WithShapeFiles(); @@ -331,9 +496,11 @@ } } + /// + /// RiverLevel must be specified in locations.csv, shapefile or scenarios.csv + /// In this test reading from shapefile is skipped, RiverLevel is defined in locations, not in scenarios + /// [Test] - // RiverLevel must be specified in locations.csv, shapefile or scenarios.csv - // In this test reading from shapefile is skipped, RiverLevel is defined in locations, not in scenarios public void ImportRiverLevelFromLocationsTest() { // Setup folder for situation where RiverLevel is specified in locations @@ -375,9 +542,11 @@ Assert.AreEqual(0, dataPluginImporter.ImportLogMessages.Count); } + /// + /// RiverLevel must be specified in locations.csv, shapefile or scenarios.csv + /// In this test reading from shapefile is skipped, RiverLevel is defined in locations and in scenarios + /// [Test] - // RiverLevel must be specified in locations.csv, shapefile or scenarios.csv - // In this test reading from shapefile is skipped, RiverLevel is defined in locations and in scenarios public void ImportRiverLevelFromScenariosTest() { // Setup folder for situation where RiverLevel is specified in locations and scenarios @@ -419,9 +588,11 @@ Assert.AreEqual(0, dataPluginImporter.ImportLogMessages.Count); } + /// + /// RiverLevel must be specified in locations.csv, shapefile or scenarios.csv + /// In this test reading from shapefile is skipped, RiverLevel is NOT defined in locations or scenarios + /// [Test] - // RiverLevel must be specified in locations.csv, shapefile or scenarios.csv - // In this test reading from shapefile is skipped, RiverLevel is NOT defined in locations or scenarios public void ImportRiverLevelNotSpecifiedTest() { // Setup folder for situation where RiverLevel is NOT specified in locations and scenarios @@ -462,5 +633,372 @@ // Expected: no error messages Assert.AreEqual(0, dataPluginImporter.ImportLogMessages.Count); } + + /// + /// Test for values that can be read from both scenarios.csv and locations.csv/shapefile for situation: + /// Locations.csv: filled with only required values (none) + /// Shapefiles: none + /// Scenarios.csv: filled with only required values (none) + /// Expected result: scenario will be filled with defaults + /// See Log.xlsx for all the values that are in all the files + /// + [Test] + public void ImportHemPolderScenarioDefaultsTest() + { + // Copy import data to test folder + var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "ImportHemPolderScenarioDefaultsTest"); + if (Directory.Exists(importFolder)) + { + Directory.Delete(importFolder, true); + } + if (!Directory.Exists(importFolder)) + { + Directory.CreateDirectory(importFolder); + } + var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\csvfiles"); + File.Copy(Path.Combine(testDataFolderCsv, "characteristicpoints.csv"), Path.Combine(importFolder, "characteristicpoints.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "segments.csv"), Path.Combine(importFolder, "segments.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "soilprofiles.csv"), Path.Combine(importFolder, "soilprofiles.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "surfacelines.csv"), Path.Combine(importFolder, "surfacelines.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "locations_basic.csv"), Path.Combine(importFolder, "locations.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "scenarios_basic.csv"), Path.Combine(importFolder, "scenarios.csv")); + // create importer + SetupInvoerHemPolderWithoutShapeFiles(importFolder); + string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); + dataPluginImporter.ImportDataForDikeRings(new List { dikeRingId }, null); + // check values for location 1 + string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); + IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); + var nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); + Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); + Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); + Assert.AreEqual("0.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); + Assert.AreEqual("1.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); + Assert.AreEqual("0.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); + Assert.AreEqual("0.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); + Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("1.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); + Assert.AreEqual("1.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); + Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); + Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); + Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); + Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); + Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); + Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + } + + /// + /// Test for values that can be read from both scenarios.csv and locations.csv/shapefile for situation: + /// Locations.csv: completely filled + /// Shapefiles: none + /// Scenarios.csv: filled with only required values (waterheight) + /// Expected result: scenario will be filled with values from locations.csv + /// See Log.xlsx for all the values that are in all the files + /// + [Test] + public void ImportHemPolderScenarioFromLocationsCsvTest() + { + // Copy import data to test folder + var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "ImportHemPolderScenarioFromLocationsCsvTest"); + if (Directory.Exists(importFolder)) + { + Directory.Delete(importFolder, true); + } + if (!Directory.Exists(importFolder)) + { + Directory.CreateDirectory(importFolder); + } + var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\csvfiles"); + File.Copy(Path.Combine(testDataFolderCsv, "characteristicpoints.csv"), Path.Combine(importFolder, "characteristicpoints.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "segments.csv"), Path.Combine(importFolder, "segments.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "soilprofiles.csv"), Path.Combine(importFolder, "soilprofiles.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "surfacelines.csv"), Path.Combine(importFolder, "surfacelines.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "locations_complete.csv"), Path.Combine(importFolder, "locations.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "scenarios_basic.csv"), Path.Combine(importFolder, "scenarios.csv")); + // create importer + SetupInvoerHemPolderWithoutShapeFiles(importFolder); + string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); + dataPluginImporter.ImportDataForDikeRings(new List { dikeRingId }, null); + // check values for location 1 + string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); + IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); + var nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); + Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); + Assert.AreEqual("3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); + Assert.AreEqual("0.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); + Assert.AreEqual("0.26", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); + Assert.AreEqual("0.27", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); + Assert.AreEqual("0.28", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); + Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual("0.29", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("0.3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); + Assert.AreEqual("3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); + Assert.AreEqual("2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); + Assert.AreEqual("2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); + Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); + Assert.AreEqual("0.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); + Assert.AreEqual("0.92", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); + Assert.AreEqual("0.94", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + } + + /// + /// Test for values that can be read from both scenarios.csv and locations.csv/shapefile for situation: + /// Locations.csv: filled completely + /// Shapefiles: line shapes filled completely + /// Scenarios.csv: filled with only required values (waterheight) + /// Expected result: scenario will be filled with values from shapefiles + /// See Log.xlsx for all the values that are in all the files + /// + [Test] + public void ImportHemPolderLineShapeOverLocationsCsvTest() + { + // Copy import data to test folder + var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "ImportHemPolderLineShapeOverLocationsCsvTest"); + if (Directory.Exists(importFolder)) + { + Directory.Delete(importFolder, true); + } + if (!Directory.Exists(importFolder)) + { + Directory.CreateDirectory(importFolder); + } + var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\csvfiles"); + var testDataFolderShape = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\shapefiles"); + File.Copy(Path.Combine(testDataFolderCsv, "characteristicpoints.csv"), Path.Combine(importFolder, "characteristicpoints.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "segments.csv"), Path.Combine(importFolder, "segments.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "soilprofiles.csv"), Path.Combine(importFolder, "soilprofiles.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "surfacelines.csv"), Path.Combine(importFolder, "surfacelines.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "locations_complete.csv"), Path.Combine(importFolder, "locations.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "scenarios_basic.csv"), Path.Combine(importFolder, "scenarios.csv")); + var shapefiles = Directory.GetFiles(testDataFolderShape); + foreach (var shapefile in shapefiles) + { + var fileName = Path.GetFileName(shapefile); + File.Copy(Path.Combine(testDataFolderShape, fileName), Path.Combine(importFolder, fileName)); + } + // create importer + SetupInvoerHemPolderWithShapeFiles(importFolder, "LijnScenario.shp"); + string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); + dataPluginImporter.ImportDataForDikeRings(new List { dikeRingId }, null); + // check values for location 1 + string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); + IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); + var nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); + Assert.AreEqual("1.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); + Assert.AreEqual("3.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); + Assert.AreEqual("0.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); + Assert.AreEqual("0.21", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); + Assert.AreEqual("0.22", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); + Assert.AreEqual("0.23", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); + Assert.AreEqual("False", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual("0.24", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual("False", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("0.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); + Assert.AreEqual("5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); + Assert.AreEqual("4", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); + Assert.AreEqual("3.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); + Assert.AreEqual("2.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); + Assert.AreEqual("0.6", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); + Assert.AreEqual("0.63", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); + Assert.AreEqual("0.66", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + // check values for location 2 + scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId2).FirstOrDefault(); + scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId2, scenarioId); + nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); + Assert.AreEqual("0.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); + Assert.AreEqual("2.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); + Assert.AreEqual("0.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); + Assert.AreEqual("0.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); + Assert.AreEqual("0.12", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); + Assert.AreEqual("0.13", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); + Assert.AreEqual("False", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual("0.14", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("0.15", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); + Assert.AreEqual("4", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); + Assert.AreEqual("3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); + Assert.AreEqual("3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); + Assert.AreEqual("2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); + Assert.AreEqual("0.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); + Assert.AreEqual("0.53", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); + Assert.AreEqual("0.56", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + } + + /// + /// Test for values that can be read from both scenarios.csv and locations.csv/shapefile for situation: + /// Locations.csv: filled completely + /// Shapefiles: area shapes filled completely + /// Scenarios.csv: filled with only required values (waterheight) + /// Expected result: scenario will be filled with values from shapefiles + /// See Log.xlsx for all the values that are in all the files + /// + [Test] + public void ImportHemPolderAreaShapeOverLocationsCsvTest() + { + // Copy import data to test folder + var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "ImportHemPolderAreaShapeOverLocationsCsvTest"); + if (Directory.Exists(importFolder)) + { + Directory.Delete(importFolder, true); + } + if (!Directory.Exists(importFolder)) + { + Directory.CreateDirectory(importFolder); + } + var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\csvfiles"); + var testDataFolderShape = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\shapefiles"); + File.Copy(Path.Combine(testDataFolderCsv, "characteristicpoints.csv"), Path.Combine(importFolder, "characteristicpoints.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "segments.csv"), Path.Combine(importFolder, "segments.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "soilprofiles.csv"), Path.Combine(importFolder, "soilprofiles.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "surfacelines.csv"), Path.Combine(importFolder, "surfacelines.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "locations_complete.csv"), Path.Combine(importFolder, "locations.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "scenarios_basic.csv"), Path.Combine(importFolder, "scenarios.csv")); + var shapefiles = Directory.GetFiles(testDataFolderShape); + foreach (var shapefile in shapefiles) + { + var fileName = Path.GetFileName(shapefile); + File.Copy(Path.Combine(testDataFolderShape, fileName), Path.Combine(importFolder, fileName)); + } + // create importer + SetupInvoerHemPolderWithShapeFiles(importFolder, "VlakScenario.shp"); + string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); + dataPluginImporter.ImportDataForDikeRings(new List { dikeRingId }, null); + // check values for location 1 + string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); + IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); + var nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); + Assert.AreEqual("0.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); + Assert.AreEqual("2.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); + Assert.AreEqual("0.05", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); + Assert.AreEqual("0.06", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); + Assert.AreEqual("0.07", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); + Assert.AreEqual("0.08", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); + Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual("0.09", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual("False", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("0.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("4", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); + Assert.AreEqual("6", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); + Assert.AreEqual("5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); + Assert.AreEqual("4.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); + Assert.AreEqual("3.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); + Assert.AreEqual("0.81", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); + Assert.AreEqual("0.83", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); + Assert.AreEqual("0.85", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + // check values for location 2 + scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId2).FirstOrDefault(); + scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId2, scenarioId); + nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); + Assert.AreEqual("1.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); + Assert.AreEqual("3.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); + Assert.AreEqual("0.15", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); + Assert.AreEqual("0.16", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); + Assert.AreEqual("0.17", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); + Assert.AreEqual("0.18", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); + Assert.AreEqual("False", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual("0.19", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("0.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); + Assert.AreEqual("5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); + Assert.AreEqual("4", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); + Assert.AreEqual("4", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); + Assert.AreEqual("3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); + Assert.AreEqual("0.7", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); + Assert.AreEqual("0.75", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); + Assert.AreEqual("0.8", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + } + + /// + /// Test for values that can be read from both scenarios.csv and locations.csv/shapefile for situation: + /// Locations.csv: filled completely + /// Shapefiles: line shapes filled completely + /// Scenarios.csv: filled completely + /// Expected result: scenario will be filled with values from scenarios.csv + /// See Log.xlsx for all the values that are in all the files + /// + [Test] + public void ImportHemPolderScenarioOverShapeAndLocationsCsvTest() + { + // Copy import data to test folder + var importFolder = Path.Combine(Directory.GetCurrentDirectory(), "ImportHemPolderScenarioOverShapeAndLocationsCsvTest"); + if (Directory.Exists(importFolder)) + { + Directory.Delete(importFolder, true); + } + if (!Directory.Exists(importFolder)) + { + Directory.CreateDirectory(importFolder); + } + var testDataFolderCsv = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\csvfiles"); + var testDataFolderShape = Path.Combine(Directory.GetCurrentDirectory(), @"..\..\Dam\Tests\TestData\HempolderImport\shapefiles"); + File.Copy(Path.Combine(testDataFolderCsv, "characteristicpoints.csv"), Path.Combine(importFolder, "characteristicpoints.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "segments.csv"), Path.Combine(importFolder, "segments.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "soilprofiles.csv"), Path.Combine(importFolder, "soilprofiles.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "surfacelines.csv"), Path.Combine(importFolder, "surfacelines.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "locations_complete.csv"), Path.Combine(importFolder, "locations.csv")); + File.Copy(Path.Combine(testDataFolderCsv, "scenarios_complete.csv"), Path.Combine(importFolder, "scenarios.csv")); + var shapefiles = Directory.GetFiles(testDataFolderShape); + foreach (var shapefile in shapefiles) + { + var fileName = Path.GetFileName(shapefile); + File.Copy(Path.Combine(testDataFolderShape, fileName), Path.Combine(importFolder, fileName)); + } + // create importer + SetupInvoerHemPolderWithShapeFiles(importFolder, "LijnScenario.shp"); + string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); + dataPluginImporter.ImportDataForDikeRings(new List { dikeRingId }, null); + // check values for location 1 + string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); + IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); + var nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); + Assert.AreEqual("0.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); + Assert.AreEqual("2.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); + Assert.AreEqual("0.55", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); + Assert.AreEqual("0.56", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); + Assert.AreEqual("0.57", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); + Assert.AreEqual("0.58", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); + Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual("0.59", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("0.6", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("0.88", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); + Assert.AreEqual("0.77", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); + Assert.AreEqual("2.88", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); + Assert.AreEqual("1.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); + Assert.AreEqual("1.77", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); + Assert.AreEqual("1.09", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); + Assert.AreEqual("1.12", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); + Assert.AreEqual("1.14", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + // check values for location 2 + scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId2).FirstOrDefault(); + scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId2, scenarioId); + nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); + Assert.AreEqual("1.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); + Assert.AreEqual("3.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); + Assert.AreEqual("0.65", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); + Assert.AreEqual("0.66", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); + Assert.AreEqual("0.67", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); + Assert.AreEqual("0.68", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); + Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual("0.69", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); + Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("0.7", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); + Assert.AreEqual("0.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); + Assert.AreEqual("0.66", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); + Assert.AreEqual("2.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); + Assert.AreEqual("1.22", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); + Assert.AreEqual("1.88", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); + Assert.AreEqual("1.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); + Assert.AreEqual("1.13", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); + Assert.AreEqual("1.15", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + } } } Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations_complete.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations_complete.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations_complete.csv (revision 2609) @@ -0,0 +1,3 @@ +location_id;dikering_id;surfaceline_id;segment_id;geo_x;geo_y;polderlevel;head_pl2;ophoogmateriaaldijk;ophoogmateriaalberm;dempingsfactor_pl3;dempingsfactor_pl4;head_pl3;head_pl4;PlLineOffsetBelowDikeTopAtRiver ;PlLineOffsetBelowDikeTopAtPolder ;PlLineOffsetBelowShoulderBaseInside ;PlLineOffsetBelowDikeToeAtPolder ;UsePlLineOffsetBelowDikeCrestMiddle ;PlLineOffsetBelowDikeCrestMiddle ;UsePlLineOffsetFactorBelowShoulderCrest ;PlLineOffsetFactorBelowShoulderCrest ;uplift_criterion_stability;uplift_criterion_piping;dike_table_height;water_height;water_height_low;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope +TPL_Hempolder_0010;TPL_Hempolder;Test1;234;198384.4;503776.3;-0.35;-1.3;HHNK1_Bfg;HHNK1_Bfl;50;50;1;3;0.25;0.26;0.27;0.28;TRUE;0.29;TRUE;0.3;1;3;2;2;1;0.9;0.92;0.94 +TPL_Hempolder_0020;TPL_Hempolder;Test1;234;198384.4;503776.3;-0.35;-1.3;HHNK1_Bfg;HHNK1_Bfl;50;50;2;4;0.35;0.36;0.37;0.38;TRUE;0.39;TRUE;0.4;2;4;3;2.5;1.5;0.91;0.93;0.95 Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/Vlakscenario.defx =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/Vlakscenario.defx (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/Vlakscenario.defx (revision 2609) @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/VlakScenario.shx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Locations.shx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/VlakScenario.prj =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/VlakScenario.prj (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/VlakScenario.prj (revision 2609) @@ -0,0 +1 @@ +GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]] \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Segments.shx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/VlakScenario.shp =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/Log.xlsx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/surfacelines.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/surfacelines.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/surfacelines.csv (revision 2609) @@ -0,0 +1,3 @@ +Profielnaam;Geologischprofiel;X_GridPoint;Y_GridPoint;ScenarioClusterID;X1;Y1;Z1;.....;Xn;Yn;Zn;(Profiel) +Test1;0;22.9;27.7;0;0;0;-1.5;5;0;-1.5;12;0;-0.4;14.2;0;0.1;15;0;0.4;17.8;0;1.4;24.7;0;3;27.2;0;3;27.7;0;3;37;0;-2.1;65;0;-2.1;75;0;-2.1;105;0;-2.1 +Test2;0;22.9;27.7;0;0;0;-1.5;5;0;-1.5;12;0;-0.4;14.2;0;0.1;15;0;0.4;17.8;0;1.4;24.7;0;3;27.2;0;3;27.7;0;3;37;0;-2.1;45;0;-2.1;47;0;-4.1;48;0;-4.1;50;0;-2.1;65;0;-2.1;75;0;-2.1;105;0;-2.1 Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/LijnScenario.qpj =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/LijnScenario.qpj (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/LijnScenario.qpj (revision 2609) @@ -0,0 +1 @@ +GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]] Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios_basic.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios_basic.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios_basic.csv (revision 2609) @@ -0,0 +1,3 @@ +location_id;location_scenario_id +TPL_Hempolder_0010;1 +TPL_Hempolder_0020;1 Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs =================================================================== diff -u -r2529 -r2609 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2529) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2609) @@ -289,7 +289,7 @@ /// fpiping /// double /// - public const string SafetyFactorPipingAttributeId = CsvColumnNames.RequiredSafetyFactorPipingColumnName; + public const string RequiredSafetyFactorPipingAttributeId = CsvColumnNames.RequiredSafetyFactorPipingColumnName; /// /// safety_factor_stability_inner_slope @@ -298,7 +298,7 @@ /// fstabinner /// double /// - public const string SafetyFactorStabilityInnerSlopeAttributeId = CsvColumnNames.RequiredSafetyFactorStabilityInnerSlopeColumnName; + public const string RequiredSafetyFactorStabilityInnerSlopeAttributeId = CsvColumnNames.RequiredSafetyFactorStabilityInnerSlopeColumnName; /// /// safety_factor_stability_outer_slope @@ -307,7 +307,7 @@ /// fstabouter /// double /// - public const string SafetyFactorStabilityOuterSlopeAttributeId = CsvColumnNames.RequiredSafetyFactorStabilityOuterSlopeColumnName; + public const string RequiredSafetyFactorStabilityOuterSlopeAttributeId = CsvColumnNames.RequiredSafetyFactorStabilityOuterSlopeColumnName; /// /// uplift_criterion_piping @@ -646,9 +646,9 @@ createItem(IntrusionVerticalWaterPressureAttributeId, "IntrusionVerticalWaterPressure.shp", "IVWP", (t, value) => t.IntrusionVerticalWaterPressure = LocationImportHelper.ToIntrusionVerticalWaterPressure(value)), createItem(TrafficLoadAttributeId, "trafficload.shp", "TrafLoad", (t, value) => t.TrafficLoad = value.ToType() ), createItem(TL_DegreeOfConsolidationAttributeId, "TL_DegreeOfConsolidation.shp", "TL_DegOfCo", (t, value) => t.TL_DegreeOfConsolidation = value.ToType() ), - createItem(SafetyFactorPipingAttributeId, "safety_factor_piping.shp", "fpiping", (t, value) => t.RequiredSafetyFactorPiping = value.ToType()), - createItem(SafetyFactorStabilityInnerSlopeAttributeId, "safety_factor_stability_inner_slope.shp", "fstabinner", (t, value) => t.RequiredSafetyFactorStabilityInnerSlope = value.ToType()), - createItem(SafetyFactorStabilityOuterSlopeAttributeId, "safety_factor_stability_outer_slope.shp", "fstabouter", (t, value) => t.RequiredSafetyFactorStabilityOuterSlope = value.ToType()), + createItem(RequiredSafetyFactorPipingAttributeId, "safety_factor_piping.shp", "fpiping", (t, value) => t.RequiredSafetyFactorPiping = value.ToType()), + createItem(RequiredSafetyFactorStabilityInnerSlopeAttributeId, "safety_factor_stability_inner_slope.shp", "fstabinner", (t, value) => t.RequiredSafetyFactorStabilityInnerSlope = value.ToType()), + createItem(RequiredSafetyFactorStabilityOuterSlopeAttributeId, "safety_factor_stability_outer_slope.shp", "fstabouter", (t, value) => t.RequiredSafetyFactorStabilityOuterSlope = value.ToType()), createItem(ShoulderEmbankmentMaterialAttributeId, ShoulderMaterialShapeFileName, "ShlderMtrl", (t, value) => t.ShoulderEmbankmentMaterial = value.ToType() ), createItem(StabilityShoulderGrowSlopeAttributeId, "StabilityShoulderGrowSlope.shp", "StShSlpGr", (t, value) => t.StabilityShoulderGrowSlope = value.ToType()), createItem(StabilityShoulderGrowDeltaXAttributeId, "StabilityShoulderGrowDeltaX.shp", "StShDXGr", (t, value) => t.StabilityShoulderGrowDeltaX = value.ToType()), Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Locations.dbf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/VlakScenario.dbf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations_basic.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations_basic.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations_basic.csv (revision 2609) @@ -0,0 +1,3 @@ +location_id;dikering_id;surfaceline_id;segment_id;geo_x;geo_y;polderlevel;head_pl2;ophoogmateriaaldijk;ophoogmateriaalberm;dempingsfactor_pl3;dempingsfactor_pl4 +TPL_Hempolder_0010;TPL_Hempolder;Test1;234;198384.4;503776.3;-0.35;-1.3;HHNK1_Bfg;HHNK1_Bfl;50;50 +TPL_Hempolder_0020;TPL_Hempolder;Test1;234;198384.4;503776.3;-0.35;-1.3;HHNK1_Bfg;HHNK1_Bfl;50;50 Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Locations.prj =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Locations.prj (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Locations.prj (revision 2609) @@ -0,0 +1 @@ +GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]] \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/segments.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/segments.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/segments.csv (revision 2609) @@ -0,0 +1,3 @@ +segment_id;soilprofile_id;probability;calculation_type +235;Segment_235_1D1;100;Stability +235;Segment_235_1D1;100;Piping Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Crosssection.sbx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations_empty.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations_empty.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations_empty.csv (revision 2609) @@ -0,0 +1,3 @@ +location_id;location_scenario_id;head_pl3;head_pl4;PlLineOffsetBelowDikeTopAtRiver ;PlLineOffsetBelowDikeTopAtPolder ;PlLineOffsetBelowShoulderBaseInside ;PlLineOffsetBelowDikeToeAtPolder ;UsePlLineOffsetBelowDikeCrestMiddle ;PlLineOffsetBelowDikeCrestMiddle ;UsePlLineOffsetFactorBelowShoulderCrest ;PlLineOffsetFactorBelowShoulderCrest ;uplift_criterion_stability;uplift_criterion_piping;dike_table_height;water_height;water_height_low;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope +TPL_Hempolder_0010;1;;;;;;;;;;;;;;;;;; +TPL_Hempolder_0020;1;;;;;;;;;;;;;;;;;; Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Locations.shp =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/VlakScenario.qpj =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/VlakScenario.qpj (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/VlakScenario.qpj (revision 2609) @@ -0,0 +1 @@ +GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]] Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios_empty.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios_empty.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios_empty.csv (revision 2609) @@ -0,0 +1,3 @@ +location_id;location_scenario_id;head_pl3;head_pl4;PlLineOffsetBelowDikeTopAtRiver ;PlLineOffsetBelowDikeTopAtPolder ;PlLineOffsetBelowShoulderBaseInside ;PlLineOffsetBelowDikeToeAtPolder ;UsePlLineOffsetBelowDikeCrestMiddle ;PlLineOffsetBelowDikeCrestMiddle ;UsePlLineOffsetFactorBelowShoulderCrest ;PlLineOffsetFactorBelowShoulderCrest ;uplift_criterion_stability;uplift_criterion_piping;dike_table_height;water_height;water_height_low;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope +TPL_Hempolder_0010;1;;;;;;;;;;;;;;1.11;;;; +TPL_Hempolder_0020;1;;;;;;;;;;;;;;1.22;;;; Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/LijnScenario.shp =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios_complete.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios_complete.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/scenarios_complete.csv (revision 2609) @@ -0,0 +1,3 @@ +location_id;location_scenario_id;head_pl3;head_pl4;PlLineOffsetBelowDikeTopAtRiver ;PlLineOffsetBelowDikeTopAtPolder ;PlLineOffsetBelowShoulderBaseInside ;PlLineOffsetBelowDikeToeAtPolder ;UsePlLineOffsetBelowDikeCrestMiddle ;PlLineOffsetBelowDikeCrestMiddle ;UsePlLineOffsetFactorBelowShoulderCrest ;PlLineOffsetFactorBelowShoulderCrest ;uplift_criterion_stability;uplift_criterion_piping;dike_table_height;water_height;water_height_low;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope +TPL_Hempolder_0010;1;0.11;2.11;0.55;0.56;0.57;0.58;TRUE;0.59;TRUE;0.6;0.88;0.77;2.88;1.11;1.77;1.09;1.12;1.14 +TPL_Hempolder_0020;1;1.11;3.11;0.65;0.66;0.67;0.68;TRUE;0.69;TRUE;0.7;0.99;0.66;2.99;1.22;1.88;1.1;1.13;1.15 Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Segments.prj =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Segments.prj (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Segments.prj (revision 2609) @@ -0,0 +1 @@ +GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]] \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Crosssection.shp =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/LijnScenario.shx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Segments.dbf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/characteristicpoints.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/characteristicpoints.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/characteristicpoints.csv (revision 2609) @@ -0,0 +1,3 @@ +Profielnaam;X_Maaiveld binnenwaarts;Y_Maaiveld binnenwaarts;Z_Maaiveld binnenwaarts;X_Insteek sloot polderzijde;Y_Insteek sloot polderzijde;Z_Insteek sloot polderzijde;X_Slootbodem polderzijde;Y_Slootbodem polderzijde;Z_Slootbodem polderzijde;X_Slootbodem dijkzijde;Y_Slootbodem dijkzijde;Z_Slootbodem dijkzijde;X_Insteek sloot dijkzijde;Y_Insteek_sloot dijkzijde;Z_Insteek sloot dijkzijde;X_Teen dijk binnenwaarts;Y_Teen dijk binnenwaarts;Z_Teen dijk binnenwaarts;X_Kruin binnenberm;Y_Kruin binnenberm;Z_Kruin binnenberm;X_Insteek binnenberm;Y_Insteek binnenberm;Z_Insteek binnenberm;X_Kruin binnentalud;Y_Kruin binnentalud;Z_Kruin binnentalud;X_Verkeersbelasting kant binnenwaarts;Y_Verkeersbelasting kant binnenwaarts;Z_Verkeersbelasting kant binnenwaarts;X_Verkeersbelasting kant buitenwaarts;Y_Verkeersbelasting kant buitenwaarts;Z_Verkeersbelasting kant buitenwaarts;X_Kruin buitentalud;Y_Kruin buitentalud;Z_Kruin buitentalud;X_Insteek buitenberm;Y_Insteek buitenberm;Z_Insteek buitenberm;X_Kruin buitenberm;Y_Kruin buitenberm;Z_Kruin buitenberm;X_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts;X_Maaiveld buitenwaarts;Y_Maaiveld buitenwaarts;Z_Maaiveld buitenwaarts;X_Dijktafelhoogte;Y_Dijktafelhoogte;Z_Dijktafelhoogte;Volgnummer +Test1;105;0;-2.1;-1;-1;-1;-1;-1;-1;-1;-1;-1;-1;-1;-1;37;0;-2.1;-1;-1;-1;-1;-1;-1;27.7;0;3;27.2;0;3;24.7;0;3;24.7;0;3;-1;-1;-1;-1;-1;-1;14.2;0;0.1;0;0;-1.5;24.7;0;3;0 +Test2;105;0;-2.1;50;0;-2.1;48;0;-4.1;47;0;-4.1;45;0;-2.1;37;0;-2.1;-1;-1;-1;-1;-1;-1;27.7;0;3;27.2;0;3;24.7;0;3;24.7;0;3;-1;-1;-1;-1;-1;-1;14.2;0;0.1;0;0;-1.5;24.7;0;3;0 Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Crosssection.shx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/Crosssection.dbf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations.csv =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations.csv (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/csvfiles/locations.csv (revision 2609) @@ -0,0 +1,3 @@ +location_id;dikering_id;surfaceline_id;segment_id;geo_x;geo_y;polderlevel;head_pl2;ophoogmateriaaldijk;ophoogmateriaalberm;dempingsfactor_pl3;dempingsfactor_pl4;head_pl3;head_pl4;PlLineOffsetBelowDikeTopAtRiver ;PlLineOffsetBelowDikeTopAtPolder ;PlLineOffsetBelowShoulderBaseInside ;PlLineOffsetBelowDikeToeAtPolder ;UsePlLineOffsetBelowDikeCrestMiddle ;PlLineOffsetBelowDikeCrestMiddle ;UsePlLineOffsetFactorBelowShoulderCrest ;PlLineOffsetFactorBelowShoulderCrest ;uplift_criterion_stability;uplift_criterion_piping;dike_table_height;water_height;water_height_low;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope +TPL_Hempolder_0010;TPL_Hempolder;Test1;234;198384.4;503776.3;-0.35;-1.3;HHNK1_Bfg;HHNK1_Bfl;50;50;0.11;2.11;0.55;0.56;0.57;0.58;TRUE;0.59;TRUE;0.6;0.88;0.77;2.88;1.11;1.77;1.09;1.12;1.14 +TPL_Hempolder_0020;TPL_Hempolder;Test1;234;198384.4;503776.3;-0.35;-1.3;HHNK1_Bfg;HHNK1_Bfl;50;50;1.11;3.11;0.65;0.66;0.67;0.68;TRUE;0.69;TRUE;0.7;0.99;0.66;2.99;1.22;1.88;1.1;1.13;1.15 Index: DamClients/DamUI/trunk/src/Dam/Tests/TestData/HempolderImport/shapefiles/LijnScenario.dbf =================================================================== diff -u Binary files differ