Merge pull request #13 from ngageoint/develop

Develop to Master, 1.1.1 changes

Author: bosborn

CHANGELOG.md

@@ -7,6 +7,10 @@ Adheres to [Semantic Versioning](http://semver.org/).
 ## 1.1.1 (TBD)
 
 * Javadoc project links to external libraries
+* Additional GeoPackage createFeatureTableWithMetadata methods - [Issue #10](https://github.com/ngageoint/geopackage-core-java/issues/10)
+* min and max column query methods - [Issue #11](https://github.com/ngageoint/geopackage-core-java/issues/11)
+* Determine bounding box from Tile Grid methods - [Issue #12](https://github.com/ngageoint/geopackage-core-java/issues/12)
+* Data Columns Dao get data column by table and column names method
 * TBD
 
 ## [1.1.0](https://github.com/ngageoint/geopackage-core-java/releases/tag/1.1.0) (10-08-2015)

pom.xml

@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>mil.nga</groupId>
 			<artifactId>wkb</artifactId>
-			<version>1.0.0</version>
+			<version>1.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

src/main/java/mil/nga/geopackage/GeoPackageConstants.java

@@ -42,4 +42,9 @@ public class GeoPackageConstants {
 	 */
 	public static final byte GEO_PACKAGE_GEOMETRY_VERSION_1 = 0;
 
+	/**
+	 * SQLite header string prefix
+	 */
+	public static final String SQLITE_HEADER_PREFIX = "SQLite format 3";
+
 }

src/main/java/mil/nga/geopackage/GeoPackageCore.java

@@ -15,6 +15,7 @@
 import mil.nga.geopackage.features.columns.GeometryColumnsDao;
 import mil.nga.geopackage.features.columns.GeometryColumnsSfSqlDao;
 import mil.nga.geopackage.features.columns.GeometryColumnsSqlMmDao;
+import mil.nga.geopackage.features.user.FeatureColumn;
 import mil.nga.geopackage.features.user.FeatureTable;
 import mil.nga.geopackage.metadata.MetadataDao;
 import mil.nga.geopackage.metadata.reference.MetadataReferenceDao;
@@ -145,16 +146,128 @@ public interface GeoPackageCore extends Closeable {
 	public void createFeatureTable(FeatureTable table);
 
 	/**
-	 * Create a new feature table with GeoPackage metadata
+	 * Create a new feature table with GeoPackage metadata. Create the Geometry
+	 * Columns table if needed, create a user feature table, create a new
+	 * Contents, insert the new Geometry Columns.
+	 * 
+	 * The user feature table will be created with 2 columns, an id column named
+	 * "id" and a geometry column using {@link GeometryColumns#getColumnName()}.
 	 * 
 	 * @param geometryColumns
+	 *            geometry columns to create
 	 * @param boundingBox
+	 *            contents bounding box
 	 * @param srsId
-	 * @return
+	 *            spatial reference system id
+	 * @return geometry columns
 	 */
 	public GeometryColumns createFeatureTableWithMetadata(
 			GeometryColumns geometryColumns, BoundingBox boundingBox, long srsId);
 
+	/**
+	 * Create a new feature table with GeoPackage metadata. Create the Geometry
+	 * Columns table if needed, create a user feature table, create a new
+	 * Contents, insert the new Geometry Columns.
+	 * 
+	 * The user feature table will be created with 2 columns, an id column with
+	 * the provided name and a geometry column using
+	 * {@link GeometryColumns#getColumnName()}.
+	 * 
+	 * @param geometryColumns
+	 *            geometry columns to create
+	 * @param idColumnName
+	 *            id column name
+	 * @param boundingBox
+	 *            contents bounding box
+	 * @param srsId
+	 *            spatial reference system id
+	 * @return geometry columns
+	 * @since 1.1.1
+	 */
+	public GeometryColumns createFeatureTableWithMetadata(
+			GeometryColumns geometryColumns, String idColumnName,
+			BoundingBox boundingBox, long srsId);
+
+	/**
+	 * Create a new feature table with GeoPackage metadata. Create the Geometry
+	 * Columns table if needed, create a user feature table, create a new
+	 * Contents, insert the new Geometry Columns.
+	 * 
+	 * The user feature table will be created with 2 + additionalColumns.size()
+	 * columns, an id column named "id", a geometry column using
+	 * {@link GeometryColumns#getColumnName()}, and the provided additional
+	 * columns.
+	 * 
+	 * @param geometryColumns
+	 *            geometry columns to create
+	 * @param additionalColumns
+	 *            additional user feature table columns to create in addition to
+	 *            id and geometry columns
+	 * @param boundingBox
+	 *            contents bounding box
+	 * @param srsId
+	 *            spatial reference system id
+	 * @return geometry columns
+	 * @since 1.1.1
+	 */
+	public GeometryColumns createFeatureTableWithMetadata(
+			GeometryColumns geometryColumns,
+			List<FeatureColumn> additionalColumns, BoundingBox boundingBox,
+			long srsId);
+
+	/**
+	 * Create a new feature table with GeoPackage metadata. Create the Geometry
+	 * Columns table if needed, create a user feature table, create a new
+	 * Contents, insert the new Geometry Columns.
+	 * 
+	 * The user feature table will be created with 2 + additionalColumns.size()
+	 * columns, an id column with the provided name, a geometry column using
+	 * {@link GeometryColumns#getColumnName()}, and the provided additional
+	 * columns.
+	 * 
+	 * @param geometryColumns
+	 *            geometry columns to create
+	 * @param idColumnName
+	 *            id column name
+	 * @param additionalColumns
+	 *            additional user feature table columns to create in addition to
+	 *            id and geometry columns
+	 * @param boundingBox
+	 *            contents bounding box
+	 * @param srsId
+	 *            spatial reference system id
+	 * @return geometry columns
+	 * @since 1.1.1
+	 */
+	public GeometryColumns createFeatureTableWithMetadata(
+			GeometryColumns geometryColumns, String idColumnName,
+			List<FeatureColumn> additionalColumns, BoundingBox boundingBox,
+			long srsId);
+
+	/**
+	 * Create a new feature table with GeoPackage metadata. Create the Geometry
+	 * Columns table if needed, create a user feature table, create a new
+	 * Contents, insert the new Geometry Columns.
+	 * 
+	 * The user feature table will be created using only the provided columns.
+	 * These should include the id column and the geometry column defined in
+	 * {@link GeometryColumns#getColumnName()}
+	 * 
+	 * @param geometryColumns
+	 *            geometry columns to create
+	 * @param boundingBox
+	 *            contents bounding box
+	 * @param srsId
+	 *            spatial reference system id
+	 * @param columns
+	 *            user feature table columns to create
+	 * @return geometry columns
+	 * @since 1.1.1
+	 */
+	public GeometryColumns createFeatureTableWithMetadata(
+			GeometryColumns geometryColumns, BoundingBox boundingBox,
+			long srsId, List<FeatureColumn> columns);
+
 	/**
 	 * Get a Tile Matrix Set DAO
 	 * 

src/main/java/mil/nga/geopackage/db/GeoPackageCoreConnection.java

@@ -35,7 +35,7 @@ public abstract class GeoPackageCoreConnection implements Closeable {
 	 * @param table
 	 * @param whereClause
 	 * @param whereArgs
-	 * @return
+	 * @return rows deleted
 	 */
 	public abstract int delete(String table, String whereClause,
 			String[] whereArgs);
@@ -46,10 +46,36 @@ public abstract int delete(String table, String whereClause,
 	 * @param table
 	 * @param where
 	 * @param args
-	 * @return
+	 * @return count
 	 */
 	public abstract int count(String table, String where, String[] args);
 
+	/**
+	 * Get the min result of the column
+	 * 
+	 * @param table
+	 * @param column
+	 * @param where
+	 * @param args
+	 * @return min or null
+	 * @since 1.1.1
+	 */
+	public abstract Integer min(String table, String column, String where,
+			String[] args);
+
+	/**
+	 * Get the max result of the column
+	 * 
+	 * @param table
+	 * @param column
+	 * @param where
+	 * @param args
+	 * @return max or null
+	 * @since 1.1.1
+	 */
+	public abstract Integer max(String table, String column, String where,
+			String[] args);
+
 	/**
 	 * {@inheritDoc}
 	 */

src/main/java/mil/nga/geopackage/factory/GeoPackageCoreImpl.java

@@ -295,6 +295,67 @@ public void createFeatureTable(FeatureTable table) {
 	@Override
 	public GeometryColumns createFeatureTableWithMetadata(
 			GeometryColumns geometryColumns, BoundingBox boundingBox, long srsId) {
+		return createFeatureTableWithMetadata(geometryColumns, null, null,
+				boundingBox, srsId);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public GeometryColumns createFeatureTableWithMetadata(
+			GeometryColumns geometryColumns, String idColumnName,
+			BoundingBox boundingBox, long srsId) {
+		return createFeatureTableWithMetadata(geometryColumns, idColumnName,
+				null, boundingBox, srsId);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public GeometryColumns createFeatureTableWithMetadata(
+			GeometryColumns geometryColumns,
+			List<FeatureColumn> additionalColumns, BoundingBox boundingBox,
+			long srsId) {
+		return createFeatureTableWithMetadata(geometryColumns, null,
+				additionalColumns, boundingBox, srsId);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public GeometryColumns createFeatureTableWithMetadata(
+			GeometryColumns geometryColumns, String idColumnName,
+			List<FeatureColumn> additionalColumns, BoundingBox boundingBox,
+			long srsId) {
+
+		if (idColumnName == null) {
+			idColumnName = "id";
+		}
+
+		List<FeatureColumn> columns = new ArrayList<FeatureColumn>();
+		columns.add(FeatureColumn.createPrimaryKeyColumn(0, idColumnName));
+		columns.add(FeatureColumn.createGeometryColumn(1,
+				geometryColumns.getColumnName(),
+				geometryColumns.getGeometryType(), false, null));
+
+		if (additionalColumns != null) {
+			columns.addAll(additionalColumns);
+		}
+
+		return createFeatureTableWithMetadata(geometryColumns, boundingBox,
+				srsId, columns);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public GeometryColumns createFeatureTableWithMetadata(
+			GeometryColumns geometryColumns, BoundingBox boundingBox,
+			long srsId, List<FeatureColumn> columns) {
 
 		// Get the SRS
 		SpatialReferenceSystem srs = getSrs(srsId);
@@ -303,11 +364,6 @@ public GeometryColumns createFeatureTableWithMetadata(
 		createGeometryColumnsTable();
 
 		// Create the user feature table
-		List<FeatureColumn> columns = new ArrayList<FeatureColumn>();
-		columns.add(FeatureColumn.createPrimaryKeyColumn(0, "id"));
-		columns.add(FeatureColumn.createGeometryColumn(1,
-				geometryColumns.getColumnName(),
-				geometryColumns.getGeometryType(), false, null));
 		FeatureTable table = new FeatureTable(geometryColumns.getTableName(),
 				columns);
 		createFeatureTable(table);
@@ -752,7 +808,7 @@ public void verifyWritable() {
 	public TableIndexDao getTableIndexDao() {
 		return createDao(TableIndex.class);
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -773,15 +829,15 @@ public boolean createTableIndexTable() {
 		}
 		return created;
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public GeometryIndexDao getGeometryIndexDao() {
 		return createDao(GeometryIndex.class);
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -802,5 +858,5 @@ public boolean createGeometryIndexTable() {
 		}
 		return created;
 	}
-	
+
 }

src/main/java/mil/nga/geopackage/schema/columns/DataColumnsDao.java

@@ -185,4 +185,20 @@ public List<DataColumns> queryByConstraintName(String constraintName)
 		return queryForEq(DataColumns.COLUMN_CONSTRAINT_NAME, constraintName);
 	}
 
+	/**
+	 * Get DataColumn by column name and table name
+	 * 
+	 * @param tableName
+	 *            table name to query for
+	 * @param columnName
+	 *            column name to query for
+	 * @return DataColumns
+	 * @throws SQLException
+	 */
+	public DataColumns getDataColumn(String tableName, String columnName)
+			throws SQLException {
+		TableColumnKey id = new TableColumnKey(tableName, columnName);
+		return queryForId(id);
+	}
+
 }