fix import

CommonRoad · Oct 1, 2024 · 90045fe · 90045fe
1 parent 0bc054e
commit 90045fe
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/crdesigner/map_conversion/opendrive/cr2odr/converter.py b/crdesigner/map_conversion/opendrive/cr2odr/converter.py
@@ -7,7 +7,7 @@
 from commonroad.common.common_lanelet import LaneletType
 from commonroad.common.file_reader import CommonRoadFileReader
 from commonroad.common.util import Path_T
-from commonroad.scenario.intersection import IntersectionIncomingElement
+from commonroad.scenario.intersection import IncomingGroup
 from commonroad.scenario.lanelet import Lanelet
 from commonroad.scenario.scenario import Scenario
 
@@ -254,10 +254,10 @@ def convert(self, file_path_out: str) -> None:
         start = time.time()
         # initialize writer object
         if (
-            self.scenario.location.geo_transformation is not None
-            and self.scenario.location.geo_transformation.geo_reference is not None
+            self.scenario.lanelet_network.location.geo_transformation is not None
+            and self.scenario.lanelet_network.location.geo_transformation.geo_reference is not None
         ):
-            geo_reference = self.scenario.location.geo_transformation.geo_reference
+            geo_reference = self.scenario.lanelet_network.location.geo_transformation.geo_reference
         else:
             geo_reference = ""
         self.writer = fwr.Writer(file_path_out, geo_reference)
@@ -494,7 +494,8 @@ def add_junction_linkage(self, link_map: LinkMap_T) -> None:
                         successors_straight.update(lanelet.successor)
                         incomings.add(lanelet.lanelet_id)
 
-                    incoming = IntersectionIncomingElement(1, incomings, set(), successors_straight, set(), None)
+                    incoming = IncomingGroup(1, incomings, None, successors_straight, set(), None)
+                    # TODO outgoing group id
 
                     Junction.counting += 1
                     Junction(

diff --git a/crdesigner/map_conversion/opendrive/cr2odr/elements/junction.py b/crdesigner/map_conversion/opendrive/cr2odr/elements/junction.py
@@ -1,6 +1,6 @@
 from typing import Dict, List
 
-from commonroad.scenario.intersection import IntersectionIncomingElement  # type: ignore
+from commonroad.scenario.intersection import IncomingGroup  # type: ignore
 from commonroad.scenario.lanelet import LaneletNetwork  # type: ignore
 from lxml import etree  # type: ignore
 from lxml.etree import Element
@@ -21,7 +21,7 @@ class Junction:
 
     def __init__(
         self,
-        incoming: List[IntersectionIncomingElement],
+        incoming: List[IncomingGroup],
         id_to_road: Dict[int, int],
         lanelet_to_lane: Dict[int, int],
         root: Element,
@@ -51,20 +51,20 @@ def __init__(
         self.junction = junction
         connection_num = 1
 
-        # Do this for every IntersectionIncomingElement
+        # Do this for every IncomingGroup
         for inter_incoming in incoming:
             all_incomings = list(inter_incoming.incoming_lanelets)
             if len(all_incomings) == 0:  # todo this should be covered in the map verification
                 continue
 
-            # get all successors of the IntersectionIncomingElement
+            # get all successors of the IncomingGroup
             # inc_suc are all roads as successors with their OpenDrive ID
             inc_suc = set()
             map_road_to_lane_link: dict = {}
 
             # all_suc has all successors with the commonroad-id
-            all_suc = inter_incoming.successors_right.union(
-                inter_incoming.successors_straight, inter_incoming.successors_left
+            all_suc = inter_incoming.outgoing_right.union(
+                inter_incoming.outgoing_straight, inter_incoming.outgoing_left
             )
             for suc in all_suc:
                 road_id = id_to_road[suc]