fix(deps): update geopackage to v6

halestudio · Dec 5, 2024 · f0d3823 · f0d3823
1 parent 5e777ae
commit f0d3823
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 40 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ apache-http-client = "4.5.14"
 ehcache = "2.6.11"
 castor = "1.4.1"
 flexmark = "0.64.8"
-geopackage = "3.5.0"
+geopackage = "6.6.5"
 deegree = "3.5.8"
 jackson = "2.18.0"
 poi = "5.3.0"

diff --git a/...t.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceReader.java b/...t.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceReader.java
@@ -36,10 +36,10 @@
 import eu.esdihumboldt.hale.common.schema.model.constraint.type.MappingRelevantFlag;
 import eu.esdihumboldt.hale.io.geopackage.internal.GeopackageFeatureCollection;
 import mil.nga.geopackage.GeoPackage;
+import mil.nga.geopackage.GeoPackageManager;
 import mil.nga.geopackage.attributes.AttributesDao;
 import mil.nga.geopackage.features.columns.GeometryColumns;
 import mil.nga.geopackage.features.user.FeatureDao;
-import mil.nga.geopackage.manager.GeoPackageManager;
 
 /**
  * Instance reader for {@link GeoPackage} files.

diff --git a/...t.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceWriter.java b/...t.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceWriter.java
@@ -19,11 +19,7 @@
 import java.text.MessageFormat;
 import java.time.Instant;
 import java.time.LocalDate;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import javax.xml.namespace.QName;
@@ -70,22 +66,18 @@
 import eu.esdihumboldt.hale.common.schema.model.constraint.type.PrimaryKey;
 import mil.nga.geopackage.BoundingBox;
 import mil.nga.geopackage.GeoPackage;
-import mil.nga.geopackage.attributes.AttributesColumn;
-import mil.nga.geopackage.attributes.AttributesDao;
-import mil.nga.geopackage.attributes.AttributesRow;
-import mil.nga.geopackage.core.srs.SpatialReferenceSystem;
-import mil.nga.geopackage.core.srs.SpatialReferenceSystemDao;
+import mil.nga.geopackage.GeoPackageManager;
+import mil.nga.geopackage.attributes.*;
 import mil.nga.geopackage.db.GeoPackageDataType;
-import mil.nga.geopackage.extension.index.FeatureTableIndex;
+import mil.nga.geopackage.db.TableColumnKey;
+import mil.nga.geopackage.extension.nga.index.FeatureTableIndex;
 import mil.nga.geopackage.features.columns.GeometryColumns;
 import mil.nga.geopackage.features.index.FeatureIndexManager;
 import mil.nga.geopackage.features.index.FeatureIndexType;
-import mil.nga.geopackage.features.user.FeatureColumn;
-import mil.nga.geopackage.features.user.FeatureDao;
-import mil.nga.geopackage.features.user.FeatureRow;
+import mil.nga.geopackage.features.user.*;
 import mil.nga.geopackage.geom.GeoPackageGeometryData;
-import mil.nga.geopackage.manager.GeoPackageManager;
-import mil.nga.geopackage.schema.TableColumnKey;
+import mil.nga.geopackage.srs.SpatialReferenceSystem;
+import mil.nga.geopackage.srs.SpatialReferenceSystemDao;
 import mil.nga.geopackage.user.UserColumn;
 import mil.nga.geopackage.user.UserCoreRow;
 import mil.nga.sf.util.ByteReader;
@@ -352,7 +344,12 @@ else if (someGeom instanceof Geometry) {
 			// differs from the column SrsId?
 
 			byte[] wkb = new WKBWriter().write(targetGeometry);
-			mil.nga.sf.Geometry geometry = GeometryReader.readGeometry(new ByteReader(wkb));
+			mil.nga.sf.Geometry geometry = null;
+			try {
+				geometry = GeometryReader.readGeometry(new ByteReader(wkb));
+			} catch (IOException e) {
+				throw new RuntimeException(e);
+			}
 
 			geometryData.setGeometry(geometry);
 		}
@@ -439,7 +436,7 @@ private GeopackageTableType createTableIfNecessary(GeoPackage geoPackage, String
 					// AugmentedValue
 					return p.getPropertyType().getConstraint(HasValueFlag.class).isEnabled() || p
 							.getPropertyType().getConstraint(AugmentedValueFlag.class).isEnabled();
-				}).collect(Collectors.toList());
+				}).toList();
 
 		Optional<? extends PropertyDefinition> geometryProperty = allProperties.stream()
 				.filter(property -> {
@@ -455,6 +452,15 @@ private GeopackageTableType createTableIfNecessary(GeoPackage geoPackage, String
 		else {
 			primaryKeyColumn = null;
 		}
+		final var fPrimaryKeyColumn = primaryKeyColumn;
+
+		Collection<? extends PropertyDefinition> additionalProperties = allProperties.stream()
+				// exclude primary key
+				.filter(p -> !p.getName().getLocalPart().equals(fPrimaryKeyColumn))
+				// exclude selected geometry property
+				.filter(p -> !geometryProperty.map(gp -> gp.getName().equals(p.getName()))
+						.orElse(false))
+				.toList();
 
 		GeopackageTableType tableType;
 		if (geometryProperty.isPresent()) {
@@ -469,20 +475,24 @@ private GeopackageTableType createTableIfNecessary(GeoPackage geoPackage, String
 			geometryColumns.setGeometryType(convertGeometryType(
 					geomProp.getPropertyType().getConstraint(GeometryType.class).getBinding()));
 
-			BoundingBox boundingBox = null; // not known at that point
 			// determine SRS from GeometryMetadata or sample instance
 			long srsId = determineSrsId(geoPackage, geomProp, instance, log);
-			List<FeatureColumn> columns = allProperties.stream()
-					.map(p -> createFeatureColumn(p, primaryKeyColumn))
+			geometryColumns.setSrsId(srsId);
+
+			BoundingBox boundingBox = null; // not known at that point
+
+			// additional columns = columns w/o geometry column + id column
+			List<FeatureColumn> additionalColumns = additionalProperties.stream()
+					.map(p -> createFeatureColumn(p, fPrimaryKeyColumn))
 					.collect(Collectors.toList());
 
 			if (primaryKeyColumn == null) {
-				// primary key column seems to be always needed (without there
-				// were errors reading the data)
-				columns.add(FeatureColumn.createPrimaryKeyColumn(findIdName(columns)));
+				// name for ID column
+				primaryKeyColumn = findIdName(additionalColumns);
 			}
 
-			geoPackage.createFeatureTableWithMetadata(geometryColumns, boundingBox, srsId, columns);
+			geoPackage.createFeatureTable(FeatureTableMetadata.create(geometryColumns,
+					primaryKeyColumn, true, additionalColumns, boundingBox));
 
 			FeatureDao featureDao = geoPackage.getFeatureDao(tableName);
 			String spatialIndexType = getParameter(PARAM_SPATIAL_INDEX_TYPE).as(String.class,
@@ -506,17 +516,18 @@ private GeopackageTableType createTableIfNecessary(GeoPackage geoPackage, String
 			// create attributes table
 			tableType = GeopackageTableType.ATTRIBUTE;
 
-			List<AttributesColumn> columns = allProperties.stream()
-					.map(p -> createAttributeColumn(p, primaryKeyColumn))
+			// additional columns = columns w/o geometry column + id column
+			List<AttributesColumn> additionalColumns = additionalProperties.stream()
+					.map(p -> createAttributeColumn(p, fPrimaryKeyColumn))
 					.collect(Collectors.toList());
 
 			if (primaryKeyColumn == null) {
-				// primary key column seems to be always needed (without there
-				// were errors reading the data)
-				columns.add(AttributesColumn.createPrimaryKeyColumn(findIdName(columns)));
+				// name for ID column
+				primaryKeyColumn = findIdName(additionalColumns);
 			}
 
-			geoPackage.createAttributesTable(tableName, columns);
+			geoPackage.createAttributesTable(AttributesTableMetadata.create(tableName,
+					primaryKeyColumn, true, additionalColumns));
 		}
 
 		return tableType;

diff --git a/...dt.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageSchemaBuilder.java b/...dt.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageSchemaBuilder.java
@@ -47,11 +47,11 @@
 import eu.esdihumboldt.hale.common.schema.model.impl.DefaultTypeDefinition;
 import mil.nga.geopackage.GeoPackage;
 import mil.nga.geopackage.attributes.AttributesDao;
-import mil.nga.geopackage.core.srs.SpatialReferenceSystem;
 import mil.nga.geopackage.db.GeoPackageDataType;
 import mil.nga.geopackage.features.columns.GeometryColumns;
 import mil.nga.geopackage.features.user.FeatureColumn;
 import mil.nga.geopackage.features.user.FeatureDao;
+import mil.nga.geopackage.srs.SpatialReferenceSystem;
 import mil.nga.geopackage.user.UserColumn;
 import mil.nga.geopackage.user.UserDao;
 import mil.nga.geopackage.user.UserTable;

diff --git a/...ldt.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageSchemaReader.java b/...ldt.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageSchemaReader.java
@@ -21,7 +21,7 @@
 import eu.esdihumboldt.hale.common.schema.model.Schema;
 import eu.esdihumboldt.hale.common.schema.persist.AbstractCachedSchemaReader;
 import mil.nga.geopackage.GeoPackage;
-import mil.nga.geopackage.manager.GeoPackageManager;
+import mil.nga.geopackage.GeoPackageManager;
 
 /**
  * Reader for geopackage schema.

diff --git a/...io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/internal/TableInstanceBuilder.groovy b/...io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/internal/TableInstanceBuilder.groovy
@@ -37,9 +37,9 @@ import eu.esdihumboldt.hale.common.schema.model.constraint.property.Cardinality
 import eu.esdihumboldt.hale.common.schema.model.constraint.property.NillableFlag
 import eu.esdihumboldt.hale.common.schema.model.constraint.type.GeometryMetadata
 import eu.esdihumboldt.hale.io.geopackage.GeopackageSchemaBuilder
-import mil.nga.geopackage.core.srs.SpatialReferenceSystem
 import mil.nga.geopackage.features.columns.GeometryColumns
 import mil.nga.geopackage.features.user.FeatureResultSet
+import mil.nga.geopackage.srs.SpatialReferenceSystem
 import mil.nga.geopackage.user.UserResultSet
 
 
@@ -175,7 +175,7 @@ class TableInstanceBuilder {
 							def geomData = ((FeatureResultSet) row).geometry
 
 							// read JTS geometry from WKB
-							def jtsGeom = wkbReader.read(geomData.wkbBytes)
+							def jtsGeom = wkbReader.read(geomData.wkb)
 
 							CRSDefinition crsDef = null
 

diff --git a/...umboldt.hale.io.geopackage/test/eu/esdihumboldt/hale/io/geopackage/GeopackageApiTest.java b/...umboldt.hale.io.geopackage/test/eu/esdihumboldt/hale/io/geopackage/GeopackageApiTest.java
@@ -24,8 +24,8 @@
 import org.junit.Test;
 
 import mil.nga.geopackage.GeoPackage;
+import mil.nga.geopackage.GeoPackageManager;
 import mil.nga.geopackage.features.user.FeatureDao;
-import mil.nga.geopackage.manager.GeoPackageManager;
 
 /**
  * Tests using the Geopackage API. These are mostly intended to verify that the

diff --git a/...io.geopackage/test/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceReaderTest.groovy b/...io.geopackage/test/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceReaderTest.groovy
@@ -25,6 +25,7 @@ import javax.xml.namespace.QName
 
 import org.junit.Test
 import org.locationtech.jts.geom.Geometry
+import org.locationtech.jts.geom.Point
 
 import eu.esdihumboldt.hale.common.core.io.impl.LogProgressIndicator
 import eu.esdihumboldt.hale.common.core.io.report.IOReport
@@ -132,7 +133,11 @@ class GeopackageInstanceReaderTest extends AbstractPlatformTest {
 		assert testInstance.p.fid.value() == 2701
 		assert testInstance.p.item_id.value() == '67983-MONI0000000001'
 		assert testInstance.p.descriptio.value() == 'Franconia Township 1 (J1-1442)'
-		//TODO test geometry
+
+		def geom = testInstance.p.geom.value()
+		assert geom instanceof GeometryProperty
+		assert geom.CRSDefinition != null
+		assert geom.geometry instanceof Point
 	}
 
 	/**

diff --git a/...io.geopackage/test/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceWriterTest.groovy b/...io.geopackage/test/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceWriterTest.groovy
@@ -43,7 +43,7 @@ import eu.esdihumboldt.hale.common.schema.model.constraint.type.Binding
 import eu.esdihumboldt.hale.common.schema.model.constraint.type.PrimaryKey
 import eu.esdihumboldt.hale.common.schema.model.impl.DefaultSchemaSpace
 import eu.esdihumboldt.util.test.AbstractPlatformTest
-import mil.nga.geopackage.manager.GeoPackageManager
+import mil.nga.geopackage.GeoPackageManager
 
 /**
  * Tests for writing instances to GeoPackage.