Skip to content

Commit

Permalink
6.6.5 release
Browse files Browse the repository at this point in the history
  • Loading branch information
bosborn committed Nov 29, 2023
1 parent 6ac07d7 commit 7291d08
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 8 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Adheres to [Semantic Versioning](http://semver.org/).

---

## 6.6.5 (TBD)
## [6.6.5](https://github.com/ngageoint/geopackage-core-java/releases/tag/6.6.5) (11-29-2023)

* TBD
* Geometry column generic type of BLOB support as base geometry

## [6.6.4](https://github.com/ngageoint/geopackage-core-java/releases/tag/6.6.4) (09-25-2023)

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ The [GeoPackage Java](https://github.com/ngageoint/geopackage-java) library is a

### Installation ###

Pull from the [Maven Central Repository](http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage-core|6.6.4|jar) (JAR, POM, Source, Javadoc)
Pull from the [Maven Central Repository](http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage-core|6.6.5|jar) (JAR, POM, Source, Javadoc)

<dependency>
<groupId>mil.nga.geopackage</groupId>
<artifactId>geopackage-core</artifactId>
<version>6.6.4</version>
<version>6.6.5</version>
</dependency>

### Build ###
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h2 class="project-tagline">by the National Geospatial-Intelligence Agency</h2>
<a href="http://ngageoint.github.io/geopackage-core-java/docs/api/" class="btn">API</a>
<a href="https://github.com/ngageoint/geopackage-core-java/zipball/master" class="btn">.zip</a>
<a href="https://github.com/ngageoint/geopackage-core-java/tarball/master" class="btn">.tar.gz</a>
<a href="http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage-core|6.6.4|jar" class="btn">The Central Repository</a>
<a href="http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage-core|6.6.5|jar" class="btn">The Central Repository</a>
</section>

<section class="main-content">
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.2</version>
<configuration>
<links>
<link>https://ngageoint.github.io/projections-java/docs/api/</link>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class FeatureColumn extends UserColumn {
/**
* Geometry type if a geometry column
*/
private final GeometryType geometryType;
private GeometryType geometryType;

/**
* Create a new primary key column
Expand Down Expand Up @@ -447,6 +447,16 @@ public FeatureColumn(FeatureColumn featureColumn) {
this.geometryType = featureColumn.geometryType;
}

/**
* Set the geometry type
*
* @param geometryType
* geometry type
*/
protected void setGeometryType(GeometryType geometryType) {
this.geometryType = geometryType;
}

/**
* Copy the column
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import mil.nga.geopackage.db.table.TableColumn;
import mil.nga.geopackage.features.columns.GeometryColumns;
import mil.nga.geopackage.user.UserTableReader;
import mil.nga.sf.GeometryType;

/**
* Reads the metadata from an existing feature table
Expand Down Expand Up @@ -59,7 +60,13 @@ public FeatureTableReader(String tableName) {
@Override
protected FeatureTable createTable(String tableName,
List<FeatureColumn> columnList) {
return new FeatureTable(tableName, columnName, columnList);
FeatureTable table = new FeatureTable(tableName, columnName,
columnList);
FeatureColumn geometryColumn = table.getGeometryColumn();
if (geometryColumn != null && !geometryColumn.isGeometry()) {
geometryColumn.setGeometryType(GeometryType.GEOMETRY);
}
return table;
}

/**
Expand Down

0 comments on commit 7291d08

Please sign in to comment.