Merge pull request #35 from ngageoint/develop

2.0.1 updates

Author: bosborn

CHANGELOG.md

@@ -4,9 +4,17 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## 2.0.1 (TBD)
-
-* TBD
+## [2.0.1](https://github.com/ngageoint/geopackage-core-java/releases/tag/2.0.1) (02-13-2018)
+
+* Coverage Data extension (previously Elevation Extension)
+* WebP extension column name fix
+* Zoom Other extension column name fix
+* RTree Index Extension core support
+* Extended Geometry bit encoding fix, set only for non standard geometries
+* Tile Grid zoom increase and decrease utilities
+* Zoom level determination fix for bounds resulting in a single point
+* Quote wrapping improvements and additional wrapping of names in SQL operations
+* wkb version update to 1.0.5
 
 ## [2.0.0](https://github.com/ngageoint/geopackage-core-java/releases/tag/2.0.0) (11-20-2017)
 

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.0|jar) (JAR, POM, Source, Javadoc)
+Pull from the [Maven Central Repository](http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage-core|2.0.1|jar) (JAR, POM, Source, Javadoc)
 
     <dependency>
         <groupId>mil.nga.geopackage</groupId>
         <artifactId>geopackage-core</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</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.0|jar" class="btn">The Central Repository</a>
+      <a href="http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage-core|2.0.1|jar" class="btn">The Central Repository</a>
     </section>
 
     <section class="main-content">

pom.xml

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

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

@@ -12,8 +12,8 @@
 import mil.nga.geopackage.core.srs.SpatialReferenceSystemSqlMmDao;
 import mil.nga.geopackage.db.GeoPackageCoreConnection;
 import mil.nga.geopackage.extension.ExtensionsDao;
-import mil.nga.geopackage.extension.elevation.GriddedCoverageDao;
-import mil.nga.geopackage.extension.elevation.GriddedTileDao;
+import mil.nga.geopackage.extension.coverage.GriddedCoverageDao;
+import mil.nga.geopackage.extension.coverage.GriddedTileDao;
 import mil.nga.geopackage.extension.index.GeometryIndexDao;
 import mil.nga.geopackage.extension.index.TableIndexDao;
 import mil.nga.geopackage.extension.link.FeatureTileLinkDao;

src/main/java/mil/nga/geopackage/core/contents/Contents.java

@@ -111,7 +111,7 @@ public class Contents {
 	/**
 	 * A human-readable description for the table_name content
 	 */
-	@DatabaseField(columnName = COLUMN_DESCRIPTION)
+	@DatabaseField(columnName = COLUMN_DESCRIPTION, defaultValue = "")
 	private String description;
 
 	/**

src/main/java/mil/nga/geopackage/core/contents/ContentsDao.java

@@ -6,6 +6,7 @@
 import java.util.List;
 
 import mil.nga.geopackage.GeoPackageException;
+import mil.nga.geopackage.db.CoreSQLUtils;
 import mil.nga.geopackage.db.GeoPackageCoreConnection;
 import mil.nga.geopackage.features.columns.GeometryColumns;
 import mil.nga.geopackage.features.columns.GeometryColumnsDao;
@@ -214,7 +215,8 @@ public int deleteCascade(Contents contents, boolean userTable)
 		int count = deleteCascade(contents);
 
 		if (userTable) {
-			db.execSQL("DROP TABLE IF EXISTS " + contents.getTableName());
+			db.execSQL("DROP TABLE IF EXISTS "
+					+ CoreSQLUtils.quoteWrap(contents.getTableName()));
 		}
 
 		return count;
@@ -319,7 +321,7 @@ public int deleteByIdCascade(String id, boolean userTable)
 			if (contents != null) {
 				count = deleteCascade(contents, userTable);
 			} else if (userTable) {
-				db.execSQL("DROP TABLE IF EXISTS " + id);
+				db.execSQL("DROP TABLE IF EXISTS " + CoreSQLUtils.quoteWrap(id));
 			}
 		}
 		return count;
@@ -404,7 +406,7 @@ private void verifyCreate(Contents contents) throws SQLException {
 				verifyTiles(dataType);
 				break;
 
-			case ELEVATION_TILES:
+			case GRIDDED_COVERAGE:
 				verifyTiles(dataType);
 				break;
 

src/main/java/mil/nga/geopackage/core/contents/ContentsDataType.java

@@ -25,11 +25,11 @@ public enum ContentsDataType {
 	ATTRIBUTES("attributes"),
 
 	/**
-	 * Tiled Gridded Elevation Data Extension
+	 * Tiled Gridded Coverage Data Extension
 	 * 
-	 * @since 1.2.1
+	 * @since 2.0.1
 	 */
-	ELEVATION_TILES("2d-gridded-coverage");
+	GRIDDED_COVERAGE("2d-gridded-coverage");
 
 	/**
 	 * Data type name

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

@@ -18,7 +18,11 @@ public class CoreSQLUtils {
 	public static String quoteWrap(String name) {
 		String quoteName = null;
 		if (name != null) {
-			quoteName = "\"" + name + "\"";
+			if (name.startsWith("\"") && name.endsWith("\"")) {
+				quoteName = name;
+			} else {
+				quoteName = "\"" + name + "\"";
+			}
 		}
 		return quoteName;
 	}

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

@@ -1,14 +1,12 @@
 package mil.nga.geopackage.db;
 
-import java.io.InputStream;
 import java.sql.SQLException;
 import java.util.List;
-import java.util.Scanner;
-import java.util.regex.Pattern;
 
 import mil.nga.geopackage.GeoPackageException;
 import mil.nga.geopackage.core.srs.SpatialReferenceSystem;
 import mil.nga.geopackage.core.srs.SpatialReferenceSystemDao;
+import mil.nga.geopackage.io.ResourceIOUtils;
 import mil.nga.geopackage.property.GeoPackageProperties;
 import mil.nga.geopackage.property.PropertyConstants;
 import mil.nga.geopackage.user.UserColumn;
@@ -140,7 +138,7 @@ public int createExtensions() {
 	}
 
 	/**
-	 * Create the Tile Gridded Elevation Coverage extension table
+	 * Create the Tiled Gridded Coverage Data Coverage extension table
 	 * 
 	 * @return executed statements
 	 * @since 1.2.1
@@ -151,7 +149,7 @@ public int createGriddedCoverage() {
 	}
 
 	/**
-	 * Create the Tile Gridded Elevation Tile extension table
+	 * Create the Tiled Gridded Coverage Data Tile extension table
 	 * 
 	 * @return executed statements
 	 * @since 1.2.1
@@ -202,39 +200,17 @@ public int createFeatureTileLink() {
 	 * @return executed statements
 	 */
 	private int createTable(String tableScript) {
-		InputStream scriptStream = getClass().getResourceAsStream(
-				"/"
-						+ GeoPackageProperties.getProperty(
-								PropertyConstants.SQL, "directory") + "/"
-						+ tableScript);
-		int statements = runScript(scriptStream);
-		return statements;
-	}
 
-	/**
-	 * Run the script input stream
-	 * 
-	 * @param stream
-	 *            input stream
-	 * @return executed statements
-	 */
-	private int runScript(final InputStream stream) {
-		int count = 0;
+		String path = GeoPackageProperties.getProperty(PropertyConstants.SQL,
+				"directory");
+		List<String> statements = ResourceIOUtils.parseSQLStatements(path,
+				tableScript);
 
-		// Use multiple newlines as the delimiter
-		Scanner s = new Scanner(stream);
-		try {
-			s.useDelimiter(Pattern.compile("\\n\\s*\\n"));
-			// Execute each statement
-			while (s.hasNext()) {
-				String statement = s.next().trim();
-				db.execSQL(statement);
-				count++;
-			}
-		} finally {
-			s.close();
+		for (String statement : statements) {
+			db.execSQL(statement);
 		}
-		return count;
+
+		return statements.size();
 	}
 
 	/**
@@ -337,7 +313,7 @@ public void createRequired() {
 	 * @since 1.1.5
 	 */
 	public void dropTable(String table) {
-		db.execSQL("DROP TABLE IF EXISTS " + table);
+		db.execSQL("DROP TABLE IF EXISTS " + CoreSQLUtils.quoteWrap(table));
 	}
 
 }