fix(UI): vehicles with different width (#64)

fix bug in osm2cityflow converter

frontend/script.js

@@ -705,24 +705,27 @@ function drawStep(step) {
 
     carContainer.removeChildren();
     turnSignalContainer.removeChildren();
-    let carLog, position, length;
+    let carLog, position, length, width;
     for (let i = 0, len = carLogs.length - 1;i < len;++i) {
         carLog = carLogs[i].split(' ');
         position = transCoord([parseFloat(carLog[0]), parseFloat(carLog[1])]);
         length = parseFloat(carLog[5]);
+        width = parseFloat(carLog[6]);
         carPool[i][0].position.set(position[0], position[1]);
         carPool[i][0].rotation = 2*Math.PI - parseFloat(carLog[2]);
         carPool[i][0].name = carLog[3];
         let carColorId = stringHash(carLog[3]) % CAR_COLORS_NUM;
         carPool[i][0].tint = CAR_COLORS[carColorId];
         carPool[i][0].width = length;
+        carPool[i][0].height = width;
         carContainer.addChild(carPool[i][0]);
 
         let laneChange = parseInt(carLog[4]) + 1;
         carPool[i][1].position.set(position[0], position[1]);
         carPool[i][1].rotation = carPool[i][0].rotation;
         carPool[i][1].texture = turnSignalTextures[laneChange];
         carPool[i][1].width = length;
+        carPool[i][1].height = width;
         turnSignalContainer.addChild(carPool[i][1]);
     }
     nodeCarNum.innerText = carLogs.length-1;

src/engine/engine.cpp

@@ -486,7 +486,8 @@ namespace CityFlow {
             int lc = vehicle->lastLaneChangeDirection();
             result.append(
                     double2string(pos.x) + " " + double2string(pos.y) + " " + double2string(atan2(dir.y, dir.x)) + " "
-                            + vehicle->getId() + " " + std::to_string(lc) + " " + double2string(vehicle->getLen())+ ",");
+                            + vehicle->getId() + " " + std::to_string(lc) + " " + double2string(vehicle->getLen()) + " "
+                            + double2string(vehicle->getWidth()) + ",");
         }
         result.append(";");
 

tests/azure-pipelines/azure-pipelines.yml

@@ -88,7 +88,7 @@ stages:
         python_version: '3.7'
         cxx_standard: '14'
         target: 'all test'
-    - script: cp build/cityflow* . && python3.7 -m unittest discover tests/python/
+    - script: python3.7 -m pip install pyproj folium && cp build/cityflow* . && git clone https://github.com/cityflow-project/data.git &&  python3.7 -m unittest discover tests/python/
       displayName: Python tests
 
   - job: "osx"
@@ -101,5 +101,5 @@ stages:
           python_version: '3'
           cxx_standard: '14'
           target: 'all test'
-      - script: cp build/cityflow* . && python3 -m unittest discover tests/python/
+      - script: python3 -m pip install pyproj folium && cp build/cityflow* . && git clone https://github.com/cityflow-project/data.git && python3 -m unittest discover tests/python/
         displayName: Python tests

tests/python/test_osm_converter.py

@@ -0,0 +1,23 @@
+import unittest
+import os
+import json
+from tools.converter.osm2cityflow import extract, draw
+
+
+class TestOsmConverter(unittest.TestCase):
+    dataPath = os.getcwd() + '/data/tools/Converter/examples/'
+    osmFile = dataPath + 'statecollege.osm'
+    CityFlowFile = dataPath + 'statecollege_roadnet.json'
+
+    def test_converter(self):
+        nodes = extract(osmFile=self.osmFile)
+        draw(nodes, self.CityFlowFile, True)
+        with open(self.CityFlowFile, 'r') as f:
+            roadnet = json.load(f)
+        intersectionsNum = len(roadnet["intersections"])
+        roadsNum = len(roadnet["roads"])
+        self.assertTrue(intersectionsNum <= roadsNum)
+
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)