Merge branch 'roundabouts' of https://github.com/AugmentedDesignLab/junction-art into roundabouts

Author: adhocmaster

junctionart/extensions/ExtendedOpenDrive.py

@@ -183,8 +183,8 @@ def adjust_startpointsByPredecessor(self):
                 if curAsSuc is None:
                     raise Exception(f"current road {currRoad.id} is not an extended successor of its predecessor. Cannot adjust start point")
 
-                if curAsSuc.cp != pyodrx.ContactPoint.start:
-                    raise Exception(f"current road {currRoad.id}'s cp is not start. Cannot adjust start point")
+                # if curAsSuc.cp != pyodrx.ContactPoint.start:
+                    # raise Exception(f"current road {currRoad.id}'s cp is not start. Cannot adjust start point")
 
                 if self.getPredecessorRoad(currRoad).planViewAdjusted():
                     self.adjust_road_wrt_neightbour(roadIdStr, currRoad.predecessor.element_id, currRoad.predecessor.contact_point, 'predecessor')

junctionart/junctions/ConnectionBuilder.py

@@ -245,4 +245,47 @@ def createRoadsForLinkConfig(self, nextRoadId, roadDic, firstRoadId, incomingRoa
 
             logging.debug(f"{self.name}: created connection for link {link}")
 
+        return newConnectionRoads
+
+    def createRoadsForRoundaboutLinkConfig(self, nextRoadId, roadDic, cp1, cp2, linkConfig):
+        """[summary]
+
+        Args:
+            nextRoadId ([type]): [description]
+            roadDic ([type]): Instead of a list of current roads, supply a dictionary where each road is keyed with its id as a string.
+            firstRoadId ([type]): [description]
+            incomingRoad ([type]): [description]
+            cp1 ([type]): cp of the first road that is connected to the intersection.
+            linkConfig ([type]): a list of tuples where each tuple defines a unique connection between two lanes. A link is a tuple ('incoming-road-id:lane-id', 'outgoing-road-id:lane-id')
+
+        Returns:
+            [type]: [description]
+        """
+        newConnectionRoads = []
+        for i in range(len(linkConfig)):
+            link = linkConfig[i]
+
+            fromUniqueLaneId = link[0]
+            incomingRoadId = int(fromUniqueLaneId.split(':')[0])
+            incomingLaneId = int(fromUniqueLaneId.split(':')[1])
+
+            toUniqueLaneId = link[1]
+            outgoingRoadId = int(toUniqueLaneId.split(':')[0])
+            outgoingLaneId = int(toUniqueLaneId.split(':')[1])
+
+            incomingRoad = roadDic[incomingRoadId]
+            outgoingRoad = roadDic[outgoingRoadId]
+
+            
+            newConnection = self.createSingleLaneConnectionRoad(nextRoadId, incomingRoad, outgoingRoad, incomingLaneId, outgoingLaneId, cp1, cp2)
+
+            # newConnection.updatePredecessorOffset(-1 if i % 2 != 0 else 1)
+            # if i % 2 != 0:
+            #     newConnection.updatePredecessorOffset(-1)
+            newConnectionRoads.append(newConnection)
+
+            nextRoadId += 1
+
+            logging.debug(f"{self.name}: created connection for link {link}")
+
         return newConnectionRoads