Improve GeoPackage support implementation:

- Add support of local tile origin based on tile matrix set extent instead of full sphere origin.
- Add surface image name based on content identifier.
- Change level set sector initialization based on tile matrix set extent instead of content extent.
- Change first level tile delta and number of levels calculation based on tile matrix zoom levels.
- Fix row calculation in tile factory.

Author: EMaksymenko

worldwind/src/main/java/gov/nasa/worldwind/layer/LayerFactory.java

@@ -8,6 +8,7 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
+import android.util.SparseArray;
 
 import java.io.BufferedInputStream;
 import java.io.InputStream;
@@ -30,6 +31,7 @@
 import gov.nasa.worldwind.ogc.gpkg.GpkgContent;
 import gov.nasa.worldwind.ogc.gpkg.GpkgSpatialReferenceSystem;
 import gov.nasa.worldwind.ogc.gpkg.GpkgTileFactory;
+import gov.nasa.worldwind.ogc.gpkg.GpkgTileMatrix;
 import gov.nasa.worldwind.ogc.gpkg.GpkgTileMatrixSet;
 import gov.nasa.worldwind.ogc.gpkg.GpkgTileUserMetrics;
 import gov.nasa.worldwind.ogc.wms.WmsCapabilities;
@@ -259,6 +261,13 @@ protected void createFromGeoPackageAsync(String pathName, Layer layer, Callback
                 continue;
             }
 
+            SparseArray<GpkgTileMatrix> tileMatrix = geoPackage.getTileMatrix(content.getTableName());
+            if (tileMatrix == null || tileMatrix.size() == 0) {
+                Logger.logMessage(Logger.WARN, "LayerFactory", "createFromGeoPackageAsync",
+                        "Unsupported GeoPackage tile matrix");
+                continue;
+            }
+
             GpkgTileUserMetrics tileMetrics = geoPackage.getTileUserMetrics(content.getTableName());
             if (tileMetrics == null) {
                 Logger.logMessage(Logger.WARN, "LayerFactory", "createFromGeoPackageAsync",
@@ -267,14 +276,15 @@ protected void createFromGeoPackageAsync(String pathName, Layer layer, Callback
             }
 
             LevelSetConfig config = new LevelSetConfig();
-            config.sector.set(content.getMinY(), content.getMinX(),
-                content.getMaxY() - content.getMinY(), content.getMaxX() - content.getMinX());
-            config.firstLevelDelta = 180;
-            config.numLevels = tileMetrics.getMaxZoomLevel() + 1; // zero when there are no zoom levels, (0 = -1 + 1)
-            config.tileWidth = 256;
-            config.tileHeight = 256;
+            config.sector.set(tileMatrixSet.getMinY(), tileMatrixSet.getMinX(),
+                    tileMatrixSet.getMaxY() - tileMatrixSet.getMinY(),
+                    tileMatrixSet.getMaxX() - tileMatrixSet.getMinX());
+            config.tileOrigin.set(tileMatrixSet.getMinY(), tileMatrixSet.getMinX());
+            config.firstLevelDelta = (tileMatrixSet.getMaxY() - tileMatrixSet.getMinY()) / tileMatrix.valueAt(0).getMatrixHeight();
+            config.numLevels = tileMatrix.size();
 
             TiledSurfaceImage surfaceImage = new TiledSurfaceImage();
+            surfaceImage.setDisplayName(content.getIdentifier());
             surfaceImage.setLevelSet(new LevelSet(config));
             surfaceImage.setTileFactory(new GpkgTileFactory(content));
             gpkgRenderables.addRenderable(surfaceImage);

worldwind/src/main/java/gov/nasa/worldwind/ogc/gpkg/GpkgTileFactory.java

@@ -5,6 +5,8 @@
 
 package gov.nasa.worldwind.ogc.gpkg;
 
+import android.util.SparseArray;
+
 import gov.nasa.worldwind.geom.Sector;
 import gov.nasa.worldwind.render.ImageSource;
 import gov.nasa.worldwind.render.ImageTile;
@@ -40,23 +42,24 @@ public Tile createTile(Sector sector, Level level, int row, int column) {
 
         ImageTile tile = new ImageTile(sector, level, row, column);
 
-        String tableName = this.tiles.getTableName();
-        int zoomLevel = level.levelNumber;
-
-        // Attempt to find the GeoPackage tile matrix associated with the WorldWind level. Assumes that the WorldWind
-        // levels match the GeoPackage tile matrix zoom levels. If there's no match then the GeoPackage contains no
-        // tiles for this level and this tile has no image source.
         GeoPackage geoPackage = this.tiles.getContainer();
-        GpkgTileMatrix tileMatrix = geoPackage.getTileMatrix(tableName).get(zoomLevel);
+        String tableName = this.tiles.getTableName();
+        SparseArray<GpkgTileMatrix> tileMatrixByZoomLevel = geoPackage.getTileMatrix(tableName);
         GpkgTileUserMetrics tileUserMetrics = geoPackage.getTileUserMetrics(tableName);
 
+        // Attempt to find the GeoPackage tile matrix associated with the WorldWind level.
+        int zoomLevel = level.levelNumber + tileMatrixByZoomLevel.keyAt(0);
+        GpkgTileMatrix tileMatrix = tileMatrixByZoomLevel.get(zoomLevel);
+
+        // Check if content table has any tiles on this zoom level.
         if (tileMatrix != null && tileUserMetrics.hasZoomLevel(zoomLevel)) {
-            // Convert the WorldWind tile address to the equivalent GeoPackage tile address. Assumes that the World
-            // Wind level set matchs the GeoPackage tile matrix set, with the exception of tile rows which are inverted.
-            int gpkgRow = tileMatrix.getMatrixHeight() - row - 1;
-            // Configure the tile with a bitmap factory that reads directly from the GeoPackage.
-            ImageSource.BitmapFactory bitmapFactory = new GpkgBitmapFactory(this.tiles, zoomLevel, column, gpkgRow);
-            tile.setImageSource(ImageSource.fromBitmapFactory(bitmapFactory));
+            // Convert the WorldWind tile row to the equivalent GeoPackage tile row.
+            int gpkgRow = level.levelHeight / level.tileHeight - row - 1;
+            if (column < tileMatrix.getMatrixWidth() && gpkgRow < tileMatrix.getMatrixHeight()) {
+                // Configure the tile with a bitmap factory that reads directly from the GeoPackage.
+                ImageSource.BitmapFactory bitmapFactory = new GpkgBitmapFactory(this.tiles, zoomLevel, column, gpkgRow);
+                tile.setImageSource(ImageSource.fromBitmapFactory(bitmapFactory));
+            }
         }
 
         return tile;