kscience/maps-kt
9
0
Fork 0
Code Issues Pull Requests2 Packages Projects Releases1 Wiki Activity

Fix package names in Trajectory

Browse Source
This commit is contained in:
Alexander Nozik 2024-08-13 16:26:31 +03:00
parent 29a0fb743c
commit 2d46a0ad98
15 changed files with 17 additions and 29 deletions
CHANGELOG.mdbuild.gradle.kts
maps-kt-features/src
commonMain/kotlin/space/kscience/maps/features
Feature.kt
commonTest/kotlin/center/sciprog/attributes
AttributesSerializationTest.kt
maps-kt-geojson/src/commonMain/kotlin/space/kscience/maps/geojson
GeoJsonPropertiesAttribute.ktgeoJsonToMap.kt
trajectory-kt/src
commonMain/kotlin/space/kscience
attributes
SerializableAttribute.kt
trajectory
Obstacle.ktObstacles.ktTrajectory2D.ktcircumvention.ktgeometryExtensions.ktpolygonExtensions.kt
commonTest/kotlin/space/kscience/kmath/geometry
ArcTests.ktCircleTests.kt

1
CHANGELOG.md

@ -14,6 +14,7 @@
### Fixed
- Add alpha attribute comprehension for all standard features.
- Package name for SerializeableAttribute
### Security

2
build.gradle.kts

@ -9,7 +9,7 @@ val kmathVersion: String by extra("0.4.0")
allprojects {
group = "space.kscience"
version = "0.4.0-dev"
version = "0.4.0-dev-2"
repositories {
mavenLocal()

2
maps-kt-features/src/commonMain/kotlin/space/kscience/maps/features/Feature.kt

@ -18,8 +18,8 @@ import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import org.jetbrains.skia.Font
import space.kscience.NameAttribute
import space.kscience.attributes.Attributes
import space.kscience.attributes.NameAttribute
import space.kscience.kmath.geometry.Angle
import space.kscience.kmath.nd.Structure2D

6
maps-kt-features/src/commonTest/kotlin/center/sciprog/attributes/AttributesSerializationTest.kt

@ -8,10 +8,10 @@ import kotlinx.serialization.modules.SerializersModule
import kotlinx.serialization.modules.contextual
import kotlinx.serialization.protobuf.ProtoBuf
import kotlinx.serialization.serializer
import space.kscience.AttributesSerializer
import space.kscience.NameAttribute
import space.kscience.SerializableAttribute
import space.kscience.attributes.Attributes
import space.kscience.attributes.AttributesSerializer
import space.kscience.attributes.NameAttribute
import space.kscience.attributes.SerializableAttribute
import kotlin.test.Ignore
import kotlin.test.Test
import kotlin.test.assertEquals

2
maps-kt-geojson/src/commonMain/kotlin/space/kscience/maps/geojson/GeoJsonPropertiesAttribute.kt

@ -2,6 +2,6 @@ package space.kscience.maps.geojson
import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.serializer
import space.kscience.SerializableAttribute
import space.kscience.attributes.SerializableAttribute
public object GeoJsonPropertiesAttribute : SerializableAttribute<JsonObject>("properties", serializer())

2
maps-kt-geojson/src/commonMain/kotlin/space/kscience/maps/geojson/geoJsonToMap.kt

@ -4,7 +4,7 @@ import androidx.compose.ui.graphics.Color
import kotlinx.serialization.json.contentOrNull
import kotlinx.serialization.json.intOrNull
import kotlinx.serialization.json.jsonPrimitive
import space.kscience.NameAttribute
import space.kscience.attributes.NameAttribute
import space.kscience.maps.coordinates.Gmc
import space.kscience.maps.features.*

4
trajectory-kt/src/commonMain/kotlin/space/kscience/AttributesSerializer.kt → trajectory-kt/src/commonMain/kotlin/space/kscience/attributes/SerializableAttribute.kt

@ -1,6 +1,6 @@
@file:Suppress("UNCHECKED_CAST")
package space.kscience
package space.kscience.attributes
import kotlinx.serialization.KSerializer
import kotlinx.serialization.builtins.serializer
@ -8,8 +8,6 @@ import kotlinx.serialization.descriptors.SerialDescriptor
import kotlinx.serialization.encoding.Decoder
import kotlinx.serialization.encoding.Encoder
import kotlinx.serialization.json.*
import space.kscience.attributes.Attribute
import space.kscience.attributes.Attributes
public class AttributesSerializer(
private val serializableAttributes: Set<SerializableAttribute<*>>,

2
trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/Obstacle.kt

@ -5,7 +5,6 @@
package space.kscience.trajectory
import space.kscience.intersectsTrajectory
import space.kscience.kmath.geometry.Angle
import space.kscience.kmath.geometry.Polygon
import space.kscience.kmath.geometry.Vector2D
@ -13,7 +12,6 @@ import space.kscience.kmath.geometry.euclidean2d.Circle2D
import space.kscience.kmath.geometry.euclidean2d.Float64Space2D
import space.kscience.kmath.misc.zipWithNextCircular
import space.kscience.kmath.structures.Float64
import space.kscience.polygon
public interface Obstacle {

3
trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/Obstacles.kt

@ -1,8 +1,5 @@
package space.kscience.trajectory
import space.kscience.containsPoint
import space.kscience.intersects
import space.kscience.intersectsOrInside
import space.kscience.kmath.geometry.Angle
import space.kscience.kmath.geometry.Polygon
import space.kscience.kmath.geometry.Vector2D

3
trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/Trajectory2D.kt

@ -9,14 +9,11 @@ package space.kscience.trajectory
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import kotlinx.serialization.UseSerializers
import space.kscience.intersects
import space.kscience.intersectsOrInside
import space.kscience.kmath.geometry.*
import space.kscience.kmath.geometry.euclidean2d.Circle2D
import space.kscience.kmath.geometry.euclidean2d.Float64Space2D
import space.kscience.kmath.geometry.euclidean2d.Float64Space2D.distanceTo
import space.kscience.kmath.structures.Float64
import space.kscience.tangent
import kotlin.math.atan2
@Serializable

1
trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/circumvention.kt

@ -1,6 +1,5 @@
package space.kscience.trajectory
import space.kscience.containsPoint
import space.kscience.kmath.geometry.*
import space.kscience.kmath.geometry.euclidean2d.Circle2D
import space.kscience.kmath.geometry.euclidean2d.Float64Space2D

3
trajectory-kt/src/commonMain/kotlin/space/kscience/geometryExtensions.kt → trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/geometryExtensions.kt

@ -1,10 +1,9 @@
package space.kscience
package space.kscience.trajectory
import space.kscience.kmath.geometry.*
import space.kscience.kmath.geometry.euclidean2d.Circle2D
import space.kscience.kmath.geometry.euclidean2d.Float64Space2D
import space.kscience.kmath.structures.Float64
import space.kscience.trajectory.*
import kotlin.math.abs
import kotlin.math.pow
import kotlin.math.sign

3
trajectory-kt/src/commonMain/kotlin/space/kscience/polygonExtensions.kt → trajectory-kt/src/commonMain/kotlin/space/kscience/trajectory/polygonExtensions.kt

@ -1,4 +1,4 @@
package space.kscience
package space.kscience.trajectory
import space.kscience.kmath.geometry.LineSegment2D
import space.kscience.kmath.geometry.Polygon
@ -7,7 +7,6 @@ import space.kscience.kmath.geometry.euclidean2d.Circle2D
import space.kscience.kmath.geometry.euclidean2d.Float64Space2D
import space.kscience.kmath.misc.zipWithNextCircular
import space.kscience.kmath.structures.Float64
import space.kscience.trajectory.Trajectory2D
public fun Float64Space2D.polygon(points: List<Vector2D<Double>>): Polygon<Vector2D<Float64>> =
object : Polygon<Vector2D<Float64>> {

4
trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/geometry/ArcTests.kt

@ -5,13 +5,13 @@
package space.kscience.kmath.geometry
import space.kscience.circle
import space.kscience.containsPoint
import space.kscience.kmath.geometry.euclidean2d.Circle2D
import space.kscience.kmath.geometry.euclidean2d.Float64Space2D
import space.kscience.kmath.geometry.euclidean2d.circumference
import space.kscience.trajectory.CircleTrajectory2D
import space.kscience.trajectory.Trajectory2D
import space.kscience.trajectory.circle
import space.kscience.trajectory.containsPoint
import kotlin.math.PI
import kotlin.test.Test
import kotlin.test.assertEquals

8
trajectory-kt/src/commonTest/kotlin/space/kscience/kmath/geometry/CircleTests.kt

@ -5,14 +5,14 @@
package space.kscience.kmath.geometry
import space.kscience.circle
import space.kscience.intersects
import space.kscience.intersectsOrInside
import space.kscience.kmath.geometry.euclidean2d.Circle2D
import space.kscience.kmath.geometry.euclidean2d.Float64Space2D
import space.kscience.kmath.geometry.euclidean2d.circumference
import space.kscience.kmath.structures.Float64
import space.kscience.segment
import space.kscience.trajectory.circle
import space.kscience.trajectory.intersects
import space.kscience.trajectory.intersectsOrInside
import space.kscience.trajectory.segment
import kotlin.math.pow
import kotlin.math.sqrt
import kotlin.test.Test