Merge pull request #24 from ngageoint/develop

Develop to Master, 1.1.7 updates

Author: bosborn

CHANGELOG.md

@@ -4,9 +4,10 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## 1.1.7 (TBD)
+## [1.1.7](https://github.com/ngageoint/geopackage-core-java/releases/tag/1.1.7) (04-18-2016)
 
-* TBD
+* Additional GeoPackage methods to get all tables and check table types
+* wkb version update to 1.0.2
 
 ## [1.1.6](https://github.com/ngageoint/geopackage-core-java/releases/tag/1.1.6) (02-19-2016)
 

README.md

@@ -33,12 +33,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|1.1.6|jar) (JAR, POM, Source, Javadoc)
+Pull from the [Maven Central Repository](http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage-core|1.1.7|jar) (JAR, POM, Source, Javadoc)
 
     <dependency>
         <groupId>mil.nga.geopackage</groupId>
         <artifactId>geopackage-core</artifactId>
-        <version>1.1.6</version>
+        <version>1.1.7</version>
     </dependency>
 
 ### Build ###

pom.xml

@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>mil.nga</groupId>
 			<artifactId>wkb</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.osgeo</groupId>

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

@@ -83,6 +83,44 @@ public interface GeoPackageCore extends Closeable {
 	 */
 	public List<String> getTileTables();
 
+	/**
+	 * Get the feature and tile tables
+	 * 
+	 * @return feature and tile table names
+	 * @since 1.1.7
+	 */
+	public List<String> getTables();
+
+	/**
+	 * Check if the table is a feature table
+	 * 
+	 * @param table
+	 *            table name
+	 * @return true if a feature table
+	 * @since 1.1.7
+	 */
+	public boolean isFeatureTable(String table);
+
+	/**
+	 * Check if the table is a tile table
+	 * 
+	 * @param table
+	 *            table name
+	 * @return true if a tile table
+	 * @since 1.1.7
+	 */
+	public boolean isTileTable(String table);
+
+	/**
+	 * Check if the table exists as a feature or tile table
+	 * 
+	 * @param table
+	 *            table name
+	 * @return true if a feature or tile table
+	 * @since 1.1.7
+	 */
+	public boolean isFeatureOrTileTable(String table);
+
 	/**
 	 * Get a Spatial Reference System DAO
 	 * 

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

@@ -3,7 +3,9 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import mil.nga.geopackage.BoundingBox;
 import mil.nga.geopackage.GeoPackageCore;
@@ -187,6 +189,44 @@ public List<String> getTileTables() {
 		return tableNames;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public List<String> getTables() {
+		List<String> tables = new ArrayList<String>();
+		tables.addAll(getFeatureTables());
+		tables.addAll(getTileTables());
+		return tables;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isFeatureTable(String table) {
+		Set<String> featureTables = new HashSet<String>(getFeatureTables());
+		return featureTables.contains(table);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isTileTable(String table) {
+		Set<String> tileTables = new HashSet<String>(getTileTables());
+		return tileTables.contains(table);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isFeatureOrTileTable(String table) {
+		Set<String> tables = new HashSet<String>(getTables());
+		return tables.contains(table);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -706,7 +746,7 @@ public void deleteTable(String table) {
 		verifyWritable();
 
 		NGAExtensions.deleteTableExtensions(this, table);
-		
+
 		ContentsDao contentsDao = getContentsDao();
 		contentsDao.deleteTable(table);
 	}