Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCharacteristicPointImporter.cs
===================================================================
diff -u -r6873 -r6955
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCharacteristicPointImporter.cs	(.../LocationCharacteristicPointImporter.cs)	(revision 6873)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCharacteristicPointImporter.cs	(.../LocationCharacteristicPointImporter.cs)	(revision 6955)
@@ -37,11 +37,9 @@
     private const string CharacteristicLinesFile = "Kruin_dijkring10.shp";
     public const string CharacteristicLineAttributeName = "TEMP_ID";
     private const string LocationsFile = "Locations.shp";
-    public const string LocationDikeAttributeName = "DIKERINGID";
     public const string LocationIDAttributeName = "LOCATION";
 
     const string DikeTopPolderLineID = "kruin-binnen";
-    const string DikeTopAtPolderLineID = "kruin-buiten";
 
 #if INCLUDE_ALL_LINE_TYPES
         private IEnumerable<string> supportedLineTypes = new[]
@@ -94,7 +92,6 @@
 
         // Load and validate the attributes required to import the locations
         ThrowWhenDataFileNotValid(ProfileLocationsRepository, LocationIDAttributeName, LocationsFile);
-        ThrowWhenDataFileNotValid(ProfileLocationsRepository, LocationDikeAttributeName, LocationsFile);
         ThrowWhenDataFileNotValid(CharacteristicLineRepository, CharacteristicLineAttributeName, CharacteristicLinesFile);
     }
 
@@ -122,7 +119,6 @@
     {
         ThrowWhenRepositoryIsInvalid(CharacteristicLineRepository, CharacteristicLineAttributeName);
         ThrowWhenRepositoryIsInvalid(ProfileLocationsRepository, LocationIDAttributeName);
-        ThrowWhenRepositoryIsInvalid(ProfileLocationsRepository, LocationDikeAttributeName);
 
         // TODO Test both repositories on geometry type (must be linestring)
 
Index: DamClients/DamUI/trunk/doc/DAM UI - User manual/DAM UI - User manual.tex
===================================================================
diff -u -r6949 -r6955
--- DamClients/DamUI/trunk/doc/DAM UI - User manual/DAM UI - User manual.tex	(.../DAM UI - User manual.tex)	(revision 6949)
+++ DamClients/DamUI/trunk/doc/DAM UI - User manual/DAM UI - User manual.tex	(.../DAM UI - User manual.tex)	(revision 6955)
@@ -850,7 +850,7 @@
 
 Binnen DAM wordt de ligging van een dwarsprofiel vastgelegd door de ‘Locatie’ (zie \autoref{fig:VoorbeeldLocatie}). 
 Een locatie is een punt en wordt ruimtelijk gedefinieerd door een XY-coördinaat. 
-Als gewerkt wordt met shape bestanden, dan bevat de attribuut tabel voor de locatie shape de volgende (hard gedefinieerde) attribuut: \\
+Als gewerkt wordt met shape bestanden, dan bevat de attribuut tabel voor de locatie shape het volgende (hard gedefinieerde) attribuut: \\
 LOCATIONID; de naam van de locatie, bijvoorbeeld dijkring\_hectometrering
 
 De LOCATIONID, net als andere naamgeving binnen DAM, mag geen leestekens bevatten (\#, -, \& of :).
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataSource.cs
===================================================================
diff -u -r6436 -r6955
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataSource.cs	(.../DataSource.cs)	(revision 6436)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataSource.cs	(.../DataSource.cs)	(revision 6955)
@@ -25,12 +25,8 @@
 {
     public DataSourceType DataSourceType { get; set; }
     public string DataLocation { get; set; }
-    public string DikeRingId { get; set; }
-
     public override string ToString()
     {
-        return DataSourceType + "|"
-                              + (string.IsNullOrWhiteSpace(DikeRingId) ? "<no_id_specified>" : DikeRingId)
-                              + "|" + DataLocation;
+        return DataSourceType + "|" + DataLocation;
     }
 }
\ No newline at end of file
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
===================================================================
diff -u -r6940 -r6955
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs	(.../DataPluginImporter.cs)	(revision 6940)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs	(.../DataPluginImporter.cs)	(revision 6955)
@@ -238,10 +238,10 @@
     }
 
     /// <summary>
-    /// Gets the dike ring information.
+    /// Gets the dike information.
     /// </summary>
     /// <returns></returns>
-    public Info GetDikeRingInfo()
+    public Info GetDikeInfo()
     {
         Dike dike = GetDike();
         return new Info
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterDotSpatialTests.cs
===================================================================
diff -u -r6436 -r6955
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterDotSpatialTests.cs	(.../LocationShapeFileImporterDotSpatialTests.cs)	(revision 6436)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterDotSpatialTests.cs	(.../LocationShapeFileImporterDotSpatialTests.cs)	(revision 6955)
@@ -33,7 +33,7 @@
     public class LocationShapeFileImporterDotSpatialTests
     {
         [Test]
-        public void CanReadLoactions()
+        public void CanReadLocations()
         {
             string locationFolder = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HHNKShapeFiles\");
             var configuredAttributes = new List<DataAttribute>();
@@ -43,12 +43,6 @@
                 AttributeName = "LOCATIONID",
                 DataSource = "LocationID.shp"
             });
-            configuredAttributes.Add(new DataAttribute
-            {
-                AttributeId = "dikering_id",
-                AttributeName = "DIKERINGID",
-                DataSource = "LocationID.shp"
-            });
             var locationRecords = new List<CsvImporterLocations.LocationRecord>();
             var locationImporter = LocationShapeFileImporter.Create(
                 locationRecords, configuredAttributes, locationFolder);
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamNewProjectDialog.cs
===================================================================
diff -u -r6857 -r6955
--- DamClients/DamUI/trunk/src/Dam/Forms/DamNewProjectDialog.cs	(.../DamNewProjectDialog.cs)	(revision 6857)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamNewProjectDialog.cs	(.../DamNewProjectDialog.cs)	(revision 6955)
@@ -317,7 +317,7 @@
                     Environment.NewLine,
                     e.Message
                 };
-                LocalizedMessageBox.ShowError(this, "CannotReadDikeringsFromImportDefinition", args);
+                LocalizedMessageBox.ShowError(this, "CannotReadDikeFromImportDefinition", args);
             }
         }
 
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs
===================================================================
diff -u -r6944 -r6955
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs	(.../DataPluginImporterCsvTests.cs)	(revision 6944)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs	(.../DataPluginImporterCsvTests.cs)	(revision 6955)
@@ -60,7 +60,7 @@
         public void CanImportDikeData()
         {
             dataPluginImporter.ImportDataForDike(null);
-            Info dikeInfo = dataPluginImporter.GetDikeRingInfo();
+            Info dikeInfo = dataPluginImporter.GetDikeInfo();
             Assert.That(dikeInfo.Name, Is.EqualTo("Kering"));
         }
 
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/IDataPlugin.cs
===================================================================
diff -u -r6873 -r6955
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/IDataPlugin.cs	(.../IDataPlugin.cs)	(revision 6873)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/IDataPlugin.cs	(.../IDataPlugin.cs)	(revision 6955)
@@ -81,7 +81,7 @@
     
     void ImportDataForDike(ProgressDelegate progress);
 
-    Info GetDikeRingInfo();
+    Info GetDikeInfo();
 
     IEnumerable<NameValueParameter> GetDikeParameters();
 
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
===================================================================
diff -u -r6932 -r6955
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml	(.../Translations.xml)	(revision 6932)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml	(.../Translations.xml)	(revision 6955)
@@ -49,7 +49,6 @@
     <Translation ID="DistanceToEntryPointDescription"
                  en-US="Distance from toe of dike to entry point of river in deep sandlayer"
                  nl-NL="Afstand tussen teen van de dijk en het intrede punt van rivier in de diepe watervoerende zandlagen"/>
-    <Translation ID="DikeRingId" en-US="Dike" nl-NL="Kering"/>
     <Translation ID="StabilityZoneType" en-US="Zone type" nl-NL="Zonerings type"/>
     <Translation ID="StabilityZoneTypeDescription" en-US="Type of zone to be used in stability calculations"
                  nl-NL="Zonerings type dat gebruikt wordt in stabiliteits berekeningen"/>
@@ -496,9 +495,6 @@
                  nl-NL="Kon geen veiligheidsfactor afleiden"/>
     <Translation ID="locationIdNotFoundError" en-US="Location ID in defx ({0}) does not match location ID in shapefile."
                  nl-NL="De locatie ID in de defx ({0}) komt niet overeen met de locatie ID in de shapefile."/>
-    <Translation ID="dikeRingIdNotFoundError"
-                 en-US="Dike ring ID in defx ({0}) does not match dike ring ID in shapefile."
-                 nl-NL="De dijkring ID in de defx ({0}) komt niet overeen met de dijkring ID in de shapefile."/>
     <Translation ID="NoDikeEmbankmentMaterial" en-US="No valid dike embankment material defined"
                  nl-NL="Dijk ophoog materiaal niet gevonden"/>
     <Translation ID="NoRequiredSafetyForZones"
Index: DamClients/DamUI/trunk/src/Dam/Forms/Translations.xml
===================================================================
diff -u -r6857 -r6955
--- DamClients/DamUI/trunk/src/Dam/Forms/Translations.xml	(.../Translations.xml)	(revision 6857)
+++ DamClients/DamUI/trunk/src/Dam/Forms/Translations.xml	(.../Translations.xml)	(revision 6955)
@@ -42,13 +42,11 @@
     <Translation ID="SensorConfigurationFilterText" en-US="Sensor configuration (*.xls)|*.xls"
                  nl-NL="Sensor configuratie (*.xls)|*.xls"/>
     <Translation ID="SelectValidFile" en-US="Please select a valid file." nl-NL="Selecteer aub een geldig bestand."/>
-    <Translation ID="SelectAtLeastOneDikering" en-US="You have to select at least one dikering"
-                 nl-NL="U moet minimaal 1 dijkring selecteren"/>
     <Translation ID="UpdatingLogMessagesFailed" en-US="Updating log messages failed"
                  nl-NL="Het updaten van de log berichten is niet gelukt"/>
-    <Translation ID="CannotReadDikeringsFromImportDefinition"
-                 en-US="Cannot read dike ring from the import definition file: {0}&#034;{1}&#034;. {2}Message of the unhandled error: {3}&#034;{4}&#034;."
-                 nl-NL="Kan geen dijkring lezen uit het import definitie bestand: {0}&#034;{1}&#034;. {2}Melding van de niet afgehandelde fout: {3}&#034;{4}&#034;."/>
+    <Translation ID="CannotReadDikeFromImportDefinition"
+                 en-US="Cannot read dike from the import definition file: {0}&#034;{1}&#034;. {2}Message of the unhandled error: {3}&#034;{4}&#034;."
+                 nl-NL="Kan geen dijk lezen uit het import definitie bestand: {0}&#034;{1}&#034;. {2}Melding van de niet afgehandelde fout: {3}&#034;{4}&#034;."/>
     <Translation ID="FileAlreadyExistsOverwriteItQuestion" en-US="File {0} already exists. Overwrite?"
                  nl-NL="Het bestand {0} bestaat al. Overschrijven?"/>
     <Translation ID="ErrorImportingDataSourceFile"
@@ -79,7 +77,6 @@
                  nl-NL="DAM import definitie (*.defx)|*.defx"/>
     <Translation ID="DamProjectFilesFilterText" en-US="DAM project (*.damx)|*.damx"
                  nl-NL="DAM project (*.damx)|*.damx"/>
-    <Translation ID="SelectDikerings" en-US="Select dikerings" nl-NL="Selecteer dijkringen"/>
     <Translation ID="SoilProfileDropdownEditCaption" en-US="Soil Profile:" nl-NL="Bodemprofiel:"/>
     <Translation ID="SelectSoilProfileButtonCaption" en-US="Show Soil Profile Details"
                  nl-NL="Toon Bodemprofiel details"/>
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs
===================================================================
diff -u -r6940 -r6955
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 6940)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs	(.../DataPluginImporterTests.cs)	(revision 6955)
@@ -1036,9 +1036,9 @@
             }
 
             using StreamWriter writer = File.CreateText(importFile);
-            writer.WriteLine("location_id;dikering_id;surfaceline_id;segment_id;water_height");
-            writer.WriteLine("RK210-560;Actualisatie;RK210-560;1;1.2");
-            writer.WriteLine("RK210-570;Actualisatie;RK210-570;1;2.2");
+            writer.WriteLine("location_id;surfaceline_id;segment_id;water_height");
+            writer.WriteLine("RK210-560;RK210-560;1;1.2");
+            writer.WriteLine("RK210-570;RK210-570;1;2.2");
         }
 
         private void CreateLocationsFileWithoutRiverLevel(string importFile)
@@ -1053,9 +1053,9 @@
             }
 
             using StreamWriter writer = File.CreateText(importFile);
-            writer.WriteLine("location_id;dikering_id;surfaceline_id;segment_id;polderlevel");
-            writer.WriteLine("RK210-560;Actualisatie;RK210-560;1;1.2");
-            writer.WriteLine("RK210-570;Actualisatie;RK210-570;1;2.2");
+            writer.WriteLine("location_id;surfaceline_id;segment_id;polderlevel");
+            writer.WriteLine("RK210-560;RK210-560;1;1.2");
+            writer.WriteLine("RK210-570;RK210-570;1;2.2");
         }
 
         private void CreateScenariosFileWithRiverLevel(string importFile)
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationCharacteristicPointImporterTest.cs
===================================================================
diff -u -r6436 -r6955
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationCharacteristicPointImporterTest.cs	(.../LocationCharacteristicPointImporterTest.cs)	(revision 6436)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationCharacteristicPointImporterTest.cs	(.../LocationCharacteristicPointImporterTest.cs)	(revision 6955)
@@ -54,7 +54,6 @@
                 ProfileLocationsRepository = profiles
             };
 
-            profileLine.AddAttribute(LocationCharacteristicPointImporter.LocationDikeAttributeName, new object());
             characteristicLine.AddAttribute(LocationCharacteristicPointImporter.CharacteristicLineAttributeName, new object());
 
             profiles.Features.Returns(new[]
@@ -70,30 +69,6 @@
         }
 
         [Test]
-        public void ImportRepository_DoesNotContainTheRequiredAttributeDikeID_Throws()
-        {
-            importer = new LocationCharacteristicPointImporter(new List<Location>())
-            {
-                CharacteristicLineRepository = characteristicLines,
-                ProfileLocationsRepository = profiles
-            };
-
-            profileLine.AddAttribute(LocationCharacteristicPointImporter.LocationIDAttributeName, new object());
-            characteristicLine.AddAttribute(LocationCharacteristicPointImporter.CharacteristicLineAttributeName, new object());
-
-            profiles.Features.Returns(new[]
-            {
-                profileLine
-            });
-            characteristicLines.Features.Returns(new[]
-            {
-                characteristicLine
-            });
-
-            Assert.That(() => importer.Import(), Throws.InvalidOperationException);
-        }
-
-        [Test]
         public void ImportRepository_DoesNotContainARequiredAttribute_Throws()
         {
             importer = new LocationCharacteristicPointImporter(new List<Location>())
@@ -140,7 +115,6 @@
                     ProfileLocationsRepository = profiles
                 };
 
-                profileLine.AddAttribute(LocationCharacteristicPointImporter.LocationDikeAttributeName, new object());
                 profileLine.AddAttribute(LocationCharacteristicPointImporter.LocationIDAttributeName, locationID);
 
                 characteristicLine.AddAttribute(LocationCharacteristicPointImporter.CharacteristicLineAttributeName, "kruin-binnen");
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs
===================================================================
diff -u -r6940 -r6955
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs	(.../DataPluginImporterDataShapeFilesTests.cs)	(revision 6940)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs	(.../DataPluginImporterDataShapeFilesTests.cs)	(revision 6955)
@@ -93,19 +93,7 @@
             Assert.That(locationDetails.First(
                             x => x.ParameterName.Equals("TrafficLoadDistributionAngle")).ParameterValue, Is.EqualTo("32"));
         }
-
-        /*[Test]
-        public void Import_NoCoverageFoundForPoint_ImporterContinuesAndErrorsAreRetrievable()
-        {
-            string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault();
-            dataPluginImporter.GetLocationDetails(dikeRingId, location18_6Id);
-            var errors = dataPluginImporter.GetImportErrors();
-            Assert.IsNotNull(errors);
-            Assert.IsTrue(errors.Count() > 0);
-            Assert.IsTrue(errors.Contains());
-        }
-*/
-
+   
         [Test]
         [Category("Slow")]
         public void CanRetrievePenetrationLengthFromDataShapeFile()
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/FeatureRepositoryExtensionsTest.cs
===================================================================
diff -u -r6436 -r6955
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/FeatureRepositoryExtensionsTest.cs	(.../FeatureRepositoryExtensionsTest.cs)	(revision 6436)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/FeatureRepositoryExtensionsTest.cs	(.../FeatureRepositoryExtensionsTest.cs)	(revision 6955)
@@ -31,7 +31,7 @@
     public class FeatureRepositoryExtensionsTest
     {
         private IFeatureRepository rep1, rep2;
-        private LineString dikeRing;
+        private LineString dike;
 
         [Test]
         public void GetLineIntersectionPoints_OneValidProfileIntersects_ListContainsOneElement()
@@ -56,7 +56,7 @@
                 geom2
             });
 
-            var dikeGeom = Feature.Create(dikeRing);
+            var dikeGeom = Feature.Create(dike);
             rep2.Query(Arg.Any<IFeature>()).Returns(new[]
             {
                 dikeGeom
@@ -103,7 +103,7 @@
                 geom2
             });
 
-            var dikeGeom = Feature.Create(dikeRing);
+            var dikeGeom = Feature.Create(dike);
             rep2.Query(Arg.Any<IFeature>()).Returns(new[]
             {
                 dikeGeom
@@ -144,7 +144,7 @@
                 geom1
             });
 
-            var dikeGeom = Feature.Create(dikeRing);
+            var dikeGeom = Feature.Create(dike);
             rep2.Query(Arg.Any<IFeature>()).Returns(new[]
             {
                 dikeGeom
@@ -180,7 +180,7 @@
                 geom1
             });
 
-            var dikeGeom = Feature.Create(dikeRing);
+            var dikeGeom = Feature.Create(dike);
             rep2.Query(Arg.Any<IFeature>()).Returns(new[]
             {
                 dikeGeom
@@ -209,7 +209,7 @@
             rep1 = Substitute.For<IFeatureRepository>();
             rep2 = Substitute.For<IFeatureRepository>();
 
-            dikeRing = new LineString(new[]
+            dike = new LineString(new[]
             {
                 new Coordinate(-2, 2),
                 new Coordinate(2, 2),
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r6940 -r6955
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 6940)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 6955)
@@ -2075,8 +2075,6 @@
                 return true;
             case "YRd":
                 return true;
-            case "DikeRingId":
-                return true;
             case "SegmentId":
                 return true;
             case "Description":