Fix calculation of bounding boxes of non-cartesian geometries.

Author: awulkiew

Visual_Studio_2015/GraphicalDebugging/ExpressionDrawer.cs

@@ -341,11 +341,11 @@ private static void DrawLinestring(Geometry.Linestring linestring, Geometry.Box
             }
         }
 
-        private static Geometry.Box AabbRange(Geometry.IRandomAccessRange<Geometry.Point> rng, Geometry.Traits traits, bool calculateEnvelope)
+        private static Geometry.Box AabbRange(Geometry.IRandomAccessRange<Geometry.Point> rng, bool closed, Geometry.Traits traits, bool calculateEnvelope)
         {
             return calculateEnvelope
-                 ? Geometry.Envelope(rng, traits)
-                 : Geometry.Aabb(rng, traits.Unit);
+                 ? Geometry.Envelope(rng, closed, traits)
+                 : Geometry.Aabb(rng, closed, traits.Unit);
         }
 
         public class Linestring : Geometry.Linestring, IDrawable
@@ -357,7 +357,7 @@ public void Draw(Geometry.Box box, Graphics graphics, Settings settings, Geometr
 
             public Geometry.Box Aabb(Geometry.Traits traits, bool calculateEnvelope)
             {
-                return AabbRange(this, traits, calculateEnvelope);
+                return AabbRange(this, false, traits, calculateEnvelope);
             }
         }
 
@@ -397,7 +397,7 @@ public void Draw(Geometry.Box box, Graphics graphics, Settings settings, Geometr
 
             public Geometry.Box Aabb(Geometry.Traits traits, bool calculateEnvelope)
             {
-                return AabbRange(this, traits, calculateEnvelope);
+                return AabbRange(this, true, traits, calculateEnvelope);
             }
         }
 
@@ -459,11 +459,11 @@ private static void DrawPolygon(Geometry.Polygon polygon, Geometry.Box box, Grap
 
         private static Geometry.Box AabbPolygon(Geometry.Polygon poly, Geometry.Traits traits, bool calculateEnvelope)
         {
-            Geometry.Box result = AabbRange(poly.Outer, traits, calculateEnvelope);
+            Geometry.Box result = AabbRange(poly.Outer, true, traits, calculateEnvelope);
 
             foreach (Geometry.Ring inner in poly.Inners)
             {
-                Geometry.Box aabb = AabbRange(inner, traits, calculateEnvelope);
+                Geometry.Box aabb = AabbRange(inner, true, traits, calculateEnvelope);
                 if (calculateEnvelope)
                     Geometry.Expand(result, aabb, traits);
                 else
@@ -556,7 +556,7 @@ public Geometry.Box Aabb(Geometry.Traits traits, bool calculateEnvelope)
 
                 for (int i = 0; i < this.Count; ++i)
                 {
-                    Geometry.Box ls_box = AabbRange(this[i], traits, calculateEnvelope);
+                    Geometry.Box ls_box = AabbRange(this[i], false, traits, calculateEnvelope);
 
                     if (box == null)
                         box = ls_box;

Visual_Studio_2015/GraphicalDebugging/Geometry.cs

@@ -316,7 +316,7 @@ public static Box AabbAngle(Point p1, Point p2, Unit unit)
             return result;
         }
 
-        public static Box Aabb(IRandomAccessRange<Point> points, Unit unit)
+        public static Box Aabb(IRandomAccessRange<Point> points, bool closed, Unit unit)
         {
             Box result = new Box();
 
@@ -335,13 +335,12 @@ public static Box Aabb(IRandomAccessRange<Point> points, Unit unit)
             }
             Point p2 = points[1];
 
-            // NOTE: This does not take into account the closing segment
-
             result = Aabb(p1, p2, unit);
-            for (int i = 2; i < points.Count; ++i)
+            int count = points.Count + (closed ? 1 : 0);
+            for (int i = 2; i < count; ++i)
             {
                 p1 = p2;
-                p2 = points[i];
+                p2 = points[i % points.Count];
                 Box b = Aabb(p1, p2, unit);
                 Expand(result, b);
             }
@@ -365,7 +364,7 @@ public static Box Aabb(Segment seg, Traits traits)
         }
         public static Box Aabb(Linestring linestring, Traits traits)
         {
-            return Aabb(linestring, traits.Unit);
+            return Aabb(linestring, false, traits.Unit);
         }
 
         public static bool IntersectsX(Box box, double x)
@@ -523,7 +522,7 @@ public static void Expand<CS>(Box<CS, Degree> box, Point<CS, Degree> p)
             if (p[1] > box.Max[1]) box.Max[1] = p[1];
         }*/
 
-        public static Box Envelope(IRandomAccessRange<Point> range, Traits traits)
+        public static Box Envelope(IRandomAccessRange<Point> range, bool closed, Traits traits)
         {
             if (range.Count <= 0)
             {
@@ -537,10 +536,11 @@ public static Box Envelope(IRandomAccessRange<Point> range, Traits traits)
             }
             else
             {
+                int count = range.Count + (closed ? 1 : 0);
                 Box result = Envelope(range[0], range[1], traits);
-                for (int i = 2; i < range.Count; ++i)
+                for (int i = 2; i < count; ++i)
                 {
-                    Box b = Envelope(range[i], range[i - 1], traits);
+                    Box b = Envelope(range[i % range.Count], range[i - 1], traits);
                     Expand(result, b, traits);
                 }
                 return result;
@@ -578,14 +578,14 @@ public static void ExpandAngle(Box box, Box b, Unit unit)
             if (left_dist >= 0 && right_dist >= 0)
             {
                 if (left_dist < right_dist)
-                    box.Min[0] = xmin2;
+                    box.Min[0] -= left_dist;
                 else
-                    box.Max[0] = xmax2;
+                    box.Max[0] += right_dist;
             }
             else if (left_dist >= 0)
-                box.Min[0] = xmin2;
+                box.Min[0] -= left_dist;
             else if (right_dist >= 0)
-                box.Max[0] = xmax2;
+                box.Max[0] += right_dist;
 
             if (box.Max[0] < box.Min[0])
                 box.Max[0] += twoPi;