Add support of TIFF and PNG compression for elevation data in GeoPack…

…age.
WorldWindEarth · Dec 22, 2023 · 626f2e1 · 626f2e1
1 parent 16edebf
commit 626f2e1
Show file tree

Hide file tree

Showing 12 changed files with 200 additions and 690 deletions.
diff --git a/worldwind/build.gradle.kts b/worldwind/build.gradle.kts
@@ -47,6 +47,8 @@ kotlin {
                 implementation("io.ktor:ktor-client-core:$ktorVersion")
                 implementation("io.github.pdvrieze.xmlutil:serialization:0.85.0")
                 implementation("com.eygraber:uri-kmp:0.0.11")
+                implementation("ar.com.hjg:pngj:2.1.0")
+                implementation("mil.nga:tiff:3.0.0")
                 api("dev.icerock.moko:resources:$mokoVersion")
             }
         }

diff --git a/worldwind/src/androidMain/kotlin/earth/worldwind/ogc/gpkg/GeoPackage.kt b/worldwind/src/androidMain/kotlin/earth/worldwind/ogc/gpkg/GeoPackage.kt
@@ -416,7 +416,7 @@ actual open class GeoPackage actual constructor(pathName: String, isReadOnly: Bo
                     while (moveToNext()) addGriddedCoverage(
                         GpkgGriddedCoverage(
                             this@GeoPackage, getInt(0), getString(1), getString(2),
-                            getDouble(3), getDouble(4), getDouble(5), getDouble(6),
+                            getFloat(3), getFloat(4), getFloat(5), getFloat(6),
                             getString(7), getString(8), getString(9), getString(10)
                         )
                     )
@@ -435,8 +435,8 @@ actual open class GeoPackage actual constructor(pathName: String, isReadOnly: Bo
             """.trimIndent(), arrayOf(tableName, tileId.toString())).use { it.run {
                 if (moveToNext()) GpkgGriddedTile(
                     this@GeoPackage, getInt(0), getString(1), getInt(2),
-                    getDouble(3), getDouble(4), getDouble(5), getDouble(6),
-                    getDouble(7), getDouble(8)
+                    getFloat(3), getFloat(4), getFloat(5), getFloat(6),
+                    getFloat(7), getFloat(8)
                 ) else null
             } }
         }

diff --git a/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/formats/tiff/Field.kt b/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/formats/tiff/Field.kt