Code review fixes

NetTopologySuite · Aug 27, 2024 · c86e69e · c86e69e
1 parent 7448c00
commit c86e69e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/src/NetTopologySuite.IO.Oracle/OracleGeometryReader.cs b/src/NetTopologySuite.IO.Oracle/OracleGeometryReader.cs
@@ -275,9 +275,6 @@ private GeometryCollection CreateCollection(GeometryFactory factory, int dim, in
                                 "ETYPE.POINT requires INTERPRETATION >= 1");
                         }
 
-                        break;
-                    case SdoEType.Multipoint:
-                        geom = CreateMultiPoint(factory, dim, lrs, elemInfo, i, coords);
                         break;
                     case SdoEType.Line:
                         geom = CreateLine(factory, dim, lrs, elemInfo, i, coords);
@@ -410,7 +407,7 @@ private MultiPoint CreateMultiPoint(GeometryFactory factory, int dim, int lrs, d
             if (!(sOffset >= 1) || !(sOffset <= coords.Count))
                 throw new ArgumentException("ELEM_INFO STARTING_OFFSET " + sOffset +
                                             " inconsistent with ORDINATES length " + coords.Count);
-            if (etype != SdoEType.Coordinate && etype != SdoEType.Multipoint)
+            if (etype != SdoEType.Coordinate)
                 throw new ArgumentException("ETYPE " + etype + " inconsistent with expected POINT");
             if (interpretation == 0)
             {

diff --git a/src/NetTopologySuite.IO.Oracle/OracleGeometryWriter.cs b/src/NetTopologySuite.IO.Oracle/OracleGeometryWriter.cs
@@ -264,7 +264,7 @@ private static int ProcessMultiPoint(MultiPoint multiPoint, int dimension, List<
             // just ProcessPoint for each point, since that would append to elemInfoList multiple
             // times.  instead, elemInfoList gets incremented just once.  *shrugs*.
             elemInfoList.Add(pos);
-            elemInfoList.Add((int)SdoEType.Multipoint);
+            elemInfoList.Add((int)SdoEType.Coordinate);
             elemInfoList.Add(cnt);
 
             for (int i = 0; i < cnt; i++)

diff --git a/src/NetTopologySuite.IO.Oracle/Sdo/SdoEType.cs b/src/NetTopologySuite.IO.Oracle/Sdo/SdoEType.cs
@@ -8,7 +8,6 @@ internal enum SdoEType
         Coordinate = 1,
         Line = 2,
         Polygon = 3,
-        Multipoint = 4,
 
         PolygonExterior = 1003,
         PolygonInterior = 2003