enabled junction mapping

Author: benediktschwab

rtron-model/src/main/kotlin/io/rtron/model/opendrive/junction/Junction.kt

@@ -26,13 +26,14 @@ import io.rtron.model.opendrive.additions.identifier.AdditionalJunctionIdentifie
 import io.rtron.model.opendrive.additions.identifier.JunctionIdentifier
 import io.rtron.model.opendrive.core.OpendriveElement
 import io.rtron.model.opendrive.objects.EOrientation
+import io.rtron.model.opendrive.road.RoadSurface
 
 @optics
 data class Junction(
     var connection: List<JunctionConnection> = emptyList(),
     var priority: List<JunctionPriority> = emptyList(),
     var controller: List<JunctionController> = emptyList(),
-    var surface: Option<JunctionSurface> = None,
+    var surface: Option<RoadSurface> = None,
     var id: String = "",
     var mainRoad: Option<String> = None,
     var name: Option<String> = None,

rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive16/Opendrive16JunctionMapper.kt

@@ -25,7 +25,7 @@ import io.rtron.model.opendrive.junction.EContactPoint
 import io.rtron.model.opendrive.junction.EElementDir
 import io.rtron.model.opendrive.junction.EJunctionType
 import io.rtron.model.opendrive.junction.JunctionPredecessorSuccessor
-import io.rtron.model.opendrive.junction.JunctionSurface
+import io.rtron.model.opendrive.road.RoadSurface
 import io.rtron.readerwriter.opendrive.reader.mapper.common.OpendriveCommonMapper
 import io.rtron.readerwriter.opendrive.reader.mapper.common.toUpperCaseVariations
 import org.asam.opendrive16.E_Junction_Type
@@ -42,10 +42,9 @@ import org.mapstruct.NullValueCheckStrategy
 abstract class Opendrive16JunctionMapper {
     private val logger = KotlinLogging.logger {}
 
-    fun mapJunctionSurfaceToOption(source: T_Junction_Surface?): Option<JunctionSurface> =
-        source?.let { mapJunctionSurface(it).some() } ?: None
+    fun mapJunctionSurfaceToOption(source: T_Junction_Surface?): Option<RoadSurface> = source?.let { mapJunctionSurface(it).some() } ?: None
 
-    abstract fun mapJunctionSurface(source: T_Junction_Surface): JunctionSurface
+    abstract fun mapJunctionSurface(source: T_Junction_Surface): RoadSurface
 
     fun mapJunctionPredecessorSuccessorToOption(source: T_Junction_PredecessorSuccessor?): Option<JunctionPredecessorSuccessor> =
         source?.let { mapJunctionPredecessorSuccessor(it).some() } ?: None

rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive18/Opendrive18JunctionMapper.kt

@@ -23,10 +23,12 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 import io.rtron.model.opendrive.junction.EContactPoint
 import io.rtron.model.opendrive.junction.EElementDir
 import io.rtron.model.opendrive.junction.EJunctionType
+import io.rtron.model.opendrive.junction.JunctionConnection
 import io.rtron.model.opendrive.junction.JunctionPredecessorSuccessor
 import io.rtron.readerwriter.opendrive.reader.mapper.common.OpendriveCommonMapper
 import io.rtron.readerwriter.opendrive.reader.mapper.common.toUpperCaseVariations
 import org.asam.opendrive18.E_Junction_Type
+import org.asam.opendrive18.T_Junction_Connection_Direct
 import org.asam.opendrive18.T_Junction_PredecessorSuccessor
 import org.mapstruct.Mapper
 import org.mapstruct.NullValueCheckStrategy
@@ -44,6 +46,11 @@ abstract class Opendrive18JunctionMapper {
 
     abstract fun mapJunctionPredecessorSuccessor(source: T_Junction_PredecessorSuccessor): JunctionPredecessorSuccessor
 
+    //
+    // Connection
+    //
+    abstract fun mapJunctionConnection(source: T_Junction_Connection_Direct): JunctionConnection
+
     //
     // Enumerations
     //

rtron-readerwriter/src/main/resources/schemas/opendrive18/OpenDRIVE_Core.xsd

@@ -29,6 +29,9 @@ See www.asam.net/license.html for further details.
                     <xs:alternative test="@type='crossing'" type="t_junction_crossing"/>
                     <xs:alternative type="t_junction_common"/>
                 </xs:element>-->
+                <!-- TODO: generalize: for non-common junction types-->
+                <xs:element maxOccurs="unbounded" minOccurs="0" name="junction" type="t_junction_common"/>
+
                 <xs:element maxOccurs="unbounded" minOccurs="0" name="junctionGroup" type="t_junctionGroup"/>
                 <xs:element maxOccurs="unbounded" minOccurs="0" name="station" type="t_station"/>
                 <xs:group maxOccurs="unbounded" minOccurs="0" ref="g_additionalData"/>

rtron-readerwriter/src/main/resources/schemas/opendrive18/OpenDRIVE_Junction.xsd

@@ -145,10 +145,11 @@ See www.asam.net/license.html for further details.
         <xs:complexContent>
             <xs:extension base="_OpenDriveElement">
                 <xs:sequence>
+                    <!-- TODO: enable
                     <xs:element maxOccurs="unbounded" minOccurs="1" name="segment" type="t_junction_boundary_segment">
-                        <!--<xs:alternative test="@type='lane'" type="t_junction_boundary_segment_lane"/>
-                        <xs:alternative test="@type='joint'" type="t_junction_boundary_segment_joint"/>-->
-                    </xs:element>
+                        <xs:alternative test="@type='lane'" type="t_junction_boundary_segment_lane"/>
+                        <xs:alternative test="@type='joint'" type="t_junction_boundary_segment_joint"/>
+                    </xs:element>-->
                     <xs:group maxOccurs="unbounded" minOccurs="0" ref="g_additionalData"/>
                 </xs:sequence>
             </xs:extension>
@@ -649,10 +650,12 @@ See www.asam.net/license.html for further details.
         <xs:complexContent>
             <xs:extension base="t_junction">
                 <xs:sequence>
+                    <!-- TODO: enable
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="connection" type="t_junction_connection">
-                        <!--<xs:alternative test="@type='virtual'" type="t_junction_connection_virtual"/>
-                        <xs:alternative type="t_junction_connection_virtual_default"/>-->
-                    </xs:element>
+                        <xs:alternative test="@type='virtual'" type="t_junction_connection_virtual"/>
+                        <xs:alternative type="t_junction_connection_virtual_default"/>
+                    </xs:element>-->
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="connection" type="t_junction_connection" />
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="crossPath" type="t_junction_crossPath"/>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="priority" type="t_junction_priority"/>
                     <xs:element maxOccurs="unbounded" minOccurs="0" name="controller" type="t_junction_controller"/>