geodesic draw and index support

ngageoint · Mar 19, 2024 · f82ac48 · f82ac48
1 parent c5cdeee
commit f82ac48
Show file tree

Hide file tree

Showing 23 changed files with 754 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ Adheres to [Semantic Versioning](http://semver.org/).
 * Ignored internal databases support for non GeoPackages (preconfigured to ignore ue3.db for Google Maps)
 * Get abstract User DAO by table name
 * Set User Custom DAO contents
+* Feature Tiles geodesic draw support
+* Feature Index Manager, RTree Index, Feature Table Index, Feature Indexer, and Manual query geodesic support
 
 ## [6.7.3](https://github.com/ngageoint/geopackage-android/releases/tag/6.7.3) (11-30-2023)
 

diff --git a/geopackage-sdk/build.gradle b/geopackage-sdk/build.gradle
@@ -175,6 +175,7 @@ dependencies {
     api 'ar.com.hjg:pngj:2.1.0'
     api 'mil.nga:tiff:3.0.0'
     api 'mil.nga:sqlite-android:3440200'
+    //noinspection GradleDependency
     javadocDeps 'com.j256.ormlite:ormlite-android:6.1',
             'mil.nga.geopackage:geopackage-core:6.6.7',
             'ar.com.hjg:pngj:2.1.0',

diff --git a/geopackage-sdk/src/androidTest/java/mil/nga/geopackage/db/FeatureIndexerTest.java b/geopackage-sdk/src/androidTest/java/mil/nga/geopackage/db/FeatureIndexerTest.java
@@ -48,12 +48,32 @@ public FeatureIndexerTest() {
      */
     @Test
     public void testIndexer() throws SQLException {
+        testIndexer(false);
+    }
+
+    /**
+     * Test indexer
+     *
+     * @throws java.sql.SQLException
+     */
+    @Test
+    public void testIndexerGeodesic() throws SQLException {
+        testIndexer(true);
+    }
+
+    /**
+     * Test indexer
+     *
+     * @param geodesic index using geodesic bounds
+     * @throws java.sql.SQLException
+     */
+    private void testIndexer(boolean geodesic) throws SQLException {
 
         FeatureDao featureDao = FeatureTileUtils.createFeatureDao(geoPackage);
 
         int initialFeatures = FeatureTileUtils.insertFeatures(geoPackage, featureDao);
 
-        FeatureIndexer indexer = new FeatureIndexer(activity, featureDao);
+        FeatureIndexer indexer = new FeatureIndexer(activity, featureDao, geodesic);
 
         GeoPackageMetadataDb db = new GeoPackageMetadataDb(activity);
         db.open();

diff --git a/.../androidTest/java/mil/nga/geopackage/extension/nga/index/FeatureTableIndexCreateTest.java b/.../androidTest/java/mil/nga/geopackage/extension/nga/index/FeatureTableIndexCreateTest.java
@@ -28,7 +28,20 @@ public FeatureTableIndexCreateTest() {
     @Test
     public void testIndex() throws Exception {
 
-        FeatureTableIndexUtils.testIndex(geoPackage);
+        FeatureTableIndexUtils.testIndex(geoPackage, false);
+
+    }
+
+    /**
+     * Test index
+     *
+     * @throws Exception
+     *             upon error
+     */
+    @Test
+    public void testIndexGeodesic() throws Exception {
+
+        FeatureTableIndexUtils.testIndex(geoPackage, true);
 
     }
 

diff --git a/...ndroidTest/java/mil/nga/geopackage/extension/nga/index/FeatureTableIndexExternalTest.java b/...ndroidTest/java/mil/nga/geopackage/extension/nga/index/FeatureTableIndexExternalTest.java
@@ -28,7 +28,20 @@ public FeatureTableIndexExternalTest() {
     @Test
     public void testIndex() throws Exception {
 
-        FeatureTableIndexUtils.testIndex(geoPackage);
+        FeatureTableIndexUtils.testIndex(geoPackage, false);
+
+    }
+
+    /**
+     * Test index
+     *
+     * @throws Exception
+     *             upon error
+     */
+    @Test
+    public void testIndexGeodesic() throws Exception {
+
+        FeatureTableIndexUtils.testIndex(geoPackage, true);
 
     }
 

diff --git a/.../androidTest/java/mil/nga/geopackage/extension/nga/index/FeatureTableIndexImportTest.java b/.../androidTest/java/mil/nga/geopackage/extension/nga/index/FeatureTableIndexImportTest.java
@@ -28,7 +28,20 @@ public FeatureTableIndexImportTest() {
     @Test
     public void testIndex() throws Exception {
 
-        FeatureTableIndexUtils.testIndex(geoPackage);
+        FeatureTableIndexUtils.testIndex(geoPackage, false);
+
+    }
+
+    /**
+     * Test index
+     *
+     * @throws Exception
+     *             upon error
+     */
+    @Test
+    public void testIndexGeodesic() throws Exception {
+
+        FeatureTableIndexUtils.testIndex(geoPackage, true);
 
     }
 

diff --git a/...k/src/androidTest/java/mil/nga/geopackage/extension/nga/index/FeatureTableIndexUtils.java b/...k/src/androidTest/java/mil/nga/geopackage/extension/nga/index/FeatureTableIndexUtils.java
@@ -25,6 +25,7 @@
 import mil.nga.proj.ProjectionTransform;
 import mil.nga.sf.GeometryEnvelope;
 import mil.nga.sf.Point;
+import mil.nga.sf.proj.ProjectionGeometryUtils;
 import mil.nga.sf.util.GeometryEnvelopeBuilder;
 
 /**
@@ -37,18 +38,19 @@ public class FeatureTableIndexUtils {
     /**
      * Test read
      *
-     * @param geoPackage
+     * @param geoPackage GeoPackage
+     * @param geodesic   index using geodesic bounds
      * @throws Exception
      */
-    public static void testIndex(GeoPackage geoPackage) throws Exception {
+    public static void testIndex(GeoPackage geoPackage, boolean geodesic) throws Exception {
 
         // Test indexing each feature table
         List<String> featureTables = geoPackage.getFeatureTables();
         for (String featureTable : featureTables) {
 
             FeatureDao featureDao = geoPackage.getFeatureDao(featureTable);
             FeatureTableIndex featureTableIndex = new FeatureTableIndex(
-                    geoPackage, featureDao);
+                    geoPackage, featureDao, geodesic);
 
             // Determine how many features have geometry envelopes or geometries
             int expectedCount = 0;
@@ -107,7 +109,8 @@ public static void testIndex(GeoPackage geoPackage) throws Exception {
                     .query();
             while (featureTableResults.hasNext()) {
                 GeometryIndex geometryIndex = featureTableResults.next();
-                validateGeometryIndex(featureTableIndex, geometryIndex);
+                validateGeometryIndex(featureTableIndex, geometryIndex,
+                        geodesic);
                 resultCount++;
             }
             featureTableResults.close();
@@ -133,7 +136,8 @@ public static void testIndex(GeoPackage geoPackage) throws Exception {
             featureTableResults = featureTableIndex.query(envelope);
             while (featureTableResults.hasNext()) {
                 GeometryIndex geometryIndex = featureTableResults.next();
-                validateGeometryIndex(featureTableIndex, geometryIndex);
+                validateGeometryIndex(featureTableIndex, geometryIndex,
+                        geodesic);
                 if (geometryIndex.getGeomId() == testFeatureRow.getId()) {
                     featureFound = true;
                 }
@@ -170,7 +174,8 @@ public static void testIndex(GeoPackage geoPackage) throws Exception {
                     transformedBoundingBox, projection);
             while (featureTableResults.hasNext()) {
                 GeometryIndex geometryIndex = featureTableResults.next();
-                validateGeometryIndex(featureTableIndex, geometryIndex);
+                validateGeometryIndex(featureTableIndex, geometryIndex,
+                        geodesic);
                 if (geometryIndex.getGeomId() == testFeatureRow.getId()) {
                     featureFound = true;
                 }
@@ -199,7 +204,8 @@ public static void testIndex(GeoPackage geoPackage) throws Exception {
             featureTableResults = featureTableIndex.query(envelope);
             while (featureTableResults.hasNext()) {
                 GeometryIndex geometryIndex = featureTableResults.next();
-                validateGeometryIndex(featureTableIndex, geometryIndex);
+                validateGeometryIndex(featureTableIndex, geometryIndex,
+                        geodesic);
                 if (geometryIndex.getGeomId() == testFeatureRow.getId()) {
                     featureFound = true;
                 }
@@ -353,13 +359,18 @@ public static void testDeleteAll(GeoPackage geoPackage) throws SQLException {
      * @param geometryIndex
      */
     private static void validateGeometryIndex(
-            FeatureTableIndex featureTableIndex, GeometryIndex geometryIndex) {
+            FeatureTableIndex featureTableIndex, GeometryIndex geometryIndex,
+            boolean geodesic) {
         FeatureRow featureRow = featureTableIndex.getFeatureRow(geometryIndex);
         TestCase.assertNotNull(featureRow);
         TestCase.assertEquals(featureTableIndex.getTableName(),
                 geometryIndex.getTableName());
         TestCase.assertEquals(geometryIndex.getGeomId(), featureRow.getId());
         GeometryEnvelope envelope = featureRow.getGeometryEnvelope();
+        if (geodesic) {
+            envelope = ProjectionGeometryUtils.geodesicEnvelope(envelope,
+                    featureTableIndex.getProjection());
+        }
 
         TestCase.assertNotNull(envelope);
 

diff --git a/...rc/androidTest/java/mil/nga/geopackage/extension/rtree/RTreeIndexExtensionCreateTest.java b/...rc/androidTest/java/mil/nga/geopackage/extension/rtree/RTreeIndexExtensionCreateTest.java
@@ -28,7 +28,20 @@ public RTreeIndexExtensionCreateTest() {
     @Test
     public void testRTree() throws SQLException {
 
-        RTreeIndexExtensionUtils.testRTree(geoPackage);
+        RTreeIndexExtensionUtils.testRTree(geoPackage, false);
+
+    }
+
+    /**
+     * Test RTree with geodesic
+     *
+     * @throws SQLException
+     *             upon error
+     */
+    @Test
+    public void testRTreeGeodesic() throws SQLException {
+
+        RTreeIndexExtensionUtils.testRTree(geoPackage, true);
 
     }
 

diff --git a/.../androidTest/java/mil/nga/geopackage/extension/rtree/RTreeIndexExtensionExternalTest.java b/.../androidTest/java/mil/nga/geopackage/extension/rtree/RTreeIndexExtensionExternalTest.java
@@ -28,7 +28,20 @@ public RTreeIndexExtensionExternalTest() {
     @Test
     public void testRTree() throws SQLException {
 
-        RTreeIndexExtensionUtils.testRTree(geoPackage);
+        RTreeIndexExtensionUtils.testRTree(geoPackage, false);
+
+    }
+
+    /**
+     * Test RTree with geodesic
+     *
+     * @throws SQLException
+     *             upon error
+     */
+    @Test
+    public void testRTreeGeodesic() throws SQLException {
+
+        RTreeIndexExtensionUtils.testRTree(geoPackage, true);
 
     }
 

diff --git a/...rc/androidTest/java/mil/nga/geopackage/extension/rtree/RTreeIndexExtensionImportTest.java b/...rc/androidTest/java/mil/nga/geopackage/extension/rtree/RTreeIndexExtensionImportTest.java
@@ -28,7 +28,20 @@ public RTreeIndexExtensionImportTest() {
     @Test
     public void testRTree() throws SQLException {
 
-        RTreeIndexExtensionUtils.testRTree(geoPackage);
+        RTreeIndexExtensionUtils.testRTree(geoPackage, false);
+
+    }
+
+    /**
+     * Test RTree with geodesic
+     *
+     * @throws SQLException
+     *             upon error
+     */
+    @Test
+    public void testRTreeGeodesic() throws SQLException {
+
+        RTreeIndexExtensionUtils.testRTree(geoPackage, true);
 
     }
 

diff --git a/...sdk/src/androidTest/java/mil/nga/geopackage/extension/rtree/RTreeIndexExtensionUtils.java b/...sdk/src/androidTest/java/mil/nga/geopackage/extension/rtree/RTreeIndexExtensionUtils.java
@@ -29,11 +29,13 @@ public class RTreeIndexExtensionUtils {
      * Test RTree
      *
      * @param geoPackage GeoPackage
+     * @param geodesic index using geodesic bounds
      * @throws SQLException upon error
      */
-    public static void testRTree(GeoPackage geoPackage) throws SQLException {
+    public static void testRTree(GeoPackage geoPackage, boolean geodesic) throws SQLException {
 
-        RTreeIndexExtension extension = new RTreeIndexExtension(geoPackage);
+        RTreeIndexExtension extension = new RTreeIndexExtension(geoPackage,
+                geodesic);
 
         List<String> featureTables = geoPackage.getFeatureTables();
         for (String featureTable : featureTables) {

diff --git a/...ackage-sdk/src/androidTest/java/mil/nga/geopackage/features/OAPIFeatureGeneratorTest.java b/...ackage-sdk/src/androidTest/java/mil/nga/geopackage/features/OAPIFeatureGeneratorTest.java
@@ -40,7 +40,7 @@ public void testOpenData1h() throws SQLException {
     }
 
     /**
-     * Test flurstueck
+     * Test lakes
      *
      * @throws SQLException upon failure
      */
@@ -82,7 +82,7 @@ public void testRakennus() throws SQLException {
     }
 
     /**
-     * Test mage
+     * Test MAGE
      *
      * @throws SQLException upon failure
      */