Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryLoopTests.cs
===================================================================
diff -u -r3893 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryLoopTests.cs	(.../GeometryLoopTests.cs)	(revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryLoopTests.cs	(.../GeometryLoopTests.cs)	(revision 4000)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using Deltares.DamEngine.Data.Geometry;
 using NUnit.Framework;
 
@@ -55,7 +56,7 @@
             loop.CurveList.Add(new GeometryCurve(loop.CurveList[1].EndPoint, loop.CurveList[0].HeadPoint));
 
             // call
-            var hasArea = loop.HasArea();
+            bool hasArea = loop.HasArea();
 
             // assert
             Assert.IsFalse(hasArea);
@@ -66,13 +67,13 @@
         {
             // setup
             var loop = new GeometryLoop();
-            loop.CurveList.Add(new GeometryCurve(new Point2D(1.1,3.3), new Point2D(4.4, 6.6)));
+            loop.CurveList.Add(new GeometryCurve(new Point2D(1.1, 3.3), new Point2D(4.4, 6.6)));
             loop.CurveList.Add(new GeometryCurve(loop.CurveList[0].HeadPoint, loop.CurveList[0].EndPoint));
             loop.CurveList.Add(new GeometryCurve(loop.CurveList[0].HeadPoint, loop.CurveList[0].EndPoint));
             loop.CurveList.Add(new GeometryCurve(new Point2D(1.1, 3.3), new Point2D(4.4, 6.6)));
 
             // call
-            var hasArea = loop.HasArea();
+            bool hasArea = loop.HasArea();
 
             // assert
             Assert.IsFalse(hasArea);
@@ -88,7 +89,7 @@
             loop.CurveList.Add(new GeometryCurve(loop.CurveList[1].EndPoint, loop.CurveList[0].HeadPoint));
 
             // call
-            var hasArea = loop.HasArea();
+            bool hasArea = loop.HasArea();
 
             // assert
             Assert.IsTrue(hasArea);
@@ -184,13 +185,13 @@
         {
             // setup
             var loop = new GeometryLoop();
-            for (int i = 0; i < count; i++)
+            for (var i = 0; i < count; i++)
             {
                 loop.CurveList.Add(new GeometryCurve(new Point2D(1.1, 3.3), new Point2D(4.4, 6.6)));
             }
 
             // call
-            var hasArea = loop.HasArea();
+            bool hasArea = loop.HasArea();
 
             // assert
             Assert.IsFalse(hasArea);
@@ -207,7 +208,7 @@
             loop.CurveList.Add(new GeometryCurve(loop.CurveList[2].EndPoint, loop.CurveList[0].HeadPoint));
 
             // call
-            var isClockWise = loop.IsClockWise();
+            bool isClockWise = loop.IsClockWise();
 
             // assert
             Assert.IsTrue(isClockWise);
@@ -220,31 +221,33 @@
         {
             // setup
             var loop = new GeometryLoop();
-            var angleSegment = 2.0 * Math.PI / pointCount;
+            double angleSegment = 2.0 * Math.PI / pointCount;
             Point2D first = null, last = null;
-            for (int i = 0; i < pointCount - 1; i++)
+            for (var i = 0; i < pointCount - 1; i++)
             {
-                var angleP0 = angleSegment * i;
-                var angleP1 = angleP0 + angleSegment;
+                double angleP0 = angleSegment * i;
+                double angleP1 = angleP0 + angleSegment;
 
-                var p1 = new Point2D(Math.Sin(angleP1),Math.Cos(angleP1));
+                var p1 = new Point2D(Math.Sin(angleP1), Math.Cos(angleP1));
                 if (i == 0)
                 {
                     first = new Point2D(Math.Sin(angleP0), Math.Cos(angleP0));
-                    
+
                     loop.CurveList.Add(new GeometryCurve(first, p1));
                 }
                 else
                 {
                     loop.CurveList.Add(new GeometryCurve(last, p1));
                 }
+
                 last = p1;
             }
+
             // TODO: Make GeometryLoop.Points less smart, such that one could simply do loop.Points.First()/.Last() :(
             loop.CurveList.Add(new GeometryCurve(last, first));
 
             // call
-            var isClockWise = loop.IsClockWise();
+            bool isClockWise = loop.IsClockWise();
 
             // assert
             Assert.IsTrue(isClockWise);
@@ -261,7 +264,7 @@
             loop.CurveList.Add(new GeometryCurve(loop.CurveList[2].EndPoint, loop.CurveList[0].HeadPoint));
 
             // call
-            var isClockWise = loop.IsClockWise();
+            bool isClockWise = loop.IsClockWise();
 
             // assert
             Assert.IsFalse(isClockWise);
@@ -274,12 +277,12 @@
         {
             // setup
             var loop = new GeometryLoop();
-            var angleSegment = -2.0 * Math.PI / pointCount;
+            double angleSegment = -2.0 * Math.PI / pointCount;
             Point2D first = null, last = null;
-            for (int i = 0; i < pointCount - 1; i++)
+            for (var i = 0; i < pointCount - 1; i++)
             {
-                var angleP0 = angleSegment * i;
-                var angleP1 = angleP0 + angleSegment;
+                double angleP0 = angleSegment * i;
+                double angleP1 = angleP0 + angleSegment;
 
                 var p1 = new Point2D(Math.Sin(angleP1), Math.Cos(angleP1));
                 if (i == 0)
@@ -291,13 +294,15 @@
                 {
                     loop.CurveList.Add(new GeometryCurve(last, p1));
                 }
+
                 last = p1;
             }
+
             // TODO: Make GeometryLoop.Points less smart, such that one could simply do loop.Points.First()/.Last() :(
             loop.CurveList.Add(new GeometryCurve(last, first));
 
             // call
-            var isClockWise = loop.IsClockWise();
+            bool isClockWise = loop.IsClockWise();
 
             // assert
             Assert.IsFalse(isClockWise);
@@ -328,7 +333,7 @@
             // setup
             var loop = new GeometryLoop();
             Point2D lastPoint = null;
-            for (int i = 0; i < curveCount; i++)
+            for (var i = 0; i < curveCount; i++)
             {
                 var newPoint = new Point2D();
                 if (i == 0)
@@ -339,10 +344,11 @@
                 {
                     loop.CurveList.Add(new GeometryCurve(lastPoint, newPoint));
                 }
+
                 lastPoint = newPoint;
             }
 
-            var pointCount = loop.CalcPoints.Count;
+            int pointCount = loop.CalcPoints.Count;
             Assert.AreEqual(curveCount == 0 ? 0 : curveCount + 1, pointCount);
 
             // call
@@ -365,7 +371,7 @@
             var point = new Point2D(1.2, 3.4);
 
             // call
-            var isContained = loop.IsPointInLoopArea(point);
+            bool isContained = loop.IsPointInLoopArea(point);
 
             // assert
             Assert.IsTrue(isContained);
@@ -388,7 +394,7 @@
             var point = new Point2D(x, z);
 
             // call
-            var isContained = loop.IsPointInLoopArea(point);
+            bool isContained = loop.IsPointInLoopArea(point);
 
             // assert
             Assert.IsTrue(isContained);
@@ -411,7 +417,7 @@
             var point = new Point2D(x, z);
 
             // call
-            var isContained = loop.IsPointInLoopArea(point);
+            bool isContained = loop.IsPointInLoopArea(point);
 
             // assert
             Assert.IsFalse(isContained);
@@ -429,12 +435,17 @@
             var curve6 = new GeometryCurve(new Point2D(19.19, 21.21), new Point2D(19.19, 21.21));
             var loop = new GeometryLoop();
             loop.CurveList.AddRange(new[]
-                {
-                    curve1, curve2, curve3, curve4, curve5, curve6
-                });
+            {
+                curve1,
+                curve2,
+                curve3,
+                curve4,
+                curve5,
+                curve6
+            });
 
             // call
-            var points = loop.CalcPoints;
+            List<Point2D> points = loop.CalcPoints;
 
             // assert
             Assert.AreEqual(2, points.Count);
@@ -455,12 +466,18 @@
             var curve7 = new GeometryCurve(curve1.HeadPoint, curve6.EndPoint);
             var loop = new GeometryLoop();
             loop.CurveList.AddRange(new[]
-                {
-                    curve1, curve2, curve3, curve4, curve5, curve6, curve7
-                });
+            {
+                curve1,
+                curve2,
+                curve3,
+                curve4,
+                curve5,
+                curve6,
+                curve7
+            });
 
             // call
-            var points = loop.CalcPoints;
+            List<Point2D> points = loop.CalcPoints;
 
             // assert
             Assert.AreEqual(7, points.Count);
@@ -488,12 +505,20 @@
             var curve9 = new GeometryCurve(new Point2D(34.34, 36.36), curve6.EndPoint);
             var loop = new GeometryLoop();
             loop.CurveList.AddRange(new[]
-                {
-                    curve1, curve2, curve3, curve4, curve5, curve6, curve7, curve8, curve9
-                });
+            {
+                curve1,
+                curve2,
+                curve3,
+                curve4,
+                curve5,
+                curve6,
+                curve7,
+                curve8,
+                curve9
+            });
 
             // call
-            var points = loop.CalcPoints;
+            List<Point2D> points = loop.CalcPoints;
 
             // assert
             Assert.AreEqual(8, points.Count);
@@ -515,12 +540,13 @@
             var curve2 = new GeometryCurve(new Point2D(7.7, 9.9), curve1.EndPoint);
             var loop = new GeometryLoop();
             loop.CurveList.AddRange(new[]
-                {
-                    curve1, curve2
-                });
+            {
+                curve1,
+                curve2
+            });
 
             // call
-            var points = loop.CalcPoints;
+            List<Point2D> points = loop.CalcPoints;
 
             // assert
             Assert.AreEqual(3, points.Count);
@@ -537,12 +563,13 @@
             var curve2 = new GeometryCurve(curve1.EndPoint, new Point2D(7.7, 9.9));
             var loop = new GeometryLoop();
             loop.CurveList.AddRange(new[]
-                {
-                    curve1, curve2
-                });
+            {
+                curve1,
+                curve2
+            });
 
             // call
-            var points = loop.CalcPoints;
+            List<Point2D> points = loop.CalcPoints;
 
             // assert
             Assert.AreEqual(3, points.Count);
@@ -559,12 +586,13 @@
             var curve2 = new GeometryCurve(new Point2D(7.7, 9.9), curve1.HeadPoint);
             var loop = new GeometryLoop();
             loop.CurveList.AddRange(new[]
-                {
-                    curve1, curve2
-                });
+            {
+                curve1,
+                curve2
+            });
 
             // call
-            var points = loop.CalcPoints;
+            List<Point2D> points = loop.CalcPoints;
 
             // assert
             Assert.AreEqual(3, points.Count);
@@ -581,12 +609,13 @@
             var curve2 = new GeometryCurve(curve1.HeadPoint, new Point2D(7.7, 9.9));
             var loop = new GeometryLoop();
             loop.CurveList.AddRange(new[]
-                {
-                    curve1, curve2
-                });
+            {
+                curve1,
+                curve2
+            });
 
             // call
-            var points = loop.CalcPoints;
+            List<Point2D> points = loop.CalcPoints;
 
             // assert
             Assert.AreEqual(3, points.Count);
@@ -604,7 +633,7 @@
             loop.CurveList.Add(curve);
 
             // call
-            var points = loop.CalcPoints;
+            List<Point2D> points = loop.CalcPoints;
 
             // assert
             Assert.AreEqual(2, points.Count);
@@ -619,10 +648,10 @@
             var loop = new GeometryLoop();
 
             // call
-            var points = loop.Points;
+            IList<GeometryPoint> points = loop.Points;
 
             // assert
             Assert.IsEmpty(points);
         }
     }
-}
+}
\ No newline at end of file