From 2a3817084d73a58520fb73fcd6b8e7560a087218 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 26 Jun 2022 11:39:54 +0300 Subject: [PATCH] Fix initialization problem for Mercator on native --- build.gradle.kts | 2 +- .../kotlin/space/kscience/kmath/geometry/MercatorAlgebra.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d8c591799..f51a49d1b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -73,4 +73,4 @@ ksciencePublish { sonatype() } -apiValidation.nonPublicMarkers.add("space.kscience.kmath.misc.UnstableKMathAPI") +apiValidation.nonPublicMarkers.add("space.kscience.kmath.misc.UnstableKMathAPI") \ No newline at end of file diff --git a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/MercatorAlgebra.kt b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/MercatorAlgebra.kt index 32b4362ae..e9854e570 100644 --- a/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/MercatorAlgebra.kt +++ b/kmath-geometry/src/commonMain/kotlin/space/kscience/kmath/geometry/MercatorAlgebra.kt @@ -58,7 +58,7 @@ public data class MercatorCoordinates(val x: Double, val y: Double) */ public open class MercatorAlgebra( public val baseLongitude: Double = 0.0, - private val radius: Double = DEFAULT_EARTH_RADIUS, + protected val radius: Double = DEFAULT_EARTH_RADIUS, private val correctedRadius: ((GeodeticCoordinates) -> Double)? = null, ) : Algebra { @@ -90,8 +90,8 @@ public open class MercatorAlgebra( ) } - public companion object : MercatorAlgebra() { + public companion object : MercatorAlgebra(0.0, 6378137.0) { public const val MAXIMUM_LATITUDE: Double = 85.05113 - public const val DEFAULT_EARTH_RADIUS: Double = 6378137.0 + public val DEFAULT_EARTH_RADIUS: Double = radius } } \ No newline at end of file