geodesic support, gradle plugin 8.3.1

ngageoint · Mar 20, 2024 · 5c66c4f · 5c66c4f
1 parent 97c45e1
commit 5c66c4f
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 * geopackage-android version 6.7.4
 * Get Tile Providers and Bounded Overlays by tile table, feature table, or user DAO
+* Feature Overlay Query and Feature Info Builder geodesic support
+* gradle plugin updated to 8.3.1
 
 ## [6.7.3](https://github.com/ngageoint/geopackage-android-map/releases/tag/6.7.3) (11-30-2023)
 

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.android.tools.build:gradle:8.3.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }

diff --git a/geopackage-map/src/main/java/mil/nga/geopackage/map/features/FeatureInfoBuilder.java b/geopackage-map/src/main/java/mil/nga/geopackage/map/features/FeatureInfoBuilder.java
@@ -124,9 +124,35 @@ public FeatureInfoBuilder(Context context, FeatureDao featureDao) {
      * @since 6.3.0
      */
     public FeatureInfoBuilder(Context context, FeatureDao featureDao, FeatureTableStyles featureStyles) {
+        this(context, featureDao, featureStyles, false);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param context    context
+     * @param featureDao feature dao
+     * @param geodesic   geodesic check flag
+     * @since 6.7.4
+     */
+    public FeatureInfoBuilder(Context context, FeatureDao featureDao, boolean geodesic) {
+        this(context, featureDao, null, geodesic);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param context       context
+     * @param featureDao    feature dao
+     * @param featureStyles feature table styles
+     * @param geodesic      geodesic check flag
+     * @since 6.7.4
+     */
+    public FeatureInfoBuilder(Context context, FeatureDao featureDao, FeatureTableStyles featureStyles, boolean geodesic) {
 
         this.featureDao = featureDao;
         this.featureStyles = featureStyles;
+        this.geodesic = geodesic;
 
         geometryType = featureDao.getGeometryType();
         name = featureDao.getDatabase() + " - " + featureDao.getTableName();

diff --git a/geopackage-map/src/main/java/mil/nga/geopackage/map/tiles/overlay/FeatureOverlayQuery.java b/geopackage-map/src/main/java/mil/nga/geopackage/map/tiles/overlay/FeatureOverlayQuery.java
@@ -104,7 +104,8 @@ public FeatureOverlayQuery(Context context, BoundedOverlay boundedOverlay, Featu
         featuresInfo = resources.getBoolean(R.bool.map_feature_overlay_features_info);
 
         FeatureDao featureDao = featureTiles.getFeatureDao();
-        featureInfoBuilder = new FeatureInfoBuilder(context, featureDao, featureTiles.getFeatureTableStyles());
+        featureInfoBuilder = new FeatureInfoBuilder(context, featureDao,
+                featureTiles.getFeatureTableStyles(), featureTiles.isGeodesic());
     }
 
     /**

diff --git a/...kage-map/src/main/java/mil/nga/geopackage/map/tiles/overlay/GeoPackageOverlayFactory.java b/...kage-map/src/main/java/mil/nga/geopackage/map/tiles/overlay/GeoPackageOverlayFactory.java
@@ -248,6 +248,7 @@ public static BoundedOverlay getBoundedOverlay(Context context, GeoPackage geoPa
      * @param context context
      * @param geoPackage GeoPackage
      * @param table tile or feature table
+     * @param density display density: {@link android.util.DisplayMetrics#density}
      * @return tile provider
      * @since 6.7.4
      */
@@ -261,6 +262,7 @@ public static TileProvider getTileProvider(Context context, GeoPackage geoPackag
      * @param context context
      * @param geoPackage GeoPackage
      * @param table tile or feature table
+     * @param density display density: {@link android.util.DisplayMetrics#density}
      * @return bounded overlay
      * @since 6.7.4
      */

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Oct 09 10:02:25 MDT 2023
+#Wed Mar 20 08:28:15 MDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists