Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Importer/CsvImporter.cs =================================================================== diff -u -r3197 -r3199 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Importer/CsvImporter.cs (.../CsvImporter.cs) (revision 3197) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Importer/CsvImporter.cs (.../CsvImporter.cs) (revision 3199) @@ -60,7 +60,7 @@ location.LocationId = locationRecord.LocationId; location.SurfacelineId = locationRecord.SurfaceLineId; location.SoilGeometryName = locationRecord.SoilGeometryName; - location.XOffset = locationRecord.XSoilGeometry2DOrigin.GetValueOrDefault(location.XOffset); + location.XOffset = locationRecord.XOffset.GetValueOrDefault(location.XOffset); location.DikeMaterial = locationRecord.DikeEmbankmentMaterial; location.LayerMaterial = locationRecord.LayerMaterial; location.LayerThickness = locationRecord.LayerThickness; Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Application.Tests/TestFiles/ApplicationTestInput/slopelayers.csv =================================================================== diff -u -r3197 -r3199 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Application.Tests/TestFiles/ApplicationTestInput/slopelayers.csv (.../slopelayers.csv) (revision 3197) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Application.Tests/TestFiles/ApplicationTestInput/slopelayers.csv (.../slopelayers.csv) (revision 3199) @@ -1,2 +1,2 @@ -location_id;surfaceline_id;segment_id;x_soilgeometry2D_origin;soilgeometry2D_name;Dikering_id;Ophoogmateriaaldijk;slope_layer_thickness;slope_layer_material; +location_id;surfaceline_id;segment_id;x_offset;soilgeometry2D_name;Dikering_id;Ophoogmateriaaldijk;slope_layer_thickness;slope_layer_material; 111-DIG-8986-01.2-dp 46;111-DIG-8986-01.2;111-DIG-8986-01.2;-5;111-DIG-8986-01.2.sti;111;Pleistoceen zand;1.2;Veen > 300; Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Importer/CsvColumnNames.cs =================================================================== diff -u -r3186 -r3199 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Importer/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 3186) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Importer/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 3199) @@ -35,9 +35,9 @@ public const string SurfaceLineColumnName = "surfaceline_id"; /// - /// x_soilgeometry2D_origin + /// x_offset /// - public const string XSoilGeometry2DOriginColumnName = "x_soilgeometry2D_origin"; + public const string XOffsetColumnName = "x_offset"; /// /// ophoogmateriaaldijk Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/TestFiles/InputFilesSingleFile/slopelayers.csv =================================================================== diff -u -r3197 -r3199 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/TestFiles/InputFilesSingleFile/slopelayers.csv (.../slopelayers.csv) (revision 3197) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/TestFiles/InputFilesSingleFile/slopelayers.csv (.../slopelayers.csv) (revision 3199) @@ -1,2 +1,2 @@ -location_id;surfaceline_id;segment_id;x_soilgeometry2D_origin;soilgeometry2D_name;Dikering_id;Ophoogmateriaaldijk;slope_layer_thickness;slope_layer_material; +location_id;surfaceline_id;segment_id;x_offset;soilgeometry2D_name;Dikering_id;Ophoogmateriaaldijk;slope_layer_thickness;slope_layer_material; 111-DIG-8986-01.2-dp 46;111-DIG-8986-01.2;111-DIG-8986-01.2;-5;111-DIG-8986-01.2.sti;111;Pleistoceen zand;1.2;Veen > 300; Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/TestFiles/InputFilesSingleFileStiGeometryLeftOfSurfaceLine/slopelayers.csv =================================================================== diff -u -r3197 -r3199 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/TestFiles/InputFilesSingleFileStiGeometryLeftOfSurfaceLine/slopelayers.csv (.../slopelayers.csv) (revision 3197) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/TestFiles/InputFilesSingleFileStiGeometryLeftOfSurfaceLine/slopelayers.csv (.../slopelayers.csv) (revision 3199) @@ -1,2 +1,2 @@ -location_id;surfaceline_id;segment_id;x_soilgeometry2D_origin;soilgeometry2D_name;Dikering_id;Ophoogmateriaaldijk;slope_layer_thickness;slope_layer_material; +location_id;surfaceline_id;segment_id;x_offset;soilgeometry2D_name;Dikering_id;Ophoogmateriaaldijk;slope_layer_thickness;slope_layer_material; 111-DIG-8986-01.2-dp 46;111-DIG-8986-01.2;111-DIG-8986-01.2;37.17;111-DIG-8986-01.2.sti;111;Pleistoceen zand;1.2;Veen > 300; Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.ImporterTests/CsvImportersTests.cs =================================================================== diff -u -r3197 -r3199 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.ImporterTests/CsvImportersTests.cs (.../CsvImportersTests.cs) (revision 3197) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.ImporterTests/CsvImportersTests.cs (.../CsvImportersTests.cs) (revision 3199) @@ -203,7 +203,7 @@ Assert.AreEqual("25-2-2-A-1-A", locationRecords[1].LocationId); Assert.AreEqual("25-2-2-A-1-A", locationRecords[1].SurfaceLineId); Assert.AreEqual("Secondstifile.sti", locationRecords[1].SoilGeometryName); - Assert.AreEqual(1.1, locationRecords[1].XSoilGeometry2DOrigin, tolerance); + Assert.AreEqual(1.1, locationRecords[1].XOffset, tolerance); Assert.AreEqual(0.8, locationRecords[1].LayerThickness, tolerance); Assert.AreEqual("zand", locationRecords[1].LayerMaterial); Assert.AreEqual("klei2", locationRecords[1].DikeEmbankmentMaterial); @@ -614,7 +614,7 @@ using (var writer = File.CreateText(filePath)) { writer.WriteLine( - "location_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;Pl1_id;polderlevel;polderlevellow;head_pl2;head_pl3;head_pl4;Grass_quality;Direction;Ophoogmateriaaldijk;Ophoogmateriaalberm;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments;PenetrationLength;TrafficLoad;minimal_circle_depth;dempingsfactor_pl3;dempingsfactor_pl4;PLLineCreationMethod;level_reduction_inside;level_reduction_outside;layer_height_distribution;layer_height_deviation;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability;Materiaaltypedijk;bp_tp;bp_hbp;bp_lbp;Baggerdiepte;distance_to_entry_point;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;PLLineOffsetDryBelowDikeTopAtRiver;PLLineOffsetDryBelowDikeTopAtPolder;PLLineOffsetDryBelowShoulderBaseInside;PLLineOffsetDryBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;detrimentfactor;dike_table_height;SlopeDampingPiezometricHeightPolderSide;StabilityDesignMethod;SlopeAdaptionStartCotangent;SlopeAdaptionEndCotangent;SlopeAdaptionStepCotangent; UseNewDikeTopWidth; NewDikeTopWidth;UseNewDikeSlopeInside;NewDikeSlopeInside;UseNewDikeSlopeOutside;NewDikeSlopeOutside;UseNewShoulderTopSlope;NewShoulderTopSlope;UseNewShoulderBaseSlope;NewShoulderBaseSlope;UseNewMaxHeightShoulderAsFraction;NewMaxHeightShoulderAsFraction;UseNewMinDistanceDikeToeStartDitch;NewMinDistanceDikeToeStartDitch;UseNewDitchDefinition;NewWidthDitchBottom;newSlopeAngleDitch;NewDepthDitch;ZoneType;ForbiddenZoneFactor;ZoneAreaRestSlopeCrestWidth;PLLineOffsetBelowDikeCrestMiddle;PLLineOffsetFactorBelowShoulderCrest;UsePLLineOffsetDryBelowDikeCrestMiddle;PLLineOffsetDryBelowDikeCrestMiddle;UsePLLineOffsetDryFactorBelowShoulderCrest;PLLineOffsetDryFactorBelowShoulderCrest;IntrusionVerticalWaterPressure;TL_DegreeOfConsolidation;water_height;water_height_low;water_height_decimerings_hoogte;max_waterheight"); + "location_id;surfaceline_id;segment_id;geo_x;geo_y;x_offset;Pl1_id;polderlevel;polderlevellow;head_pl2;head_pl3;head_pl4;Grass_quality;Direction;Ophoogmateriaaldijk;Ophoogmateriaalberm;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments;PenetrationLength;TrafficLoad;minimal_circle_depth;dempingsfactor_pl3;dempingsfactor_pl4;PLLineCreationMethod;level_reduction_inside;level_reduction_outside;layer_height_distribution;layer_height_deviation;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability;Materiaaltypedijk;bp_tp;bp_hbp;bp_lbp;Baggerdiepte;distance_to_entry_point;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;PLLineOffsetDryBelowDikeTopAtRiver;PLLineOffsetDryBelowDikeTopAtPolder;PLLineOffsetDryBelowShoulderBaseInside;PLLineOffsetDryBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;detrimentfactor;dike_table_height;SlopeDampingPiezometricHeightPolderSide;StabilityDesignMethod;SlopeAdaptionStartCotangent;SlopeAdaptionEndCotangent;SlopeAdaptionStepCotangent; UseNewDikeTopWidth; NewDikeTopWidth;UseNewDikeSlopeInside;NewDikeSlopeInside;UseNewDikeSlopeOutside;NewDikeSlopeOutside;UseNewShoulderTopSlope;NewShoulderTopSlope;UseNewShoulderBaseSlope;NewShoulderBaseSlope;UseNewMaxHeightShoulderAsFraction;NewMaxHeightShoulderAsFraction;UseNewMinDistanceDikeToeStartDitch;NewMinDistanceDikeToeStartDitch;UseNewDitchDefinition;NewWidthDitchBottom;newSlopeAngleDitch;NewDepthDitch;ZoneType;ForbiddenZoneFactor;ZoneAreaRestSlopeCrestWidth;PLLineOffsetBelowDikeCrestMiddle;PLLineOffsetFactorBelowShoulderCrest;UsePLLineOffsetDryBelowDikeCrestMiddle;PLLineOffsetDryBelowDikeCrestMiddle;UsePLLineOffsetDryFactorBelowShoulderCrest;PLLineOffsetDryFactorBelowShoulderCrest;IntrusionVerticalWaterPressure;TL_DegreeOfConsolidation;water_height;water_height_low;water_height_decimerings_hoogte;max_waterheight"); writer.WriteLine( "16-1-1-C-3-Z;16-1-1-C-3-Z;1043;124330;441312;1;16-1-1-C-3-Z;0.9;0.2;13.056;0.9;0.8;1;1;klei;klei2;1;2;3;12;TRUE;1.3;10;1.5;30;40;ExpertKnowledgeRRD;1;2;Uniform;0.1;1.2;1.3;1.4;0.01;0.02;0.03;1.1;1.2;klei;1.0;1.1;1.2;2.0;2.1;0.5;0.6;0.1;0.2;0.6;1.6;0.2;0.3;2.0;0.2;0.5;0.9;3.5;0.01;OptimizedSlopeAndShoulderAdaption;3.0;6.0;0.5;TRUE;1.8;TRUE;1.9;TRUE;2.9;TRUE;2.8;TRUE;2.7;TRUE;0.6;TRUE;2.6;TRUE;1.1;1.2;1.3;NoZones;0.5;1.6;1.0;0.1;TRUE;1.1;FALSE;0.11;Standard;10.1;1.2;1.3;1.4;1.5"); writer.WriteLine( @@ -627,7 +627,7 @@ using (var writer = File.CreateText(filePath)) { writer.WriteLine( - "location_id;surfaceline_id;soilgeometry2D_name;x_soilgeometry2D_origin;slope_layer_thickness;slope_layer_material;Ophoogmateriaaldijk;"); + "location_id;surfaceline_id;soilgeometry2D_name;x_offset;slope_layer_thickness;slope_layer_material;Ophoogmateriaaldijk;"); writer.WriteLine( "16-1-1-C-3-Z;16-1-1-C-3-Z;Firststifile.sti;0.9;1.2;klei;klei2;"); writer.WriteLine( @@ -640,7 +640,7 @@ using (var writer = File.CreateText(filePath)) { writer.WriteLine( - "location_id;surfaceline_id;soilgeometry2D_name;x_soilgeometry2D_origin;slope_layer_thickness;slope_layer_material;Ophoogmateriaaldijk;polderlevel;polderlevellow;head_pl2;head_pl3;head_pl4;"); + "location_id;surfaceline_id;soilgeometry2D_name;x_offset;slope_layer_thickness;slope_layer_material;Ophoogmateriaaldijk;polderlevel;polderlevellow;head_pl2;head_pl3;head_pl4;"); writer.WriteLine( "16-1-1-C-3-Z;16-1-1-C-3-Z;Firststifile.sti;0.ssw9;1.2;klei;klei2;-0.6;-0.9,2.1;2.2;2.5;"); writer.WriteLine( Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Importer/CsvImporterLocations.cs =================================================================== diff -u -r3186 -r3199 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Importer/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 3186) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Importer/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 3199) @@ -67,13 +67,13 @@ public string SurfaceLineId { get; set; } /// - /// Gets or sets the x soil geometry2 d origin. + /// Gets or sets the x offset. /// This is the offset needed to combine with the surface line correctly when both do not line up. /// /// - /// The x soil geometry2 d origin. + /// The x offset. /// - public double? XSoilGeometry2DOrigin { get; set; } // Only optional item + public double? XOffset { get; set; } // Only optional item /// /// Gets or sets the dike embankment material. This is to be used as filling material for surface between the original 2D sti profile and the surface line. @@ -148,7 +148,7 @@ CheckColumn(colIndexLocationId, fileName, CsvColumnNames.LocationColumnName); int colIndexSurfaceLineId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SurfaceLineColumnName); CheckColumn(colIndexSurfaceLineId, fileName, CsvColumnNames.SurfaceLineColumnName); - int colIndexXSoilGeometry2DOrigin = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.XSoilGeometry2DOriginColumnName); + int colIndexXOffset = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.XOffsetColumnName); int colIndexDikeEmbankmentMaterial = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeEmbankmentMaterialColumnName); CheckColumn(colIndexDikeEmbankmentMaterial, fileName, CsvColumnNames.DikeEmbankmentMaterialColumnName); int colSoilGeometryName = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SoilGeometryNameColumnName); @@ -180,10 +180,10 @@ /* * Optional column */ - if (colIndexXSoilGeometry2DOrigin > -1) + if (colIndexXOffset > -1) { - colIndex = colIndexXSoilGeometry2DOrigin; - locationRecord.XSoilGeometry2DOrigin = Convert.ToDouble(csv[colIndexXSoilGeometry2DOrigin]); + colIndex = colIndexXOffset; + locationRecord.XOffset = Convert.ToDouble(csv[colIndexXOffset]); } locationRecords.Add(locationRecord); } Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/TestFiles/InputFilesSingleFileMissingDikeMaterial/slopelayers.csv =================================================================== diff -u -r3197 -r3199 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/TestFiles/InputFilesSingleFileMissingDikeMaterial/slopelayers.csv (.../slopelayers.csv) (revision 3197) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/TestFiles/InputFilesSingleFileMissingDikeMaterial/slopelayers.csv (.../slopelayers.csv) (revision 3199) @@ -1,2 +1,2 @@ -location_id;surfaceline_id;segment_id;x_soilgeometry2D_origin;soilgeometry2D_name;Dikering_id +location_id;surfaceline_id;segment_id;x_offset;soilgeometry2D_name;Dikering_id 111-DIG-8986-01.2-dp 46;111-DIG-8986-01.2;111-DIG-8986-01.2;37.17;111-DIG-8986-01.2-dp 46.sti;111