Fix package naming

This commit is contained in:
Alexander Nozik 2022-07-23 10:58:16 +03:00
parent 09dfdcc84a
commit cdee88573d
No known key found for this signature in database
GPG Key ID: F7FCF2DD25C71357
19 changed files with 30 additions and 30 deletions

View File

@ -9,9 +9,9 @@ import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.window.Window import androidx.compose.ui.window.Window
import androidx.compose.ui.window.application import androidx.compose.ui.window.application
import centre.sciprog.maps.GeodeticMapCoordinates import center.sciprog.maps.compose.*
import centre.sciprog.maps.MapViewPoint import center.sciprog.maps.GeodeticMapCoordinates
import centre.sciprog.maps.compose.* import center.sciprog.maps.MapViewPoint
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.engine.cio.CIO import io.ktor.client.engine.cio.CIO
import kotlinx.coroutines.delay import kotlinx.coroutines.delay

View File

@ -7,7 +7,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.window.Window import androidx.compose.ui.window.Window
import androidx.compose.ui.window.application import androidx.compose.ui.window.application
import center.sciprog.compose.scheme.* import center.sciprog.scheme.*
@Composable @Composable
@Preview @Preview

View File

@ -1,4 +1,4 @@
package centre.sciprog.maps.compose package center.sciprog.maps.compose
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateMapOf
@ -8,7 +8,7 @@ import androidx.compose.ui.graphics.drawscope.DrawScope
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import centre.sciprog.maps.GeodeticMapCoordinates import center.sciprog.maps.GeodeticMapCoordinates
typealias FeatureId = String typealias FeatureId = String

View File

@ -1,4 +1,4 @@
package centre.sciprog.maps.compose package center.sciprog.maps.compose
import kotlin.jvm.Synchronized import kotlin.jvm.Synchronized

View File

@ -1,4 +1,4 @@
package centre.sciprog.maps.compose package center.sciprog.maps.compose
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Offset
@ -12,9 +12,9 @@ import androidx.compose.ui.graphics.vector.rememberVectorPainter
import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import centre.sciprog.maps.GeodeticMapCoordinates import center.sciprog.maps.GeodeticMapCoordinates
import centre.sciprog.maps.GmcBox import center.sciprog.maps.GmcBox
import centre.sciprog.maps.wrapAll import center.sciprog.maps.wrapAll
//TODO replace zoom range with zoom-based representation change //TODO replace zoom range with zoom-based representation change
sealed class MapFeature(val zoomRange: IntRange) { sealed class MapFeature(val zoomRange: IntRange) {

View File

@ -1,4 +1,4 @@
package centre.sciprog.maps.compose package center.sciprog.maps.compose
import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.ImageBitmap
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope

View File

@ -1,10 +1,10 @@
package centre.sciprog.maps.compose package center.sciprog.maps.compose
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.DpSize
import centre.sciprog.maps.* import center.sciprog.maps.*
import kotlin.math.PI import kotlin.math.PI
import kotlin.math.log2 import kotlin.math.log2
import kotlin.math.min import kotlin.math.min

View File

@ -1,4 +1,4 @@
package centre.sciprog.maps.compose package center.sciprog.maps.compose
import androidx.compose.foundation.Canvas import androidx.compose.foundation.Canvas
import androidx.compose.foundation.gestures.drag import androidx.compose.foundation.gestures.drag
@ -16,7 +16,7 @@ import androidx.compose.ui.graphics.nativeCanvas
import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.input.pointer.* import androidx.compose.ui.input.pointer.*
import androidx.compose.ui.unit.* import androidx.compose.ui.unit.*
import centre.sciprog.maps.* import center.sciprog.maps.*
import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import mu.KotlinLogging import mu.KotlinLogging
@ -33,7 +33,7 @@ private fun Color.toPaint(): Paint = Paint().apply {
private fun IntRange.intersect(other: IntRange) = max(first, other.first)..min(last, other.last) private fun IntRange.intersect(other: IntRange) = max(first, other.first)..min(last, other.last)
internal fun MapViewPoint.move(deltaX: Double, deltaY: Double): MapViewPoint { internal fun MapViewPoint.move(deltaX: Double, deltaY: Double): MapViewPoint {
val newCoordinates = GeodeticMapCoordinates.ofRadians( val newCoordinates = center.sciprog.maps.GeodeticMapCoordinates.ofRadians(
(focus.latitude + deltaY / scaleFactor).coerceIn( (focus.latitude + deltaY / scaleFactor).coerceIn(
-MercatorProjection.MAXIMUM_LATITUDE, -MercatorProjection.MAXIMUM_LATITUDE,
MercatorProjection.MAXIMUM_LATITUDE MercatorProjection.MAXIMUM_LATITUDE

View File

@ -1,4 +1,4 @@
package centre.sciprog.maps.compose package center.sciprog.maps.compose
import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.toComposeImageBitmap import androidx.compose.ui.graphics.toComposeImageBitmap

View File

@ -1,4 +1,4 @@
package centre.sciprog.maps package center.sciprog.maps
import kotlin.math.PI import kotlin.math.PI

View File

@ -1,4 +1,4 @@
package centre.sciprog.maps package center.sciprog.maps
import kotlin.math.abs import kotlin.math.abs
import kotlin.math.max import kotlin.math.max

View File

@ -1,4 +1,4 @@
package centre.sciprog.maps package center.sciprog.maps
import kotlin.math.pow import kotlin.math.pow

View File

@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package centre.sciprog.maps package center.sciprog.maps
import kotlin.math.* import kotlin.math.*

View File

@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package centre.sciprog.maps package center.sciprog.maps
import kotlin.math.* import kotlin.math.*

View File

@ -1,4 +1,4 @@
package center.sciprog.compose.scheme package center.sciprog.scheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateMapOf
@ -10,7 +10,7 @@ import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import center.sciprog.compose.scheme.SchemeFeature.Companion.defaultScaleRange import center.sciprog.scheme.SchemeFeature.Companion.defaultScaleRange
typealias FeatureId = String typealias FeatureId = String

View File

@ -1,4 +1,4 @@
package center.sciprog.compose.scheme package center.sciprog.scheme
import kotlin.math.abs import kotlin.math.abs
import kotlin.math.max import kotlin.math.max

View File

@ -1,4 +1,4 @@
package center.sciprog.compose.scheme package center.sciprog.scheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
@ -10,7 +10,7 @@ import androidx.compose.ui.graphics.vector.rememberVectorPainter
import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import center.sciprog.compose.scheme.SchemeFeature.Companion.defaultScaleRange import center.sciprog.scheme.SchemeFeature.Companion.defaultScaleRange
internal typealias FloatRange = ClosedFloatingPointRange<Float> internal typealias FloatRange = ClosedFloatingPointRange<Float>

View File

@ -1,4 +1,4 @@
package center.sciprog.compose.scheme package center.sciprog.scheme
import androidx.compose.foundation.Canvas import androidx.compose.foundation.Canvas
import androidx.compose.foundation.gestures.drag import androidx.compose.foundation.gestures.drag

View File

@ -1,4 +1,4 @@
package center.sciprog.compose.scheme package center.sciprog.scheme
import kotlin.math.pow import kotlin.math.pow