Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r599 -r711
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 599)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 711)
@@ -59,7 +59,7 @@
         private SoilType dikeMaterialType = SoilType.Clay;
         private double dikeTableHeight = 0.0;
         private double dredgingDepth = 0;
-        private double forbiddenZoneFactor = 1.0;
+        
         private IList<GaugePLLine> gaugePLLines = new List<GaugePLLine>();
         private IList<Gauge> gauges = new List<Gauge>();
         private double? headPL2 = null;
@@ -73,8 +73,8 @@
         private double levelReductionOutside = 0;
         private PL1Line localXZPL1Line;
         private GeometryPoint localXZSheetPilePoint;
-        private string mapForSoilGeometries2D = "";
-        private double minimalCircleDepth = 0;
+
+        private StabilityOptions stabilityOptions;
         private ModelFactors modelFactors = new ModelFactors();
         private string name = "";
         private double newDepthDitch = 1.0;
@@ -117,10 +117,8 @@
         private double stabilityShoulderGrowDeltaX = 2.0;
         private double stabilityShoulderGrowSlope = 1.0/3;
         private double stabilitySlopeAdaptionDeltaX = 2.0;
-        private MStabZonesType stabilityZoneType = MStabZonesType.NoZones;
-
+        
         private string surfaceLineId = "";
-        private double trafficLoad = 0;
         private bool useNewDikeSlopeInside;
         private bool useNewDikeSlopeOutside;
         private bool useNewDikeTopWidth;
@@ -133,8 +131,7 @@
         private double xSoilGeometry2DOrigin = 0;
         private double xrd = 0;
         private double yrd = 0;
-        private double zoneAreaRestSlopeCrestWidth = 3.0;
-
+        
         private double? plLineOffsetFactorBelowShoulderCrest;
         private double? plLineOffsetBelowDikeCrestMiddle;
         private double? plLineOffsetDryFactorBelowShoulderCrest;
@@ -262,18 +259,6 @@
             }
         }
 
-        public virtual double TrafficLoad
-        {
-            get
-            {
-                return trafficLoad;
-            }
-            set
-            {
-                trafficLoad = value;                
-            }
-        }
-
         public virtual double DredgingDepth
         {
             get
@@ -440,21 +425,6 @@
             }
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public virtual double MinimalCircleDepth
-        {
-            get
-            {
-                return minimalCircleDepth;
-            }
-            set
-            {
-                minimalCircleDepth = value;                
-            }
-        }
-
         public virtual double LevelReductionInside
         {
             get
@@ -614,17 +584,7 @@
         public SoilList SoilList { get; set; }
 
 
-        public string MapForSoilGeometries2D
-        {
-            get
-            {
-                return mapForSoilGeometries2D;
-            }
-            set
-            {
-                mapForSoilGeometries2D = value;
-            }
-        }
+        
 
         public virtual IList<Gauge> Gauges
         {
@@ -972,42 +932,17 @@
 
         #region IGeographic Members
 
-        public MStabZonesType StabilityZoneType
+        public StabilityOptions StabilityOptions
         {
             get
             {
-                return stabilityZoneType;
+                return stabilityOptions;
             }
             set
             {
-                stabilityZoneType = value;                
+                stabilityOptions = value;
             }
         }
-
-        public double ForbiddenZoneFactor
-        {
-            get
-            {
-                return forbiddenZoneFactor;
-            }
-            set
-            {
-                forbiddenZoneFactor = value;                
-            }
-        }
-
-        public double ZoneAreaRestSlopeCrestWidth
-        {
-            get
-            {
-                return zoneAreaRestSlopeCrestWidth;
-            }
-            set
-            {
-                zoneAreaRestSlopeCrestWidth = value;                
-            }
-        }
-
         public double X
         {
             get
@@ -1054,7 +989,7 @@
         [Validate]
         public ValidationResult[] IsRequiredSafetySetForZoneTypeArea()
         {
-            if (stabilityZoneType == MStabZonesType.ZoneAreas)
+            if (stabilityOptions != null && stabilityOptions.StabilityZoneType == MStabZonesType.ZoneAreas)
             {
                 // For design projects, the safetey must be defined per scenario, not per location
                 if (DamProjectType == DamProjectType.Design && scenarios != null && scenarios.Count > 0)
@@ -1802,25 +1737,6 @@
 
         #endregion
 
-        /// <summary>
-        /// Sets the default values; taking into account which DamProjectType and DamType is set
-        /// </summary>
-        /// <param name="damType">Type of the dam.</param>
-        /// <param name="damProjectType">Type of the dam project.</param>
-        // TODO fix hiding parameter (e.g. use field instead of parameter)
-        // TODO possibly set this when setting a damType and damProjectType for this location
-        public void SetDefaultValues(DamType damType, DamProjectType damProjectType)
-        {
-            if ((damType == DamType.Regional) && (damProjectType == DamProjectType.Assessment))
-            {
-                zoneAreaRestSlopeCrestWidth = 1.5;
-            }
-            else
-            {
-                zoneAreaRestSlopeCrestWidth = 3.0;
-            }
-        }
-
         [Validate]
         public ValidationResult[] AscendingLocalXZSurfaceLine()
         {