Corrections for serialisation of complex geometries

Terradue · Jun 30, 2022 · c0e443d · c0e443d
1 parent d8baa83
commit c0e443d
Showing 1 changed file with 30 additions and 21 deletions.
diff --git a/src/DotNetStac/StacGeometryHelpers.cs b/src/DotNetStac/StacGeometryHelpers.cs
@@ -41,48 +41,57 @@ public static IPosition[] GetBoundingBox(this IGeometryObject geometry)
             if (geometry == null)
                 throw new ArgumentNullException(nameof(geometry));
             IPosition upperRight = null, lowerLeft = null;
+            double lowerLeftLon, lowerLeftLat, upperRightLon, upperRightLat;
 
             switch (geometry.Type)
             {
                 case GeoJSONObjectType.GeometryCollection:
                     GeometryCollection geometryCollection = geometry as GeometryCollection;
-                    lowerLeft = geometryCollection.Geometries.Min(geom => geom.GetBoundingBox()[0]);
-                    upperRight = geometryCollection.Geometries.Max(geom => geom.GetBoundingBox()[1]);
+                    lowerLeftLon = geometryCollection.Geometries.Min(gp => gp.GetBoundingBox()[0].Longitude);
+                    lowerLeftLat = geometryCollection.Geometries.Min(gp => gp.GetBoundingBox()[0].Latitude);
+                    upperRightLon = geometryCollection.Geometries.Max(gp => gp.GetBoundingBox()[1].Longitude);
+                    upperRightLat = geometryCollection.Geometries.Max(gp => gp.GetBoundingBox()[1].Latitude);
+                    lowerLeft = new Position(lowerLeftLat, lowerLeftLon);
+                    upperRight = new Position(upperRightLat, upperRightLon);
+                    break;
+                case GeoJSONObjectType.MultiPolygon:
+                    MultiPolygon multiPolygon = geometry as MultiPolygon;
+                    lowerLeftLon = multiPolygon.Coordinates.Min(gp => gp.GetBoundingBox()[0].Longitude);
+                    lowerLeftLat = multiPolygon.Coordinates.Min(gp => gp.GetBoundingBox()[0].Latitude);
+                    upperRightLon = multiPolygon.Coordinates.Max(gp => gp.GetBoundingBox()[1].Longitude);
+                    upperRightLat = multiPolygon.Coordinates.Max(gp => gp.GetBoundingBox()[1].Latitude);
+                    lowerLeft = new Position(lowerLeftLat, lowerLeftLon);
+                    upperRight = new Position(upperRightLat, upperRightLon);
+                    break;
+                case GeoJSONObjectType.MultiLineString:
+                    MultiLineString multiLineString = geometry as MultiLineString;
+                    lowerLeftLon = multiLineString.Coordinates.Min(gp => gp.GetBoundingBox()[0].Longitude);
+                    lowerLeftLat = multiLineString.Coordinates.Min(gp => gp.GetBoundingBox()[0].Latitude);
+                    upperRightLon = multiLineString.Coordinates.Max(gp => gp.GetBoundingBox()[1].Longitude);
+                    upperRightLat = multiLineString.Coordinates.Max(gp => gp.GetBoundingBox()[1].Latitude);
+                    lowerLeft = new Position(lowerLeftLat, lowerLeftLon);
+                    upperRight = new Position(upperRightLat, upperRightLon);
+                    break;
+                case GeoJSONObjectType.Polygon:
+                    Polygon polygon = geometry as Polygon;
+                    lowerLeft = polygon.Coordinates.Min(ls => ls.GetBoundingBox()[0]);
+                    upperRight = polygon.Coordinates.Max(ls => ls.GetBoundingBox()[1]);
                     break;
                 case GeoJSONObjectType.LineString:
                     LineString lineString = geometry as LineString;
                     lowerLeft = lineString.Coordinates.ToArray().GetLowerLeft();
                     upperRight = lineString.Coordinates.ToArray().GetUpperRight();
                     break;
-                case GeoJSONObjectType.MultiLineString:
-                    MultiLineString multiLineString = geometry as MultiLineString;
-                    lowerLeft = multiLineString.Coordinates.Min(lString => lString.GetBoundingBox()[0]);
-                    upperRight = multiLineString.Coordinates.Max(lString => lString.GetBoundingBox()[1]);
-                    break;
                 case GeoJSONObjectType.MultiPoint:
                     MultiPoint multiPoint = geometry as MultiPoint;
                     lowerLeft = multiPoint.Coordinates.Select(p => p.Coordinates).ToArray().GetLowerLeft();
                     upperRight = multiPoint.Coordinates.Select(p => p.Coordinates).ToArray().GetUpperRight();
                     break;
-                case GeoJSONObjectType.MultiPolygon:
-                    MultiPolygon multiPolygon = geometry as MultiPolygon;
-                    IPosition lowerLeftLonPos = multiPolygon.Coordinates.Min(poly => poly.GetBoundingBox()[0]);
-                    IPosition lowerLeftLatPos = multiPolygon.Coordinates.Min(poly => poly.GetBoundingBox()[0]);
-                    IPosition upperRightLonPos = multiPolygon.Coordinates.Max(poly => poly.GetBoundingBox()[1]);
-                    IPosition upperRightLatPos = multiPolygon.Coordinates.Max(poly => poly.GetBoundingBox()[1]);
-                    lowerLeft = new Position(lowerLeftLatPos.Latitude, lowerLeftLonPos.Longitude, (lowerLeftLatPos.Altitude + lowerLeftLonPos.Altitude) / 2);
-                    upperRight = new Position(upperRightLatPos.Latitude, upperRightLonPos.Longitude, (upperRightLatPos.Altitude + upperRightLonPos.Altitude) / 2);
-                    break;
                 case GeoJSONObjectType.Point:
                     Point point = geometry as Point;
                     lowerLeft = point.Coordinates;
                     upperRight = point.Coordinates;
                     break;
-                case GeoJSONObjectType.Polygon:
-                    Polygon polygon = geometry as Polygon;
-                    lowerLeft = polygon.Coordinates.Min(lString => lString.GetBoundingBox()[0]);
-                    upperRight = polygon.Coordinates.Max(lString => lString.GetBoundingBox()[1]);
-                    break;
             }
 
             return new IPosition[2] { lowerLeft, upperRight };