From dd36db2e70c315b67eb0344525b7f42267fa40cd Mon Sep 17 00:00:00 2001
From: Eugene Maksymenko <maxigene@gmail.com>
Date: Wed, 15 Jan 2025 16:00:20 +0200
Subject: [PATCH] Optimize imports.

---
 README.md                                                  | 2 +-
 build.gradle.kts                                           | 2 +-
 .../kotlin/earth/worldwind/shape/TextAttributesTest.kt     | 2 +-
 .../commonMain/kotlin/earth/worldwind/draw/DrawContext.kt  | 2 +-
 .../elevation/coverage/AbstractTiledElevationCoverage.kt   | 3 ++-
 .../earth/worldwind/globe/terrain/BasicTessellator.kt      | 1 -
 .../kotlin/earth/worldwind/globe/terrain/TerrainTile.kt    | 2 +-
 .../earth/worldwind/layer/atmosphere/AtmosphereLayer.kt    | 2 +-
 .../earth/worldwind/layer/starfield/StarFieldLayer.kt      | 2 +-
 .../kotlin/earth/worldwind/render/RenderContext.kt         | 6 +-----
 .../kotlin/earth/worldwind/render/buffer/BufferObject.kt   | 2 +-
 .../kotlin/earth/worldwind/render/buffer/BufferPool.kt     | 2 +-
 .../src/commonMain/kotlin/earth/worldwind/shape/Ellipse.kt | 2 +-
 .../src/commonMain/kotlin/earth/worldwind/shape/Path.kt    | 2 +-
 .../src/commonMain/kotlin/earth/worldwind/shape/Polygon.kt | 7 +++++--
 .../commonMain/kotlin/earth/worldwind/util/math/WWMath.kt  | 4 +++-
 .../kotlin/earth/worldwind/render/image/ImageSource.kt     | 2 --
 .../globe/elevation/coverage/CacheableElevationCoverage.kt | 1 -
 .../kotlin/earth/worldwind/layer/CacheableImageLayer.kt    | 1 -
 .../kotlin/earth/worldwind/ogc/gpkg/GeoPackage.kt          | 2 --
 20 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 25c4a6d00..a0c2dc1dc 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'earth.worldwind:worldwind:1.6.6'
+    implementation 'earth.worldwind:worldwind:1.6.7'
 }
 ```
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 951cff757..32724a603 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ buildscript {
 
 allprojects {
     group = "earth.worldwind"
-    version = "1.6.6"
+    version = "1.6.7"
 
     extra.apply {
         set("minSdk", 21)
diff --git a/worldwind/src/androidUnitTest/kotlin/earth/worldwind/shape/TextAttributesTest.kt b/worldwind/src/androidUnitTest/kotlin/earth/worldwind/shape/TextAttributesTest.kt
index 40f1949b0..d63e24b06 100644
--- a/worldwind/src/androidUnitTest/kotlin/earth/worldwind/shape/TextAttributesTest.kt
+++ b/worldwind/src/androidUnitTest/kotlin/earth/worldwind/shape/TextAttributesTest.kt
@@ -1,8 +1,8 @@
 package earth.worldwind.shape
 
 import android.content.res.Resources
-import android.util.TypedValue
 import android.graphics.Typeface
+import android.util.TypedValue
 import earth.worldwind.geom.Offset
 import earth.worldwind.geom.OffsetMode
 import earth.worldwind.render.Color
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/draw/DrawContext.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/draw/DrawContext.kt
index 5e79cc3fa..02731d0a1 100644
--- a/worldwind/src/commonMain/kotlin/earth/worldwind/draw/DrawContext.kt
+++ b/worldwind/src/commonMain/kotlin/earth/worldwind/draw/DrawContext.kt
@@ -8,8 +8,8 @@ import earth.worldwind.geom.Viewport
 import earth.worldwind.render.Color
 import earth.worldwind.render.Framebuffer
 import earth.worldwind.render.Texture
-import earth.worldwind.render.buffer.BufferPool
 import earth.worldwind.render.buffer.BufferObject
+import earth.worldwind.render.buffer.BufferPool
 import earth.worldwind.util.NumericArray
 import earth.worldwind.util.kgl.*
 
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/globe/elevation/coverage/AbstractTiledElevationCoverage.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/globe/elevation/coverage/AbstractTiledElevationCoverage.kt
index 3b6aef438..6e2423bc0 100644
--- a/worldwind/src/commonMain/kotlin/earth/worldwind/globe/elevation/coverage/AbstractTiledElevationCoverage.kt
+++ b/worldwind/src/commonMain/kotlin/earth/worldwind/globe/elevation/coverage/AbstractTiledElevationCoverage.kt
@@ -6,9 +6,10 @@ import earth.worldwind.geom.Sector
 import earth.worldwind.geom.TileMatrix
 import earth.worldwind.geom.TileMatrixSet
 import earth.worldwind.globe.elevation.ElevationSourceFactory
-import earth.worldwind.util.*
+import earth.worldwind.util.AbsentResourceList
 import earth.worldwind.util.Logger.INFO
 import earth.worldwind.util.Logger.log
+import earth.worldwind.util.LruMemoryCache
 import earth.worldwind.util.format.format
 import earth.worldwind.util.math.fract
 import earth.worldwind.util.math.mod
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/globe/terrain/BasicTessellator.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/globe/terrain/BasicTessellator.kt
index 24dc7e4d5..2ff3dbbbe 100644
--- a/worldwind/src/commonMain/kotlin/earth/worldwind/globe/terrain/BasicTessellator.kt
+++ b/worldwind/src/commonMain/kotlin/earth/worldwind/globe/terrain/BasicTessellator.kt
@@ -8,7 +8,6 @@ import earth.worldwind.geom.Sector
 import earth.worldwind.globe.Globe
 import earth.worldwind.render.RenderContext
 import earth.worldwind.render.buffer.BufferObject
-import earth.worldwind.util.NumericArray
 import earth.worldwind.util.*
 import earth.worldwind.util.kgl.GL_ARRAY_BUFFER
 import earth.worldwind.util.kgl.GL_ELEMENT_ARRAY_BUFFER
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/globe/terrain/TerrainTile.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/globe/terrain/TerrainTile.kt
index deff25643..7f0debf22 100644
--- a/worldwind/src/commonMain/kotlin/earth/worldwind/globe/terrain/TerrainTile.kt
+++ b/worldwind/src/commonMain/kotlin/earth/worldwind/globe/terrain/TerrainTile.kt
@@ -5,8 +5,8 @@ import earth.worldwind.geom.Vec3
 import earth.worldwind.globe.Globe
 import earth.worldwind.render.RenderContext
 import earth.worldwind.render.buffer.BufferObject
-import earth.worldwind.util.NumericArray
 import earth.worldwind.util.Level
+import earth.worldwind.util.NumericArray
 import earth.worldwind.util.Tile
 import earth.worldwind.util.kgl.GL_ARRAY_BUFFER
 
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/layer/atmosphere/AtmosphereLayer.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/layer/atmosphere/AtmosphereLayer.kt
index c741e3dcc..8be95cdf9 100644
--- a/worldwind/src/commonMain/kotlin/earth/worldwind/layer/atmosphere/AtmosphereLayer.kt
+++ b/worldwind/src/commonMain/kotlin/earth/worldwind/layer/atmosphere/AtmosphereLayer.kt
@@ -9,10 +9,10 @@ import earth.worldwind.render.buffer.BufferObject
 import earth.worldwind.render.image.ImageConfig
 import earth.worldwind.render.image.ImageOptions
 import earth.worldwind.render.image.ImageSource.Companion.fromResource
+import earth.worldwind.util.NumericArray
 import earth.worldwind.util.SunPosition
 import earth.worldwind.util.kgl.GL_ARRAY_BUFFER
 import earth.worldwind.util.kgl.GL_ELEMENT_ARRAY_BUFFER
-import earth.worldwind.util.NumericArray
 import kotlinx.datetime.Instant
 
 open class AtmosphereLayer: AbstractLayer("Atmosphere") {
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/layer/starfield/StarFieldLayer.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/layer/starfield/StarFieldLayer.kt
index 85af04a78..375e28c56 100644
--- a/worldwind/src/commonMain/kotlin/earth/worldwind/layer/starfield/StarFieldLayer.kt
+++ b/worldwind/src/commonMain/kotlin/earth/worldwind/layer/starfield/StarFieldLayer.kt
@@ -8,9 +8,9 @@ import earth.worldwind.layer.AbstractLayer
 import earth.worldwind.render.RenderContext
 import earth.worldwind.render.buffer.BufferObject
 import earth.worldwind.render.image.ImageSource
-import earth.worldwind.util.NumericArray
 import earth.worldwind.util.Logger.ERROR
 import earth.worldwind.util.Logger.logMessage
+import earth.worldwind.util.NumericArray
 import earth.worldwind.util.SunPosition
 import earth.worldwind.util.kgl.GL_ARRAY_BUFFER
 import kotlinx.datetime.Clock
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/render/RenderContext.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/render/RenderContext.kt
index 2d6af3796..3e0a35730 100644
--- a/worldwind/src/commonMain/kotlin/earth/worldwind/render/RenderContext.kt
+++ b/worldwind/src/commonMain/kotlin/earth/worldwind/render/RenderContext.kt
@@ -2,11 +2,7 @@ package earth.worldwind.render
 
 import earth.worldwind.PickedObject
 import earth.worldwind.PickedObjectList
-import earth.worldwind.draw.Drawable
-import earth.worldwind.draw.DrawableGroup
-import earth.worldwind.draw.DrawableQueue
-import earth.worldwind.draw.DrawableTerrain
-import earth.worldwind.draw.UploadQueue
+import earth.worldwind.draw.*
 import earth.worldwind.geom.*
 import earth.worldwind.geom.AltitudeMode.*
 import earth.worldwind.globe.Globe
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/render/buffer/BufferObject.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/render/buffer/BufferObject.kt
index 23f1d9312..f3b54fe22 100644
--- a/worldwind/src/commonMain/kotlin/earth/worldwind/render/buffer/BufferObject.kt
+++ b/worldwind/src/commonMain/kotlin/earth/worldwind/render/buffer/BufferObject.kt
@@ -4,9 +4,9 @@ import earth.worldwind.draw.DrawContext
 import earth.worldwind.render.RenderResource
 import earth.worldwind.util.Logger.ERROR
 import earth.worldwind.util.Logger.logMessage
+import earth.worldwind.util.NumericArray
 import earth.worldwind.util.kgl.GL_STATIC_DRAW
 import earth.worldwind.util.kgl.KglBuffer
-import earth.worldwind.util.NumericArray
 
 open class BufferObject(protected val target: Int, var byteCount: Int) : RenderResource {
     protected var id = KglBuffer.NONE
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/render/buffer/BufferPool.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/render/buffer/BufferPool.kt
index 58391349d..7b06975ee 100644
--- a/worldwind/src/commonMain/kotlin/earth/worldwind/render/buffer/BufferPool.kt
+++ b/worldwind/src/commonMain/kotlin/earth/worldwind/render/buffer/BufferPool.kt
@@ -1,7 +1,7 @@
 package earth.worldwind.render.buffer
 
-import earth.worldwind.util.kgl.KglBuffer
 import earth.worldwind.draw.DrawContext
+import earth.worldwind.util.kgl.KglBuffer
 
 open class BufferPool(
     protected val target: Int,
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/shape/Ellipse.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/shape/Ellipse.kt
index 9b6fca7fe..17ce361c8 100644
--- a/worldwind/src/commonMain/kotlin/earth/worldwind/shape/Ellipse.kt
+++ b/worldwind/src/commonMain/kotlin/earth/worldwind/shape/Ellipse.kt
@@ -7,7 +7,7 @@ import earth.worldwind.draw.DrawableSurfaceShape
 import earth.worldwind.geom.*
 import earth.worldwind.geom.Angle.Companion.ZERO
 import earth.worldwind.geom.Angle.Companion.toDegrees
-import earth.worldwind.render.*
+import earth.worldwind.render.RenderContext
 import earth.worldwind.render.buffer.BufferObject
 import earth.worldwind.render.image.ImageOptions
 import earth.worldwind.render.image.ResamplingMode
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/shape/Path.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/shape/Path.kt
index 673762fdc..e81f2b28e 100644
--- a/worldwind/src/commonMain/kotlin/earth/worldwind/shape/Path.kt
+++ b/worldwind/src/commonMain/kotlin/earth/worldwind/shape/Path.kt
@@ -5,7 +5,7 @@ import earth.worldwind.draw.Drawable
 import earth.worldwind.draw.DrawableShape
 import earth.worldwind.draw.DrawableSurfaceShape
 import earth.worldwind.geom.*
-import earth.worldwind.render.*
+import earth.worldwind.render.RenderContext
 import earth.worldwind.render.buffer.BufferObject
 import earth.worldwind.render.image.ImageOptions
 import earth.worldwind.render.image.ResamplingMode
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/shape/Polygon.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/shape/Polygon.kt
index ba679833b..d2c381280 100644
--- a/worldwind/src/commonMain/kotlin/earth/worldwind/shape/Polygon.kt
+++ b/worldwind/src/commonMain/kotlin/earth/worldwind/shape/Polygon.kt
@@ -6,7 +6,7 @@ import earth.worldwind.draw.DrawableShape
 import earth.worldwind.draw.DrawableSurfaceShape
 import earth.worldwind.geom.*
 import earth.worldwind.geom.Angle.Companion.degrees
-import earth.worldwind.render.*
+import earth.worldwind.render.RenderContext
 import earth.worldwind.render.buffer.BufferObject
 import earth.worldwind.render.image.ImageOptions
 import earth.worldwind.render.image.ResamplingMode
@@ -19,7 +19,10 @@ import earth.worldwind.util.Logger.logMessage
 import earth.worldwind.util.NumericArray
 import earth.worldwind.util.glu.GLU
 import earth.worldwind.util.glu.GLUtessellatorCallbackAdapter
-import earth.worldwind.util.kgl.*
+import earth.worldwind.util.kgl.GL_ARRAY_BUFFER
+import earth.worldwind.util.kgl.GL_ELEMENT_ARRAY_BUFFER
+import earth.worldwind.util.kgl.GL_TRIANGLES
+import earth.worldwind.util.kgl.GL_UNSIGNED_INT
 import earth.worldwind.util.math.encodeOrientationVector
 import kotlin.jvm.JvmOverloads
 
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/util/math/WWMath.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/util/math/WWMath.kt
index b09a2e53d..aad330385 100644
--- a/worldwind/src/commonMain/kotlin/earth/worldwind/util/math/WWMath.kt
+++ b/worldwind/src/commonMain/kotlin/earth/worldwind/util/math/WWMath.kt
@@ -1,6 +1,8 @@
 package earth.worldwind.util.math
 
-import kotlin.math.*
+import kotlin.math.ceil
+import kotlin.math.floor
+import kotlin.math.ln
 
 /**
  * Restricts a value to the range [min, max] degrees, clamping values outside the range. Values less than min are
diff --git a/worldwind/src/jsMain/kotlin/earth/worldwind/render/image/ImageSource.kt b/worldwind/src/jsMain/kotlin/earth/worldwind/render/image/ImageSource.kt
index 64d7cc0cb..f546ee3e4 100644
--- a/worldwind/src/jsMain/kotlin/earth/worldwind/render/image/ImageSource.kt
+++ b/worldwind/src/jsMain/kotlin/earth/worldwind/render/image/ImageSource.kt
@@ -10,8 +10,6 @@ import org.w3c.dom.CanvasRenderingContext2D
 import org.w3c.dom.HTMLCanvasElement
 import org.w3c.dom.Image
 import org.w3c.dom.url.URL
-import kotlin.collections.mutableMapOf
-import kotlin.collections.set
 
 /**
  * Provides a mechanism for specifying images from a variety of sources. ImageSource retains the image source on behalf
diff --git a/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/globe/elevation/coverage/CacheableElevationCoverage.kt b/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/globe/elevation/coverage/CacheableElevationCoverage.kt
index 543facffa..e91804bda 100644
--- a/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/globe/elevation/coverage/CacheableElevationCoverage.kt
+++ b/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/globe/elevation/coverage/CacheableElevationCoverage.kt
@@ -1,6 +1,5 @@
 package earth.worldwind.globe.elevation.coverage
 
-import earth.worldwind.geom.Sector
 import earth.worldwind.geom.TileMatrixSet
 import earth.worldwind.globe.elevation.CacheSourceFactory
 import earth.worldwind.util.ContentManager
diff --git a/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/layer/CacheableImageLayer.kt b/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/layer/CacheableImageLayer.kt
index ebf53707b..452770843 100644
--- a/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/layer/CacheableImageLayer.kt
+++ b/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/layer/CacheableImageLayer.kt
@@ -1,6 +1,5 @@
 package earth.worldwind.layer
 
-import earth.worldwind.geom.Sector
 import earth.worldwind.shape.TiledSurfaceImage
 import earth.worldwind.util.ContentManager
 
diff --git a/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/ogc/gpkg/GeoPackage.kt b/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/ogc/gpkg/GeoPackage.kt
index ac66550d9..ad60be3ca 100644
--- a/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/ogc/gpkg/GeoPackage.kt
+++ b/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/ogc/gpkg/GeoPackage.kt
@@ -15,11 +15,9 @@ import earth.worldwind.layer.WebImageLayer
 import earth.worldwind.layer.mercator.MercatorSector
 import earth.worldwind.util.LevelSet
 import earth.worldwind.util.LevelSetConfig
-import earth.worldwind.util.Logger
 import earth.worldwind.util.ormlite.initConnection
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import java.sql.SQLException
 import java.util.*
 import kotlin.math.*