Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTests.cs =================================================================== diff -u -r6436 -r6669 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTests.cs (.../CsvImporterTests.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTests.cs (.../CsvImporterTests.cs) (revision 6669) @@ -452,8 +452,8 @@ Assert.That(locationRecords[1].ShoulderEmbankmentMaterial, Is.EqualTo("klei2")); Assert.That(locationRecords[1].PenetrationLength, Is.EqualTo(1.3).Within(tolerance)); Assert.That(locationRecords[1].TrafficLoad, Is.EqualTo(10).Within(tolerance)); - Assert.That(locationRecords[0].TL_DegreeOfConsolidation, Is.EqualTo(10.1).Within(tolerance)); - Assert.That(locationRecords[1].TL_DegreeOfConsolidation, Is.EqualTo(55.5).Within(tolerance)); + Assert.That(locationRecords[0].TrafficLoadDistributionAngle, Is.EqualTo(10.1).Within(tolerance)); + Assert.That(locationRecords[1].TrafficLoadDistributionAngle, Is.EqualTo(55.5).Within(tolerance)); Assert.That(locationRecords[1].MinimalCircleDepth, Is.EqualTo(1.5).Within(tolerance)); Assert.That(locationRecords[1].DampingFactorPl3, Is.EqualTo(30.0).Within(tolerance)); Assert.That(locationRecords[1].DampingFactorPl4, Is.EqualTo(40.0).Within(tolerance)); @@ -1325,7 +1325,7 @@ { using StreamWriter 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_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;TrafficLoadDistributionAngle;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( Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r6436 -r6669 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 6669) @@ -1134,7 +1134,7 @@ location.StabilityZoneType = StabilityZoneType.NoZones; location.ForbiddenZoneFactor = 10.0 * i + 0.42; location.TrafficLoad = 10.0 * i + 0.44; - location.TL_DegreeOfConsolidation = 10.0 * i + 0.45; + location.TrafficLoadDistributionAngle = 10.0 * i + 0.45; location.RedesignDikeHeight = false; location.RedesignDikeShoulder = false; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNK_WILMEBREEK/Shapes/TrafficLoad.dbf =================================================================== diff -u -r4651 -r6669 Binary files differ Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r6436 -r6669 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 6669) @@ -482,7 +482,7 @@ if (inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidationSpecified) { - location.TL_DegreeOfConsolidation = inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidation; + location.TrafficLoadDistributionAngle = inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidation; } if (inputLocation.StabilityOptions.MinimumCircleDepthSpecified) Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DistributionAngle.shp =================================================================== diff -u Binary files differ Fisheye: Tag 6669 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DegreeOfConsolidation.prj'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNK_WILMEBREEK/Shapes/TrafficLoad.prj =================================================================== diff -u -r4651 -r6669 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNK_WILMEBREEK/Shapes/TrafficLoad.prj (.../TrafficLoad.prj) (revision 4651) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNK_WILMEBREEK/Shapes/TrafficLoad.prj (.../TrafficLoad.prj) (revision 6669) @@ -1 +1 @@ -PROJCS["RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Double_Stereographic"],PARAMETER["False_Easting",155000.0],PARAMETER["False_Northing",463000.0],PARAMETER["Central_Meridian",5.38763888888889],PARAMETER["Scale_Factor",0.9999079],PARAMETER["Latitude_Of_Origin",52.15616055555555],UNIT["Meter",1.0]] \ No newline at end of file +PROJCS["RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Double_Stereographic"],PARAMETER["False_Easting",155000.0],PARAMETER["False_Northing",463000.0],PARAMETER["Central_Meridian",5.38763888888889],PARAMETER["Scale_Factor",0.9999079],PARAMETER["Latitude_Of_Origin",52.1561605555556],UNIT["Meter",1.0]] \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.Designer.cs =================================================================== diff -u -r6439 -r6669 --- DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.Designer.cs (.../LocationPropertyControl.Designer.cs) (revision 6439) +++ DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.Designer.cs (.../LocationPropertyControl.Designer.cs) (revision 6669) @@ -52,8 +52,8 @@ this.LoadGroupControl = new DevExpress.XtraEditors.GroupControl(); this.TrafficLoadEdit = new DevExpress.XtraEditors.SpinEdit(); this.TrafficLoadLabel = new DevExpress.XtraEditors.LabelControl(); - this.TL_DegreeOfConsolidationEdit = new DevExpress.XtraEditors.SpinEdit(); - this.TL_DegreeOfConsolidationLabel = new DevExpress.XtraEditors.LabelControl(); + this.TrafficLoadDistributionAngleEdit = new DevExpress.XtraEditors.SpinEdit(); + this.TrafficLoadDistributionAngleLabel = new DevExpress.XtraEditors.LabelControl(); this.IdentificationGroupControl = new DevExpress.XtraEditors.GroupControl(); this.DikeEdit = new DevExpress.XtraEditors.TextEdit(); this.DikeLabel = new DevExpress.XtraEditors.LabelControl(); @@ -84,7 +84,7 @@ ((System.ComponentModel.ISupportInitialize)(this.LoadGroupControl)).BeginInit(); this.LoadGroupControl.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.TrafficLoadEdit.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.TL_DegreeOfConsolidationEdit.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.TrafficLoadDistributionAngleEdit.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.IdentificationGroupControl)).BeginInit(); this.IdentificationGroupControl.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.DikeEdit.Properties)).BeginInit(); @@ -109,8 +109,8 @@ // this.LoadGroupControl.Controls.Add(this.TrafficLoadEdit); this.LoadGroupControl.Controls.Add(this.TrafficLoadLabel); - this.LoadGroupControl.Controls.Add(this.TL_DegreeOfConsolidationEdit); - this.LoadGroupControl.Controls.Add(this.TL_DegreeOfConsolidationLabel); + this.LoadGroupControl.Controls.Add(this.TrafficLoadDistributionAngleEdit); + this.LoadGroupControl.Controls.Add(this.TrafficLoadDistributionAngleLabel); this.LoadGroupControl.Dock = System.Windows.Forms.DockStyle.Top; this.LoadGroupControl.Location = new System.Drawing.Point(0, 155); this.LoadGroupControl.Name = "LoadGroupControl"; @@ -146,33 +146,33 @@ this.TrafficLoadLabel.TabIndex = 8; this.TrafficLoadLabel.Text = "Traffic load"; // - // TL_DegreeOfConsolidationEdit + // TrafficLoadDistributionAngleEdit // - this.TL_DegreeOfConsolidationEdit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.TrafficLoadDistributionAngleEdit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.TL_DegreeOfConsolidationEdit.EditValue = new decimal(new int[] { + this.TrafficLoadDistributionAngleEdit.EditValue = new decimal(new int[] { 0, 0, 0, 0}); - this.TL_DegreeOfConsolidationEdit.EnterMoveNextControl = true; - this.TL_DegreeOfConsolidationEdit.Location = new System.Drawing.Point(154, 61); - this.TL_DegreeOfConsolidationEdit.Name = "TL_DegreeOfConsolidationEdit"; - this.TL_DegreeOfConsolidationEdit.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric; - this.TL_DegreeOfConsolidationEdit.Properties.EditFormat.FormatString = "F3"; - this.TL_DegreeOfConsolidationEdit.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.Numeric; - this.TL_DegreeOfConsolidationEdit.Properties.HideSelection = false; - this.TL_DegreeOfConsolidationEdit.Properties.ValidateOnEnterKey = true; - this.TL_DegreeOfConsolidationEdit.Size = new System.Drawing.Size(119, 20); - this.TL_DegreeOfConsolidationEdit.TabIndex = 9; + this.TrafficLoadDistributionAngleEdit.EnterMoveNextControl = true; + this.TrafficLoadDistributionAngleEdit.Location = new System.Drawing.Point(154, 61); + this.TrafficLoadDistributionAngleEdit.Name = "TrafficLoadDistributionAngleEdit"; + this.TrafficLoadDistributionAngleEdit.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric; + this.TrafficLoadDistributionAngleEdit.Properties.EditFormat.FormatString = "F3"; + this.TrafficLoadDistributionAngleEdit.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.Numeric; + this.TrafficLoadDistributionAngleEdit.Properties.HideSelection = false; + this.TrafficLoadDistributionAngleEdit.Properties.ValidateOnEnterKey = true; + this.TrafficLoadDistributionAngleEdit.Size = new System.Drawing.Size(119, 20); + this.TrafficLoadDistributionAngleEdit.TabIndex = 9; // - // TL_DegreeOfConsolidationLabel + // TrafficLoadDistributionAngleLabel // - this.TL_DegreeOfConsolidationLabel.Location = new System.Drawing.Point(12, 64); - this.TL_DegreeOfConsolidationLabel.Name = "TL_DegreeOfConsolidationLabel"; - this.TL_DegreeOfConsolidationLabel.Size = new System.Drawing.Size(113, 13); - this.TL_DegreeOfConsolidationLabel.TabIndex = 8; - this.TL_DegreeOfConsolidationLabel.Text = "Degree of consolidation"; + this.TrafficLoadDistributionAngleLabel.Location = new System.Drawing.Point(12, 64); + this.TrafficLoadDistributionAngleLabel.Name = "TrafficLoadDistributionAngleLabel"; + this.TrafficLoadDistributionAngleLabel.Size = new System.Drawing.Size(113, 13); + this.TrafficLoadDistributionAngleLabel.TabIndex = 8; + this.TrafficLoadDistributionAngleLabel.Text = "Traffic load distribution angle"; // // IdentificationGroupControl // @@ -508,7 +508,7 @@ this.LoadGroupControl.ResumeLayout(false); this.LoadGroupControl.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.TrafficLoadEdit.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.TL_DegreeOfConsolidationEdit.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.TrafficLoadDistributionAngleEdit.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.IdentificationGroupControl)).EndInit(); this.IdentificationGroupControl.ResumeLayout(false); this.IdentificationGroupControl.PerformLayout(); @@ -556,8 +556,8 @@ private DevExpress.XtraEditors.LabelControl DikeEmbankmentMaterialLabel; private DevExpress.XtraEditors.SpinEdit TrafficLoadEdit; private DevExpress.XtraEditors.LabelControl TrafficLoadLabel; - private DevExpress.XtraEditors.SpinEdit TL_DegreeOfConsolidationEdit; - private DevExpress.XtraEditors.LabelControl TL_DegreeOfConsolidationLabel; + private DevExpress.XtraEditors.SpinEdit TrafficLoadDistributionAngleEdit; + private DevExpress.XtraEditors.LabelControl TrafficLoadDistributionAngleLabel; private DevExpress.XtraEditors.GroupControl CalculationGroupControl; private DevExpress.XtraEditors.LabelControl ZoneLabel; private DevExpress.XtraEditors.ComboBoxEdit ZoneEdit; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DegreeOfConsolidation.dbf =================================================================== diff -u -r4512 -r6669 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationPropertyImporterTest.cs =================================================================== diff -u -r6436 -r6669 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 6669) @@ -181,7 +181,7 @@ UpliftCriterionPiping = doubleInitialValue, UpliftCriterionStability = doubleInitialValue, TrafficLoad = doubleInitialValue, - TL_DegreeOfConsolidation = doubleInitialValue, + TrafficLoadDistributionAngle = doubleInitialValue, ShoulderEmbankmentMaterial = stringInitialValue, StabilityShoulderGrowSlope = doubleInitialValue, StabilityShoulderGrowDeltaX = doubleInitialValue, @@ -253,7 +253,7 @@ Assert.That(location.PlLineOffsetBelowShoulderBaseInside, Is.EqualTo(doubleTestValue)); Assert.That(location.PlLineOffsetBelowDikeToeAtPolder, Is.EqualTo(doubleTestValue)); Assert.That(location.TrafficLoad, Is.EqualTo(doubleTestValue)); - Assert.That(location.TL_DegreeOfConsolidation, Is.EqualTo(doubleTestValue)); + Assert.That(location.TrafficLoadDistributionAngle, Is.EqualTo(doubleTestValue)); Assert.That(location.RequiredSafetyFactorPiping, Is.EqualTo(doubleTestValue)); Assert.That(location.RequiredSafetyFactorStabilityInnerSlope, Is.EqualTo(doubleTestValue)); Assert.That(location.RequiredSafetyFactorStabilityOuterSlope, Is.EqualTo(doubleTestValue)); @@ -394,7 +394,7 @@ UpliftCriterionPiping = doubleInitialValue, UpliftCriterionStability = doubleInitialValue, TrafficLoad = doubleInitialValue, - TL_DegreeOfConsolidation = doubleInitialValue, + TrafficLoadDistributionAngle = doubleInitialValue, ShoulderEmbankmentMaterial = stringInitialValue, StabilityShoulderGrowSlope = doubleInitialValue, StabilityShoulderGrowDeltaX = doubleInitialValue, @@ -472,7 +472,7 @@ Assert.That(location.PlLineOffsetBelowShoulderBaseInside, Is.EqualTo(doubleTestValue)); Assert.That(location.PlLineOffsetBelowDikeToeAtPolder, Is.EqualTo(doubleTestValue)); Assert.That(location.TrafficLoad, Is.EqualTo(doubleTestValue)); - Assert.That(location.TL_DegreeOfConsolidation, Is.EqualTo(doubleTestValue)); + Assert.That(location.TrafficLoadDistributionAngle, Is.EqualTo(doubleTestValue)); Assert.That(location.RequiredSafetyFactorPiping, Is.EqualTo(doubleTestValue)); Assert.That(location.RequiredSafetyFactorStabilityInnerSlope, Is.EqualTo(doubleTestValue)); Assert.That(location.RequiredSafetyFactorStabilityOuterSlope, Is.EqualTo(doubleTestValue)); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs =================================================================== diff -u -r6436 -r6669 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs (.../DataPluginImporterDataShapeFilesTests.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs (.../DataPluginImporterDataShapeFilesTests.cs) (revision 6669) @@ -67,7 +67,7 @@ } [Test] - public void CanRetrieveDegreeOfConsolidationFromDataShapeFile() + public void CanRetrieveTrafficLoadDistributionAngleFromDataShapeFile() { SetupGrootSalland(); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); @@ -77,11 +77,11 @@ NameValueParameter[] nameValueParameters = locationDetails as NameValueParameter[] ?? locationDetails.ToArray(); Assert.That(nameValueParameters.Count(), Is.GreaterThan(0)); - Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("TL_DegreeOfConsolidation")).ParameterValue, Is.EqualTo("0.123")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("TrafficLoadDistributionAngle")).ParameterValue, Is.EqualTo("0.123")); } [Test] - public void CanRetrieveDegreeOfConsolidationFromDataShapeFileInCombinationWithCrossSectionShapeFile() + public void CanRetrieveTrafficLoadDistributionAngleFromDataShapeFileInCombinationWithCrossSectionShapeFile() { SetupHHNK_WILMEBREEK(); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); @@ -90,11 +90,11 @@ IEnumerable locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location1Id); NameValueParameter[] nameValueParameters = locationDetails as NameValueParameter[] ?? locationDetails.ToArray(); Assert.That(nameValueParameters.Count(), Is.GreaterThan(0)); - Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("TL_DegreeOfConsolidation")).ParameterValue, Is.EqualTo("0.33")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("TrafficLoadDistributionAngle")).ParameterValue, Is.EqualTo("25")); locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location22Id); Assert.That(locationDetails.First( - x => x.ParameterName.Equals("TL_DegreeOfConsolidation")).ParameterValue, Is.EqualTo("0.55")); + x => x.ParameterName.Equals("TrafficLoadDistributionAngle")).ParameterValue, Is.EqualTo("32")); } /*[Test] @@ -157,7 +157,7 @@ new DataAttribute { AttributeId = - LocationShapeFileAttributeMap.TL_DegreeOfConsolidationAttributeId + LocationShapeFileAttributeMap.TrafficLoadDistributionAngleAttributeId } } }; @@ -204,8 +204,8 @@ }, new DataAttribute { - AttributeId = LocationShapeFileAttributeMap.TL_DegreeOfConsolidationAttributeId, - AttributeName = "TL_DegOfCo", + AttributeId = LocationShapeFileAttributeMap.TrafficLoadDistributionAngleAttributeId, + AttributeName = "TL_Angle", DataSource = "TrafficLoad.shp" } } Index: DamClients/DamUI/trunk/data/Tutorials/DAMDesign/Stability/Stabiliteit/locations.csv =================================================================== diff -u -r6542 -r6669 --- DamClients/DamUI/trunk/data/Tutorials/DAMDesign/Stability/Stabiliteit/locations.csv (.../locations.csv) (revision 6542) +++ DamClients/DamUI/trunk/data/Tutorials/DAMDesign/Stability/Stabiliteit/locations.csv (.../locations.csv) (revision 6669) @@ -1,24 +1,24 @@ -Location_id;Surfaceline_id;Segment_id;geo_x;geo_y;x_soilgeometry2D_origin;PenetrationLength;TrafficLoad;polderlevel;head_pl2;ophoogmateriaaldijk;ophoogmateriaalberm;dempingsfactor_pl3;dempingsfactor_pl4;PLLineCreationMethod;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLIneOffsetBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;minimal_circle_depth;SlopeDampingPiezometricHeightPolderside;UseNewDikeTopWidth;NewDikeTopWidth;UseNewDikeSlopeInside;NewDikeSlopeInside;UseNewDikeSlopeOutside;NewDikeSlopeOutside;UseNewShoulderTopSlope;NewShoulderTopSlope;UseNewShoulderBaseSlope;NewShoulderBaseSlope;UseNewMaxHeightShoulderAsFraction;NewMaxHeightShoulderAsFraction;UseNewMinDistanceDikeToeStartDitch;NewMinDistanceDikeToeStartDitch;UseNewDitchDefinition;NewWidthDitchBottom;NewDepthDitch;NewSlopeAngleDitch -DWP_1;SurfDWP_1;SegDWP_1;99718;437106;-8.42;0;13;1.6;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_2;SurfDWP_2;SegDWP_2;100130;437229;-11.31;0;13;-0.35;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_3;SurfDWP_3;SegDWP_3;101611;437577;-11.6;0;13;-0.7;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_4;SurfDWP_4;SegDWP_4;102397;438403;-20.86;0;13;-0.7;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_5;SurfDWP_5;SegDWP_5;103367;439210;-15.66;0;13;-0.7;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_6;SurfDWP_6;SegDWP_6;103496;439515;-6.44;0;13;-0.7;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_7;SurfDWP_7;SegDWP_7;103954;440651;-0.52;0;13;-0.7;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_8;SurfDWP_8;SegDWP_8;104115;440659;2.07;0;13;-1.05;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_9;SurfDWP_9;SegDWP_9;104178;441030;8.84;0;13;-1.1;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_10;SurfDWP_10;SegDWP_10;103535;441992;8.14;0;13;-1;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_11;SurfDWP_11;SegDWP_11;103167;442590;-11.57;0;13;-1.35;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_12;SurfDWP_12;SegDWP_12;103641;442727;-9.82;0;13;-3;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_13;SurfDWP_13;SegDWP_13;104631;442927;7.58;0;13;-3;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_14;SurfDWP_14;SegDWP_14;104726;443275;-7.77;0;13;-1.65;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_15;SurfDWP_15;SegDWP_15;105819;443749;-2.99;0;13;-1.2;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_16;SurfDWP_16;SegDWP_16;106034;444348;5.21;0;13;-0.7;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_17;SurfDWP_17;SegDWP_17;106385;444649;0.47;0;13;-0.8;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_18;SurfDWP_18;SegDWP_18;106511;444934;5.28;0;13;-0.8;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_19;SurfDWP_19;SegDWP_19;107637;445483;-1.71;0;13;-1.2;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_20;SurfDWP_20;SegDWP_20;108263;446056;2.05;0;13;-1.2;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_21;SurfDWP_21;SegDWP_21;108898;446548;5.23;0;13;-1.3;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_22;SurfDWP_22;SegDWP_22;109395;446544;5.96;0;13;-1.3;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 -DWP_23;SurfDWP_23;SegDWP_23;109682;446726;4.51;0;13;-1.3;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 \ No newline at end of file +Location_id;Surfaceline_id;Segment_id;geo_x;geo_y;x_soilgeometry2D_origin;PenetrationLength;TrafficLoad;TrafficLoadDistributionAngle;polderlevel;head_pl2;ophoogmateriaaldijk;ophoogmateriaalberm;dempingsfactor_pl3;dempingsfactor_pl4;PLLineCreationMethod;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLIneOffsetBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;minimal_circle_depth;SlopeDampingPiezometricHeightPolderside;UseNewDikeTopWidth;NewDikeTopWidth;UseNewDikeSlopeInside;NewDikeSlopeInside;UseNewDikeSlopeOutside;NewDikeSlopeOutside;UseNewShoulderTopSlope;NewShoulderTopSlope;UseNewShoulderBaseSlope;NewShoulderBaseSlope;UseNewMaxHeightShoulderAsFraction;NewMaxHeightShoulderAsFraction;UseNewMinDistanceDikeToeStartDitch;NewMinDistanceDikeToeStartDitch;UseNewDitchDefinition;NewWidthDitchBottom;NewDepthDitch;NewSlopeAngleDitch +DWP_1;SurfDWP_1;SegDWP_1;99718;437106;-8.42;0;13;0;1.6;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_2;SurfDWP_2;SegDWP_2;100130;437229;-11.31;0;13;0;-0.35;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_3;SurfDWP_3;SegDWP_3;101611;437577;-11.6;0;13;0;-0.7;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_4;SurfDWP_4;SegDWP_4;102397;438403;-20.86;0;13;0;-0.7;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_5;SurfDWP_5;SegDWP_5;103367;439210;-15.66;0;13;0;-0.7;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_6;SurfDWP_6;SegDWP_6;103496;439515;-6.44;0;13;0;-0.7;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_7;SurfDWP_7;SegDWP_7;103954;440651;-0.52;0;13;0;-0.7;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_8;SurfDWP_8;SegDWP_8;104115;440659;2.07;0;13;0;-1.05;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_9;SurfDWP_9;SegDWP_9;104178;441030;8.84;0;13;35;-1.1;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_10;SurfDWP_10;SegDWP_10;103535;441992;8.14;0;13;0;-1;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_11;SurfDWP_11;SegDWP_11;103167;442590;-11.57;0;13;0;-1.35;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_12;SurfDWP_12;SegDWP_12;103641;442727;-9.82;0;13;0;-3;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_13;SurfDWP_13;SegDWP_13;104631;442927;7.58;0;13;0;-3;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_14;SurfDWP_14;SegDWP_14;104726;443275;-7.77;0;13;0;-1.65;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_15;SurfDWP_15;SegDWP_15;105819;443749;-2.99;0;13;25;-1.2;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_16;SurfDWP_16;SegDWP_16;106034;444348;5.21;0;13;0;-0.7;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_17;SurfDWP_17;SegDWP_17;106385;444649;0.47;0;13;0;-0.8;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_18;SurfDWP_18;SegDWP_18;106511;444934;5.28;0;13;0;-0.8;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_19;SurfDWP_19;SegDWP_19;107637;445483;-1.71;0;13;0;-1.2;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_20;SurfDWP_20;SegDWP_20;108263;446056;2.05;0;13;0;-1.2;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_21;SurfDWP_21;SegDWP_21;108898;446548;5.23;0;13;0;-1.3;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_22;SurfDWP_22;SegDWP_22;109395;446544;5.96;0;13;0;-1.3;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 +DWP_23;SurfDWP_23;SegDWP_23;109682;446726;4.51;0;13;0;-1.3;0;dijksmateriaal_klei;bermmateriaal_klei;0;0;ExpertKnowledgeRRD;0.5;0.5;0.2;0.2;0.333;1;1;1.5;0;FALSE;5;FALSE;0.333;FALSE;0.333;FALSE;0.05;FALSE;0.333;FALSE;0.5;FALSE;3;FALSE;1;1;1 \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DistributionAngle.qmd =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DistributionAngle.qmd (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DistributionAngle.qmd (revision 6669) @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + 0 + 0 + + + + + false + + + + Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs =================================================================== diff -u -r6436 -r6669 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 6669) @@ -887,7 +887,7 @@ location.DampingFactorPL4 = locationRecord.DampingFactorPl4.GetValueOrDefault(location.DampingFactorPL4); location.PenetrationLength = locationRecord.PenetrationLength.GetValueOrDefault(location.PenetrationLength); location.TrafficLoad = locationRecord.TrafficLoad.GetValueOrDefault(location.TrafficLoad); - location.TL_DegreeOfConsolidation = locationRecord.TL_DegreeOfConsolidation; + location.TrafficLoadDistributionAngle = locationRecord.TrafficLoadDistributionAngle; location.PLLineCreationMethod = locationRecord.PLLineCreationMethod.GetValueOrDefault(location.PLLineCreationMethod); if (locationRecord.IntrusionVerticalWaterPressure.HasValue) { Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DegreeOfConsolidation.shx =================================================================== diff -u -r4512 -r6669 Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DistributionAngle.shx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs =================================================================== diff -u -r6436 -r6669 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 6669) @@ -131,9 +131,9 @@ public const string TrafficLoadColumnName = "TrafficLoad"; /// - /// TL_DegreeOfConsolidation + /// TrafficLoadDistributionAngle /// - public const string TlDegreeOfConsolidationColumnName = "TL_DegreeOfConsolidation"; + public const string TrafficLoadDistributionAngle = "TrafficLoadDistributionAngle"; /// /// PLLineCreationMethod Index: DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.cs =================================================================== diff -u -r6436 -r6669 --- DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.cs (.../LocationPropertyControl.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.cs (.../LocationPropertyControl.cs) (revision 6669) @@ -42,7 +42,7 @@ BindSupport.BindTextValueAndUnit(this, YLabel, YEdit, typeof(Location), "YRd"); BindSupport.BindTextValueAndUnit(this, TrafficLoadLabel, TrafficLoadEdit, typeof(Location), "TrafficLoad"); - BindSupport.BindTextValueAndUnit(this, TL_DegreeOfConsolidationLabel, TL_DegreeOfConsolidationEdit, typeof(Location), "TL_DegreeOfConsolidation"); + BindSupport.BindTextValueAndUnit(this, TrafficLoadDistributionAngleLabel, TrafficLoadDistributionAngleEdit, typeof(Location), "TrafficLoadDistributionAngle"); BindSupport.BindTextAndValue(this, DikeEmbankmentMaterialLabel, DikeEmbankmentMaterialEdit, typeof(Location), "DikeEmbankmentMaterial"); BindSupport.BindTextAndValue(this, ShoulderEmbankmentMaterialLabel, ShoulderEmbankmentMaterialEdit, typeof(Location), "ShoulderEmbankmentMaterial"); BindSupport.BindTextValueAndUnit(this, StabilityShoulderGrowSlopeLabel, StabilityShoulderGrowSlopeEdit, typeof(Location), "StabilityShoulderGrowSlope"); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r6660 -r6669 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 6660) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 6669) @@ -677,8 +677,8 @@ ForbiddenZoneFactor = location.ForbiddenZoneFactor, TrafficLoadSpecified = true, TrafficLoad = location.TrafficLoad, - TrafficLoadDegreeOfConsolidationSpecified = location.TL_DegreeOfConsolidation.HasValue, - TrafficLoadDegreeOfConsolidation = location.TL_DegreeOfConsolidation ?? 0.0, + TrafficLoadDegreeOfConsolidationSpecified = location.TrafficLoadDistributionAngle.HasValue, + TrafficLoadDegreeOfConsolidation = location.TrafficLoadDistributionAngle ?? 0.0, MinimumCircleDepthSpecified = true, MinimumCircleDepth = location.MinimalCircleDepth }; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs =================================================================== diff -u -r6436 -r6669 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 6669) @@ -69,7 +69,7 @@ int colIndexOphoogmateriaalberm = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ShoulderEmbankmentMaterialColumnName); int colIndexPenetrationLength = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PenetrationLengthColumnName); int colIndexTrafficLoad = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.TrafficLoadColumnName); - int colIndexTL_DegreeOfConsolidation = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.TlDegreeOfConsolidationColumnName); + int colIndexTrafficLoadDistributionAngle = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.TrafficLoadDistributionAngle); int colIndexMinimalCircleDepth = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.MinimalCircleDepthColumnName); int colIndexDempingsfactorPl3 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DampingFactorPl3ColumnName); int colIndexDempingsfactorPl4 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DampingFactorPl4ColumnName); @@ -147,7 +147,7 @@ locationRecord.ShoulderEmbankmentMaterial = FetchOptionalColumnToString(colIndexOphoogmateriaalberm, csv); locationRecord.PenetrationLength = FetchOptionalColumnToDouble(colIndexPenetrationLength, csv); locationRecord.TrafficLoad = FetchOptionalColumnToDouble(colIndexTrafficLoad, csv); - locationRecord.TL_DegreeOfConsolidation = FetchOptionalColumnToDouble(colIndexTL_DegreeOfConsolidation, csv); + locationRecord.TrafficLoadDistributionAngle = FetchOptionalColumnToDouble(colIndexTrafficLoadDistributionAngle, csv); locationRecord.MinimalCircleDepth = FetchOptionalColumnToDouble(colIndexMinimalCircleDepth, csv); locationRecord.DampingFactorPl3 = FetchOptionalColumnToDouble(colIndexDempingsfactorPl3, csv); locationRecord.DampingFactorPl4 = FetchOptionalColumnToDouble(colIndexDempingsfactorPl4, csv); @@ -294,7 +294,7 @@ public string ShoulderEmbankmentMaterial { get; set; } public double? PenetrationLength { get; set; } public double? TrafficLoad { get; set; } - public double? TL_DegreeOfConsolidation { get; set; } + public double? TrafficLoadDistributionAngle { get; set; } public double? MinimalCircleDepth { get; set; } public double? DampingFactorPl3 { get; set; } public double? DampingFactorPl4 { get; set; } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r6554 -r6669 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 6554) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 6669) @@ -58,7 +58,7 @@ public const string DampingFactorPL4 = "DampingFactorPL4"; public const string PenetrationLength = "PenetrationLength"; public const string TrafficLoad = "TrafficLoad"; - public const string TL_DegreeOfConsolidation = "TL_DegreeOfConsolidation"; + public const string TrafficLoadDistributionAngle = "TrafficLoadDistributionAngle"; public const string PLLineCreationMethod = "PLLineCreationMethod"; public const string StabilityShoulderGrowSlope = "StabilityShoulderGrowSlope"; public const string StabilityShoulderGrowDeltaX = "StabilityShoulderGrowDeltaX"; @@ -155,7 +155,7 @@ private SurfaceLine2 surfaceLine2; private double trafficLoad; - private double? degreeOfConsolidation; + private double? trafficLoadDistributionAngle; private bool useNewDikeSlopeInside; private bool useNewDikeSlopeOutside; private bool useNewDikeTopWidth; @@ -347,21 +347,26 @@ } } - [Unit(UnitType.Percentage)] + [Unit(UnitType.Angle)] + [Label("Traffic load distribution angle")] + [Description("Distribution angle of the traffic load")] + [Minimum(0)] + [Maximum(89)] + [Clearable] [Format("F3")] [Category(DikeCategory)] [PropertyOrder(1, 21)] - public virtual double? TL_DegreeOfConsolidation + public virtual double? TrafficLoadDistributionAngle { get { - return degreeOfConsolidation; + return trafficLoadDistributionAngle; } set { - DataEventPublisher.BeforeChange(this, "TL_DegreeOfConsolidation"); - degreeOfConsolidation = value; - DataEventPublisher.AfterChange(this, "TL_DegreeOfConsolidation"); + DataEventPublisher.BeforeChange(this, "TrafficLoadDistributionAngle"); + trafficLoadDistributionAngle = value; + DataEventPublisher.AfterChange(this, "TrafficLoadDistributionAngle"); } } @@ -1027,9 +1032,9 @@ nameValuePairs.Add(LocationParameterNames.StabilityShoulderGrowDeltaX, StabilityShoulderGrowDeltaX.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.StabilitySlopeAdaptionDeltaX, StabilitySlopeAdaptionDeltaX.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.TrafficLoad, TrafficLoad.ToString(numberFormatInfo)); - if (TL_DegreeOfConsolidation.HasValue) + if (TrafficLoadDistributionAngle.HasValue) { - nameValuePairs.Add(LocationParameterNames.TL_DegreeOfConsolidation, TL_DegreeOfConsolidation.Value.ToString(numberFormatInfo)); + nameValuePairs.Add(LocationParameterNames.TrafficLoadDistributionAngle, TrafficLoadDistributionAngle.Value.ToString(numberFormatInfo)); } nameValuePairs.Add(LocationParameterNames.MinimalCircleDepth, MinimalCircleDepth.ToString(numberFormatInfo)); @@ -1380,9 +1385,9 @@ TrafficLoad = Convert.ToDouble(parameterValue, numberFormatInfo); } - if (parameterName.Equals(LocationParameterNames.TL_DegreeOfConsolidation)) + if (parameterName.Equals(LocationParameterNames.TrafficLoadDistributionAngle)) { - TL_DegreeOfConsolidation = Convert.ToDouble(parameterValue, numberFormatInfo); + TrafficLoadDistributionAngle = Convert.ToDouble(parameterValue, numberFormatInfo); } if (parameterName.Equals(LocationParameterNames.MinimalCircleDepth)) @@ -2173,7 +2178,7 @@ return true; case "TrafficLoad": return true; - case "TL_DegreeOfConsolidation": + case "TrafficLoadDistributionAngle": return true; case "DampingFactorPL3": return true; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/LocationTests.cs =================================================================== diff -u -r6555 -r6669 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/LocationTests.cs (.../LocationTests.cs) (revision 6555) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/LocationTests.cs (.../LocationTests.cs) (revision 6669) @@ -100,7 +100,7 @@ Assert.That(actualLocation.AreLocalXZObjectsCreated, Is.EqualTo(areLocalXzObjectsCreated)); Assert.That(actualLocation.PenetrationLength, Is.EqualTo(penetrationLength)); Assert.That(actualLocation.TrafficLoad, Is.EqualTo(trafficLoad)); - Assert.That(actualLocation.TL_DegreeOfConsolidation, Is.EqualTo(null)); + Assert.That(actualLocation.TrafficLoadDistributionAngle, Is.EqualTo(null)); Assert.That(actualLocation.PLLineCreationMethod, Is.EqualTo(plLineCreationMethod)); Assert.That(actualLocation.IntrusionVerticalWaterPressure, Is.EqualTo(IntrusionVerticalWaterPressureType.Standard)); Assert.That(actualLocation.StabilityShoulderGrowSlope, Is.EqualTo(stabilityShoulderGrowSlope).Within(1e-12)); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml =================================================================== diff -u -r6554 -r6669 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6554) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 6669) @@ -60,10 +60,10 @@ - - + + Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNK_WILMEBREEK/DAM_WILMKEBREEK_VB.defx =================================================================== diff -u -r4651 -r6669 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNK_WILMEBREEK/DAM_WILMKEBREEK_VB.defx (.../DAM_WILMKEBREEK_VB.defx) (revision 4651) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNK_WILMEBREEK/DAM_WILMKEBREEK_VB.defx (.../DAM_WILMKEBREEK_VB.defx) (revision 6669) @@ -45,9 +45,9 @@ - - - + + + Fisheye: Tag 6669 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DegreeOfConsolidation.qpj'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DistributionAngle.dbf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DistributionAngle.cpg =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DistributionAngle.cpg (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DistributionAngle.cpg (revision 6669) @@ -0,0 +1 @@ +UTF-8 \ No newline at end of file Index: DamClients/DamUI/trunk/data/Tutorials/DAMDesign/Stability/DAM Tutorial Design.damx =================================================================== diff -u -r6658 -r6669 --- DamClients/DamUI/trunk/data/Tutorials/DAMDesign/Stability/DAM Tutorial Design.damx (.../DAM Tutorial Design.damx) (revision 6658) +++ DamClients/DamUI/trunk/data/Tutorials/DAMDesign/Stability/DAM Tutorial Design.damx (.../DAM Tutorial Design.damx) (revision 6669) @@ -1,8 +1,8 @@  - - + + - + @@ -121,10 +121,10 @@ - + - - + + @@ -7775,8 +7775,8 @@ - - + + @@ -7785,7 +7785,7 @@ - + @@ -7980,8 +7980,8 @@ - - + + @@ -8000,7 +8000,7 @@ - + @@ -8167,8 +8167,8 @@ - - + + @@ -8177,7 +8177,7 @@ - + @@ -8332,8 +8332,8 @@ - - + + @@ -8342,7 +8342,7 @@ - + @@ -8465,8 +8465,8 @@ - - + + @@ -8475,7 +8475,7 @@ - + @@ -8600,8 +8600,8 @@ - - + + @@ -8610,7 +8610,7 @@ - + @@ -8785,8 +8785,8 @@ - - + + @@ -8795,7 +8795,7 @@ - + @@ -8962,8 +8962,8 @@ - - + + @@ -8972,7 +8972,7 @@ - + @@ -9115,8 +9115,8 @@ - - + + @@ -9125,7 +9125,7 @@ - + @@ -9264,8 +9264,8 @@ - - + + @@ -9274,7 +9274,7 @@ - + @@ -9433,8 +9433,8 @@ - - + + @@ -9443,7 +9443,7 @@ - + @@ -9606,8 +9606,8 @@ - - + + @@ -9616,7 +9616,7 @@ - + @@ -9803,8 +9803,8 @@ - - + + @@ -9813,7 +9813,7 @@ - + @@ -9980,8 +9980,8 @@ - - + + @@ -9990,7 +9990,7 @@ - + @@ -10121,8 +10121,8 @@ - - + + @@ -10131,7 +10131,7 @@ - + @@ -10278,8 +10278,8 @@ - - + + @@ -10288,7 +10288,7 @@ - + @@ -10491,8 +10491,8 @@ - - + + @@ -10501,7 +10501,7 @@ - + @@ -10676,8 +10676,8 @@ - - + + @@ -10686,7 +10686,7 @@ - + @@ -10865,8 +10865,8 @@ - - + + @@ -10875,7 +10875,7 @@ - + @@ -11054,8 +11054,8 @@ - - + + @@ -11064,7 +11064,7 @@ - + @@ -11231,8 +11231,8 @@ - - + + @@ -11241,7 +11241,7 @@ - + @@ -11420,8 +11420,8 @@ - - + + @@ -11430,7 +11430,7 @@ - + @@ -11581,8 +11581,8 @@ - - + + @@ -11617,10 +11617,10 @@ - + - + @@ -11648,8 +11648,8 @@ - - + + @@ -11678,7 +11678,7 @@ - + @@ -11879,8 +11879,8 @@ - - + + @@ -11895,306 +11895,306 @@ - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -12203,15 +12203,15 @@ - - + + - - + + @@ -12221,15 +12221,15 @@ - - + + - - + + @@ -12239,15 +12239,15 @@ - - + + - - + + @@ -12257,15 +12257,15 @@ - - + + - - + + @@ -12275,15 +12275,15 @@ - - + + - - + + @@ -12293,15 +12293,15 @@ - - + + - - + + @@ -12311,15 +12311,15 @@ - - + + - - + + @@ -12329,15 +12329,15 @@ - - + + - - + + @@ -12347,15 +12347,15 @@ - - + + - - + + @@ -12365,15 +12365,15 @@ - - + + - - + + @@ -12393,17 +12393,17 @@ - - + + - - + + @@ -12413,15 +12413,15 @@ - - + + - - + + @@ -12431,15 +12431,15 @@ - - + + - - + + @@ -12449,15 +12449,15 @@ - - + + - - + + @@ -12467,15 +12467,15 @@ - - + + - - + + @@ -12485,15 +12485,15 @@ - - + + - - + + @@ -12503,15 +12503,15 @@ - - + + - - + + @@ -12521,15 +12521,15 @@ - - + + - - + + @@ -12539,15 +12539,15 @@ - - + + - - + + @@ -12557,15 +12557,15 @@ - - + + - - + + @@ -12575,15 +12575,15 @@ - - + + - - + + @@ -12593,15 +12593,15 @@ - - + + - - + + @@ -12611,15 +12611,15 @@ - - + + - - + + @@ -14600,34 +14600,34 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + @@ -14766,7 +14766,7 @@ - + Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs =================================================================== diff -u -r6436 -r6669 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 6669) @@ -81,7 +81,7 @@ createItem(UsePlLineOffsetFactorBelowShoulderCrestAttributeId, PlLineShapeFileName, "UPLFBlSC", (t, value) => t.UsePlLineOffsetFactorBelowShoulderCrest = value.ToType()), 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(TrafficLoadDistributionAngleAttributeId, "TrafficLoadDistributionAngle.shp", "TL_Angle", (t, value) => t.TrafficLoadDistributionAngle = 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()), @@ -383,13 +383,13 @@ public const string TrafficLoadAttributeId = CsvColumnNames.TrafficLoadColumnName; /// - /// TL_DegreeOfConsolidation + /// TrafficLoadDistributionAngle /// CustomShape - /// TL_DegreeOfConsolidation.shp - /// TL_DegOfCo + /// TrafficLoadDistributionAngle.shp + /// TL_Angle /// double /// - public const string TL_DegreeOfConsolidationAttributeId = CsvColumnNames.TlDegreeOfConsolidationColumnName; + public const string TrafficLoadDistributionAngleAttributeId = CsvColumnNames.TrafficLoadDistributionAngle; /// /// PLLineCreationMethod Fisheye: Tag 6669 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DegreeOfConsolidation.cpg'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs =================================================================== diff -u -r6664 -r6669 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 6664) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 6669) @@ -278,7 +278,7 @@ Assert.That(location.ShoulderEmbankmentMaterial, Is.EqualTo("klei2")); Assert.That(location.PenetrationLength, Is.EqualTo(1.3).Within(tolerance)); Assert.That(location.TrafficLoad, Is.EqualTo(10).Within(tolerance)); - Assert.That(location.TL_DegreeOfConsolidation, Is.EqualTo(22.44).Within(tolerance)); + Assert.That(location.TrafficLoadDistributionAngle, Is.EqualTo(22.44).Within(tolerance)); Assert.That(location.MinimalCircleDepth, Is.EqualTo(1.5).Within(tolerance)); Assert.That(location.DampingFactorPL3, Is.EqualTo(0.3).Within(tolerance)); Assert.That(location.DampingFactorPL4, Is.EqualTo(0.4).Within(tolerance)); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj =================================================================== diff -u -r6436 -r6669 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 6669) @@ -659,22 +659,22 @@ PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/Shapes/TL_DegreeOfConsolidation.shp =================================================================== diff -u -r4512 -r6669 Binary files differ