Merge pull request #22 from ngageoint/develop

Develop to Master, 1.2.2 updates
ngageoint · Dec 16, 2015 · a8f140c · a8f140c
2 parents 43a3acf + 3c12d9b
commit a8f140c
Show file tree

Hide file tree

Showing 5 changed files with 269 additions and 113 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,9 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## 1.2.2 (TBD)
+## [1.2.2](https://github.com/ngageoint/geopackage-android/releases/tag/1.2.2) (12-16-2015)
 
-* TBD
+* geopackage-core version updated to 1.1.3 for Geometry projection transformations
 
 ## [1.2.1](https://github.com/ngageoint/geopackage-android/releases/tag/1.2.1) (12-14-2015)
 

diff --git a/geopackage-sdk/build.gradle b/geopackage-sdk/build.gradle
@@ -149,7 +149,7 @@ dependencies {
     compile 'com.google.android.gms:play-services:6.1.71'
     compile 'com.google.maps.android:android-maps-utils:0.3.3'
     compile 'com.j256.ormlite:ormlite-android:4.48'
-    compile 'mil.nga.geopackage:geopackage-core:1.1.2'
+    compile 'mil.nga.geopackage:geopackage-core:1.1.3'
     javadocDeps 'com.j256.ormlite:ormlite-android:4.48',
-            'mil.nga.geopackage:geopackage-core:1.1.2'
+            'mil.nga.geopackage:geopackage-core:1.1.3'
 }
diff --git a/...k/src/androidTest/java/mil/nga/geopackage/test/geom/GeoPackageGeometryDataCreateTest.java b/...k/src/androidTest/java/mil/nga/geopackage/test/geom/GeoPackageGeometryDataCreateTest.java
@@ -31,4 +31,17 @@ public void testReadWriteBytes() throws SQLException, IOException {
 
 	}
 
+	/**
+	 * Test geometry projection transform
+	 *
+	 * @throws SQLException
+	 * @throws IOException
+	 */
+	public void testGeometryProjectionTransform() throws SQLException,
+			IOException {
+
+		GeoPackageGeometryDataUtils.testGeometryProjectionTransform(geoPackage);
+
+	}
+
 }
diff --git a/...k/src/androidTest/java/mil/nga/geopackage/test/geom/GeoPackageGeometryDataImportTest.java b/...k/src/androidTest/java/mil/nga/geopackage/test/geom/GeoPackageGeometryDataImportTest.java
@@ -31,4 +31,17 @@ public void testReadWriteBytes() throws SQLException, IOException {
 
 	}
 
+	/**
+	 * Test geometry projection transform
+	 *
+	 * @throws SQLException
+	 * @throws IOException
+	 */
+	public void testGeometryProjectionTransform() throws SQLException,
+			IOException {
+
+		GeoPackageGeometryDataUtils.testGeometryProjectionTransform(geoPackage);
+
+	}
+
 }