Merge pull request #33 from ngageoint/develop

release 1.3.1

Author: bosborn

CHANGELOG.md

@@ -4,9 +4,11 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## 1.3.1 (TBD)
+## [1.3.1](https://github.com/ngageoint/geopackage-core-java/releases/tag/1.3.1) (07-13-2017)
 
-* TBD
+* Improved handling of unknown Contents bounding boxes
+* User table zoom level bounding of degree unit projections
+* Tile Bounding Box Utils method to bound degree unit bounding box with web mercator limits
 
 ## [1.3.0](https://github.com/ngageoint/geopackage-core-java/releases/tag/1.3.0) (06-27-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|1.3.0|jar) (JAR, POM, Source, Javadoc)
+Pull from the [Maven Central Repository](http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage-core|1.3.1|jar) (JAR, POM, Source, Javadoc)
 
     <dependency>
         <groupId>mil.nga.geopackage</groupId>
         <artifactId>geopackage-core</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.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|1.3.0|jar" class="btn">The Central Repository</a>
+      <a href="http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage-core|1.3.1|jar" class="btn">The Central Repository</a>
     </section>
 
     <section class="main-content">

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

@@ -392,8 +392,11 @@ public ForeignCollection<TileMatrix> getTileMatrix() {
 	 * @return bounding box
 	 */
 	public BoundingBox getBoundingBox() {
-		BoundingBox boundingBox = new BoundingBox(getMinX(), getMaxX(),
-				getMinY(), getMaxY());
+		BoundingBox boundingBox = null;
+		if (minX != null && maxX != null && minY != null && maxY != null) {
+			boundingBox = new BoundingBox(getMinX(), getMaxX(), getMinY(),
+					getMaxY());
+		}
 		return boundingBox;
 	}
 

src/main/java/mil/nga/geopackage/tiles/TileBoundingBoxUtils.java

@@ -905,6 +905,20 @@ public static double getPixelYSize(BoundingBox webMercatorBoundingBox,
 	 */
 	public static BoundingBox boundWgs84BoundingBoxWithWebMercatorLimits(
 			BoundingBox boundingBox) {
+		return boundDegreesBoundingBoxWithWebMercatorLimits(boundingBox);
+	}
+
+	/**
+	 * Bound the upper and lower bounds of the degrees bounding box with web
+	 * mercator limits
+	 * 
+	 * @param boundingBox
+	 *            degrees bounding box
+	 * @return bounding box
+	 * @since 1.3.1
+	 */
+	public static BoundingBox boundDegreesBoundingBoxWithWebMercatorLimits(
+			BoundingBox boundingBox) {
 		BoundingBox bounded = new BoundingBox(boundingBox);
 		if (bounded.getMinLatitude() < ProjectionConstants.WEB_MERCATOR_MIN_LAT_RANGE) {
 			bounded.setMinLatitude(ProjectionConstants.WEB_MERCATOR_MIN_LAT_RANGE);

src/main/java/mil/nga/geopackage/user/UserCoreDao.java

@@ -14,6 +14,8 @@
 import mil.nga.geopackage.projection.ProjectionTransform;
 import mil.nga.geopackage.tiles.TileBoundingBoxUtils;
 
+import org.osgeo.proj4j.units.DegreeUnit;
+
 /**
  * Abstract User DAO for reading user tables
  * 
@@ -604,13 +606,20 @@ public int getZoomLevel() {
 			throw new GeoPackageException(
 					"No projection was set which is required to determine the zoom level");
 		}
+		int zoomLevel = 0;
 		BoundingBox boundingBox = getBoundingBox();
-		ProjectionTransform webMercatorTransform = projection
-				.getTransformation(ProjectionConstants.EPSG_WEB_MERCATOR);
-		BoundingBox webMercatorBoundingBox = webMercatorTransform
-				.transform(boundingBox);
-		int zoomLevel = TileBoundingBoxUtils
-				.getZoomLevel(webMercatorBoundingBox);
+		if (boundingBox != null) {
+			if (projection.getUnit() instanceof DegreeUnit) {
+				boundingBox = TileBoundingBoxUtils
+						.boundDegreesBoundingBoxWithWebMercatorLimits(boundingBox);
+			}
+			ProjectionTransform webMercatorTransform = projection
+					.getTransformation(ProjectionConstants.EPSG_WEB_MERCATOR);
+			BoundingBox webMercatorBoundingBox = webMercatorTransform
+					.transform(boundingBox);
+			zoomLevel = TileBoundingBoxUtils
+					.getZoomLevel(webMercatorBoundingBox);
+		}
 		return zoomLevel;
 	}