bump to version 1.3.0

.dockerignore

@@ -0,0 +1,75 @@
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+### Gradle template
+.gradle
+**/build/
+!src/**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.properties
+
+# Cache of project
+.gradletasknamecache
+
+# Eclipse Gradle plugin generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+### Kotlin template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.3.0] - 2023-03-06
+### Added
+- validity checks according to [article](https://doi.org/10.5194/isprs-annals-X-4-W2-2022-257-2022)
+- JSON reports
+- compressed dataset writing
+- OpenDRIVE cropping and offsetting
+- CityGML code lists #21
+- CityGML3 traffic direction #22
+
+### Removed
+- kscript due to complexity (conventional CLI is easier)
+
 ## [1.2.2] - 2021-10-14
 ### Fixed
 - stop breaking for a specific parameter combination for road objects

Dockerfile

@@ -1,31 +1,19 @@
-# adopted from: https://github.com/holgerbrandl/kscript/blob/master/misc/Dockerfile
-
-FROM openjdk:11.0.12-jdk-buster
+FROM gradle:jdk17 AS builder
 
 LABEL maintainer="Benedikt Schwab"
 LABEL maintainer.email="benedikt.schwab(at)tum.de"
 LABEL maintainer.organization="Chair of Geoinformatics, Technical University of Munich (TUM)"
 LABEL source.repo="https://github.com/tum-gis/rtron"
 
-WORKDIR '/project'
+COPY . /home/app
+WORKDIR /home/app
 
-SHELL ["/bin/bash", "-c"]
+RUN gradle shadowJar
 
-RUN apt-get update && \
-	apt-get -y install curl zip unzip && \
-    rm -rf /var/lib/apt/lists/*
 
-# Install https://sdkman.io
-RUN curl -s "https://get.sdkman.io" | bash && \
-    source /root/.sdkman/bin/sdkman-init.sh && \
-    # sdk install java 11.0.12-zulu && \
-    sdk install kotlin 1.5.21 && \
-    sdk install kscript 3.1.0
+FROM bellsoft/liberica-openjdk-debian:17 AS runtime
 
-# Download rtron dependency
-ARG RTRON_VERSION="1.2.2"
-ENV RTRON_VERSION=$RTRON_VERSION
-RUN source /root/.sdkman/bin/sdkman-init.sh && /usr/bin/env kscript "@file:DependsOn(\"io.rtron:rtron-main:$RTRON_VERSION\")"
+WORKDIR /app
+COPY --from=builder /home/app/rtron-cli/build/libs/rtron-1*.jar /app/app.jar
 
-ENTRYPOINT source /root/.sdkman/bin/sdkman-init.sh && /usr/bin/env kscript "$0" "$@"
-CMD [ "--help" ]
+ENTRYPOINT ["java", "-jar", "/app/app.jar"]

buildSrc/src/main/kotlin/Configuration.kt

@@ -17,7 +17,7 @@
 object Project {
     const val name = "rtron"
     const val group = "io.rtron"
-    const val version = "1.3.0-alpha.0"
+    const val version = "1.3.0"
 }
 
 object ProjectComponents {

rtron-math/src/main/kotlin/io/rtron/math/analysis/function/univariate/combination/ConcatenatedFunction.kt

@@ -18,7 +18,6 @@ package io.rtron.math.analysis.function.univariate.combination
 
 import arrow.core.Either
 import arrow.core.NonEmptyList
-import arrow.core.computations.ResultEffect.bind
 import arrow.core.continuations.either
 import arrow.core.getOrElse
 import io.rtron.math.analysis.function.univariate.UnivariateFunction

rtron-math/src/main/kotlin/io/rtron/math/geometry/euclidean/twod/curve/CompositeCurve2D.kt

@@ -16,7 +16,7 @@
 
 package io.rtron.math.geometry.euclidean.twod.curve
 
-import arrow.core.computations.ResultEffect.bind
+import arrow.core.getOrElse
 import io.rtron.math.container.ConcatenationContainer
 import io.rtron.math.geometry.curved.oned.point.CurveRelativeVector1D
 import io.rtron.math.geometry.euclidean.twod.Rotation2D
@@ -50,14 +50,14 @@ data class CompositeCurve2D(
 
     // Methods
     override fun calculatePointLocalCSUnbounded(curveRelativePoint: CurveRelativeVector1D): Vector2D {
-        val localMember = container.fuzzySelectMember(curveRelativePoint.curvePosition, tolerance).bind()
+        val localMember = container.fuzzySelectMember(curveRelativePoint.curvePosition, tolerance).getOrElse { throw it }
         val localPoint = CurveRelativeVector1D(localMember.localParameter)
 
         return localMember.member.calculatePointGlobalCSUnbounded(localPoint)
     }
 
     override fun calculateRotationLocalCSUnbounded(curveRelativePoint: CurveRelativeVector1D): Rotation2D {
-        val localMember = container.fuzzySelectMember(curveRelativePoint.curvePosition, tolerance).bind()
+        val localMember = container.fuzzySelectMember(curveRelativePoint.curvePosition, tolerance).getOrElse { throw it }
         val localPoint = CurveRelativeVector1D(localMember.localParameter)
 
         return localMember.member.calculatePoseGlobalCSUnbounded(localPoint).rotation

rtron-math/src/main/kotlin/io/rtron/math/geometry/euclidean/twod/curve/LateralTranslatedCurve2D.kt

@@ -17,7 +17,6 @@
 package io.rtron.math.geometry.euclidean.twod.curve
 
 import arrow.core.Either
-import arrow.core.computations.ResultEffect.bind
 import arrow.core.continuations.either
 import arrow.core.getOrElse
 import io.rtron.math.analysis.function.univariate.UnivariateFunction
@@ -57,7 +56,7 @@ data class LateralTranslatedCurve2D(
         val curveAffine = baseCurve.calculatePoseGlobalCSUnbounded(curveRelativePoint)
             .let { Affine2D.of(it) }
 
-        val translation = calculateTranslation(curveRelativePoint).bind().lateralOffset
+        val translation = calculateTranslation(curveRelativePoint).getOrElse { throw it }.lateralOffset
 
         return curveAffine.transform(Vector2D(0.0, translation))
     }

rtron-math/src/main/kotlin/io/rtron/math/processing/triangulation/TriangulationAlgorithm.kt

@@ -18,7 +18,6 @@ package io.rtron.math.processing.triangulation
 
 import arrow.core.Either
 import arrow.core.NonEmptyList
-import arrow.core.computations.ResultEffect.bind
 import arrow.core.continuations.either
 import arrow.core.left
 import io.rtron.math.geometry.euclidean.threed.point.Vector3D

rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/module/VegetationModuleBuilder.kt

@@ -17,8 +17,8 @@
 package io.rtron.transformer.converter.roadspaces2citygml.module
 
 import arrow.core.Either
-import arrow.core.computations.ResultEffect.bind
 import arrow.core.continuations.either
+import arrow.core.getOrElse
 import io.rtron.io.messages.ContextMessageList
 import io.rtron.io.messages.DefaultMessage
 import io.rtron.io.messages.DefaultMessageList
@@ -56,7 +56,7 @@ class VegetationModuleBuilder(
         geometryTransformer.rotation.tap {
             attributesAdder.addRotationAttributes(it, solitaryVegetationObjectFeature)
         }
-        addAttributes(solitaryVegetationObjectFeature, geometryTransformer).bind()
+        addAttributes(solitaryVegetationObjectFeature, geometryTransformer).getOrElse { throw it }
 
         // semantics
         identifierAdder.addUniqueIdentifier(roadspaceObject.id, solitaryVegetationObjectFeature)