Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneErosionDataSynchronizationService.cs =================================================================== diff -u -rd9997dac11dc7662a6882d104761171a5f6233e4 -r25ec12515bc09ad7c194bb970edddd4593ed60cd --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneErosionDataSynchronizationService.cs (.../DuneErosionDataSynchronizationService.cs) (revision d9997dac11dc7662a6882d104761171a5f6233e4) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneErosionDataSynchronizationService.cs (.../DuneErosionDataSynchronizationService.cs) (revision 25ec12515bc09ad7c194bb970edddd4593ed60cd) @@ -21,18 +21,12 @@ using System; using System.Collections.Generic; -using System.Globalization; using System.Linq; -using System.Text.RegularExpressions; using Core.Common.Base; -using Core.Common.Base.Geometry; using Core.Common.Util.Extensions; -using log4net; using Riskeer.Common.Data.Hydraulics; using Riskeer.DuneErosion.Data; using Riskeer.DuneErosion.IO; -using Riskeer.DuneErosion.Service.Properties; -using DuneErosionDataResources = Riskeer.DuneErosion.Data.Properties.Resources; namespace Riskeer.DuneErosion.Service { @@ -41,8 +35,6 @@ /// public static class DuneErosionDataSynchronizationService { - private static readonly ILog log = LogManager.GetLogger(typeof(DuneErosionDataSynchronizationService)); - /// /// Sets based upon /// the . @@ -139,32 +131,5 @@ return affectedCalculations; } - - private static bool DoesHydraulicBoundaryLocationMatchWithDuneLocation(HydraulicBoundaryLocation hydraulicBoundaryLocation, - ReadDuneLocation readDuneLocation) - { - if (!Math2D.AreEqualPoints(hydraulicBoundaryLocation.Location, readDuneLocation.Location)) - { - return false; - } - - // Regex to search for a pattern like "__" - // Only the last number is captured in a group called "Offset" - // The last number can also contain decimals. - var regex = new Regex(@"^(?:\S+)_(?:\d+)_(?(?:\d+\.)?\d+$)"); - Match match = regex.Match(hydraulicBoundaryLocation.Name); - - if (!match.Success) - { - log.ErrorFormat(Resources.DuneErosionDataSynchronizationService_SetDuneLocations_Location_0_is_dune_location_but_name_is_not_according_format, - hydraulicBoundaryLocation.Name); - return false; - } - - string duneLocationOffset = readDuneLocation.Offset.ToString(DuneErosionDataResources.DuneLocation_Offset_format, - CultureInfo.InvariantCulture); - - return match.Groups["Offset"].Value == duneLocationOffset; - } } } \ No newline at end of file Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/Properties/Resources.Designer.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r25ec12515bc09ad7c194bb970edddd4593ed60cd --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 25ec12515bc09ad7c194bb970edddd4593ed60cd) @@ -82,16 +82,6 @@ } /// - /// Looks up a localized string similar to Locatie '{0}' moet voldoen aan het formaat 'Naam_Vaknummer_Metrering'. Deze locatie is niet toegevoegd aan de hydraulische belastingen voor het faalmechanisme Duinafslag.. - /// - internal static string DuneErosionDataSynchronizationService_SetDuneLocations_Location_0_is_dune_location_but_name_is_not_according_format { - get { - return ResourceManager.GetString("DuneErosionDataSynchronizationService_SetDuneLocations_Location_0_is_dune_locatio" + - "n_but_name_is_not_according_format", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Hydraulische belastingen berekenen voor locatie '{0}' ({1}). /// internal static string DuneLocationCalculationActivity_Calculate_hydraulic_boundary_conditions_for_DuneLocation_with_name_0_CalculationIdentifier_1 { Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/Properties/Resources.resx =================================================================== diff -u -ra2ce0fb95282be3f3e106eb67145f942d47e2c2d -r25ec12515bc09ad7c194bb970edddd4593ed60cd --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/Properties/Resources.resx (.../Resources.resx) (revision a2ce0fb95282be3f3e106eb67145f942d47e2c2d) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/Properties/Resources.resx (.../Resources.resx) (revision 25ec12515bc09ad7c194bb970edddd4593ed60cd) @@ -130,9 +130,6 @@ Hydraulische belastingenberekening voor locatie '{0}' ({1}) is niet geconvergeerd. - - Locatie '{0}' moet voldoen aan het formaat 'Naam_Vaknummer_Metrering'. Deze locatie is niet toegevoegd aan de hydraulische belastingen voor het faalmechanisme Duinafslag. - Hydraulische belastingen berekenen voor locatie '{0}' ({1})