diff --git a/src/tam/network.js b/src/tam/network.js
index 07e83be..0b59de0 100644
--- a/src/tam/network.js
+++ b/src/tam/network.js
@@ -206,14 +206,14 @@ ${name} is one-way and cannot be used in reverse.`);
                 const end = elements[lineStops[stopIdx + 1]].tags.ref;
 
                 const id = `${begin}-${end}`;
-                const nodes = path.slice(
+                const nodesIds = path.slice(
                     path.indexOf(lineStops[stopIdx]),
                     path.indexOf(lineStops[stopIdx + 1]) + 1,
                 );
 
                 if (id in segments)
                 {
-                    if (!util.arraysEqual(nodes, segments[id].nodes))
+                    if (!util.arraysEqual(nodesIds, segments[id].nodesIds))
                     {
                         throw new Error(`Segment ${id} is defined as a
 different sequence of nodes in two or more lines.`);
@@ -223,31 +223,30 @@ different sequence of nodes in two or more lines.`);
                 }
                 else
                 {
-                    const points = nodes.map(id => ({
+                    const nodes = nodesIds.map(id => ({
                         lat: elements[id].lat,
                         lon: elements[id].lon
                     }));
 
-                    if (points.length)
+                    if (nodes.length)
                     {
-                        // Augment each point with the distance to the start
-                        points[0].distance = 0;
+                        // Augment each node with the distance to the start
+                        nodes[0].distance = 0;
 
-                        for (let i = 1; i < points.length; ++i)
+                        for (let i = 1; i < nodes.length; ++i)
                         {
-                            points[i].distance = geolib.getPreciseDistance(
-                                points[i - 1],
-                                points[i],
-                            ) + points[i - 1].distance;
+                            nodes[i].distance = geolib.getPreciseDistance(
+                                nodes[i - 1],
+                                nodes[i],
+                            ) + nodes[i - 1].distance;
                         }
                     }
 
                     segments[id] = {
                         // Keep track of the original sequence of nodes to
                         // compare with duplicates
+                        nodesIds,
                         nodes,
-
-                        points,
                         routes: [[lineRef, routeRef]],
                     };
                 }
@@ -269,7 +268,7 @@ different sequence of nodes in two or more lines.`);
     // Remove OSM nodes from segments that were only used for checking validity
     for (let segment of Object.values(segments))
     {
-        delete segment.nodes;
+        delete segment.nodesIds;
     }
 
     return {stops, lines, segments};
diff --git a/src/tam/network.json b/src/tam/network.json
index 043e5b8..641b0eb 100644
--- a/src/tam/network.json
+++ b/src/tam/network.json
@@ -3125,7 +3125,7 @@
     },
     "segments": {
         "44105-43223": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5911314,
                     "lon": 3.8909614,
@@ -3309,7 +3309,7 @@
             ]
         },
         "43223-43225": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5904199,
                     "lon": 3.8849928,
@@ -3403,7 +3403,7 @@
             ]
         },
         "43225-42123": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5922458,
                     "lon": 3.8802527,
@@ -3657,7 +3657,7 @@
             ]
         },
         "42123-42125": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5994208,
                     "lon": 3.8756775,
@@ -3805,7 +3805,7 @@
             ]
         },
         "42125-43127": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6030665,
                     "lon": 3.8761818,
@@ -3970,7 +3970,7 @@
             ]
         },
         "43127-43233": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6052422,
                     "lon": 3.8797131,
@@ -4042,7 +4042,7 @@
             ]
         },
         "43233-44104": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.606427,
                     "lon": 3.8766896,
@@ -4126,7 +4126,7 @@
             ]
         },
         "44104-44103": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6081335,
                     "lon": 3.8735638,
@@ -4195,7 +4195,7 @@
             ]
         },
         "44103-44102": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6116575,
                     "lon": 3.8723575,
@@ -4234,7 +4234,7 @@
             ]
         },
         "44102-41129": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6148093,
                     "lon": 3.8737906,
@@ -4314,7 +4314,7 @@
             ]
         },
         "41129-41131": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6147274,
                     "lon": 3.8782032,
@@ -4418,7 +4418,7 @@
             ]
         },
         "41131-42231": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6143022,
                     "lon": 3.8820808,
@@ -4653,7 +4653,7 @@
             ]
         },
         "42231-42233": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6139508,
                     "lon": 3.8883314,
@@ -4898,7 +4898,7 @@
             ]
         },
         "42233-41143": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6125111,
                     "lon": 3.8949065,
@@ -5053,7 +5053,7 @@
             ]
         },
         "41143-41145": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6072981,
                     "lon": 3.8939097,
@@ -5180,7 +5180,7 @@
             ]
         },
         "41145-43217": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6041858,
                     "lon": 3.8948873,
@@ -5474,7 +5474,7 @@
             ]
         },
         "43217-43219": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5994093,
                     "lon": 3.8949293,
@@ -5703,7 +5703,7 @@
             ]
         },
         "43219-44105": {
-            "points": [],
+            "nodes": [],
             "routes": [
                 [
                     "4",
@@ -5716,7 +5716,7 @@
             ]
         },
         "42125-42127": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6030665,
                     "lon": 3.8761818,
@@ -5806,7 +5806,7 @@
             ]
         },
         "42127-41138": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6044372,
                     "lon": 3.8798509,
@@ -6006,7 +6006,7 @@
             ]
         },
         "41138-41139": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6071804,
                     "lon": 3.8833017,
@@ -6234,7 +6234,7 @@
             ]
         },
         "41139-41141": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6086092,
                     "lon": 3.8866898,
@@ -6322,7 +6322,7 @@
             ]
         },
         "41141-41143": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6088993,
                     "lon": 3.8902941,
@@ -6435,7 +6435,7 @@
             ]
         },
         "44201-43139": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5912294,
                     "lon": 3.8911652,
@@ -6569,7 +6569,7 @@
             ]
         },
         "43139-43141": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5935183,
                     "lon": 3.8960726,
@@ -6798,7 +6798,7 @@
             ]
         },
         "43141-41211": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5994861,
                     "lon": 3.8950854,
@@ -7047,7 +7047,7 @@
             ]
         },
         "41211-41213": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6042503,
                     "lon": 3.8949185,
@@ -7164,7 +7164,7 @@
             ]
         },
         "41213-42137": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6073923,
                     "lon": 3.8939694,
@@ -7314,7 +7314,7 @@
             ]
         },
         "42137-42139": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6126573,
                     "lon": 3.8949896,
@@ -7539,7 +7539,7 @@
             ]
         },
         "42139-41225": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.61399,
                     "lon": 3.8881044,
@@ -7769,7 +7769,7 @@
             ]
         },
         "41225-41227": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6142312,
                     "lon": 3.8817785,
@@ -7883,7 +7883,7 @@
             ]
         },
         "41227-44202": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6147682,
                     "lon": 3.8780174,
@@ -7978,7 +7978,7 @@
             ]
         },
         "44202-44203": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6148219,
                     "lon": 3.8737427,
@@ -8022,7 +8022,7 @@
             ]
         },
         "44203-44204": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6116632,
                     "lon": 3.8722737,
@@ -8101,7 +8101,7 @@
             ]
         },
         "44204-43125": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6081132,
                     "lon": 3.8735064,
@@ -8175,7 +8175,7 @@
             ]
         },
         "43125-43231": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6063438,
                     "lon": 3.8768143,
@@ -8257,7 +8257,7 @@
             ]
         },
         "43231-42245": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6051723,
                     "lon": 3.8797962,
@@ -8397,7 +8397,7 @@
             ]
         },
         "42245-42247": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6031345,
                     "lon": 3.8759259,
@@ -8545,7 +8545,7 @@
             ]
         },
         "42247-43133": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5992903,
                     "lon": 3.8756446,
@@ -8824,7 +8824,7 @@
             ]
         },
         "43133-43135": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5921013,
                     "lon": 3.8804566,
@@ -8918,7 +8918,7 @@
             ]
         },
         "43135-44201": {
-            "points": [],
+            "nodes": [],
             "routes": [
                 [
                     "4",
@@ -8931,7 +8931,7 @@
             ]
         },
         "41213-41215": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6073923,
                     "lon": 3.8939694,
@@ -9049,7 +9049,7 @@
             ]
         },
         "41215-41217": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6089494,
                     "lon": 3.8900989,
@@ -9142,7 +9142,7 @@
             ]
         },
         "41217-41218": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6084999,
                     "lon": 3.8866241,
@@ -9355,7 +9355,7 @@
             ]
         },
         "41218-42243": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6070636,
                     "lon": 3.8831972,
@@ -9555,7 +9555,7 @@
             ]
         },
         "42243-42245": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6044596,
                     "lon": 3.8798132,
@@ -9645,7 +9645,7 @@
             ]
         },
         "42101-42103": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5748738,
                     "lon": 3.8306564,
@@ -9815,7 +9815,7 @@
             ]
         },
         "42103-42105": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5708282,
                     "lon": 3.8379052,
@@ -9935,7 +9935,7 @@
             ]
         },
         "42105-42107": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5719919,
                     "lon": 3.8444363,
@@ -9995,7 +9995,7 @@
             ]
         },
         "42107-42111": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5752209,
                     "lon": 3.8499642,
@@ -10205,7 +10205,7 @@
             ]
         },
         "42111-42113": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.583879,
                     "lon": 3.8601051,
@@ -10460,7 +10460,7 @@
             ]
         },
         "42113-42115": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5888673,
                     "lon": 3.865695,
@@ -10575,7 +10575,7 @@
             ]
         },
         "42115-42117": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5925048,
                     "lon": 3.8664382,
@@ -10690,7 +10690,7 @@
             ]
         },
         "42117-42119": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5955627,
                     "lon": 3.8679574,
@@ -10865,7 +10865,7 @@
             ]
         },
         "42119-42121": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.59358,
                     "lon": 3.8731927,
@@ -10990,7 +10990,7 @@
             ]
         },
         "42121-42123": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.594954,
                     "lon": 3.8760145,
@@ -11150,7 +11150,7 @@
             ]
         },
         "42125-41221": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6030665,
                     "lon": 3.8761818,
@@ -11330,7 +11330,7 @@
             ]
         },
         "41221-41223": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6056635,
                     "lon": 3.8802526,
@@ -11409,7 +11409,7 @@
             ]
         },
         "41223-42141": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6083781,
                     "lon": 3.8798137,
@@ -11674,7 +11674,7 @@
             ]
         },
         "42141-42143": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6144427,
                     "lon": 3.8819233,
@@ -11864,7 +11864,7 @@
             ]
         },
         "42143-42145": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6170502,
                     "lon": 3.8835972,
@@ -12069,7 +12069,7 @@
             ]
         },
         "42145-42147": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6204816,
                     "lon": 3.8840706,
@@ -12309,7 +12309,7 @@
             ]
         },
         "42147-42149": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.626274,
                     "lon": 3.8833184,
@@ -12399,7 +12399,7 @@
             ]
         },
         "42149-42151": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6267745,
                     "lon": 3.8887704,
@@ -12649,7 +12649,7 @@
             ]
         },
         "42151-42153": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.628648,
                     "lon": 3.8978384,
@@ -12769,7 +12769,7 @@
             ]
         },
         "42153-42155": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6301681,
                     "lon": 3.9026917,
@@ -12824,7 +12824,7 @@
             ]
         },
         "42155-42157": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6314509,
                     "lon": 3.90911,
@@ -12864,7 +12864,7 @@
             ]
         },
         "42157-42159": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6327881,
                     "lon": 3.9158063,
@@ -12944,7 +12944,7 @@
             ]
         },
         "42159-42163": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6342577,
                     "lon": 3.9223924,
@@ -13169,7 +13169,7 @@
             ]
         },
         "42163-42165": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.638641,
                     "lon": 3.9248354,
@@ -13489,7 +13489,7 @@
             ]
         },
         "42165-42167": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6468218,
                     "lon": 3.9294517,
@@ -13714,7 +13714,7 @@
             ]
         },
         "42167-42169": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6493863,
                     "lon": 3.9210111,
@@ -13979,7 +13979,7 @@
             ]
         },
         "42201-42203": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6544887,
                     "lon": 3.9128035,
@@ -14269,7 +14269,7 @@
             ]
         },
         "42203-42205": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6492406,
                     "lon": 3.9210503,
@@ -14514,7 +14514,7 @@
             ]
         },
         "42205-42207": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6466173,
                     "lon": 3.9294866,
@@ -14834,7 +14834,7 @@
             ]
         },
         "42207-42211": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6384876,
                     "lon": 3.9248573,
@@ -15049,7 +15049,7 @@
             ]
         },
         "42211-42213": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6342103,
                     "lon": 3.9221379,
@@ -15139,7 +15139,7 @@
             ]
         },
         "42213-42215": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6327809,
                     "lon": 3.9156202,
@@ -15179,7 +15179,7 @@
             ]
         },
         "42215-42217": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6314427,
                     "lon": 3.9089161,
@@ -15234,7 +15234,7 @@
             ]
         },
         "42217-42219": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6301628,
                     "lon": 3.9025061,
@@ -15354,7 +15354,7 @@
             ]
         },
         "42219-42221": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6285691,
                     "lon": 3.8976846,
@@ -15589,7 +15589,7 @@
             ]
         },
         "42221-42223": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6267545,
                     "lon": 3.8885806,
@@ -15689,7 +15689,7 @@
             ]
         },
         "42223-42225": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6262919,
                     "lon": 3.8830851,
@@ -15929,7 +15929,7 @@
             ]
         },
         "42225-42227": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6203407,
                     "lon": 3.884074,
@@ -16129,7 +16129,7 @@
             ]
         },
         "42227-42229": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6169338,
                     "lon": 3.8834353,
@@ -16329,7 +16329,7 @@
             ]
         },
         "42229-41133": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6144479,
                     "lon": 3.8821386,
@@ -16584,7 +16584,7 @@
             ]
         },
         "41133-41135": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6084079,
                     "lon": 3.8797702,
@@ -16668,7 +16668,7 @@
             ]
         },
         "41135-42245": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6056584,
                     "lon": 3.8801992,
@@ -16843,7 +16843,7 @@
             ]
         },
         "42247-42249": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5992903,
                     "lon": 3.8756446,
@@ -16998,7 +16998,7 @@
             ]
         },
         "42249-42251": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5948469,
                     "lon": 3.8758854,
@@ -17113,7 +17113,7 @@
             ]
         },
         "42251-42253": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5936982,
                     "lon": 3.8730593,
@@ -17278,7 +17278,7 @@
             ]
         },
         "42253-42255": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5954543,
                     "lon": 3.8677984,
@@ -17393,7 +17393,7 @@
             ]
         },
         "42255-42257": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5923385,
                     "lon": 3.8664466,
@@ -17498,7 +17498,7 @@
             ]
         },
         "42257-42259": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5887133,
                     "lon": 3.8656566,
@@ -17748,7 +17748,7 @@
             ]
         },
         "42259-42263": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5837056,
                     "lon": 3.8602074,
@@ -17973,7 +17973,7 @@
             ]
         },
         "42263-42265": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5751577,
                     "lon": 3.8497681,
@@ -18048,7 +18048,7 @@
             ]
         },
         "42265-42267": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5719914,
                     "lon": 3.8444352,
@@ -18168,7 +18168,7 @@
             ]
         },
         "42267-42269": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5708971,
                     "lon": 3.837919,
@@ -18353,7 +18353,7 @@
             ]
         },
         "43259-43261": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.570666,
                     "lon": 3.9052229,
@@ -18518,7 +18518,7 @@
             ]
         },
         "43261-43209": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5713259,
                     "lon": 3.9141537,
@@ -18828,7 +18828,7 @@
             ]
         },
         "43209-43213": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5827358,
                     "lon": 3.9256144,
@@ -19042,7 +19042,7 @@
             ]
         },
         "43213-41207": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.597799,
                     "lon": 3.9036298,
@@ -19161,7 +19161,7 @@
             ]
         },
         "41207-41209": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.601486,
                     "lon": 3.899234,
@@ -19283,7 +19283,7 @@
             ]
         },
         "41209-42237": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6006479,
                     "lon": 3.8955356,
@@ -19487,7 +19487,7 @@
             ]
         },
         "42237-42239": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6040207,
                     "lon": 3.8938614,
@@ -19611,7 +19611,7 @@
             ]
         },
         "42239-42241": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6037185,
                     "lon": 3.8889694,
@@ -19715,7 +19715,7 @@
             ]
         },
         "42241-43127": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6037618,
                     "lon": 3.8842324,
@@ -19939,7 +19939,7 @@
             ]
         },
         "43233-43235": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.606427,
                     "lon": 3.8766896,
@@ -20088,7 +20088,7 @@
             ]
         },
         "43235-43237": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6062372,
                     "lon": 3.8727299,
@@ -20167,7 +20167,7 @@
             ]
         },
         "43237-43239": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6085626,
                     "lon": 3.8681304,
@@ -20261,7 +20261,7 @@
             ]
         },
         "43239-43241": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6100217,
                     "lon": 3.8615025,
@@ -20380,7 +20380,7 @@
             ]
         },
         "43241-43243": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.610261,
                     "lon": 3.8548,
@@ -20534,7 +20534,7 @@
             ]
         },
         "43243-43245": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6114471,
                     "lon": 3.8466375,
@@ -20673,7 +20673,7 @@
             ]
         },
         "43245-43247": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6135181,
                     "lon": 3.8395235,
@@ -20907,7 +20907,7 @@
             ]
         },
         "43247-43249": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6182507,
                     "lon": 3.8391413,
@@ -21056,7 +21056,7 @@
             ]
         },
         "43249-43251": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6219189,
                     "lon": 3.8349511,
@@ -21140,7 +21140,7 @@
             ]
         },
         "43251-43253": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6195151,
                     "lon": 3.8319619,
@@ -21279,7 +21279,7 @@
             ]
         },
         "43253-43255": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6154832,
                     "lon": 3.8258568,
@@ -21468,7 +21468,7 @@
             ]
         },
         "43255-43257": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6163397,
                     "lon": 3.8196588,
@@ -21867,7 +21867,7 @@
             ]
         },
         "43201-43203": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5579564,
                     "lon": 3.9636474,
@@ -21962,7 +21962,7 @@
             ]
         },
         "43203-43205": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5654383,
                     "lon": 3.9573953,
@@ -22082,7 +22082,7 @@
             ]
         },
         "43205-43207": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5729444,
                     "lon": 3.9456566,
@@ -22187,7 +22187,7 @@
             ]
         },
         "43207-43209": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5781392,
                     "lon": 3.9350421,
@@ -22282,7 +22282,7 @@
             ]
         },
         "43101-43103": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6174206,
                     "lon": 3.8099711,
@@ -22681,7 +22681,7 @@
             ]
         },
         "43103-43105": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6161429,
                     "lon": 3.8196447,
@@ -22865,7 +22865,7 @@
             ]
         },
         "43105-43107": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6156769,
                     "lon": 3.8259015,
@@ -22989,7 +22989,7 @@
             ]
         },
         "43107-43109": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6195923,
                     "lon": 3.8321502,
@@ -23068,7 +23068,7 @@
             ]
         },
         "43109-43111": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6220087,
                     "lon": 3.8351279,
@@ -23232,7 +23232,7 @@
             ]
         },
         "43111-43113": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6174105,
                     "lon": 3.8397593,
@@ -23436,7 +23436,7 @@
             ]
         },
         "43113-43115": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6134871,
                     "lon": 3.8397933,
@@ -23575,7 +23575,7 @@
             ]
         },
         "43115-43117": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6113243,
                     "lon": 3.8467949,
@@ -23724,7 +23724,7 @@
             ]
         },
         "43117-43119": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6102597,
                     "lon": 3.855048,
@@ -23848,7 +23848,7 @@
             ]
         },
         "43119-43121": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.609864,
                     "lon": 3.8624768,
@@ -23937,7 +23937,7 @@
             ]
         },
         "43121-43123": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6085373,
                     "lon": 3.8681087,
@@ -24051,7 +24051,7 @@
             ]
         },
         "43123-43125": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6055891,
                     "lon": 3.8739545,
@@ -24220,7 +24220,7 @@
             ]
         },
         "43231-42129": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6051723,
                     "lon": 3.8797962,
@@ -24444,7 +24444,7 @@
             ]
         },
         "42129-42131": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6036345,
                     "lon": 3.8842954,
@@ -24568,7 +24568,7 @@
             ]
         },
         "42131-42133": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6037049,
                     "lon": 3.8892253,
@@ -24717,7 +24717,7 @@
             ]
         },
         "42133-41147": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.603993,
                     "lon": 3.8940022,
@@ -24961,7 +24961,7 @@
             ]
         },
         "41147-41149": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6005714,
                     "lon": 3.8955449,
@@ -25093,7 +25093,7 @@
             ]
         },
         "41149-43145": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6016996,
                     "lon": 3.8999684,
@@ -25197,7 +25197,7 @@
             ]
         },
         "43145-43149": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5977551,
                     "lon": 3.9034583,
@@ -25396,7 +25396,7 @@
             ]
         },
         "43149-43161": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5826143,
                     "lon": 3.9257823,
@@ -25691,7 +25691,7 @@
             ]
         },
         "43161-43159": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5713482,
                     "lon": 3.9139627,
@@ -25856,7 +25856,7 @@
             ]
         },
         "43149-43151": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5826143,
                     "lon": 3.9257823,
@@ -25951,7 +25951,7 @@
             ]
         },
         "43151-43153": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5779836,
                     "lon": 3.9352762,
@@ -26046,7 +26046,7 @@
             ]
         },
         "43153-43155": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5728456,
                     "lon": 3.9457963,
@@ -26191,7 +26191,7 @@
             ]
         },
         "43155-43157": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.5653949,
                     "lon": 3.9573136,
@@ -26301,7 +26301,7 @@
             ]
         },
         "41201-41261": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.603795,
                     "lon": 3.9204329,
@@ -26420,7 +26420,7 @@
             ]
         },
         "41261-41203": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6037495,
                     "lon": 3.9157023,
@@ -26554,7 +26554,7 @@
             ]
         },
         "41203-41205": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6033754,
                     "lon": 3.90986,
@@ -26653,7 +26653,7 @@
             ]
         },
         "41205-41207": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6027593,
                     "lon": 3.903967,
@@ -26722,7 +26722,7 @@
             ]
         },
         "41209-41211": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6006479,
                     "lon": 3.8955356,
@@ -26881,7 +26881,7 @@
             ]
         },
         "41218-41221": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6070636,
                     "lon": 3.8831972,
@@ -27061,7 +27061,7 @@
             ]
         },
         "41223-41225": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6083781,
                     "lon": 3.8798137,
@@ -27331,7 +27331,7 @@
             ]
         },
         "41227-41229": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6147682,
                     "lon": 3.8780174,
@@ -27446,7 +27446,7 @@
             ]
         },
         "41229-41231": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6165623,
                     "lon": 3.874061,
@@ -27615,7 +27615,7 @@
             ]
         },
         "41231-41233": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6190802,
                     "lon": 3.8695186,
@@ -27689,7 +27689,7 @@
             ]
         },
         "41233-41235": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6226771,
                     "lon": 3.868106,
@@ -27793,7 +27793,7 @@
             ]
         },
         "41235-41237": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6270831,
                     "lon": 3.8656488,
@@ -27972,7 +27972,7 @@
             ]
         },
         "41237-41239": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6291152,
                     "lon": 3.8614592,
@@ -28146,7 +28146,7 @@
             ]
         },
         "41239-41241": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6316941,
                     "lon": 3.8525865,
@@ -28225,7 +28225,7 @@
             ]
         },
         "41241-41243": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6347952,
                     "lon": 3.8483979,
@@ -28459,7 +28459,7 @@
             ]
         },
         "41243-41245": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6316074,
                     "lon": 3.8430532,
@@ -28738,7 +28738,7 @@
             ]
         },
         "41245-41247": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6346401,
                     "lon": 3.8332043,
@@ -28917,7 +28917,7 @@
             ]
         },
         "41247-41249": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6389849,
                     "lon": 3.8276286,
@@ -29016,7 +29016,7 @@
             ]
         },
         "41249-41251": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6362734,
                     "lon": 3.8226703,
@@ -29150,7 +29150,7 @@
             ]
         },
         "41251-41253": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6306938,
                     "lon": 3.8210035,
@@ -29279,7 +29279,7 @@
             ]
         },
         "41253-41263": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6275357,
                     "lon": 3.8174933,
@@ -29418,7 +29418,7 @@
             ]
         },
         "41263-41255": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6211235,
                     "lon": 3.8173578,
@@ -29587,7 +29587,7 @@
             ]
         },
         "41218-43127": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6070636,
                     "lon": 3.8831972,
@@ -29797,7 +29797,7 @@
             ]
         },
         "44102-41229": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6148093,
                     "lon": 3.8737906,
@@ -29882,7 +29882,7 @@
             ]
         },
         "41101-41163": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6162888,
                     "lon": 3.8198414,
@@ -30066,7 +30066,7 @@
             ]
         },
         "41163-41103": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6213447,
                     "lon": 3.8174028,
@@ -30200,7 +30200,7 @@
             ]
         },
         "41103-41105": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.627657,
                     "lon": 3.817535,
@@ -30339,7 +30339,7 @@
             ]
         },
         "41105-41107": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6306579,
                     "lon": 3.8212168,
@@ -30478,7 +30478,7 @@
             ]
         },
         "41107-41109": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6364094,
                     "lon": 3.822705,
@@ -30572,7 +30572,7 @@
             ]
         },
         "41109-41111": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6390018,
                     "lon": 3.8277875,
@@ -30761,7 +30761,7 @@
             ]
         },
         "41111-41113": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6345296,
                     "lon": 3.833307,
@@ -31050,7 +31050,7 @@
             ]
         },
         "41113-41115": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6316307,
                     "lon": 3.8430936,
@@ -31289,7 +31289,7 @@
             ]
         },
         "41115-41117": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.634628,
                     "lon": 3.8484797,
@@ -31368,7 +31368,7 @@
             ]
         },
         "41117-41119": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6316751,
                     "lon": 3.8525608,
@@ -31567,7 +31567,7 @@
             ]
         },
         "41119-41121": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6291563,
                     "lon": 3.8616709,
@@ -31736,7 +31736,7 @@
             ]
         },
         "41121-41123": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6269267,
                     "lon": 3.8658015,
@@ -31830,7 +31830,7 @@
             ]
         },
         "41123-41125": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6224984,
                     "lon": 3.8681444,
@@ -31884,7 +31884,7 @@
             ]
         },
         "41125-41127": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6189067,
                     "lon": 3.8694871,
@@ -32038,7 +32038,7 @@
             ]
         },
         "41127-41129": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6164766,
                     "lon": 3.8741187,
@@ -32143,7 +32143,7 @@
             ]
         },
         "41131-41133": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6143022,
                     "lon": 3.8820808,
@@ -32413,7 +32413,7 @@
             ]
         },
         "41135-41138": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6056584,
                     "lon": 3.8801992,
@@ -32613,7 +32613,7 @@
             ]
         },
         "41145-41147": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6041858,
                     "lon": 3.8948873,
@@ -32817,7 +32817,7 @@
             ]
         },
         "41149-41151": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6016996,
                     "lon": 3.8999684,
@@ -32891,7 +32891,7 @@
             ]
         },
         "41151-41153": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6027649,
                     "lon": 3.9041182,
@@ -33005,7 +33005,7 @@
             ]
         },
         "41153-41161": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6033557,
                     "lon": 3.9100221,
@@ -33149,7 +33149,7 @@
             ]
         },
         "41161-41155": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6037388,
                     "lon": 3.9157934,
@@ -33253,7 +33253,7 @@
             ]
         },
         "41127-44202": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6164766,
                     "lon": 3.8741187,
@@ -33323,7 +33323,7 @@
             ]
         },
         "43231-41138": {
-            "points": [
+            "nodes": [
                 {
                     "lat": 43.6051723,
                     "lon": 3.8797962,
diff --git a/src/tam/simulation.js b/src/tam/simulation.js
index 7fd262d..22b791e 100644
--- a/src/tam/simulation.js
+++ b/src/tam/simulation.js
@@ -147,7 +147,7 @@ class Course
             const delta = this.speed * time;
 
             const segment = this.currentSegment;
-            const length = segment.points[segment.points.length - 1].distance;
+            const length = segment.nodes[segment.nodes.length - 1].distance;
             this.traveledDistance += delta;
 
             if (this.traveledDistance >= length)
@@ -159,7 +159,7 @@ class Course
             // Recompute updated position
             const departureStop = network.stops[this.departureStop];
             const arrivalStop = network.stops[this.arrivalStop];
-            const nextNodeIndex = segment.points.findIndex(
+            const nextNodeIndex = segment.nodes.findIndex(
                 ({distance}) => distance >= this.traveledDistance);
 
             if (nextNodeIndex === 0)
@@ -171,8 +171,8 @@ class Course
             }
             else
             {
-                const previousNode = segment.points[nextNodeIndex - 1];
-                const nextNode = segment.points[nextNodeIndex];
+                const previousNode = segment.nodes[nextNodeIndex - 1];
+                const nextNode = segment.nodes[nextNodeIndex];
 
                 const previousPoint = turf.toMercator([
                     previousNode.lon,
@@ -271,7 +271,7 @@ with initial speed ${this.computeTheoreticalSpeed() * 3600} km/h`);
         }
 
         const segment = this.currentSegment;
-        const length = segment.points[segment.points.length - 1].distance;
+        const length = segment.nodes[segment.nodes.length - 1].distance;
 
         const remainingTime = this.arrivalTime - Date.now();
         const remainingDistance = length - this.traveledDistance;