From 2b0243a9709127093b6187da5c4b255a1d086357 Mon Sep 17 00:00:00 2001 From: Jilles van Gurp Date: Mon, 15 Nov 2021 10:07:43 +0100 Subject: [PATCH] make altitude nullable and don't use 0 meters as a replacement for null --- .../kotlin/com/jillesvangurp/geojson/geojson.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/commonMain/kotlin/com/jillesvangurp/geojson/geojson.kt b/src/commonMain/kotlin/com/jillesvangurp/geojson/geojson.kt index b32f264..b0041d1 100644 --- a/src/commonMain/kotlin/com/jillesvangurp/geojson/geojson.kt +++ b/src/commonMain/kotlin/com/jillesvangurp/geojson/geojson.kt @@ -70,10 +70,6 @@ fun BoundingBox.isValid(): Boolean { return this.westLongitude <= this.eastLongitude && this.southLatitude <= this.northLatitude } -fun PointCoordinates.ensureHasAltitude() = - if (this.size == 3) this else doubleArrayOf(this.longitude, this.latitude, 0.0) -// fun MultiPointCoordinates.ensureHasAltitude() = - val PointCoordinates.latitude: Double get() = this[1] @@ -93,8 +89,8 @@ val Degree.eastOrWest: CompassDirection get() = if (this >= 0) CompassDirection. fun PointCoordinates.humanReadable(): String { return """${latitude.degree}° ${latitude.minutes}' ${latitude.seconds}" ${latitude.northOrSouth.letter}, ${longitude.degree}° ${longitude.minutes}' ${longitude.seconds}" ${longitude.eastOrWest.letter}""" } -val PointCoordinates.altitude: Double - get() = if (this.size == 3) this[2] else 0.0 +val PointCoordinates.altitude: Double? + get() = if (this.size == 3) this[2] else null val BoundingBox.southLatitude: Double get() = this[1]