From 631dac180f7a53e0fb61cf5d7d89305c357e0910 Mon Sep 17 00:00:00 2001
From: leo <leo.lemaire007@orange.fr>
Date: Mon, 7 Feb 2022 18:28:37 +0100
Subject: [PATCH] =?UTF-8?q?fix=C3=A9=20qqus=20bugs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Car.py        |  6 ++++--
 Map.py        | 12 ++++++++++--
 main.py       |  4 +++-
 test3.rou.xml |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Car.py b/Car.py
index defcec5..f4daca7 100644
--- a/Car.py
+++ b/Car.py
@@ -7,12 +7,14 @@ class Car:
         startEdge=self.map.getEdge(self.route[self.index])
         nextEdge=self.map.getEdge(self.route[self.index+1])
 
-        inverted=not (startEdge.getToNode()==nextEdge.getFromNode() or startEdge.getToNode()==nextEdge.getToNode)
+        inverted=not (startEdge.getToNode()==nextEdge.getFromNode() or startEdge.getToNode()==nextEdge.getToNode())
         
-        laneId=0 if inverted else 1
+        laneId=0 if not inverted else 1
         self.laneShape=startEdge.getLane(laneId).getShape()
         if(inverted):
             self.laneShape.reverse()
+
+        print(f"{self.id} : {startEdge.getID()} -> {nextEdge.getID()} via {laneId}")
     
     def __init__(self,carID,route,parentMap,surface):
         self.id=carID
diff --git a/Map.py b/Map.py
index 1bf4fc6..8d57aa8 100644
--- a/Map.py
+++ b/Map.py
@@ -12,8 +12,12 @@ class Map:
     
     def fromPath(self,path):
         self.net = sumolib.net.readNet(path,withInternal=True)
+    
+    def text(self,text,pos,font):
+        img = font.render(text,True,(255,255,255))
+        self.surf.blit(img,pos)
 
-    def draw(self,screen):
+    def draw(self,screen,debug=False,font=None):
         for edge in self.net.getEdges():
             color=(255,255,255)
             if(edge.getFunction()=="internal"):
@@ -22,6 +26,10 @@ class Map:
                 pts=lane.getShape()
                 pts=map(self.convertPos,pts)
                 pg.draw.lines(self.surf,color,False,list(pts))
+        
+        if(debug):
+            for node in self.net.getNodes():
+               self.text(node.getID(),self.convertPos(node.getCoord()),font) 
 
         screen.blit(self.surf,(0,0))
 
@@ -42,4 +50,4 @@ class Map:
         x=pos[0]*scale-bounds[0]
         y=pos[1]*scale-bounds[1]
         
-        return (x,y)
+        return (x,self.surf.get_height()-y)
diff --git a/main.py b/main.py
index cecac5b..08f1e99 100644
--- a/main.py
+++ b/main.py
@@ -13,6 +13,8 @@ from CarController import CarController
 
 pg.init()
 
+font = pg.font.SysFont(None, 20)
+
 screen = pg.display.set_mode((1280, 480), pg.SCALED)
 pg.display.set_caption("Traffic")
 
@@ -38,7 +40,7 @@ while running:
             running = False
     
     carSurf.fill((0,0,0))
-    m.draw(screen)
+    m.draw(screen,debug=True,font=font)
     cc.update()
     cc.draw(screen)
     pg.display.flip()
diff --git a/test3.rou.xml b/test3.rou.xml
index 2ce4dc4..7e4a5d7 100644
--- a/test3.rou.xml
+++ b/test3.rou.xml
@@ -45,7 +45,7 @@
         <route edges="gneE19 gneE20 gneE21 gneE22 gneE23 gneE25 gneE27 gneE28 gneE29 gneE30 gneE31" color="cyan"/>
     </vehicle>
     <vehicle id="vehicle_1" depart="0.00">
-        <route edges="gneE20 gneE21 gneE22 gneE23 gneE25 gneE25 gneE27 gneE28 gneE29 gneE30 gneE31" color="cyan"/>
+        <route edges="gneE20 gneE21 gneE22 gneE23 gneE25 gneE27 gneE28 gneE29 gneE30 gneE31" color="cyan"/>
     </vehicle>
     <vehicle id="vehicle_2" depart="0.00">
         <route edges="gneE15 gneE16 gneE17 gneE18 gneE19 gneE20 gneE21 gneE22 gneE23 gneE24" color="cyan"/>