Merge pull request #36 from ngageoint/develop

2.0.2 release

Author: bosborn

CHANGELOG.md

@@ -4,9 +4,13 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## 2.0.2 (TBD)
+## [2.0.2](https://github.com/ngageoint/geopackage-core-java/releases/tag/2.0.2) (03-20-2018)
 
-* TBD
+* Tile Scaling extension for scaling missing tiles from nearby zoom levels
+* Projection Transform "is same projection" method
+* Tile DAO zoom level improvements and approximate zoom level determinations
+* IO Utils close quietly method and stream closing
+* RTree Trigger Update 3 spec fix
 
 ## [2.0.1](https://github.com/ngageoint/geopackage-core-java/releases/tag/2.0.1) (02-13-2018)
 

README.md

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

docs/index.html

@@ -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|2.0.1|jar" class="btn">The Central Repository</a>
+      <a href="http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage-core|2.0.2|jar" class="btn">The Central Repository</a>
     </section>
 
     <section class="main-content">

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

@@ -17,6 +17,7 @@
 import mil.nga.geopackage.extension.index.GeometryIndexDao;
 import mil.nga.geopackage.extension.index.TableIndexDao;
 import mil.nga.geopackage.extension.link.FeatureTileLinkDao;
+import mil.nga.geopackage.extension.scale.TileScalingDao;
 import mil.nga.geopackage.features.columns.GeometryColumns;
 import mil.nga.geopackage.features.columns.GeometryColumnsDao;
 import mil.nga.geopackage.features.columns.GeometryColumnsSfSqlDao;
@@ -743,4 +744,20 @@ public AttributesTable createAttributesTable(String tableName,
 	public AttributesTable createAttributesTable(String tableName,
 			List<AttributesColumn> columns);
 
+	/**
+	 * Get a Tile Scaling DAO
+	 * 
+	 * @return tile scaling dao
+	 * @since 2.0.2
+	 */
+	public TileScalingDao getTileScalingDao();
+
+	/**
+	 * Create the Tile Scaling Table if it does not exist
+	 * 
+	 * @return true if created
+	 * @since 2.0.2
+	 */
+	public boolean createTileScalingTable();
+
 }

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

@@ -192,6 +192,17 @@ public int createFeatureTileLink() {
 				PropertyConstants.SQL, "feature_tile_link"));
 	}
 
+	/**
+	 * Create Tile Scaling table
+	 * 
+	 * @return executed statements
+	 * @since 2.0.2
+	 */
+	public int createTileScaling() {
+		return createTable(GeoPackageProperties.getProperty(
+				PropertyConstants.SQL, "tile_scaling"));
+	}
+	
 	/**
 	 * Create a table using the table script
 	 * 

src/main/java/mil/nga/geopackage/extension/NGAExtensions.java

@@ -12,6 +12,9 @@
 import mil.nga.geopackage.extension.link.FeatureTileLink;
 import mil.nga.geopackage.extension.link.FeatureTileLinkDao;
 import mil.nga.geopackage.extension.link.FeatureTileTableCoreLinker;
+import mil.nga.geopackage.extension.scale.TileScaling;
+import mil.nga.geopackage.extension.scale.TileScalingDao;
+import mil.nga.geopackage.extension.scale.TileTableScaling;
 
 import com.j256.ormlite.support.ConnectionSource;
 import com.j256.ormlite.table.TableUtils;
@@ -29,13 +32,16 @@ public class NGAExtensions {
 	 * Delete all NGA table extensions for the table within the GeoPackage
 	 * 
 	 * @param geoPackage
+	 *            GeoPackage
 	 * @param table
+	 *            table name
 	 */
 	public static void deleteTableExtensions(GeoPackageCore geoPackage,
 			String table) {
 
 		deleteGeometryIndex(geoPackage, table);
 		deleteFeatureTileLink(geoPackage, table);
+		deleteTileScaling(geoPackage, table);
 
 		// Delete future extensions for the table here
 	}
@@ -45,6 +51,7 @@ public static void deleteTableExtensions(GeoPackageCore geoPackage,
 	 * GeoPackage
 	 * 
 	 * @param geoPackage
+	 *            GeoPackage
 	 */
 	public static void deleteExtensions(GeoPackageCore geoPackage) {
 		deleteExtensions(geoPackage, false);
@@ -55,6 +62,7 @@ public static void deleteExtensions(GeoPackageCore geoPackage) {
 	 * GeoPackage
 	 * 
 	 * @param geoPackage
+	 *            GeoPackage
 	 * @param ignoreErrors
 	 *            true to ignore errors when deleting tables
 	 */
@@ -63,6 +71,7 @@ public static void deleteExtensions(GeoPackageCore geoPackage,
 
 		deleteGeometryIndexExtension(geoPackage, ignoreErrors);
 		deleteFeatureTileLinkExtension(geoPackage, ignoreErrors);
+		deleteTileScalingExtension(geoPackage, ignoreErrors);
 
 		// Delete future extension tables here
 	}
@@ -71,7 +80,9 @@ public static void deleteExtensions(GeoPackageCore geoPackage,
 	 * Delete the Geometry Index extension for the table
 	 * 
 	 * @param geoPackage
+	 *            GeoPackage
 	 * @param table
+	 *            table name
 	 * @since 1.1.5
 	 */
 	public static void deleteGeometryIndex(GeoPackageCore geoPackage,
@@ -100,7 +111,9 @@ public static void deleteGeometryIndex(GeoPackageCore geoPackage,
 	 * custom tables
 	 * 
 	 * @param geoPackage
+	 *            GeoPackage
 	 * @param ignoreErrors
+	 *            true to ignore errors
 	 * @since 1.1.5
 	 */
 	public static void deleteGeometryIndexExtension(GeoPackageCore geoPackage,
@@ -122,8 +135,8 @@ public static void deleteGeometryIndexExtension(GeoPackageCore geoPackage,
 						ignoreErrors);
 			}
 			if (extensionsDao.isTableExists()) {
-				extensionsDao.deleteByExtension(
-						FeatureTableCoreIndex.EXTENSION_NAME);
+				extensionsDao
+						.deleteByExtension(FeatureTableCoreIndex.EXTENSION_NAME);
 			}
 		} catch (SQLException e) {
 			throw new GeoPackageException(
@@ -137,7 +150,9 @@ public static void deleteGeometryIndexExtension(GeoPackageCore geoPackage,
 	 * Delete the Feature Tile Link extensions for the table
 	 * 
 	 * @param geoPackage
+	 *            GeoPackage
 	 * @param table
+	 *            table name
 	 * @since 1.1.5
 	 */
 	public static void deleteFeatureTileLink(GeoPackageCore geoPackage,
@@ -161,7 +176,9 @@ public static void deleteFeatureTileLink(GeoPackageCore geoPackage,
 	 * and custom tables
 	 * 
 	 * @param geoPackage
+	 *            GeoPackage
 	 * @param ignoreErrors
+	 *            true to ignore errors
 	 * @since 1.1.5
 	 */
 	public static void deleteFeatureTileLinkExtension(
@@ -178,8 +195,8 @@ public static void deleteFeatureTileLinkExtension(
 						ignoreErrors);
 			}
 			if (extensionsDao.isTableExists()) {
-				extensionsDao.deleteByExtension(
-						FeatureTileTableCoreLinker.EXTENSION_NAME);
+				extensionsDao
+						.deleteByExtension(FeatureTileTableCoreLinker.EXTENSION_NAME);
 			}
 		} catch (SQLException e) {
 			throw new GeoPackageException(
@@ -189,4 +206,67 @@ public static void deleteFeatureTileLinkExtension(
 
 	}
 
+	/**
+	 * Delete the Tile Scaling extensions for the table
+	 * 
+	 * @param geoPackage
+	 *            GeoPackage
+	 * @param table
+	 *            table name
+	 * @since 2.0.2
+	 */
+	public static void deleteTileScaling(GeoPackageCore geoPackage, String table) {
+
+		TileScalingDao tileScalingDao = geoPackage.getTileScalingDao();
+		ExtensionsDao extensionsDao = geoPackage.getExtensionsDao();
+
+		try {
+			if (tileScalingDao.isTableExists()) {
+				tileScalingDao.deleteById(table);
+			}
+			if (extensionsDao.isTableExists()) {
+				extensionsDao.deleteByExtension(
+						TileTableScaling.EXTENSION_NAME, table);
+			}
+		} catch (SQLException e) {
+			throw new GeoPackageException(
+					"Failed to delete Tile Scaling. GeoPackage: "
+							+ geoPackage.getName() + ", Table: " + table, e);
+		}
+	}
+
+	/**
+	 * Delete the Tile Scaling extension including the extension entries and
+	 * custom tables
+	 * 
+	 * @param geoPackage
+	 *            GeoPackage
+	 * @param ignoreErrors
+	 *            true to ignore errors
+	 * @since 2.0.2
+	 */
+	public static void deleteTileScalingExtension(GeoPackageCore geoPackage,
+			boolean ignoreErrors) {
+
+		TileScalingDao tileScalingDao = geoPackage.getTileScalingDao();
+		ExtensionsDao extensionsDao = geoPackage.getExtensionsDao();
+		ConnectionSource connectionSource = geoPackage.getDatabase()
+				.getConnectionSource();
+		try {
+			if (tileScalingDao.isTableExists()) {
+				TableUtils.dropTable(connectionSource, TileScaling.class,
+						ignoreErrors);
+			}
+			if (extensionsDao.isTableExists()) {
+				extensionsDao
+						.deleteByExtension(TileTableScaling.EXTENSION_NAME);
+			}
+		} catch (SQLException e) {
+			throw new GeoPackageException(
+					"Failed to delete Tile Scaling extension and table. GeoPackage: "
+							+ geoPackage.getName(), e);
+		}
+
+	}
+
 }