src/front/map.js

@@ -25,41 +25,22 @@ h0NmFsdzQ3emxqIn0.cyxF0h36emIMTk3cc4VqUw`;
 const simulation = require('../tam/simulation');
 const network = require('../tam/network.json');
 
-const getRoutesLines = routes => routes.filter(
+const getRouteColors = routes =>
+{
+    const colors = routes.filter(
         // Only consider normal routes (excluding alternate routes)
         ([lineRef, routeRef]) =>
         network.lines[lineRef].routes[routeRef].state === 'normal'
-).map(([lineRef]) => lineRef);
+    ).map(([lineRef]) => network.lines[lineRef].color);
 
-const getLinesColors = lines =>
-{
-    if (lines.length >= 1)
+    if (colors.length >= 1)
     {
-        return lines.map(lineRef => network.lines[lineRef].color);
+        return colors;
     }
 
     return ['#FFFFFF'];
 };
 
-const lineFeaturesOrder = (feature1, feature2) =>
-{
-    const lines1 = feature1.get('lines');
-
-    if (lines1.length === 0)
-    {
-        return -1;
-    }
-
-    const lines2 = feature2.get('lines');
-
-    if (lines2.length === 0)
-    {
-        return 1;
-    }
-
-    return Math.min(...lines1) - Math.min(...lines2);
-};
-
 const makeDataSources = () =>
 {
     const segmentsSource = new VectorSource();
@@ -68,8 +49,7 @@ const makeDataSources = () =>
     segmentsSource.addFeatures(
         Object.values(network.segments).map(({routes, nodes}) =>
             new Feature({
-                lines: getRoutesLines(routes),
-                colors: getLinesColors(getRoutesLines(routes)),
+                colors: getRouteColors(routes),
                 geometry: new LineString(nodes.map(
                     ({lat, lon}) => proj.fromLonLat([lon, lat])
                 )),
@@ -80,8 +60,7 @@ const makeDataSources = () =>
     stopsSource.addFeatures(
         Object.values(network.stops).map(({routes, lon, lat}) =>
             new Feature({
-                lines: getRoutesLines(routes),
-                colors: getLinesColors(getRoutesLines(routes)),
+                colors: getRouteColors(routes),
                 geometry: new Point(proj.fromLonLat([lon, lat])),
             })
         )
@@ -213,7 +192,6 @@ const createMap = target =>
 
     const segmentsBorderLayer = new VectorLayer({
         source: segmentsSource,
-        renderOrder: lineFeaturesOrder,
         style: segmentBorderStyle,
 
         updateWhileInteracting: true,
@@ -222,7 +200,6 @@ const createMap = target =>
 
     const segmentsInnerLayer = new VectorLayer({
         source: segmentsSource,
-        renderOrder: lineFeaturesOrder,
         style: segmentInnerStyle,
 
         updateWhileInteracting: true,
@@ -231,7 +208,6 @@ const createMap = target =>
 
     const stopsLayer = new VectorLayer({
         source: stopsSource,
-        renderOrder: lineFeaturesOrder,
         style: stopStyle,
 
         minZoom: 13,

src/tam/simulation.js

@@ -238,7 +238,7 @@ class Course
     {
         if (!(`${this.currentStop}-${stop}` in network.segments))
         {
-            console.warn(`Course ${this.id} cannot go from stop
+            console.warn(`Course ${this.id} is cannot go from stop
 ${this.currentStop} to stop ${stop}. Teleporting to ${stop}`);
             this.arriveToStop(stop);
             return;