kscience/maps-kt
8
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases 1 Wiki Activity

Fix package naming

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demo/maps/src/jvmMain/kotlin/Main.kt
View File

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

2
demo/scheme/src/jvmMain/kotlin/Main.kt
View File

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

4
maps-kt-compose/src/commonMain/kotlin/centre/sciprog/maps/compose/FeatureBuilder.kt → maps-kt-compose/src/commonMain/kotlin/center/sciprog/maps/compose/FeatureBuilder.kt
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.mutableStateMapOf
@ -8,7 +8,7 @@ import androidx.compose.ui.graphics.drawscope.DrawScope
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import centre.sciprog.maps.GeodeticMapCoordinates
import center.sciprog.maps.GeodeticMapCoordinates
typealias FeatureId = String

2
maps-kt-compose/src/commonMain/kotlin/centre/sciprog/maps/compose/LruCache.kt → maps-kt-compose/src/commonMain/kotlin/center/sciprog/maps/compose/LruCache.kt
View File

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

8
maps-kt-compose/src/commonMain/kotlin/centre/sciprog/maps/compose/MapFeature.kt → maps-kt-compose/src/commonMain/kotlin/center/sciprog/maps/compose/MapFeature.kt
View File

@ -1,4 +1,4 @@
package centre.sciprog.maps.compose
package center.sciprog.maps.compose
import androidx.compose.runtime.Composable
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.IntSize
import androidx.compose.ui.unit.dp
import centre.sciprog.maps.GeodeticMapCoordinates
import centre.sciprog.maps.GmcBox
import centre.sciprog.maps.wrapAll
import center.sciprog.maps.GeodeticMapCoordinates
import center.sciprog.maps.GmcBox
import center.sciprog.maps.wrapAll
//TODO replace zoom range with zoom-based representation change
sealed class MapFeature(val zoomRange: IntRange) {

2
maps-kt-compose/src/commonMain/kotlin/centre/sciprog/maps/compose/MapTileProvider.kt → maps-kt-compose/src/commonMain/kotlin/center/sciprog/maps/compose/MapTileProvider.kt
View File

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

4
maps-kt-compose/src/commonMain/kotlin/centre/sciprog/maps/compose/MapView.kt → maps-kt-compose/src/commonMain/kotlin/center/sciprog/maps/compose/MapView.kt
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.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.DpSize
import centre.sciprog.maps.*
import center.sciprog.maps.*
import kotlin.math.PI
import kotlin.math.log2
import kotlin.math.min

6
maps-kt-compose/src/jvmMain/kotlin/centre/sciprog/maps/compose/MapViewJvm.kt → maps-kt-compose/src/jvmMain/kotlin/center/sciprog/maps/compose/MapViewJvm.kt
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.gestures.drag
@ -16,7 +16,7 @@ import androidx.compose.ui.graphics.nativeCanvas
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.input.pointer.*
import androidx.compose.ui.unit.*
import centre.sciprog.maps.*
import center.sciprog.maps.*
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.launch
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)
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(
-MercatorProjection.MAXIMUM_LATITUDE,
MercatorProjection.MAXIMUM_LATITUDE

2
maps-kt-compose/src/jvmMain/kotlin/centre/sciprog/maps/compose/OpenStreetMapTileProvider.kt → maps-kt-compose/src/jvmMain/kotlin/center/sciprog/maps/compose/OpenStreetMapTileProvider.kt
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.toComposeImageBitmap

2
maps-kt-core/src/commonMain/kotlin/centre/sciprog/maps/GeodeticMapCoordinates.kt → maps-kt-core/src/commonMain/kotlin/center/sciprog/maps/GeodeticMapCoordinates.kt
View File

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

2
maps-kt-core/src/commonMain/kotlin/centre/sciprog/maps/GmcBox.kt → maps-kt-core/src/commonMain/kotlin/center/sciprog/maps/GmcBox.kt
View File

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

2
maps-kt-core/src/commonMain/kotlin/centre/sciprog/maps/MapViewPoint.kt → maps-kt-core/src/commonMain/kotlin/center/sciprog/maps/MapViewPoint.kt
View File

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

2
maps-kt-core/src/commonMain/kotlin/centre/sciprog/maps/MercatorProjection.kt → maps-kt-core/src/commonMain/kotlin/center/sciprog/maps/MercatorProjection.kt
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.
*/
package centre.sciprog.maps
package center.sciprog.maps
import kotlin.math.*

2
maps-kt-core/src/commonMain/kotlin/centre/sciprog/maps/WebMercatorProjection.kt → maps-kt-core/src/commonMain/kotlin/center/sciprog/maps/WebMercatorProjection.kt
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.
*/
package centre.sciprog.maps
package center.sciprog.maps
import kotlin.math.*

4
scheme-kt/src/jvmMain/kotlin/center/sciprog/compose/scheme/FeatureBuilder.kt → scheme-kt/src/jvmMain/kotlin/center/sciprog/scheme/FeatureBuilder.kt
View File

@ -1,4 +1,4 @@
package center.sciprog.compose.scheme
package center.sciprog.scheme
import androidx.compose.runtime.Composable
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.unit.DpSize
import androidx.compose.ui.unit.dp
import center.sciprog.compose.scheme.SchemeFeature.Companion.defaultScaleRange
import center.sciprog.scheme.SchemeFeature.Companion.defaultScaleRange
typealias FeatureId = String

2
scheme-kt/src/jvmMain/kotlin/center/sciprog/compose/scheme/SchemeCoordinates.kt → scheme-kt/src/jvmMain/kotlin/center/sciprog/scheme/SchemeCoordinates.kt
View File

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

4
scheme-kt/src/jvmMain/kotlin/center/sciprog/compose/scheme/SchemeFeature.kt → scheme-kt/src/jvmMain/kotlin/center/sciprog/scheme/SchemeFeature.kt
View File

@ -1,4 +1,4 @@
package center.sciprog.compose.scheme
package center.sciprog.scheme
import androidx.compose.runtime.Composable
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.IntSize
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>

2
scheme-kt/src/jvmMain/kotlin/center/sciprog/compose/scheme/SchemeView.kt → scheme-kt/src/jvmMain/kotlin/center/sciprog/scheme/SchemeView.kt
View File

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

2
scheme-kt/src/jvmMain/kotlin/center/sciprog/compose/scheme/SchemeViewPoint.kt → scheme-kt/src/jvmMain/kotlin/center/sciprog/scheme/SchemeViewPoint.kt
View File

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