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

Make elevation optional for Gmc

Browse Source
This commit is contained in:
Alexander Nozik 2023-01-14 20:09:58 +03:00
parent 9a7e086591
commit 82a1260e3f
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -8,7 +8,7 @@ plugins {
allprojects { allprojects {
group = "center.sciprog" group = "center.sciprog"
version = "0.2.1-dev-3" version = "0.2.1-dev-4"
} }
ksciencePublish{ ksciencePublish{

4
maps-kt-core/src/commonMain/kotlin/center/sciprog/maps/coordinates/GeodeticMapCoordinates.kt
View File

@ -2,11 +2,13 @@ package center.sciprog.maps.coordinates
/** /**
* Geodetic coordinated * Geodetic coordinated
*
* @param elevation is optional
*/ */
public class GeodeticMapCoordinates( public class GeodeticMapCoordinates(
public val latitude: Angle, public val latitude: Angle,
public val longitude: Angle, public val longitude: Angle,
public val elevation: Distance = 0.kilometers, public val elevation: Distance? = null,
) { ) {
init { init {
require(latitude in (-Angle.piDiv2)..(Angle.piDiv2)) { "Latitude $latitude is not in (-PI/2)..(PI/2)" } require(latitude in (-Angle.piDiv2)..(Angle.piDiv2)) { "Latitude $latitude is not in (-PI/2)..(PI/2)" }

4
maps-kt-geojson/src/commonMain/kotlin/center/sciprog/maps/geojson/GeoJsonGeometry.kt
View File

@ -37,8 +37,8 @@ internal fun JsonElement.toGmc() = jsonArray.run {
internal fun Gmc.toJsonArray(): JsonArray = buildJsonArray { internal fun Gmc.toJsonArray(): JsonArray = buildJsonArray {
add(longitude.degrees.value) add(longitude.degrees.value)
add(latitude.degrees.value) add(latitude.degrees.value)
if (elevation.kilometers != 0.0) { elevation?.let {
add(elevation.meters) add(it.meters)
} }
} }

1
maps-kt-scheme/src/commonMain/kotlin/center/sciprog/maps/scheme/XYViewScope.kt
View File

@ -24,6 +24,7 @@ class XYViewScope(
(canvasSize.width / 2 + (x.dp - viewPoint.focus.x.dp) * viewPoint.zoom), (canvasSize.width / 2 + (x.dp - viewPoint.focus.x.dp) * viewPoint.zoom),
(canvasSize.height / 2 + (viewPoint.focus.y.dp - y.dp) * viewPoint.zoom) (canvasSize.height / 2 + (viewPoint.focus.y.dp - y.dp) * viewPoint.zoom)
) )
override fun computeViewPoint(rectangle: Rectangle<XY>): ViewPoint<XY> { override fun computeViewPoint(rectangle: Rectangle<XY>): ViewPoint<XY> {
val scale = min( val scale = min(
canvasSize.width.value / rectangle.width, canvasSize.width.value / rectangle.width,