Merge branch 'develop' of...

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emquarima/vecto-sim into feature/VECTO-110-documentation

DeclarationCycleZip/Program.cs

@@ -52,9 +52,14 @@ namespace DeclarationCycleZip
 			table.Columns.Add("<stop>");
 
 			var lastDistance = cycleData.Entries.First().Distance - 1.SI<Meter>();
+			DrivingCycleData.DrivingCycleEntry prevEntry = null;
 			foreach (var x in cycleData.Entries) {
 				if (x.Distance.IsEqual(lastDistance)) {
-					continue;
+					if (prevEntry != null && prevEntry.VehicleTargetSpeed.IsEqual(0.SI<MeterPerSecond>())) {
+						x.Distance = x.Distance + 1.SI<Meter>();
+					} else {
+						continue;
+					}
 				}
 				var row = table.NewRow();
 				row["<s>"] = x.Distance.Value().ToString(CultureInfo.InvariantCulture);
@@ -63,6 +68,7 @@ namespace DeclarationCycleZip
 				row["<stop>"] = x.StoppingTime.Value().ToString(CultureInfo.InvariantCulture);
 				table.Rows.Add(row);
 				lastDistance = x.Distance;
+				prevEntry = x;
 			}
 
 			VectoCSVFile.Write(Path.GetFileName(args[0]), table);

VECTO.sln

 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VECTO", "VECTO\VECTO.vbproj", "{AAC0F132-0A9F-45B3-B682-77AC9B24B352}"
 EndProject

VectoCore/InputData/Reader/DrivingCycleDataReader.cs

@@ -204,6 +204,8 @@ namespace TUGraz.VectoCore.InputData.Reader
 					// vehicle stops. duplicate current distance entry with 0 waiting time
 					var tmp = new DrivingCycleData.DrivingCycleEntry(entry) {
 						StoppingTime = 0.SI<Second>(),
+						RoadGradient = entry.RoadGradient,
+						RoadGradientPercent = entry.RoadGradientPercent,
 						VehicleTargetSpeed = i < entries.Count - 1 ? entries[i + 1].VehicleTargetSpeed : 0.SI<MeterPerSecond>()
 					};
 					filtered.Add(tmp);

VectoCore/Resources/Declaration/MissionCycles/Coach.vdri

-<s>,<v>,<grad>,<stop>
+<s>,<v>,<grad>,<stop>
 0,0,-0.020237973270086,2
+1,64,-0.020237973270086,0
 69,64,-0.175306591975122,0
 89,64,-0.295483883884611,0
 119,64,-0.407019169249986,0
@@ -2412,6 +2413,7 @@
 110632,34,3.03118811718217,0
 110649,34,2.84237203678016,0
 110651,0,2.84237203678016,40
+110652,18,2.84237203678016,0
 110669,18,2.65355595637815,0
 110689,18,2.46473987597614,0
 110709,18,2.27592379557413,0
@@ -2427,6 +2429,7 @@
 111539,11,3.11578269004649,0
 111569,11,2.97289736341333,0
 111575,0,2.97289736341333,40
+111576,20,2.97289736341333,0
 111599,20,2.85162650914198,0
 111629,20,2.73035565487063,0
 111659,20,2.48222399657918,0
@@ -2922,6 +2925,7 @@
 128539,54,0.0786439463279041,0
 128554,34,0.0786439463279041,0
 128613,0,0.0786439463279041,40
+128614,20,0.0786439463279041,0
 128879,20,0.208775906126899,0
 128899,20,0.326578921202276,0
 128919,20,0.444381936277653,0
@@ -2968,6 +2972,7 @@
 129889,18,1.9807123382877,0
 129931,11,1.9807123382877,0
 129950,0,1.9807123382877,40
+129951,21,1.9807123382877,0
 130139,21,2.29627535336308,0
 130149,21,2.79627535336308,0
 130159,21,3.29627535336308,0
@@ -3181,6 +3186,7 @@
 133999,54,4.16991263979525,0
 134001,34,4.16991263979525,0
 134014,0,4.16991263979525,40
+134015,10,4.16991263979525,0
 134029,10,4.27845083075002,0
 134059,10,4.03912851919223,0
 134069,10,3.64048228803645,0
@@ -4491,6 +4497,7 @@
 171949,34,-3.19892474713944,0
 171959,34,-3.07243660643592,0
 171960,0,-3.07243660643592,40
+171961,18,-3.07243660643592,0
 171969,18,-2.93232555115954,0
 171979,18,-2.79221449588315,0
 171989,18,-2.65210344060677,0
@@ -5077,6 +5084,7 @@
 192249,34,0.271533443815342,0
 192259,34,0.416665102106798,0
 192363,0,0.416665102106798,40
+192364,18,0.416665102106798,0
 192419,18,0.295389071956043,0
 192439,18,0.151603142307804,0
 192459,18,0.00781721265956232,0
@@ -5340,6 +5348,7 @@
 200059,34,1.02839711215705,0
 200079,34,1.22797902170479,0
 200085,0,1.22797902170479,40
+200086,18,1.22797902170479,0
 200089,18,1.33323570512187,0
 200099,18,1.45471359456911,0
 200109,18,1.59104625788569,0

VectoCore/Resources/Declaration/MissionCycles/LongHaul.vdri

-<s>,<v>,<grad>,<stop>
+<s>,<v>,<grad>,<stop>
 0,0,-0.8925,1
-1,83,-0.89543478,0
+1,83,-0.8925,0
 2,83,-0.89836957,0
 3,83,-0.90130435,0
 4,83,-0.90423913,0
@@ -2697,7 +2697,7 @@
 2915,85,-1.672,0
 2916,85,-1.506,0
 2917,0,-1.34,45
-2918,79,-1.174,0
+2918,79,-1.34,0
 2919,79,-1.008,0
 2920,79,-0.842,0
 2921,79,-0.676,0
@@ -57732,7 +57732,7 @@
 61991,83,-1.61,0
 61992,83,-1.6,0
 61993,0,-1.59,10
-61994,15,-1.58,0
+61994,15,-1.59,0
 61995,15,-1.46,0
 61996,15,-1.25,0
 61997,15,-1.13,0
@@ -57827,7 +57827,7 @@
 62086,15,-0.115,0
 62087,15,-0.04,0
 62088,0,0.025714286,10
-62089,83,0.091428571,0
+62089,83,0.025714286,0
 62090,83,0.15714286,0
 62091,83,0.22285714,0
 62092,83,0.28857143,0
@@ -92935,4 +92935,4 @@
 100182,83,-0.875,0
 100183,83,-0.879375,0
 100184,83,-0.88375,0
-100185,0,-0.888125,1
+100185,0,-0.888125,1
\ No newline at end of file

VectoCore/Resources/Declaration/MissionCycles/RegionalDelivery.vdri

-<s>,<v>,<grad>,<stop>
+<s>,<v>,<grad>,<stop>
 0,0,0.0102453667268308,2
+1,45,0.0102453667268308,0
 10,45,0.510245366726831,0
 20,45,1.01024536672683,0
 30,45,1.51024536672683,0
@@ -45,6 +46,7 @@
 490,14.3,-0.144585141747746,0
 500,14.3,0.134821637913271,0
 504,0,0.134821637913271,25
+505,37,0.134821637913271,0
 510,37,0.383974180286153,0
 520,37,0.528126722659034,0
 560,37,0.394652146387848,0
@@ -160,6 +162,7 @@
 2010,20,-1.87263598920537,0
 2050,20,-1.58433090445961,0
 2052,0,-1.58433090445961,30
+2053,71,-1.58433090445961,0
 2060,71,-1.46509361632402,0
 2080,71,-1.23551734513757,0
 2090,71,-0.95255124344266,0
@@ -660,6 +663,7 @@
 9060,46,2.66236401079463,0
 9070,46,2.16236401079463,0
 9072,0,2.16236401079463,30
+9073,26,2.16236401079463,0
 9080,26,1.66236401079463,0
 9090,26,1.16236401079463,0
 9100,26,0.662364010794628,0
@@ -680,6 +684,7 @@
 9240,20,-2.86594107395113,0
 9250,20,-2.36594107395113,0
 9252,0,-2.36594107395113,25
+9253,15,-2.36594107395113,0
 9260,15,-1.86594107395113,0
 9270,15,-1.36594107395113,0
 9280,15,-0.865941073951134,0

VectoCore/Resources/Declaration/MissionCycles/Suburban.vdri

-<s>,<v>,<grad>,<stop>
+<s>,<v>,<grad>,<stop>
 0,0,-3.3,3.2
+1,32.3,-3.3,0
 2,32.3,-3.1,0
 3,32.3,-2.9,0
 4,32.3,-2.8,0
@@ -69,7 +70,7 @@
 273,52.3,-2.4,0
 274,52.3,-2.6,0
 275,0,-2.5,2
-276,18.5,-2.1,0
+276,18.5,-2.5,0
 277,18.5,-2,0
 278,18.5,-1.9,0
 280,18.5,-1.8,0
@@ -111,7 +112,7 @@
 423,37,-0.1,0
 424,37,-0.3,0
 425,0,-0.8,12.4
-426,55.2,-0.4,0
+426,55.2,-0.8,0
 427,55.2,-0.3,0
 428,55.2,-0.2,0
 439,55.2,-0.3,0
@@ -188,7 +189,7 @@
 813,43.6,-2.5,0
 814,43.6,-1.9,0
 815,0,-2.7,3.6
-816,39.6,-2.3,0
+816,39.6,-2.7,0
 817,39.6,-2.2,0
 822,39.6,-2.1,0
 830,39.6,-2,0
@@ -295,7 +296,7 @@
 1586,46,-1.2,0
 1587,46,-1.3,0
 1588,0,-0.7,32.4
-1589,15.8,-1.1,0
+1589,15.8,-0.7,0
 1590,15.8,-1,0
 1591,15.8,-0.9,0
 1593,15.8,-0.8,0
@@ -330,7 +331,7 @@
 1772,42.2,0.4,0
 1773,42.2,0,0
 1774,0,0.1,12
-1775,16.7,0.4,0
+1775,16.7,0.1,0
 1776,16.7,0.5,0
 1777,16.7,0.6,0
 1779,16.7,0.7,0
@@ -354,7 +355,7 @@
 1863,32,-1,0
 1864,32,-1.2,0
 1865,0,-0.7,23.8
-1866,41.3,-1.2,0
+1866,41.3,-0.7,0
 1867,41.3,-1.1,0
 1869,41.3,-1,0
 1873,41.3,-0.9,0
@@ -426,13 +427,14 @@
 2298,12.3,-0.6,0
 2299,12.3,-0.8,0
 2300,0,-0.5,2
-2301,12.3,-0.4,0
+2301,12.3,-0.5,0
 2302,12.3,-0.3,0
 2304,12.3,-0.2,0
 2309,12.3,-0.3,0
 2315,12.3,-0.4,0
 2316,12.3,-0.5,0
 2322,0,-0.6,1.2
+2323,10.6,-0.6,0
 2324,10.6,-0.4,0
 2325,10.6,-0.3,0
 2326,10.6,-0.2,0
@@ -456,7 +458,7 @@
 2412,27,0.1,0
 2413,27,-0.1,0
 2414,0,0.4,9.6
-2415,23.9,-0.2,0
+2415,23.9,0.4,0
 2416,23.9,-0.1,0
 2417,23.9,0,0
 2418,23.9,0.1,0
@@ -467,7 +469,7 @@
 2499,23.9,0,0
 2500,23.9,-0.3,0
 2501,0,0.1,6.8
-2502,30.7,-0.2,0
+2502,30.7,0.1,0
 2503,30.7,0.1,0
 2505,30.7,0.2,0
 2506,30.7,0.3,0
@@ -492,7 +494,7 @@
 2587,30.7,0.8,0
 2588,30.7,0.5,0
 2589,0,1.4,7.6
-2590,50.1,0.8,0
+2590,50.1,1.4,0
 2591,50.1,1,0
 2599,50.1,0.9,0
 2603,50.1,0.8,0
@@ -537,7 +539,7 @@
 2917,50.1,-2.1,0
 2918,50.1,-2.5,0
 2919,0,-3,21.4
-2920,48.7,-2.2,0
+2920,48.7,-3,0
 2921,48.7,-2.1,0
 2922,48.7,-2,0
 2924,48.7,-1.9,0
@@ -611,7 +613,7 @@
 3204,35.1,-2.8,0
 3205,35.1,-3.2,0
 3206,0,-2.6,10.4
-3207,19,-3.5,0
+3207,19,-2.6,0
 3208,19,-3.3,0
 3209,19,-3.4,0
 3210,19,-3.3,0
@@ -695,7 +697,7 @@
 3448,12.3,2.1,0
 3450,12.3,2.2,0
 3459,0,2,21.2
-3460,32,2.4,0
+3460,32,2,0
 3461,32,2,0
 3462,32,2.2,0
 3463,32,2.4,0
@@ -752,7 +754,7 @@
 3680,26.1,-1.1,0
 3681,26.1,-1.2,0
 3682,0,-1,16.2
-3683,29.3,-0.7,0
+3683,29.3,-1,0
 3684,29.3,-0.5,0
 3685,29.3,-0.4,0
 3686,29.3,-0.3,0
@@ -815,7 +817,7 @@
 4069,32.1,-0.5,0
 4072,32.1,-0.6,0
 4073,0,-0.9,9.6
-4074,23.1,-1.1,0
+4074,23.1,-0.9,0
 4075,23.1,-0.9,0
 4076,23.1,-0.7,0
 4077,23.1,-0.6,0
@@ -824,7 +826,7 @@
 4124,23.1,-0.8,0
 4125,23.1,-1.1,0
 4126,0,-0.3,3.8
-4127,35.7,-1.1,0
+4127,35.7,-0.3,0
 4128,35.7,-0.7,0
 4129,35.7,-0.6,0
 4131,35.7,-0.5,0
@@ -856,7 +858,7 @@
 4289,30.7,1,0
 4307,30.7,0.9,0
 4309,0,0.6,2
-4310,32.5,0.3,0
+4310,32.5,0.6,0
 4311,32.5,0.7,0
 4312,32.5,0.8,0
 4313,32.5,0.9,0
@@ -1006,7 +1008,7 @@
 5239,45.1,1.5,0
 5240,45.1,1.3,0
 5241,0,0.9,14.8
-5242,35.4,1.5,0
+5242,35.4,0.9,0
 5243,35.4,1.6,0
 5244,35.4,1.7,0
 5245,35.4,1.8,0
@@ -1095,7 +1097,7 @@
 5852,54.9,-1.6,0
 5855,54.9,-1.9,0
 5856,0,-2.3,4.2
-5857,47.2,-1.7,0
+5857,47.2,-2.3,0
 5858,47.2,-1.6,0
 5859,47.2,-1.5,0
 5860,47.2,-1.4,0
@@ -1425,7 +1427,7 @@
 8515,42.5,1.4,0
 8523,42.5,1.2,0
 8524,0,0.8,10.8
-8525,36.3,1.1,0
+8525,36.3,0.8,0
 8526,36.3,1.2,0
 8527,36.3,1.3,0
 8528,36.3,1.4,0
@@ -1470,7 +1472,7 @@
 8842,27.4,0.6,0
 8843,27.4,0.2,0
 8844,0,0.2,21.2
-8845,33.8,0.5,0
+8845,33.8,0.2,0
 8846,33.8,0.6,0
 8847,33.8,0.7,0
 8849,33.8,0.8,0
@@ -1564,7 +1566,7 @@
 9357,34.2,-0.4,0
 9359,34.2,-0.7,0
 9360,0,-0.5,8.8
-9361,34.2,-0.3,0
+9361,34.2,-0.5,0
 9362,34.2,-0.2,0
 9364,34.2,-0.1,0
 9367,34.2,0,0
@@ -1648,7 +1650,7 @@
 9949,37.7,0.3,0
 9950,37.7,0,0
 9951,0,-0.1,7.4
-9952,37,0.2,0
+9952,37,-0.1,0
 9953,37,0.3,0
 9963,37,0.2,0
 9968,37,0.1,0
@@ -1713,7 +1715,7 @@
 10396,36.4,-0.2,0
 10397,36.4,-0.6,0
 10398,0,-0.5,8.8
-10399,29.1,-0.3,0
+10399,29.1,-0.5,0
 10400,29.1,-0.2,0
 10401,29.1,-0.1,0
 10404,29.1,0,0
@@ -1896,7 +1898,7 @@
 11777,35.1,-0.9,0
 11778,35.1,-1.2,0
 11779,0,-1.3,12.2
-11780,26.6,-0.9,0
+11780,26.6,-1.3,0
 11781,26.6,-0.8,0
 11782,26.6,-0.7,0
 11783,26.6,-0.6,0
@@ -2050,7 +2052,7 @@
 13253,61.3,-1.1,0
 13254,61.3,-1.3,0
 13255,0,-1.8,13.6
-13256,57.5,-1,0
+13256,57.5,-1.8,0
 13257,57.5,-0.9,0
 13258,57.5,-0.8,0
 13259,57.5,-0.7,0
@@ -2116,7 +2118,7 @@
 13608,57.5,-2.5,0
 13618,57.5,-2.7,0
 13619,0,-2.1,6
-13620,25,-2.5,0
+13620,25,-2.1,0
 13621,25,-2.3,0
 13622,25,-2.2,0
 13623,25,-2.1,0
@@ -2211,7 +2213,7 @@
 14071,30.4,-1.7,0
 14072,30.4,-1.9,0
 14073,0,-2.5,12.4
-14074,42.7,-1.8,0
+14074,42.7,-2.5,0
 14075,42.7,-1.7,0
 14076,42.7,-1.6,0
 14078,42.7,-1.5,0
@@ -2385,7 +2387,7 @@
 15262,24.4,0.3,0
 15263,24.4,0,0
 15264,0,0.1,11
-15265,31.4,0.3,0
+15265,31.4,0.1,0
 15266,31.4,0.4,0
 15267,31.4,0.5,0
 15269,31.4,0.6,0
@@ -2440,7 +2442,7 @@
 15649,28.4,-1.4,0
 15650,28.4,-1.6,0
 15651,0,-2.3,7.6
-15652,22.5,-1.9,0
+15652,22.5,-2.3,0
 15653,22.5,-1.8,0
 15654,22.5,-1.5,0
 15655,22.5,-1.4,0
@@ -2551,7 +2553,7 @@
 16502,26.1,0.8,0
 16503,26.1,0.7,0
 16504,0,-0.1,11.4
-16505,32.4,0.2,0
+16505,32.4,-0.1,0
 16506,32.4,0.5,0
 16507,32.4,0.6,0
 16508,32.4,0.7,0
@@ -2602,7 +2604,7 @@
 16823,34.7,0.4,0
 16825,34.7,0.2,0
 16826,0,-0.3,6
-16827,35.6,0.3,0
+16827,35.6,-0.3,0
 16828,35.6,0.4,0
 16829,35.6,0.5,0
 16832,35.6,0.6,0
@@ -2654,7 +2656,7 @@
 17101,22.9,-0.2,0
 17102,22.9,-0.5,0
 17103,0,0,11
-17104,21.8,-0.2,0
+17104,21.8,0,0
 17105,21.8,0.1,0
 17106,21.8,0.2,0
 17107,21.8,0.3,0
@@ -2749,7 +2751,7 @@
 17734,32.8,0,0
 17735,32.8,-0.3,0
 17736,0,-0.8,13.6
-17737,30.9,-0.2,0
+17737,30.9,-0.8,0
 17738,30.9,0.1,0
 17739,30.9,0.2,0
 17741,30.9,0.3,0
@@ -2772,7 +2774,7 @@
 17839,10,-0.8,0
 17840,10,-1.1,0
 17841,0,-0.4,19
-17842,33.5,-1.4,0
+17842,33.5,-0.4,0
 17843,33.5,-0.9,0
 17844,33.5,-0.8,0
 17846,33.5,-0.7,0
@@ -2884,7 +2886,7 @@
 18354,40.1,0.8,0
 18355,40.1,0.6,0
 18356,0,0.2,12.8
-18357,45.7,0.4,0
+18357,45.7,0.2,0
 18358,45.7,0.6,0
 18359,45.7,0.7,0
 18360,45.7,0.8,0
@@ -2952,7 +2954,7 @@
 18985,35.2,0.4,0
 18986,35.2,0.1,0
 18987,0,0.9,13
-18988,63.5,0.4,0
+18988,63.5,0.9,0
 18989,63.5,0.5,0
 18990,63.5,0.6,0
 18991,63.5,0.7,0
@@ -2993,7 +2995,7 @@
 19369,63.5,-1.1,0
 19370,63.5,-1.7,0
 19371,0,-1.1,27
-19372,27.8,-0.9,0
+19372,27.8,-1.1,0
 19373,27.8,-0.8,0
 19374,27.8,-0.7,0
 19376,27.8,-0.6,0
@@ -3007,7 +3009,7 @@
 19455,27.8,0,0
 19456,27.8,-0.4,0
 19457,0,-0.5,9.4
-19458,49.8,0,0
+19458,49.8,-0.5,0
 19459,49.8,0.1,0
 19460,49.8,0.2,0
 19461,49.8,0.3,0
@@ -3057,7 +3059,7 @@
 19857,54.4,-1.7,0
 19858,54.4,-2.3,0
 19859,0,-2,22.2
-19860,20.4,-1.3,0
+19860,20.4,-2,0
 19861,20.4,-1.2,0
 19862,20.4,-1.1,0
 19863,20.4,-1,0
@@ -3328,7 +3330,7 @@
 21508,56.4,-0.3,0
 21521,56.4,-0.5,0
 21522,0,-1.2,8
-21523,49.3,-0.4,0
+21523,49.3,-1.2,0
 21524,49.3,-0.3,0
 21526,49.3,-0.2,0
 21527,49.3,-0.1,0
@@ -3389,7 +3391,7 @@
 21931,30.8,-0.5,0
 21932,30.8,-0.7,0
 21933,0,-1.6,10.8
-21934,28.1,-0.9,0
+21934,28.1,-1.6,0
 21935,28.1,-0.8,0
 21936,28.1,-0.7,0
 21939,28.1,-0.8,0
@@ -3528,7 +3530,7 @@
 22528,55.7,-1,0
 22532,55.7,-1.1,0
 22533,0,-1.7,21.6
-22534,26.6,-1.1,0
+22534,26.6,-1.7,0
 22535,26.6,-0.8,0
 22536,26.6,-0.7,0
 22537,26.6,-0.6,0
@@ -3593,7 +3595,7 @@
 22845,50.6,-0.2,0
 22846,50.6,-0.4,0
 22847,0,-0.7,17.2
-22848,60.2,-0.1,0
+22848,60.2,-0.7,0
 22849,60.2,0.1,0
 22851,60.2,0.2,0
 22852,60.2,0.3,0

VectoCore/Resources/Declaration/MissionCycles/Urban.vdri

-<s>,<v>,<grad>,<stop>
+<s>,<v>,<grad>,<stop>
 0,0,-7,12.6
-1,23.7,-6.9,0
+1,23.7,-7,0
 2,23.7,-7,0
 5,23.7,-7.1,0
 10,23.7,-7.2,0
@@ -115,7 +115,7 @@
 165,14.1,3.8,0
 166,14.1,3.7,0
 167,0,3.4,5.6
-168,31.2,3.3,0
+168,31.2,3.4,0
 169,31.2,3.1,0
 170,31.2,2.9,0
 171,31.2,2.8,0
@@ -257,6 +257,7 @@
 628,18.4,0.6,0
 640,18.4,0.7,0
 661,0,0.7,5.2
+662,28.9,0.7,0
 668,28.9,0.6,0
 676,28.9,0.5,0
 685,28.9,0.4,0
@@ -279,7 +280,7 @@
 872,28.9,0.9,0
 876,28.9,0.8,0
 878,0,0.8,32.6
-879,13.6,0.7,0
+879,13.6,0.8,0
 880,13.6,0.6,0
 882,13.6,0.5,0
 883,13.6,0.4,0
@@ -407,7 +408,7 @@
 1185,33.3,-0.1,0
 1187,33.3,0,0
 1188,0,0.1,25.4
-1189,34.2,0.2,0
+1189,34.2,0.1,0
 1191,34.2,0.3,0
 1193,34.2,0.4,0
 1195,34.2,0.5,0
@@ -482,6 +483,7 @@
 1391,34.2,2.6,0
 1392,34.2,2.5,0
 1393,0,2.3,57.2
+1394,31.3,2.3,0
 1395,31.3,2.2,0
 1397,31.3,2.1,0
 1398,31.3,2,0
@@ -673,7 +675,7 @@
 2022,33.7,2.2,0
 2025,33.7,2.3,0
 2027,0,2.3,5
-2028,18.8,2.4,0
+2028,18.8,2.3,0
 2032,18.8,2.5,0
 2037,18.8,2.6,0
 2042,18.8,2.7,0
@@ -688,7 +690,7 @@
 2111,14.3,3.5,0
 2115,14.3,3.6,0
 2135,0,3.6,23.8
-2136,11.1,3.7,0
+2136,11.1,3.6,0
 2137,11.1,3.6,0
 2141,11.1,3.5,0
 2144,11.1,3.4,0
@@ -830,7 +832,7 @@
 2354,27.8,-3.6,0
 2355,27.8,-3.5,0
 2356,0,-3.3,55
-2357,35.1,-3.1,0
+2357,35.1,-3.3,0
 2358,35.1,-3,0
 2359,35.1,-2.9,0
 2360,35.1,-2.7,0
@@ -906,7 +908,7 @@
 2528,35.1,1.4,0
 2530,35.1,1.5,0
 2531,0,1.6,35.8
-2532,38.9,1.7,0
+2532,38.9,1.6,0
 2533,38.9,1.8,0
 2534,38.9,1.9,0
 2536,38.9,2,0
@@ -1027,7 +1029,7 @@
 2983,32.9,7.2,0
 2988,32.9,7.3,0
 2990,0,7.3,20.8
-2991,10,7.2,0
+2991,10,7.3,0
 2994,10,7.1,0
 2996,10,7,0
 2997,10,6.9,0
@@ -1041,7 +1043,7 @@
 3006,10,6.1,0
 3007,10,6,0
 3008,0,5.8,2
-3009,20.9,5.7,0
+3009,20.9,5.8,0
 3010,20.9,5.6,0
 3011,20.9,5.4,0
 3012,20.9,5.3,0
@@ -1127,6 +1129,7 @@
 3313,43.4,1.1,0
 3315,43.4,1.2,0
 3316,0,1.2,22
+3317,18.7,1.2,0
 3318,18.7,1.3,0
 3322,18.7,1.4,0
 3339,18.7,1.3,0
@@ -1220,6 +1223,7 @@
 3689,47.1,0.3,0
 3696,47.1,0.2,0
 3701,0,0.2,23.2
+3702,45.5,0.2,0
 3704,45.5,0.1,0
 3710,45.5,0,0
 3717,45.5,-0.1,0
@@ -1285,6 +1289,7 @@
 4210,45.5,2.3,0
 4212,45.5,2.4,0
 4213,0,2.4,10.2
+4214,51.5,2.4,0
 4216,51.5,2.5,0
 4221,51.5,2.6,0
 4234,51.5,2.5,0
@@ -1393,6 +1398,7 @@
 5071,59.4,2.2,0
 5076,59.4,2.3,0
 5077,0,2.3,8.6
+5078,44.2,2.3,0
 5084,44.2,2.2,0
 5091,44.2,2.1,0
 5094,44.2,2,0
@@ -1466,7 +1472,7 @@
 5366,44.2,4.5,0
 5367,44.2,4.6,0
 5368,0,4.7,32.4
-5369,32.2,4.8,0
+5369,32.2,4.7,0
 5370,32.2,4.9,0
 5372,32.2,5,0
 5373,32.2,5.1,0
@@ -1554,6 +1560,7 @@
 5572,35.5,-4.6,0
 5592,35.5,-4.5,0
 5595,0,-4.5,9.4
+5596,38.4,-4.5,0
 5597,38.4,-4.4,0
 5602,38.4,-4.3,0
 5606,38.4,-4.2,0
@@ -1661,7 +1668,7 @@
 6118,39.9,2.7,0
 6119,39.9,2.8,0
 6120,0,2.8,21
-6121,50,2.9,0
+6121,50,2.8,0
 6122,50,3,0
 6124,50,3.1,0
 6125,50,3.2,0
@@ -1811,7 +1818,7 @@
 7436,34.5,4.3,0
 7439,34.5,4.4,0
 7443,0,4.4,51.2
-7444,43.4,4.5,0
+7444,43.4,4.4,0
 7455,43.4,4.4,0
 7459,43.4,4.3,0
 7462,43.4,4.2,0
@@ -1973,6 +1980,7 @@
 7996,33.8,-1.2,0
 7998,33.8,-1.3,0
 7999,0,-1.3,73.8
+8000,27.8,-1.3,0
 8001,27.8,-1.4,0
 8003,27.8,-1.5,0
 8006,27.8,-1.6,0
@@ -2043,6 +2051,7 @@
 8157,17.9,-4,0
 8160,17.9,-4.1,0
 8169,0,-4.1,7.8
+8170,28.5,-4.1,0
 8173,28.5,-4,0
 8176,28.5,-3.9,0
 8178,28.5,-3.8,0
@@ -2138,7 +2147,7 @@
 8480,23.6,0.2,0
 8489,23.6,0.3,0
 8498,0,0.4,25.6
-8499,28.6,0.3,0
+8499,28.6,0.4,0
 8519,28.6,0.2,0
 8527,28.6,0.1,0
 8534,28.6,0,0
@@ -2255,7 +2264,7 @@
 9098,33.4,3.2,0
 9099,33.4,3.3,0
 9100,0,3.4,14.4
-9101,10,3.5,0
+9101,10,3.4,0
 9102,10,3.6,0
 9103,10,3.7,0
 9104,10,3.8,0
@@ -2267,6 +2276,7 @@
 9116,10,4.4,0
 9117,10,4.3,0
 9118,0,4.3,13.6
+9119,14.5,4.3,0
 9121,14.5,4.2,0
 9123,14.5,4.1,0
 9125,14.5,4,0
@@ -2410,6 +2420,7 @@
 9519,17.5,0.1,0
 9520,17.5,0.2,0
 9522,0,0.3,18.6
+9523,20.4,0.3,0
 9524,20.4,0.4,0
 9526,20.4,0.5,0
 9528,20.4,0.6,0
@@ -2553,13 +2564,13 @@
 10315,33.4,1.9,0
 10320,33.4,2,0
 10344,0,2,13.2
-10345,17.4,2.1,0
+10345,17.4,2,0
 10346,17.4,2,0
 10352,17.4,1.9,0
 10363,17.4,1.8,0
 10378,17.4,1.7,0
 10385,0,1.8,4
-10386,47.1,1.7,0
+10386,47.1,1.8,0
 10396,47.1,1.6,0
 10409,47.1,1.5,0
 10417,47.1,1.4,0
@@ -2599,7 +2610,7 @@
 10726,47.1,0.2,0
 10738,47.1,0.4,0
 10774,0,0.4,43.2
-10775,33.5,0.3,0
+10775,33.5,0.4,0
 10781,33.5,0.4,0
 10788,33.5,0.5,0
 10794,33.5,0.6,0
@@ -2713,7 +2724,7 @@
 11159,25.1,3.7,0
 11161,25.1,3.6,0
 11162,0,3.6,18.8
-11163,15.4,3.5,0
+11163,15.4,3.6,0
 11164,15.4,3.4,0
 11165,15.4,3.3,0
 11167,15.4,3.2,0
@@ -2936,6 +2947,7 @@
 11675,41.3,-1.8,0
 11681,41.3,-1.6,0
 11683,0,-1.6,17
+11684,40.3,-1.6,0
 11687,40.3,-1.5,0
 11689,40.3,-1.4,0
 11691,40.3,-1.3,0
@@ -3030,7 +3042,7 @@
 11957,34,-3.8,0
 11959,34,-3.9,0
 11960,0,-4,32.6
-11961,29.6,-4.1,0
+11961,29.6,-4,0
 11963,29.6,-4.2,0
 11964,29.6,-4.3,0
 11966,29.6,-4.4,0
@@ -3167,7 +3179,7 @@
 12332,44.2,4,0
 12333,44.2,4.2,0
 12334,0,4.4,22
-12335,33.4,4.6,0
+12335,33.4,4.4,0
 12336,33.4,4.8,0
 12337,33.4,4.9,0
 12338,33.4,5.1,0
@@ -3292,7 +3304,7 @@
 12664,33.4,-0.2,0
 12667,33.4,-0.3,0
 12668,0,-0.3,7.8
-12669,34.8,-0.4,0
+12669,34.8,-0.3,0
 12671,34.8,-0.5,0
 12672,34.8,-0.6,0
 12674,34.8,-0.7,0
@@ -3365,6 +3377,7 @@
 12814,34.8,2.2,0
 12820,34.8,2,0
 12824,0,2,0.8
+12825,48.3,2,0
 12827,48.3,1.9,0
 12829,48.3,1.8,0
 12832,48.3,1.7,0
@@ -3423,7 +3436,7 @@
 13083,48.3,0.2,0
 13088,48.3,0,0
 13091,0,0,15
-13092,41.7,0.1,0
+13092,41.7,0,0
 13093,41.7,0,0
 13100,41.7,-0.1,0
 13114,41.7,-0.2,0
@@ -3455,6 +3468,7 @@
 13585,45.7,0.4,0
 13593,45.7,0.3,0
 13605,0,0.3,17
+13606,62.7,0.3,0
 13607,62.7,0.2,0
 13613,62.7,0.1,0
 13631,62.7,0,0
@@ -3500,7 +3514,7 @@
 14138,62.7,3.8,0
 14142,62.7,3.9,0
 14146,0,3.9,12.2
-14147,33.4,4,0
+14147,33.4,3.9,0
 14151,33.4,3.9,0
 14159,33.4,3.8,0
 14162,33.4,3.7,0
@@ -3558,6 +3572,7 @@
 14250,33.4,-4.1,0
 14253,33.4,-4.2,0
 14254,0,-4.2,18.4
+14255,28.2,-4.2,0
 14257,28.2,-4.3,0
 14265,28.2,-4.2,0
 14269,28.2,-4.1,0
@@ -3606,6 +3621,7 @@
 14345,28.2,0.6,0
 14348,28.2,0.7,0
 14349,0,0.7,11.6
+14350,44,0.7,0
 14353,44,0.8,0
 14358,44,0.9,0
 14363,44,1,0
@@ -3636,6 +3652,7 @@
 14562,44,0.1,0
 14570,44,0,0
 14578,0,0,20.6
+14579,49.6,0,0
 14580,49.6,-0.1,0
 14584,49.6,-0.2,0
 14590,49.6,-0.3,0
@@ -3670,7 +3687,7 @@
 14827,49.6,-0.6,0
 14831,49.6,-0.5,0
 14835,0,-0.5,10.8
-14836,45.5,-0.4,0
+14836,45.5,-0.5,0
 14839,45.5,-0.3,0
 14844,45.5,-0.2,0
 14851,45.5,-0.1,0
@@ -3698,7 +3715,7 @@
 15115,45.5,1.7,0
 15121,45.5,1.8,0
 15140,0,1.7,9
-15141,55.2,1.8,0
+15141,55.2,1.7,0
 15142,55.2,1.7,0
 15147,55.2,1.6,0
 15151,55.2,1.5,0
@@ -3738,7 +3755,7 @@
 15614,46.8,0.2,0
 15624,46.8,0.4,0
 15628,0,0.4,11
-15629,53.4,0.3,0
+15629,53.4,0.4,0
 15635,53.4,0.4,0
 15646,53.4,0.5,0
 15655,53.4,0.6,0
@@ -3774,6 +3791,7 @@
 16197,60.8,1.3,0
 16208,60.8,1.4,0
 16215,0,1.4,9
+16216,48.6,1.4,0
 16221,48.6,1.3,0
 16231,48.6,1.2,0
 16237,48.6,1.1,0
@@ -3889,6 +3907,7 @@
 16880,35.6,-0.3,0
 16896,35.6,-0.2,0
 16912,0,-0.2,40.6
+16913,43,-0.2,0
 16926,43,-0.3,0
 16941,43,-0.4,0
 16952,43,-0.5,0
@@ -3915,6 +3934,7 @@
 17145,43,-0.2,0
 17148,43,-0.1,0
 17149,0,-0.1,8.8
+17150,32.4,-0.1,0
 17151,32.4,0,0
 17155,32.4,0.1,0
 17159,32.4,0.2,0
@@ -3951,7 +3971,7 @@
 17283,18.4,-1.7,0
 17288,18.4,-1.6,0
 17290,0,-1.6,10.8
-17291,31.7,-1.5,0
+17291,31.7,-1.6,0
 17294,31.7,-1.4,0
 17298,31.7,-1.3,0
 17300,31.7,-1.2,0
@@ -4023,7 +4043,7 @@
 17878,30.9,0.3,0
 17881,30.9,0.5,0
 17883,0,0.5,194.2
-17884,36.2,0.7,0
+17884,36.2,0.5,0
 17889,36.2,0.8,0
 17917,36.2,0.7,0
 17925,36.2,0.6,0
@@ -4050,6 +4070,7 @@
 18223,33.7,-1.3,0
 18226,33.7,-1.4,0
 18227,0,-1.4,10.4
+18228,22.8,-1.4,0
 18229,22.8,-1.5,0
 18231,22.8,-1.6,0
 18233,22.8,-1.7,0
@@ -4079,6 +4100,7 @@
 18315,22.8,-2,0
 18317,22.8,-1.8,0
 18318,0,-1.8,57.2
+18319,18,-1.8,0
 18321,18,-1.7,0
 18323,18,-1.6,0
 18325,18,-1.5,0
@@ -4147,7 +4169,7 @@
 18533,36.8,-4.7,0
 18536,36.8,-4.6,0
 18538,0,-4.6,26.8
-18539,41,-4.5,0
+18539,41,-4.6,0
 18541,41,-4.4,0
 18543,41,-4.3,0
 18545,41,-4.2,0
@@ -4235,6 +4257,7 @@
 18813,41,0.3,0
 18823,41,0.4,0
 18824,0,0.4,34.8
+18825,25.6,0.4,0
 18828,25.6,0.3,0
 18841,25.6,0.2,0
 18848,25.6,0.1,0
@@ -4255,6 +4278,7 @@
 18897,25.6,-1.4,0
 18899,25.6,-1.5,0
 18903,0,-1.6,2
+18904,38.9,-1.6,0
 18906,38.9,-1.7,0
 18908,38.9,-1.8,0
 18912,38.9,-1.9,0
@@ -4297,6 +4321,7 @@
 19101,38.9,-1,0
 19111,38.9,-0.9,0
 19115,0,-0.9,3.4
+19116,28.1,-0.9,0
 19118,28.1,-0.8,0
 19124,28.1,-0.7,0
 19128,28.1,-0.6,0
@@ -4316,7 +4341,7 @@
 19201,28.1,0,0
 19207,28.1,-0.1,0
 19208,0,0,21.2
-19209,37.6,-0.1,0
+19209,37.6,0,0
 19215,37.6,-0.2,0
 19226,37.6,-0.1,0
 19235,37.6,0,0
@@ -4378,7 +4403,7 @@
 19378,37.6,5.7,0
 19379,37.6,5.8,0
 19381,0,5.9,51
-19382,38.3,6,0
+19382,38.3,5.9,0
 19383,38.3,6.1,0
 19385,38.3,6.2,0
 19387,38.3,6.3,0
@@ -4492,7 +4517,7 @@
 19749,38.3,-3.6,0
 19752,38.3,-3.7,0
 19763,0,-3.7,8.8
-19764,24.2,-3.6,0
+19764,24.2,-3.7,0
 19766,24.2,-3.5,0
 19768,24.2,-3.4,0
 19770,24.2,-3.3,0
@@ -4540,7 +4565,7 @@
 19822,24.2,2.7,0
 19824,24.2,2.9,0
 19827,0,2.8,43
-19828,33.5,2.9,0
+19828,33.5,2.8,0
 19835,33.5,2.8,0
 19838,33.5,2.7,0
 19841,33.5,2.6,0
@@ -4636,7 +4661,7 @@
 20189,33.5,-1.7,0
 20193,33.5,-1.6,0
 20196,0,-1.6,9.6
-20197,27,-1.5,0
+20197,27,-1.6,0
 20201,27,-1.4,0
 20205,27,-1.3,0
 20208,27,-1.2,0
@@ -4653,7 +4678,7 @@
 20278,27,-0.1,0
 20284,27,0,0
 20287,0,0,2
-20288,25.7,0.1,0
+20288,25.7,0,0
 20294,25.7,0.2,0
 20298,25.7,0.3,0
 20302,25.7,0.4,0
@@ -4675,6 +4700,7 @@
 20381,25.7,2,0
 20393,25.7,1.9,0
 20397,0,1.9,13
+20398,36.3,1.9,0
 20399,36.3,1.8,0
 20403,36.3,1.7,0
 20406,36.3,1.6,0
@@ -4818,7 +4844,7 @@
 20837,36.3,1.3,0
 20838,36.3,1.5,0
 20839,0,1.6,2
-20840,16.7,1.8,0
+20840,16.7,1.6,0
 20841,16.7,1.9,0
 20842,16.7,2.1,0
 20843,16.7,2.2,0
@@ -4928,7 +4954,7 @@
 21014,33.1,5.2,0
 21015,33.1,5.3,0
 21016,0,5.4,51
-21017,46.6,5.5,0
+21017,46.6,5.4,0
 21019,46.6,5.6,0
 21020,46.6,5.7,0
 21022,46.6,5.8,0
@@ -5039,6 +5065,7 @@
 21571,46.6,-2.5,0
 21579,46.6,-2.3,0
 21581,0,-2.3,30.6
+21582,29.9,-2.3,0
 21586,29.9,-2.2,0
 21589,29.9,-2.1,0
 21591,29.9,-2,0
@@ -5072,7 +5099,7 @@
 21770,26.9,-1,0
 21820,26.9,-0.9,0
 21830,0,-0.9,38.4
-21831,31.6,-0.8,0
+21831,31.6,-0.9,0
 21832,31.6,-0.9,0
 21835,31.6,-0.8,0
 21845,31.6,-0.7,0
@@ -5114,6 +5141,7 @@
 22284,30.4,2.7,0
 22288,30.4,2.8,0
 22292,0,2.9,11.6
+22293,30.5,2.9,0
 22296,30.5,3,0
 22305,30.5,3.1,0
 22323,30.5,3,0
@@ -5202,6 +5230,7 @@
 22667,37.2,-6.2,0
 22669,37.2,-6.3,0
 22672,0,-6.3,16
+22673,25.7,-6.3,0
 22678,25.7,-6.2,0
 22681,25.7,-6.1,0
 22683,25.7,-6,0
@@ -5267,6 +5296,7 @@
 22794,25.7,1.9,0
 22799,25.7,1.8,0
 22802,0,1.8,8.2
+22803,25.6,1.8,0
 22805,25.6,1.7,0
 22821,25.6,1.8,0
 22827,25.6,1.9,0
@@ -5428,7 +5458,7 @@
 23118,25.6,-4.8,0
 23119,25.6,-4.9,0
 23120,0,-5.1,34.8
-23121,26,-5.2,0
+23121,26,-5.1,0
 23122,26,-5.3,0
 23123,26,-5.4,0
 23124,26,-5.5,0
@@ -5506,7 +5536,7 @@
 23236,26,0.7,0
 23237,26,0.6,0
 23238,0,0.3,40.8
-23239,24.3,0.1,0
+23239,24.3,0.3,0
 23240,24.3,0,0
 23241,24.3,-0.2,0
 23242,24.3,-0.4,0
@@ -5572,7 +5602,7 @@
 23318,24.3,0.4,0
 23319,24.3,0.6,0
 23320,0,0.9,12.8
-23321,31.2,1,0
+23321,31.2,0.9,0
 23322,31.2,1.2,0
 23323,31.2,1.4,0
 23324,31.2,1.6,0
@@ -5752,7 +5782,7 @@
 23608,30.3,-4,0
 23609,30.3,-4.2,0
 23610,0,-4.4,2
-23611,27.6,-4.5,0
+23611,27.6,-4.4,0
 23612,27.6,-4.7,0
 23613,27.6,-4.9,0
 23614,27.6,-5.1,0
@@ -5819,7 +5849,7 @@
 23703,27.6,-1.6,0
 23704,27.6,-1.4,0
 23705,0,-1.3,5.4
-23706,30.4,-1.2,0
+23706,30.4,-1.3,0
 23707,30.4,-1.1,0
 23708,30.4,-0.9,0
 23709,30.4,-0.8,0
@@ -5869,6 +5899,7 @@
 23957,33.4,-1.1,0
 23968,33.4,-1.2,0
 23985,0,-1.2,14
+23986,35,-1.2,0
 24004,35,-1.1,0
 24015,35,-1,0
 24023,35,-0.9,0
@@ -5919,7 +5950,7 @@
 24241,35,4.7,0
 24242,35,4.8,0
 24243,0,4.9,31.8
-24244,27.2,5,0
+24244,27.2,4.9,0
 24245,27.2,5.1,0
 24247,27.2,5.2,0
 24248,27.2,5.3,0
@@ -6084,7 +6115,7 @@
 24501,23,-2.7,0
 24502,23,-2.8,0
 24504,0,-3,83.8
-24505,20.6,-2.9,0
+24505,20.6,-3,0
 24506,20.6,-3,0
 24511,20.6,-2.9,0
 24515,20.6,-2.8,0
@@ -6122,6 +6153,7 @@
 24574,20.6,0.4,0
 24584,20.6,0.5,0
 24605,0,0.5,37.6
+24606,14.7,0.5,0
 24616,14.7,0.4,0
 24640,14.7,0.3,0
 24651,23.2,0.3,0
@@ -6132,6 +6164,7 @@
 24768,22.2,0.3,0
 24776,22.2,0.2,0
 24779,0,0.2,26.6
+24780,22.6,0.2,0
 24781,22.6,0.1,0
 24784,22.6,0,0
 24787,22.6,-0.1,0
@@ -6197,7 +6230,7 @@
 24891,23,4.4,0
 24892,23,4.5,0
 24893,0,4.7,36.6
-24894,15.9,4.8,0
+24894,15.9,4.7,0
 24895,15.9,4.9,0
 24896,15.9,5,0
 24897,15.9,5.2,0
@@ -6308,7 +6341,7 @@
 25040,29.3,-0.1,0
 25041,29.3,0.1,0
 25042,0,0.3,8.8
-25043,36.8,0.4,0
+25043,36.8,0.3,0
 25044,36.8,0.6,0
 25045,36.8,0.8,0
 25046,36.8,0.9,0
@@ -6552,7 +6585,7 @@
 25691,35.2,3.6,0
 25694,35.2,3.7,0
 25699,0,3.8,3.8
-25700,26.5,3.7,0
+25700,26.5,3.8,0
 25701,26.5,3.8,0
 25704,26.5,3.7,0
 25709,26.5,3.6,0
@@ -6609,7 +6642,7 @@
 25802,26.5,-0.9,0
 25804,26.5,-0.8,0
 25805,0,-0.7,35.2
-25806,31.8,-0.6,0
+25806,31.8,-0.7,0
 25807,31.8,-0.5,0
 25809,31.8,-0.4,0
 25811,31.8,-0.3,0
@@ -6676,7 +6709,7 @@
 26070,33.9,1.6,0
 26074,33.9,1.7,0
 26077,0,1.7,32.6
-26078,37,1.8,0
+26078,37,1.7,0
 26096,37,1.7,0
 26100,37,1.6,0
 26104,37,1.5,0
@@ -6738,7 +6771,7 @@
 26251,37,1.5,0
 26254,37,1.7,0
 26255,0,1.7,12.2
-26256,30.1,1.6,0
+26256,30.1,1.7,0
 26257,30.1,1.7,0
 26264,30.1,1.8,0
 26273,30.1,1.7,0
@@ -6763,6 +6796,7 @@
 26347,30.1,-0.2,0
 26357,30.1,-0.1,0
 26386,0,-0.1,6.2
+26387,38.6,-0.1,0
 26396,38.6,-0.2,0
 26402,38.6,-0.3,0
 26406,38.6,-0.4,0
@@ -6863,6 +6897,7 @@
 26803,22.5,0.7,0
 26804,22.5,0.6,0
 26805,0,0.4,84.4
+26806,22.4,0.4,0
 26807,22.4,0.2,0
 26808,22.4,0.1,0
 26809,22.4,-0.1,0
@@ -6911,6 +6946,7 @@
 26861,22.4,-5.9,0
 26863,22.4,-6,0
 26871,0,-6,36.2
+26872,31.6,-6,0
 26874,31.6,-5.9,0
 26877,31.6,-5.8,0
 26879,31.6,-5.7,0
@@ -7006,7 +7042,7 @@
 27199,30.4,2,0
 27203,30.4,1.9,0
 27207,0,1.9,8.6
-27208,32,1.8,0
+27208,32,1.9,0
 27210,32,1.7,0
 27213,32,1.6,0
 27215,32,1.5,0
@@ -7048,6 +7084,7 @@
 27718,36.6,-0.6,0
 27729,36.6,-0.7,0
 27735,0,-0.7,9.4
+27736,38.7,-0.7,0
 27749,38.7,-0.6,0
 27758,38.7,-0.5,0
 27764,38.7,-0.4,0
@@ -7074,6 +7111,7 @@
 28045,38.7,-0.3,0
 28058,38.7,-0.2,0
 28059,0,-0.2,13.4
+28060,22.3,-0.2,0
 28063,22.3,-0.1,0
 28067,22.3,0,0
 28069,22.3,0.1,0
@@ -7208,6 +7246,7 @@
 29126,24.2,-0.6,0
 29133,24.2,-0.7,0
 29140,0,-0.7,11.6
+29141,31.7,-0.7,0
 29164,31.7,-0.6,0
 29172,31.7,-0.5,0
 29180,31.7,-0.4,0
@@ -7217,7 +7256,7 @@
 29244,31.7,-0.2,0
 29257,31.7,-0.3,0
 29267,0,-0.3,11
-29268,34.6,-0.4,0
+29268,34.6,-0.3,0
 29274,34.6,-0.5,0
 29281,34.6,-0.6,0
 29288,34.6,-0.7,0
@@ -7268,7 +7307,7 @@
 29433,34.6,3.3,0
 29436,34.6,3.2,0
 29438,0,3.2,8.8
-29439,17.2,3.1,0
+29439,17.2,3.2,0
 29441,17.2,3,0
 29442,17.2,2.9,0
 29444,17.2,2.8,0
@@ -7290,7 +7329,7 @@
 29466,17.2,1.1,0
 29467,17.2,1,0
 29468,0,0.9,4.2
-29469,50.6,0.8,0
+29469,50.6,0.9,0
 29470,50.6,0.7,0
 29472,50.6,0.6,0
 29473,50.6,0.5,0
@@ -7427,7 +7466,7 @@
 30055,50.6,-0.1,0
 30059,50.6,-0.8,0
 30061,0,-0.8,55.2
-30062,36.4,-0.9,0
+30062,36.4,-0.8,0
 30064,36.4,-1,0
 30069,36.4,-1.1,0
 30073,36.4,-1.2,0
@@ -7519,6 +7558,7 @@
 30582,39.7,-2,0
 30584,39.7,-2.1,0
 30586,0,-2.2,10
+30587,14.5,-2.2,0
 30588,14.5,-2.3,0
 30591,14.5,-2.4,0
 30593,14.5,-2.5,0
@@ -7526,6 +7566,7 @@
 30598,14.5,-2.7,0
 30602,14.5,-2.8,0
 30608,0,-2.8,2
+30609,14.5,-2.8,0
 30611,14.5,-2.9,0
 30616,14.5,-2.8,0
 30622,14.5,-2.7,0
@@ -7545,7 +7586,7 @@
 30645,14.5,-1.3,0
 30647,14.5,-1.2,0
 30648,0,-1.1,42.8
-30649,25.8,-1,0
+30649,25.8,-1.1,0
 30650,25.8,-0.9,0
 30651,25.8,-0.8,0
 30652,25.8,-0.7,0
@@ -7631,6 +7672,7 @@
 31048,33.4,2.7,0
 31056,33.4,2.8,0
 31060,0,2.8,13.4
+31061,22.8,2.8,0
 31068,22.8,2.7,0
 31075,22.8,2.6,0
 31079,22.8,2.5,0
@@ -7876,7 +7918,7 @@
 32159,19.1,-0.1,0
 32162,19.1,0,0
 32163,0,0,71
-32164,20,0.1,0
+32164,20,0,0
 32167,20,0.2,0
 32171,20,0.3,0
 32176,20,0.4,0
@@ -7891,7 +7933,7 @@
 32214,20,-0.5,0
 32217,20,-0.7,0
 32218,0,-0.7,2
-32219,33.9,-0.6,0
+32219,33.9,-0.7,0
 32220,33.9,-0.7,0
 32222,33.9,-0.8,0
 32224,33.9,-0.9,0
@@ -7948,6 +7990,7 @@
 32380,33.9,3.4,0
 32383,33.9,3.5,0
 32387,0,3.5,29.8
+32388,29.6,3.5,0
 32397,29.6,3.4,0
 32401,29.6,3.3,0
 32404,29.6,3.2,0
@@ -8040,6 +8083,7 @@
 32585,26.1,1.5,0
 32587,26.1,1.7,0
 32590,0,1.8,18.4
+32591,27,1.8,0
 32595,27,1.9,0
 32606,27,1.8,0
 32609,27,1.7,0
@@ -8102,7 +8146,7 @@
 32765,27,-2.1,0
 32768,27,-2,0
 32770,0,-2,9.4
-32771,32.4,-1.9,0
+32771,32.4,-2,0
 32775,32.4,-1.8,0
 32778,32.4,-1.7,0
 32782,32.4,-1.6,0
@@ -8208,7 +8252,7 @@
 33467,28,-0.8,0
 33475,28,-0.9,0
 33481,0,-0.9,21.2
-33482,17.2,-0.8,0
+33482,17.2,-0.9,0
 33490,17.2,-0.7,0
 33494,17.2,-0.6,0
 33497,17.2,-0.5,0
@@ -8301,6 +8345,7 @@
 33652,26.2,-2.4,0
 33653,26.2,-2.5,0
 33655,0,-2.6,27.8
+33656,30.3,-2.6,0
 33657,30.3,-2.7,0
 33659,30.3,-2.8,0
 33666,30.3,-2.7,0
@@ -8512,6 +8557,7 @@
 34128,33.6,1.6,0
 34130,33.6,1.7,0
 34133,0,1.8,16.4
+34134,18.9,1.8,0
 34136,18.9,1.9,0
 34139,18.9,2,0
 34143,18.9,2.1,0
@@ -8524,7 +8570,7 @@
 34172,18.9,1.6,0
 34173,18.9,1.5,0
 34174,0,1.5,2
-34175,38,1.4,0
+34175,38,1.5,0
 34177,38,1.3,0
 34178,38,1.2,0
 34179,38,1.1,0
@@ -8778,7 +8824,7 @@
 35593,17.3,4.1,0
 35594,17.3,4.3,0
 35595,0,4.4,35.8
-35596,31.6,4.5,0
+35596,31.6,4.4,0
 35597,31.6,4.6,0
 35599,31.6,4.7,0
 35600,31.6,4.8,0
@@ -8883,7 +8929,7 @@
 35838,24.7,-0.8,0
 35840,24.7,-0.7,0
 35842,0,-0.6,13.2
-35843,26.7,-0.5,0
+35843,26.7,-0.6,0
 35845,26.7,-0.4,0
 35847,26.7,-0.3,0
 35848,26.7,-0.2,0
@@ -8970,6 +9016,7 @@
 36067,31.8,-2.4,0
 36071,31.8,-2.5,0
 36078,0,-2.4,22.4
+36079,23.9,-2.4,0
 36084,23.9,-2.3,0
 36087,23.9,-2.2,0
 36089,23.9,-2.1,0
@@ -9013,6 +9060,7 @@
 36140,23.9,1.9,0
 36142,23.9,2,0
 36143,0,2,15.8
+36144,21.3,2,0
 36145,21.3,2.1,0
 36148,21.3,2.2,0
 36156,21.3,2.3,0
@@ -9073,6 +9121,7 @@
 36639,41.4,-0.9,0
 36649,41.4,-1,0
 36662,0,-1,8.4
+36663,47.3,-1,0
 36675,47.3,-0.9,0
 36681,47.3,-0.8,0
 36687,47.3,-0.7,0
@@ -9225,6 +9274,7 @@
 37487,47.3,3.9,0
 37490,47.3,3.7,0
 37493,0,3.7,9.8
+37494,35.4,3.7,0
 37495,35.4,3.6,0
 37497,35.4,3.5,0
 37499,35.4,3.4,0
@@ -9410,6 +9460,7 @@
 37930,25.7,4.8,0
 37933,25.7,4.9,0
 37944,0,4.9,13
+37945,32.9,4.9,0
 37946,32.9,4.8,0
 37949,32.9,4.7,0
 37951,32.9,4.6,0
@@ -9554,7 +9605,7 @@
 38398,32.9,-4.3,0
 38399,32.9,-4.4,0
 38401,0,-4.5,18.2
-38402,35.4,-4.6,0
+38402,35.4,-4.5,0
 38403,35.4,-4.7,0
 38405,35.4,-4.8,0
 38407,35.4,-4.9,0
@@ -9708,7 +9759,7 @@
 38921,36.7,-0.7,0
 38923,36.7,-0.8,0
 38926,0,-0.8,22.4
-38927,28.2,-0.9,0
+38927,28.2,-0.8,0
 38928,28.2,-1,0
 38932,28.2,-1.1,0
 38936,28.2,-1.2,0
@@ -9765,7 +9816,7 @@
 39096,28.2,6.3,0
 39097,28.2,6.5,0
 39098,0,6.6,37.8
-39099,27.1,7.1,0
+39099,27.1,6.6,0
 39100,27.1,7.3,0
 39101,27.1,7.4,0
 39102,27.1,7.5,0
@@ -9838,7 +9889,7 @@
 39199,27.1,-1.5,0
 39200,27.1,-1.6,0
 39201,0,-1.7,47.2
-39202,29.5,-1.9,0
+39202,29.5,-1.7,0
 39203,29.5,-2,0
 39204,29.5,-2.1,0
 39205,29.5,-2.2,0

VectoCore/Resources/Declaration/MissionCycles/UrbanDelivery.vdri

-<s>,<v>,<grad>,<stop>
+<s>,<v>,<grad>,<stop>
 0,0,-0.000772284811190119,2
+1,12,-0.000772284811190119,0
 13,68,-0.000772284811190119,0
 30,68,0.270414155866776,0
 40,68,0.43651585078203,0
@@ -92,6 +93,7 @@
 1480,19,-0.375348555997631,0
 1490,19,-0.121111267862038,0
 1500,0,0.138210766036268,25
+1501,15,0.138210766036268,0
 1510,15,0.373803986375251,0
 1520,15,0.556854833832878,0
 1570,15,0.663634494849827,0
@@ -100,6 +102,7 @@
 1610,15,1.26193957959559,0
 1620,15,1.37888873213796,0
 1632,0,1.37888873213796,20
+1633,23,1.37888873213796,0
 1670,23,1.25685483383288,0
 1690,23,1.04329551179898,0
 1710,23,0.843295511798979,0
@@ -107,6 +110,7 @@
 1750,23,0.489058223663386,0
 1770,23,0.360244664341353,0
 1776,0,0.360244664341353,20
+1777,48,0.360244664341353,0
 1790,48,0.21787178298542,0
 1810,48,0.0144819524769455,0
 1820,48,-0.121111267862038,0
@@ -209,6 +213,7 @@
 3200,17,0.707702291459996,0
 3210,17,-0.139755335658648,0
 3216,0,-0.139755335658648,35
+3217,21,-0.139755335658648,0
 3220,21,-1.00924686108238,0
 3230,21,-1.81772143735356,0
 3240,21,-2.49229770854,0
@@ -282,6 +287,7 @@
 4050,50,-6.28212821701459,0
 4060,50,-5.35331465769255,0
 4068,0,-5.35331465769255,20
+4069,52,-5.35331465769255,0
 4070,52,-4.36687397972644,0
 4080,52,-3.38551804752305,0
 4090,52,-2.44653499667559,0
@@ -313,6 +319,7 @@
 4400,52,-1.85331465769255,0
 4410,52,-1.31094177633661,0
 4416,0,-1.31094177633661,25
+4417,29,-1.31094177633661,0
 4420,29,-0.661789233963732,0
 4430,29,0.0144819524769453,0
 4440,29,0.672109071121013,0
@@ -340,6 +347,7 @@
 4690,16,1.10770229146,0
 4700,16,0.490753138917624,0
 4704,0,0.490753138917624,30
+4705,28,0.490753138917624,0
 4710,28,-0.170263810234919,0
 4720,28,-0.836365505150173,0
 4730,28,-1.48043330176034,0
@@ -360,6 +368,7 @@
 4930,15,-4.12958584413322,0
 4940,15,-3.9058570305739,0
 4944,0,-3.9058570305739,25
+4945,53.6,-3.9058570305739,0
 4950,53.6,-3.63467058989593,0
 4960,53.6,-3.33467058989594,0
 4970,53.6,-3.02111126786204,0
@@ -426,12 +435,14 @@
 5820,49,0.328041274510844,0
 5850,49,0.660244664341352,0
 5856,0,0.660244664341352,20
+5857,11,0.660244664341352,0
 5860,11,1.02634635925661,0
 5870,11,1.43143110501932,0
 5880,11,1.84329551179898,0
 5890,11,2.19922771518881,0
 5900,11,2.43651585078203,0
 5928,0,2.43651585078203,35
+5929,22,2.43651585078203,0
 5930,22,2.02804127451084,0
 5940,22,1.50939720671423,0
 5950,22,0.834820935527792,0
@@ -497,6 +508,7 @@
 6640,40,-5.62280618311627,0
 6650,40,-5.0651790644722,0
 6660,0,-4.42789092887899,25
+6661,20,-4.42789092887899,0
 6670,20,-3.74314516616712,0
 6680,20,-3.06178923396373,0
 6690,20,-2.36687397972645,0
@@ -541,6 +553,7 @@
 7110,27,-2.16856889498068,0
 7120,27,-1.98043330176034,0
 7140,0,-1.98043330176034,15
+7141,28,-1.98043330176034,0
 7150,28,-2.11094177633661,0
 7160,28,-2.41433160684509,0
 7170,28,-2.83806042040441,0
@@ -555,9 +568,11 @@
 7270,28,-2.21094177633662,0
 7280,28,-1.28212821701458,0
 7284,0,-1.28212821701458,30
+7285,10,-1.28212821701458,0
 7290,10,-0.282128217014579,0
 7300,10,0.687363308409149,0
 7308,0,0.687363308409149,20
+7309,33,0.687363308409149,0
 7310,33,1.5534650033244,0
 7320,33,2.29583788468033,0
 7330,33,2.88736330840915,0
@@ -647,6 +662,7 @@
 8380,35,3.70261754569729,0
 8400,35,3.82126161349389,0
 8448,0,3.82126161349389,35
+8449,38,3.82126161349389,0
 8450,38,3.96024466434135,0
 8460,38,4.1805836473922,0
 8470,38,4.46193957959559,0
@@ -704,6 +720,7 @@
 9080,26.1,-0.202467200065428,0
 9090,26.1,0.0687192406125384,0
 9096,0,0.0687192406125384,25
+9097,37,0.0687192406125384,0
 9100,37,0.307702291459996,0
 9110,37,0.465329410104064,0
 9160,37,0.283973477900674,0
@@ -816,6 +833,7 @@
 10630,19,-0.768568894980682,0
 10640,19,-0.271958725489157,0
 10644,0,-0.271958725489157,30
+10645,12,-0.271958725489157,0
 10650,12,0.202617545697284,0
 10660,12,0.560244664341352,0
 10670,12,0.773803986375251,0
@@ -824,6 +842,7 @@
 10720,12,0.311092121968471,0
 10730,12,0.200922630443047,0
 10752,0,0.200922630443047,25
+10753,31,0.200922630443047,0
 10770,31,0.0839734779006742,0
 10780,31,-0.0295858441332241,0
 10790,31,-0.158399403455258,0
@@ -925,6 +944,7 @@
 12180,31,-2.6058570305739,0
 12190,31,-1.6058570305739,0
 12192,0,-1.6058570305739,15
+12193,29,-1.6058570305739,0
 12200,29,-0.631280759387461,0
 12210,29,0.233126020273555,0
 12220,29,0.890753138917624,0
@@ -1032,6 +1052,7 @@
 13750,38,-1.83467058989594,0
 13760,38,-1.39229770854001,0
 13764,0,-1.39229770854001,35
+13765,50,-1.39229770854001,0
 13770,50,-0.917721437353564,0
 13780,50,-0.527890928878986,0
 13790,50,-0.25670448820102,0
@@ -1052,6 +1073,7 @@
 14080,36,-2.48382313226882,0
 14090,36,-1.99907736955695,0
 14100,0,-1.57365364074339,20
+14101,11,-1.57365364074339,0
 14110,11,-1.13975533565865,0
 14120,11,-0.597382454302715,0
 14130,11,-0.444840081421359,0
@@ -1060,6 +1082,7 @@
 14170,11,0.102617545697284,0
 14180,11,0.211092121968471,0
 14208,0,0.211092121968471,20
+14209,48,0.211092121968471,0
 14250,48,0.485668393154912,0
 14260,48,0.79922771518881,0
 14270,48,1.12804127451084,0
@@ -1282,6 +1305,7 @@
 17140,56.9,5.87210907112102,0
 17150,56.9,5.69244805417186,0
 17160,0,5.45515991857864,30
+17161,52,5.45515991857864,0
 17170,52,5.17210907112102,0
 17180,52,4.84668534230745,0
 17190,52,4.47380398637525,0
@@ -1680,6 +1704,7 @@
 22940,23,0.504312460951522,0
 22950,23,0.60600737620576,0
 22956,0,0.60600737620576,30
+22957,26,0.60600737620576,0
 22980,26,0.282278562646437,0
 22990,26,-0.0499248271840715,0
 23000,26,-0.36348414921797,0
@@ -1697,6 +1722,7 @@
 23120,26,-2.20416211531966,0
 23130,26,-1.35670448820102,0
 23136,0,-1.35670448820102,25
+23137,24,-1.35670448820102,0
 23140,24,-0.809246861082378,0
 23150,24,-0.143145166167122,0
 23160,24,0.0653294101040642,0