Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs
===================================================================
diff -u -r2513 -r2529
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs	(.../EntityFactory.cs)	(revision 2513)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs	(.../EntityFactory.cs)	(revision 2529)
@@ -305,33 +305,17 @@
             location1.YRd = 143090;
             location1.PolderLevel = 0.4;
             location1.HeadPL2 = 4.0;
-            location1.HeadPl3 = 3.0;
-            location1.HeadPl4 = 2.5;
             location1.DikeEmbankmentMaterial = "clay";
             location1.ShoulderEmbankmentMaterial = "sand";
             location1.StabilityShoulderGrowSlope = 3.1;
             location1.StabilityShoulderGrowDeltaX = 3.2;
             location1.StabilitySlopeAdaptionDeltaX = 3.3;
-            location1.PlLineOffsetBelowDikeTopAtRiver = 3.4;
-            location1.PlLineOffsetBelowDikeTopAtPolder = 3.5;
-            location1.PlLineOffsetBelowShoulderBaseInside = 3.52;
-            location1.PlLineOffsetBelowDikeToeAtPolder = 3.54;
-            location1.PlLineOffsetBelowDikeCrestMiddle = 3.55;
-            location1.PlLineOffsetFactorBelowShoulderCrest = 0.36;
             location1.IntrusionVerticalWaterPressure = IntrusionVerticalWaterPressureType.FullHydroStatic;
             location1.PenetrationLength = 3.6;
             location1.TrafficLoad = 3.7;
             location1.TL_DegreeOfConsolidation = 3.8;
             location1.MinimalCircleDepth = 1.11;
             location1.DistanceToEntryPoint = 1.16;
-            location1.ModelFactors.RequiredSafetyFactorPiping = 1.11;
-            location1.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = 1.12;
-            location1.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = 1.13;
-            location1.ModelFactors.UpliftCriterionPiping = 1.14;
-            location1.ModelFactors.UpliftCriterionStability = 1.15;
-            location1.DikeTableHeight = 0.1;
-            location1.RiverLevel = 0.2;
-            location1.RiverLevelLow = 0.3;
             
             dike.Locations.Add(location1);
             Location location2 = new Location();
@@ -665,74 +649,6 @@
         }
 
         /// <summary>
-        /// Creates a location object
-        /// </summary>
-        /// <param name="locationId">The location id</param>
-        /// <param name="segmentId">The segment id</param>
-        /// <param name="surfaceLineId">The surface line id</param>
-        /// <param name="xRd">The rd x coordinate</param>
-        /// <param name="yRd">The rd y coordinate</param>
-        /// <param name="polderLevel">The polder level</param>
-        /// <returns>A materialized object</returns>
-        /// <exception cref="ArgumentNullException" />
-        /// <exception cref="EntityAlreadyExistException"
-        public Location CreateLocation(string locationId, string segmentId, string surfaceLineId, string pl1Id)
-        {
-            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(locationId, StringResourceNames.SegmentIdArgumentNullOrEmpty);
-            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(segmentId, StringResourceNames.SegmentIdArgumentNullOrEmpty);
-            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(surfaceLineId, StringResourceNames.SurfaceLineIdArgumentNullOrEmpty);
-
-            ThrowHelper.ThrowWhenConditionIsTrue(
-                locations.FirstOrDefault(l => l.Name == locationId),
-                StringResourceNames.EntityAlreadyExist,
-                c => c != null,
-                e => new EntityAlreadyExistException(string.Format("Location '{0}' {1}", locationId, ThrowHelper.GetResourceString(e)))
-                );
-
-            // Lookup the segment to associate
-            // if the item does not exists create one and add it to the lookup
-            var segment = segments.FirstOrDefault(s => s.Name == segmentId.ToString());
-            if (segment == null)
-            {
-                segment = new Segment() { Name = segmentId };
-                segments.Add(segment);
-            }
-
-            // Lookup the surface line to associate
-            // if the item does not exists create one and add it to the lookup
-            var surfaceLine = surfaceLines.FirstOrDefault(s => s.Name == surfaceLineId);
-            if (surfaceLine == null)
-            {
-                surfaceLine = new SurfaceLine2
-                {
-                    Name = surfaceLineId,
-                    CharacteristicPoints = { GeometryMustContainPoint = true },
-                    Geometry = new LocalizedGeometryPointString()
-                };
-                surfaceLines.Add(surfaceLine);
-            }
-
-            // Lookup the pl1 line to associate
-            // if the item does not exists create one and add it to the lookup
-            var pl1Line = pl1Lines.FirstOrDefault(s => s.Name == pl1Id);
-            if (pl1Line == null)
-            {
-                pl1Line = new PL1Line() { Name = pl1Id };
-                pl1Lines.Add(pl1Line);
-            }
-
-            var location = new Location()
-            {
-                Name = locationId,
-                Segment = segment,
-                SurfaceLine2 = surfaceLine,
-                PL1Line = pl1Line,
-            };
-
-            return location;
-        }
-
-        /// <summary>
         /// Creates a new surface line point which will be added to the characteristics point collection
         /// </summary>
         /// <param name="surfaceLineId">The ID of the surface line containing the point collections</param>