diff --git a/src/NetTopologySuite.IO.Oracle/OracleGeometryReader.cs b/src/NetTopologySuite.IO.Oracle/OracleGeometryReader.cs
index 006e72a..cb7a9dd 100644
--- 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
index dc24490..4acc32d 100644
--- 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
index 7188df7..04573d2 100644
--- 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
diff --git a/test/NetTopologySuite.IO.Oracle.Test/OracleTest.cs b/test/NetTopologySuite.IO.Oracle.Test/OracleTest.cs
index 6a0de6c..200fd99 100644
--- a/test/NetTopologySuite.IO.Oracle.Test/OracleTest.cs
+++ b/test/NetTopologySuite.IO.Oracle.Test/OracleTest.cs
@@ -46,11 +46,12 @@ public void CCWTestsOnPolygon()
[TestCase("POLYGON((10 10,20 10,20 20,10 20,10 10))", -1)]
[TestCase("POLYGON((10 10,20 10,20 20,10 20,10 10),(5 5,5 6,6 6,6 5,5 5))", -1)]
[TestCase("POLYGON Z((10 10 0,20 10 0,20 20 0,10 20 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))", -1)]
+ [TestCase("MULTIPOLYGON(((10 10,20 10,20 20,20 10,10 10)))", -1)]
[TestCase("MULTIPOLYGON(((10 10,20 10,20 20,20 10,10 10)),((10 10,20 10,20 20,20 10,10 10)))", -1)]
[TestCase("MULTIPOLYGON(((10 10,20 10,20 20,10 20,10 10),(5 5,5 6,6 6,6 5,5 5)),((10 10,20 10,20 20,20 10,10 10)))", -1)]
[TestCase("MULTIPOLYGON(((10 10,20 10,20 20,10 20,10 10),(5 5,5 6,6 6,6 5,5 5)),((10 10,20 10,20 20,20 10,10 10),(5 5,5 6,6 6,6 5,5 5)))", -1)]
[TestCase("MULTIPOLYGON Z(((10 10 0,20 10 0,20 20 0,10 20 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)),((10 10 0,20 10 0,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0)))", -1)]
- [TestCase("MULTILINESTRING((10 10,20 10,20 20,20 10),(5 5,5 6,6 6,6 5))", -1)]
+ [TestCase("MULTILINESTRING((10 10,20 10,20 20,20 10))", -1)]
[TestCase("MULTILINESTRING((1 1, 2 1, 3 1), (1 2, 2 2, 3 2, 4 2), (1 3, 1 3, 3 3, 4 3))", -1)]
[TestCase("MULTILINESTRING((1 1, 2 1, 3 1), (1 2, 2 2, 3 2, 4 2), (1 3, 1 3, 3 3, 4 3),(1 5, 2 5, 3 5),(1 6, 2 6, 3 6, 4 6))", -1)]
[TestCase("MULTILINESTRING Z((10 10 5,20 10 5,20 20 0,20 10 0,10 10 0),(5 5 0,5 6 0,6 6 0,6 5 0,5 5 0))", -1)]
@@ -83,7 +84,6 @@ public void BasicConversion(string wkt, int srid)
///
///
///
- [TestCase("GEOMETRYCOLLECTION(MULTIPOINT(11 12))", "GEOMETRYCOLLECTION(MULTIPOINT(11 12))", - 1)]
[TestCase("GEOMETRYCOLLECTION(MULTIPOINT(11 12, 20 20))", "GEOMETRYCOLLECTION(MULTIPOINT(11 12, 20 20))", - 1)]
[TestCase("GEOMETRYCOLLECTION(MULTIPOLYGON(((10 10,20 10,20 20,10 20,10 10),(5 5,5 6,6 6,6 5,5 5)),((10 10,20 10,20 20,20 10,10 10),(5 5,5 6,6 6,6 5,5 5))))", "GEOMETRYCOLLECTION(POLYGON((10 10,20 10,20 20,10 20,10 10),(5 5,5 6,6 6,6 5,5 5)),POLYGON((10 10,20 10,20 20,20 10,10 10),(5 5,5 6,6 6,6 5,5 5)))", - 1)]
[TestCase("GEOMETRYCOLLECTION(MULTILINESTRING((10 10,20 10,20 20,10 20,10 10),(5 5,5 6,6 6,6 5,5 5)))", "GEOMETRYCOLLECTION(LINESTRING(10 10,20 10,20 20,10 20,10 10),LINESTRING(5 5,5 6,6 6,6 5,5 5))", -1)]