Update ConnectionBuilder.py

added function spec for createRoadsForLinkConfig

Author: adhocmaster

junctionart/junctions/ConnectionBuilder.py

@@ -204,31 +204,45 @@ def createUTurnConnectionRoads(self, nextRoadId, outsideRoads, cp1, strategy=Lan
 
 
     def createRoadsForLinkConfig(self, nextRoadId, roadDic, firstRoadId, incomingRoad, cp1, linkConfig):
-            newConnectionRoads = []
-            for link in linkConfig:
+        """[summary]
 
-                fromUniqueLaneId = link[0]
-                incomingLaneId = int(fromUniqueLaneId.split(':')[1])
+        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')
 
-                toUniqueLaneId = link[1]
-                outgoingRoadId = int(toUniqueLaneId.split(':')[0])
-                outgoingLaneId = int(toUniqueLaneId.split(':')[1])
+        Returns:
+            [type]: [description]
+        """
+        newConnectionRoads = []
+        for link in linkConfig:
+            
+
+            fromUniqueLaneId = link[0]
+            incomingLaneId = int(fromUniqueLaneId.split(':')[1])
 
-                outgoingRoad = roadDic[outgoingRoadId]
+            toUniqueLaneId = link[1]
+            outgoingRoadId = int(toUniqueLaneId.split(':')[0])
+            outgoingLaneId = int(toUniqueLaneId.split(':')[1])
 
-                if firstRoadId == incomingRoad.id and firstRoadId == outgoingRoad.id: # for U-turns
-                    newConnection = self.createSingleLaneConnectionRoad(nextRoadId, incomingRoad, outgoingRoad, incomingLaneId, outgoingLaneId, cp1, cp1)
-                elif firstRoadId == incomingRoad.id:
-                    newConnection = self.createSingleLaneConnectionRoad(nextRoadId, incomingRoad, outgoingRoad, incomingLaneId, outgoingLaneId, cp1, pyodrx.ContactPoint.start)
-                elif firstRoadId == outgoingRoad.id:
-                    newConnection = self.createSingleLaneConnectionRoad(nextRoadId, incomingRoad, outgoingRoad, incomingLaneId, outgoingLaneId, pyodrx.ContactPoint.start, cp1)
-                else:
-                    newConnection = self.createSingleLaneConnectionRoad(nextRoadId, incomingRoad, outgoingRoad, incomingLaneId, outgoingLaneId, pyodrx.ContactPoint.start, pyodrx.ContactPoint.start)
+            outgoingRoad = roadDic[outgoingRoadId]
+
+            if firstRoadId == incomingRoad.id and firstRoadId == outgoingRoad.id: # for U-turns
+                newConnection = self.createSingleLaneConnectionRoad(nextRoadId, incomingRoad, outgoingRoad, incomingLaneId, outgoingLaneId, cp1, cp1)
+            elif firstRoadId == incomingRoad.id:
+                newConnection = self.createSingleLaneConnectionRoad(nextRoadId, incomingRoad, outgoingRoad, incomingLaneId, outgoingLaneId, cp1, pyodrx.ContactPoint.start)
+            elif firstRoadId == outgoingRoad.id:
+                newConnection = self.createSingleLaneConnectionRoad(nextRoadId, incomingRoad, outgoingRoad, incomingLaneId, outgoingLaneId, pyodrx.ContactPoint.start, cp1)
+            else:
+                newConnection = self.createSingleLaneConnectionRoad(nextRoadId, incomingRoad, outgoingRoad, incomingLaneId, outgoingLaneId, pyodrx.ContactPoint.start, pyodrx.ContactPoint.start)
 
-                newConnectionRoads.append(newConnection)
+            newConnectionRoads.append(newConnection)
 
-                nextRoadId += 1
+            nextRoadId += 1
 
-                logging.debug(f"{self.name}: created connection for link {link}")
+            logging.debug(f"{self.name}: created connection for link {link}")
 
-            return newConnectionRoads
+        return newConnectionRoads