fixed derived gml duplicates caused by same road object and signal ids

Author: benediktschwab

rtron-model/src/main/kotlin/io/rtron/model/roadspaces/identifier/RoadspaceObjectIdentifier.kt

@@ -20,6 +20,7 @@ import arrow.core.Option
 import arrow.core.getOrElse
 import io.rtron.model.roadspaces.roadspace.attribute.AttributeList
 import io.rtron.model.roadspaces.roadspace.attribute.attributes
+import io.rtron.model.roadspaces.roadspace.objects.RoadObjectType
 
 /**
  * Identifier of a lane section containing essential meta information.
@@ -32,10 +33,13 @@ data class RoadspaceObjectIdentifier(
     val roadspaceObjectId: String,
     val roadspaceObjectRepeatIndex: Option<Int>,
     val roadspaceObjectName: Option<String>,
+    val roadspaceObjectType: RoadObjectType,
     val roadspaceIdentifier: RoadspaceIdentifier,
 ) : AbstractRoadspacesIdentifier(), RoadspaceIdentifierInterface by roadspaceIdentifier {
     // Properties and Initializers
-    val hashKey get() = "RoadspaceObject_${roadspaceObjectId}_${roadspaceObjectRepeatIndex}_${roadspaceIdentifier.roadspaceId}"
+    val hashKey get() =
+        "RoadspaceObject_${roadspaceObjectType}_${roadspaceObjectId}_" +
+            "${roadspaceObjectRepeatIndex}_${roadspaceIdentifier.roadspaceId}"
 
     // Conversions
     override fun toAttributes(prefix: String): AttributeList {

rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/opendrive2roadspaces/roadspaces/RoadspaceObjectBuilder.kt

@@ -135,7 +135,7 @@ class RoadspaceObjectBuilder(
                     currentRoadObjectRepeat.additionalId.toEither { IllegalStateException("Additional outline ID must be available.") }
                         .getOrElse { throw it }
                 val roadspaceObjectId =
-                    RoadspaceObjectIdentifier(roadObject.id, repeatIdentifier.repeatIndex.some(), roadObject.name, id)
+                    RoadspaceObjectIdentifier(roadObject.id, repeatIdentifier.repeatIndex.some(), roadObject.name, type, id)
 
                 val pointGeometry = buildPointGeometry(currentRoadObjectRepeat, roadReferenceLine)
                 val boundingBoxGeometry = buildBoundingBoxGeometry(roadObject, roadReferenceLine)
@@ -160,7 +160,7 @@ class RoadspaceObjectBuilder(
 
         val roadObjects =
             if (roadObjectsFromRepeat.isEmpty()) {
-                val roadspaceObjectId = RoadspaceObjectIdentifier(roadObject.id, None, roadObject.name, id)
+                val roadspaceObjectId = RoadspaceObjectIdentifier(roadObject.id, None, roadObject.name, type, id)
                 val pointGeometry = buildPointGeometry(roadObject, roadReferenceLine)
                 val boundingBoxGeometry = buildBoundingBoxGeometry(roadObject, roadReferenceLine)
                 val complexGeometry =
@@ -491,7 +491,7 @@ class RoadspaceObjectBuilder(
     ): ContextIssueList<RoadspaceObject> {
         val issueList = DefaultIssueList()
 
-        val objectId = RoadspaceObjectIdentifier(roadSignal.id, None, roadSignal.name, id)
+        val objectId = RoadspaceObjectIdentifier(roadSignal.id, None, roadSignal.name, RoadObjectType.SIGNAL, id)
 
         val pointGeometry = buildPointGeometry(roadSignal, roadReferenceLine)
         val complexGeometry =