Merge pull request #31 from ngageoint/develop

1.17 release
ngageoint · Nov 21, 2017 · 0b186ab · 0b186ab
2 parents de429cf + f252323
commit 0b186ab
Show file tree

Hide file tree

Showing 12 changed files with 1,197 additions and 372 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,27 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## 1.17 (TBD)
-
-* TBD
+## [1.17](https://github.com/ngageoint/geopackage-mapcache-android/releases/tag/1.17) (11-21-2017)
+
+* geopackage-android-map version updated to 2.0.0
+* GeoPackage share fix for external GeoPackages
+* Geometry simplifications for displayed map features based upon zoom level
+* Only display and maintain features in the current map views
+* Maintain active feature indices when editing map features
+* Queryable map features (previously only available for feature tiles)
+* Automatically select active feature table when editing features
+* Update geometry envelopes when editing features
+* Increase default max map features & max points per tile to 5000, max features per tile to 2000
+* Updated preloaded GeoPackage url example files
+* Updated various now deprecated Android library calls
+* gradle plugin updated to 2.3.3
+* android maven gradle plugin updated to 2.0
+* maven google dependency
+* compile SDK version 26
+* build tools version updated to 26.0.1
+* target SDK version updated to 26
+* appcompat v7:26.0.2
+* multidex version 1.0.2
 
 ## [1.16](https://github.com/ngageoint/geopackage-mapcache-android/releases/tag/1.16) (07-13-2017)
 

diff --git a/build.gradle b/build.gradle
@@ -2,17 +2,23 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
         mavenLocal()
     }
 }
diff --git a/docs/index.html b/docs/index.html
@@ -15,7 +15,7 @@ <h1 class="project-name">GeoPackage MapCache Android</h1>
       <img class="img" alt="GeoPackage" src="http://ngageoint.github.io/GeoPackage/images/GeoPackage.png" width="128px">
       <h2 class="project-tagline">by the National Geospatial-Intelligence Agency</h2>
       <a href="https://github.com/ngageoint/geopackage-mapcache-android" class="btn">GitHub</a>
-      <a href="https://github.com/ngageoint/geopackage-mapcache-android/releases/download/1.16/mapcache-1.16.apk" class="btn">APK</a>
+      <a href="https://github.com/ngageoint/geopackage-mapcache-android/releases/download/1.17/mapcache-1.17.apk" class="btn">APK</a>
       <a href="https://github.com/ngageoint/geopackage-mapcache-android/zipball/master" class="btn">.zip</a>
       <a href="https://github.com/ngageoint/geopackage-mapcache-android/tarball/master" class="btn">.tar.gz</a>
     </section>

diff --git a/mapcache/build.gradle b/mapcache/build.gradle
@@ -5,8 +5,8 @@ def googleMapsApiReleaseKey = hasProperty('RELEASE_MAPS_MAPCACHE_API_KEY') ? REL
 def googleMapsApiKeyDebug = hasProperty('DEBUG_MAPS_API_KEY') ? DEBUG_MAPS_API_KEY: ''
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     dexOptions {
         javaMaxHeapSize "4g"
@@ -15,7 +15,7 @@ android {
     defaultConfig {
         applicationId "mil.nga.mapcache"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 18
         versionName '1.17'
         multiDexEnabled true
@@ -50,9 +50,11 @@ task androidAppVersion {
 }
 
 dependencies {
-    compile "mil.nga.geopackage.map:geopackage-android-map:1.4.1" // comment out to build locally
-    compile 'com.android.support:multidex:1.0.1'
+    compile 'com.android.support:appcompat-v7:26.0.2'
+    compile "mil.nga.geopackage.map:geopackage-android-map:2.0.0" // comment out to build locally
     //compile project(':geopackage-map') // uncomment me to build locally
+    compile 'com.android.support:multidex:1.0.2'
+    androidTestCompile 'com.android.support:multidex:1.0.2'
 }
 
 configure extensions.android, {

diff --git a/mapcache/src/main/java/mil/nga/mapcache/GeoPackageManagerFragment.java b/mapcache/src/main/java/mil/nga/mapcache/GeoPackageManagerFragment.java
@@ -867,7 +867,10 @@ private void shareDatabaseOption(final String database) {
             // If external database, no permission is needed
             if (manager.isExternal(database)) {
                 // Create the Uri and share
-                Uri databaseUri = Uri.fromFile(databaseFile);
+                Uri databaseUri = FileProvider.getUriForFile(getActivity(),
+                        "mil.nga.mapcache.fileprovider",
+                        databaseFile);
+                shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                 launchShareIntent(shareIntent, databaseUri);
             }
             // If internal database, file must be copied to cache for permission
@@ -1083,7 +1086,7 @@ public void onClick(DialogInterface dialog, int id) {
                             }
 
                             BoundingBox boundingBox = new BoundingBox(minLon,
-                                    maxLon, minLat, maxLat);
+                                    minLat, maxLon, maxLat);
 
                             GeometryType geometryType = GeometryType
                                     .fromName(geometryTypeSpinner
@@ -1238,7 +1241,7 @@ public void onClick(DialogInterface dialog, int id) {
                                     .isChecked();
 
                             BoundingBox boundingBox = new BoundingBox(minLon,
-                                    maxLon, minLat, maxLat);
+                                    minLat, maxLon, maxLat);
 
                             // If not importing tiles, just create the table
                             if (tileUrl == null || tileUrl.isEmpty()) {
@@ -2049,7 +2052,7 @@ public void onClick(DialogInterface dialog, int id) {
                                     .isChecked();
 
                             BoundingBox boundingBox = new BoundingBox(minLon,
-                                    maxLon, minLat, maxLat);
+                                    minLat, maxLon, maxLat);
 
                             // Load tiles
                             LoadTilesTask.loadTiles(getActivity(),
@@ -2328,8 +2331,8 @@ private void createFeatureTilesTableOption(final GeoPackageTable table) {
                 Projection projection = null;
                 if (boundingBox == null) {
                     boundingBox = new BoundingBox(-ProjectionConstants.WGS84_HALF_WORLD_LON_WIDTH,
-                            ProjectionConstants.WGS84_HALF_WORLD_LON_WIDTH,
                             ProjectionConstants.WEB_MERCATOR_MIN_LAT_RANGE,
+                            ProjectionConstants.WGS84_HALF_WORLD_LON_WIDTH,
                             ProjectionConstants.WEB_MERCATOR_MAX_LAT_RANGE);
                     projection = ProjectionFactory.getProjection(ProjectionConstants.EPSG_WORLD_GEODETIC_SYSTEM);
                 } else {
@@ -2449,7 +2452,7 @@ public void onClick(DialogInterface dialog, int id) {
                                     .isChecked();
 
                             BoundingBox boundingBox = new BoundingBox(minLon,
-                                    maxLon, minLat, maxLat);
+                                    minLat, maxLon, maxLat);
 
                             GeoPackageManager manager = GeoPackageFactory.getManager(getActivity());
                             GeoPackage geoPackage = manager.open(table.getDatabase());
@@ -2626,8 +2629,8 @@ private void addFeatureOverlayTableOption(final GeoPackageTable table) {
             worldGeodeticBoundingBox = worldGeodeticTransform.transform(webMercatorBoundingBox);
         } else {
             worldGeodeticBoundingBox = new BoundingBox(-ProjectionConstants.WGS84_HALF_WORLD_LON_WIDTH,
-                    ProjectionConstants.WGS84_HALF_WORLD_LON_WIDTH,
                     ProjectionConstants.WEB_MERCATOR_MIN_LAT_RANGE,
+                    ProjectionConstants.WGS84_HALF_WORLD_LON_WIDTH,
                     ProjectionConstants.WEB_MERCATOR_MAX_LAT_RANGE);
         }
 
@@ -4117,18 +4120,15 @@ public boolean onLongClick(View v) {
                                 break;
                         }
                     }
-                    imageView.setImageDrawable(getResources().getDrawable(
-                            drawableId));
+                    imageView.setImageDrawable(ContextCompat.getDrawable(getActivity(), drawableId));
                     break;
 
                 case TILE:
-                    imageView.setImageDrawable(getResources().getDrawable(
-                            R.drawable.ic_tiles));
+                    imageView.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.ic_tiles));
                     break;
 
                 case FEATURE_OVERLAY:
-                    imageView.setImageDrawable(getResources().getDrawable(
-                            R.drawable.ic_format_paint));
+                    imageView.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.ic_format_paint));
                     break;
 
                 default: