Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs =================================================================== diff -u -r5381bd5b3ecceb680618068d07e2b112ecf56359 -reee451cf51269da7014a593ae7062a6a7ad0bcda --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs (.../AssemblyGmlWriter.cs) (revision 5381bd5b3ecceb680618068d07e2b112ecf56359) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs (.../AssemblyGmlWriter.cs) (revision eee451cf51269da7014a593ae7062a6a7ad0bcda) @@ -136,12 +136,11 @@ { WriteStartElementWithId(AssemblyXmlIdentifiers.AssessmentSection, AssemblyXmlIdentifiers.ImwapNamespace, assessmentSection.Id); - writer.WriteElementString(AssemblyXmlIdentifiers.Name, AssemblyXmlIdentifiers.ImwapNamespace, assessmentSection.Name); - WriteGeometry(AssemblyXmlIdentifiers.Geometry2D, assessmentSection.Geometry); - writer.WriteElementString(AssemblyXmlIdentifiers.Length, AssemblyXmlIdentifiers.ImwapNamespace, XmlConvert.ToString(Math2D.Length(assessmentSection.Geometry))); writer.WriteElementString(AssemblyXmlIdentifiers.AssessmentSectionType, AssemblyXmlIdentifiers.ImwapNamespace, Resources.AssessmentSectionType); + writer.WriteElementString(AssemblyXmlIdentifiers.Name, AssemblyXmlIdentifiers.ImwapNamespace, assessmentSection.Name); + writer.WriteElementString(AssemblyXmlIdentifiers.Length, AssemblyXmlIdentifiers.ImwapNamespace, XmlConvert.ToString(Math2D.Length(assessmentSection.Geometry))); writer.WriteEndElement(); } @@ -231,10 +230,10 @@ writer.WriteElementString(AssemblyXmlIdentifiers.FailureMechanismSectionAssemblyGroup, AssemblyXmlIdentifiers.UboiNamespace, EnumDisplayNameHelper.GetDisplayName(sectionAssemblyResult.AssemblyGroup)); - writer.WriteElementString(AssemblyXmlIdentifiers.FailureMechanismSectionAssemblyGroupAssemblyMethod, AssemblyXmlIdentifiers.UboiNamespace, - EnumDisplayNameHelper.GetDisplayName(sectionAssemblyResult.AssemblyGroupAssemblyMethod)); writer.WriteElementString(AssemblyXmlIdentifiers.Probability, AssemblyXmlIdentifiers.UboiNamespace, XmlConvert.ToString(sectionAssemblyResult.Probability)); + writer.WriteElementString(AssemblyXmlIdentifiers.FailureMechanismSectionAssemblyGroupAssemblyMethod, AssemblyXmlIdentifiers.UboiNamespace, + EnumDisplayNameHelper.GetDisplayName(sectionAssemblyResult.AssemblyGroupAssemblyMethod)); writer.WriteElementString(AssemblyXmlIdentifiers.ProbabilityAssemblyMethod, AssemblyXmlIdentifiers.UboiNamespace, EnumDisplayNameHelper.GetDisplayName(sectionAssemblyResult.ProbabilityAssemblyMethod)); writer.WriteElementString(AssemblyXmlIdentifiers.Status, AssemblyXmlIdentifiers.UboiNamespace, Resources.FullAssembly); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/AssemblyGmlWriterTest/configuredAssembly.gml =================================================================== diff -u -rd226a725b8d8cff126a9332f32431594bf140a05 -reee451cf51269da7014a593ae7062a6a7ad0bcda --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/AssemblyGmlWriterTest/configuredAssembly.gml (.../configuredAssembly.gml) (revision d226a725b8d8cff126a9332f32431594bf140a05) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/test-data/AssemblyGmlWriterTest/configuredAssembly.gml (.../configuredAssembly.gml) (revision eee451cf51269da7014a593ae7062a6a7ad0bcda) @@ -2,14 +2,14 @@ - Traject A 0 0 100 0 - 100 Dijktraject + Traject A + 100 @@ -41,8 +41,8 @@ +III - BOI-0B-1 0.00073 + BOI-0B-1 BOI-0A-2 VOLLDG Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml =================================================================== diff -u -r080697c142dc27ec10228b365fed8e6301c8b8f3 -reee451cf51269da7014a593ae7062a6a7ad0bcda --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml (.../ExpectedGml.gml) (revision 080697c142dc27ec10228b365fed8e6301c8b8f3) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml (.../ExpectedGml.gml) (revision eee451cf51269da7014a593ae7062a6a7ad0bcda) @@ -2,14 +2,14 @@ - assessmentSectionName 0 0 3 4 - 5 Dijktraject + assessmentSectionName + 5 @@ -41,8 +41,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -52,8 +52,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -72,8 +72,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -83,8 +83,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -103,8 +103,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -114,8 +114,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -134,8 +134,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -145,8 +145,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -165,8 +165,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -176,8 +176,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -196,8 +196,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -207,8 +207,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -227,8 +227,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -238,8 +238,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -258,8 +258,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -269,8 +269,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -289,8 +289,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -300,8 +300,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -320,8 +320,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -331,8 +331,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -351,8 +351,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -362,8 +362,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -382,8 +382,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -393,8 +393,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -413,8 +413,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -424,8 +424,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -444,8 +444,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -455,8 +455,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -475,8 +475,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -486,8 +486,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -506,8 +506,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG @@ -517,8 +517,8 @@ +I - BOI-0B-1 0.1 + BOI-0B-1 BOI-0A-1 VOLLDG