Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs =================================================================== diff -u -r0df7cded06f5afbac08b97e025242ba55c90ec57 -ra6b7d895b8e5fe00b1fccb22f473637e87e3bcc8 --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision 0df7cded06f5afbac08b97e025242ba55c90ec57) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision a6b7d895b8e5fe00b1fccb22f473637e87e3bcc8) @@ -88,11 +88,16 @@ NotifyProgress(Resources.FailureMechanismSectionsImporter_ProgressText_Validating_imported_sections, 2, 3); ICollection readFailureMechanismSections = readResults.ImportedItems; - if (!SectionsCorrespondToReferenceLine(referenceLine, readFailureMechanismSections)) + if (HasStartOrEndPointsTooFarFromReferenceLine(referenceLine, readFailureMechanismSections)) { - LogCriticalFileReadError(Resources.FailureMechanismSectionsImporter_Import_Imported_sections_do_not_correspond_to_current_referenceline); + LogCriticalFileReadError(Resources.FailureMechanismSectionsImporter_Import_Imported_sections_too_far_from_current_referenceline); return false; } + if (IsTotalLengthOfSectionsTooDifferentFromReferenceLineLength(referenceLine, readFailureMechanismSections)) + { + LogCriticalFileReadError(Resources.FailureMechanismSectionsImporter_Import_Imported_sections_too_different_from_referenceline_length); + return false; + } if (Canceled) { @@ -182,21 +187,6 @@ log.Error(errorMessage); } - private static bool SectionsCorrespondToReferenceLine(ReferenceLine referenceLine, ICollection mechanismSections) - { - if (HasStartOrEndPointsTooFarFromReferenceLine(referenceLine, mechanismSections)) - { - return false; - } - - if (IsTotalLengthOfSectionsTooDifferentFromReferenceLineLength(referenceLine, mechanismSections)) - { - return false; - } - - return true; - } - private static bool HasStartOrEndPointsTooFarFromReferenceLine(ReferenceLine referenceLine, ICollection mechanismSections) { foreach (var failureMechanismSection in mechanismSections) Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs =================================================================== diff -u -rd641f7a03b05f5d7e48f9adeffabafdcb48e1c14 -ra6b7d895b8e5fe00b1fccb22f473637e87e3bcc8 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d641f7a03b05f5d7e48f9adeffabafdcb48e1c14) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a6b7d895b8e5fe00b1fccb22f473637e87e3bcc8) @@ -22,7 +22,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -461,16 +461,26 @@ } /// - /// Looks up a localized string similar to Vakindeling komt niet overeen met de huidige referentielijn.. + /// Looks up a localized string similar to Opgetelde lengte van de vakken komt niet overeen met de trajectlengte.. /// - public static string FailureMechanismSectionsImporter_Import_Imported_sections_do_not_correspond_to_current_referenceline { + public static string FailureMechanismSectionsImporter_Import_Imported_sections_too_different_from_referenceline_length { get { - return ResourceManager.GetString("FailureMechanismSectionsImporter_Import_Imported_sections_do_not_correspond_to_cu" + - "rrent_referenceline", resourceCulture); + return ResourceManager.GetString("FailureMechanismSectionsImporter_Import_Imported_sections_too_different_from_refe" + + "renceline_length", resourceCulture); } } /// + /// Looks up a localized string similar to Geografische ligging van één of meerdere vakken wijkt af van de ligging van de trajectlijn.. + /// + public static string FailureMechanismSectionsImporter_Import_Imported_sections_too_far_from_current_referenceline { + get { + return ResourceManager.GetString("FailureMechanismSectionsImporter_Import_Imported_sections_too_far_from_current_re" + + "ferenceline", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Geïmporteerde gegevens toevoegen aan het toetsspoor.. /// public static string FailureMechanismSectionsImporter_ProgressText_Adding_imported_data_to_failureMechanism { @@ -983,14 +993,14 @@ } /// - /// Looks up a localized string similar to BEGIN TRANSACTION; - ///CREATE TABLE "TimeIntegrationSettings" ( - /// "LocationID" INTEGER NOT NULL, - /// "CalculationTypeID" INTEGER NOT NULL, - /// "TimeIntegrationSchemeID" INTEGER NOT NULL, - /// CONSTRAINT timeintegrationsettings_pk PRIMARY KEY ("LocationID", "CalculationTypeID"), - /// CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY ("CalculationTypeID") REFERENCES CalculationTypes ("CalculationTypeID") ON DELETE NO ACTION ON UPDATE NO ACTION - ///); + /// Looks up a localized string similar to BEGIN TRANSACTION; + ///CREATE TABLE "TimeIntegrationSettings" ( + /// "LocationID" INTEGER NOT NULL, + /// "CalculationTypeID" INTEGER NOT NULL, + /// "TimeIntegrationSchemeID" INTEGER NOT NULL, + /// CONSTRAINT timeintegrationsettings_pk PRIMARY KEY ("LocationID", "CalculationTypeID"), + /// CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY ("CalculationTypeID") REFERENCES CalculationTypes ("CalculationTypeID") ON DELETE NO ACTION ON UPDATE NO ACTION + ///); ///CREATE TABLE "Numeri [rest of string was truncated]";. /// public static string settings_schema { @@ -1304,7 +1314,7 @@ } /// - /// Looks up a localized string similar to De waarde voor parameter '{0}' op regel {1}, kolom '{2}', moet getal zijn groter dan 0.. + /// Looks up a localized string similar to De waarde voor parameter '{0}' op regel {1}, kolom '{2}', moet een getal zijn groter dan 0.. /// public static string StructuresParameterRowsValidator_ValidatePositiveDoubleParameter_ParameterId_0_Line_1_ColumnName_2_must_be_greater_than_zero { get { Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx =================================================================== diff -u -rd641f7a03b05f5d7e48f9adeffabafdcb48e1c14 -ra6b7d895b8e5fe00b1fccb22f473637e87e3bcc8 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision d641f7a03b05f5d7e48f9adeffabafdcb48e1c14) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision a6b7d895b8e5fe00b1fccb22f473637e87e3bcc8) @@ -367,9 +367,6 @@ Vakindeling importeren afgebroken. Geen gegevens ingelezen. - - Vakindeling komt niet overeen met de huidige referentielijn. - Geïmporteerde gegevens toevoegen aan het toetsspoor. @@ -498,4 +495,10 @@ De waarde voor parameter '{0}' op regel {1}, kolom '{2}', moet een getal zijn groter dan 0. + + Geografische ligging van één of meerdere vakken wijkt af van de ligging van de trajectlijn. + + + Opgetelde lengte van de vakken komt niet overeen met de trajectlengte. + \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs =================================================================== diff -u -rffe405e6b0f8b4d10e6be78cf7735c554eb42a93 -ra6b7d895b8e5fe00b1fccb22f473637e87e3bcc8 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs (.../FailureMechanismSectionsImporterTest.cs) (revision ffe405e6b0f8b4d10e6be78cf7735c554eb42a93) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs (.../FailureMechanismSectionsImporterTest.cs) (revision a6b7d895b8e5fe00b1fccb22f473637e87e3bcc8) @@ -312,7 +312,7 @@ Action call = () => importSuccessful = importer.Import(); // Assert - var expectedMessage = "Vakindeling komt niet overeen met de huidige referentielijn. " + Environment.NewLine + + var expectedMessage = "Geografische ligging van één of meerdere vakken wijkt af van de ligging van de trajectlijn. " + Environment.NewLine + "Er is geen vakindeling geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); Assert.IsFalse(importSuccessful); @@ -342,7 +342,7 @@ Action call = () => importSuccessful = importer.Import(); // Assert - var expectedMessage = "Vakindeling komt niet overeen met de huidige referentielijn. " + Environment.NewLine + + var expectedMessage = "Geografische ligging van één of meerdere vakken wijkt af van de ligging van de trajectlijn. " + Environment.NewLine + "Er is geen vakindeling geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); Assert.IsFalse(importSuccessful); @@ -369,7 +369,7 @@ Action call = () => importSuccessful = importer.Import(); // Assert - var expectedMessage = "Vakindeling komt niet overeen met de huidige referentielijn. " + Environment.NewLine + + var expectedMessage = "Opgetelde lengte van de vakken komt niet overeen met de trajectlengte. " + Environment.NewLine + "Er is geen vakindeling geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); Assert.IsFalse(importSuccessful); @@ -396,7 +396,7 @@ Action call = () => importSuccessful = importer.Import(); // Assert - var expectedMessage = "Vakindeling komt niet overeen met de huidige referentielijn. " + Environment.NewLine + + var expectedMessage = "Opgetelde lengte van de vakken komt niet overeen met de trajectlengte. " + Environment.NewLine + "Er is geen vakindeling geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); Assert.IsFalse(importSuccessful);