geopackage-core 6.6.2

Author: bosborn

CHANGELOG.md

@@ -6,7 +6,7 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ## 6.6.1 (TBD)
 
-* TBD
+* geopackage-core version 6.6.2
 
 ## [6.6.0](https://github.com/ngageoint/geopackage-java/releases/tag/6.6.0) (12-07-2022)
 

pom.xml

@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>mil.nga.geopackage</groupId>
 			<artifactId>geopackage-core</artifactId>
-			<version>6.6.1</version>
+			<version>6.6.2</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.j256.ormlite</groupId>

src/test/java/mil/nga/geopackage/features/user/FeatureUtils.java

@@ -43,6 +43,7 @@
 import mil.nga.sf.MultiPolygon;
 import mil.nga.sf.Point;
 import mil.nga.sf.Polygon;
+import mil.nga.sf.wkb.GeometryCodes;
 import mil.nga.sf.wkb.GeometryReader;
 
 /**
@@ -124,7 +125,12 @@ public static void testRead(GeoPackage geoPackage)
 						Geometry geometryFromBytes = GeometryReader
 								.readGeometry(wkbBytes);
 						TestCase.assertNotNull(geometryFromBytes);
-						TestCase.assertEquals(geometry.getGeometryType(),
+						GeometryType type = GeometryCodes
+								.getWKBGeometryType(geometry);
+						if (type == GeometryType.MULTICURVE) {
+							type = GeometryType.GEOMETRYCOLLECTION;
+						}
+						TestCase.assertEquals(type,
 								geometryFromBytes.getGeometryType());
 						validateGeometry(geometryType, geometryFromBytes);
 
@@ -137,7 +143,7 @@ public static void testRead(GeoPackage geoPackage)
 						Geometry geometryFromBytes2 = GeometryReader
 								.readGeometry(wkbBytes2);
 						TestCase.assertNotNull(geometryFromBytes2);
-						TestCase.assertEquals(geometry.getGeometryType(),
+						TestCase.assertEquals(type,
 								geometryFromBytes2.getGeometryType());
 						validateGeometry(geometryType, geometryFromBytes2);
 					}

src/test/java/mil/nga/geopackage/geom/GeoPackageGeometryDataUtils.java

@@ -255,14 +255,48 @@ public static void compareGeometryData(GeoPackageGeometryData expected,
 		// Compare header bytes
 		compareByteArrays(expected.getHeaderBytes(), actual.getHeaderBytes());
 
+		Geometry expectedGeometry = expected.getGeometry();
+		Geometry actualGeometry = actual.getGeometry();
+
+		byte[] expectedWKB = expected.getWkb();
+		byte[] actualWKB = actual.getWkb();
+
+		byte[] expectedBytes = expected.getBytes();
+		byte[] actualBytes = actual.getBytes();
+
+		if (expectedGeometry != null && actualGeometry != null
+				&& expectedGeometry
+						.getGeometryType() == GeometryType.MULTILINESTRING) {
+			if (!(actualGeometry instanceof MultiLineString)) {
+				@SuppressWarnings("unchecked")
+				GeometryCollection<LineString> geomCollection = (GeometryCollection<LineString>) actualGeometry;
+				MultiLineString multiLineString = new MultiLineString();
+				multiLineString.addGeometries(geomCollection.getGeometries());
+				actualGeometry = multiLineString;
+				int wkbLocation;
+				int byteLocation;
+				if (actual.getByteOrder() == ByteOrder.BIG_ENDIAN) {
+					wkbLocation = 4;
+					byteLocation = 12;
+				} else {
+					wkbLocation = 1;
+					byteLocation = 9;
+				}
+				byte code = (byte) GeometryCodes
+						.getCode(GeometryType.MULTICURVE);
+				actualWKB[wkbLocation] = code;
+				actualBytes[byteLocation] = code;
+			}
+		}
+
 		// Compare geometries
-		compareGeometries(expected.getGeometry(), actual.getGeometry());
+		compareGeometries(expectedGeometry, actualGeometry);
 
 		// Compare well-known binary geometries
-		compareByteArrays(expected.getWkb(), actual.getWkb());
+		compareByteArrays(expectedWKB, actualWKB);
 
 		// Compare all bytes
-		compareByteArrays(expected.getBytes(), actual.getBytes());
+		compareByteArrays(expectedBytes, actualBytes);
 
 	}