Merge branch 'main' into feat/5-min-trip-timer

Author: ImRodry

assets/bikeSerialNumberMapping.json

@@ -101,7 +101,7 @@
 	"E0104": "a1597ad755",
 	"E0105": "a1db84748a",
 	"E0106": "6edb938caa",
-	"E0107": "0a2e068eac",
+	"E0107": "5A2E0DB5CC",
 	"C0108": "0490f19ffa",
 	"E0109": "9b90e4658a",
 	"E0110": "f92e065d8c",
@@ -163,7 +163,7 @@
 	"E0178": "162e0afecc",
 	"E0179": "70db8afbda",
 	"E0180": "d4597901f5",
-	"E0182": "71db91d1ea",
+	"E0182": "702e0bf9ac",
 	"E0183": "06f36ac25d",
 	"E0184": "26db9c7b1a",
 	"E0185": "5590f44b7a",
@@ -440,7 +440,7 @@
 	"E0502": "0cdb9f125a",
 	"E0503": "f6db92e55a",
 	"E0504": "48dba30a3a",
-	"E0505": "60a28a0149",
+	"E0505": "682e03c98c",
 	"E0506": "c359885745",
 	"E0507": "51599835a5",
 	"C0508": "2c597e7e75",
@@ -552,7 +552,7 @@
 	"E0632": "10a2a01b09",
 	"E0633": "7159893495",
 	"E0634": "f52dfdf9dc",
-	"E0635": "4fdba4faca",
+	"E0635": "e5d4c8bb42",
 	"E0637": "a759777cf5",
 	"E0639": "29db8da5da",
 	"C0640": "47db93b5ba",
@@ -732,7 +732,7 @@
 	"E0844": "7cdb80fdda",
 	"E0845": "805980cc95",
 	"E0846": "48db90b9ba",
-	"E0847": "2b59765155",
+	"E0847": "1D2E0EA19C",
 	"E0848": "1a90e8c8aa",
 	"E0849": "e6598dc7f5",
 	"E0850": "225985ab55",
@@ -838,7 +838,7 @@
 	"E0950": "88db98915a",
 	"E0951": "d65976cc35",
 	"E0952": "3cdb9a374a",
-	"E0953": "d9db91198a",
+	"E0953": "ab2e0c058c",
 	"E0954": "1e5978aa95",
 	"E0955": "b059952955",
 	"E0956": "fedb8f309a",
@@ -899,7 +899,7 @@
 	"E1013": "7fd4b29b82",
 	"E1014": "30d4b13762",
 	"E1015": "fad46dd192",
-	"E1016": "e5d4c8bb42",
+	"E1016": "4fdba4faca",
 	"E1017": "02d4b24622",
 	"E1018": "c0d4b3c562",
 	"E1019": "85d4a26192",
@@ -1088,7 +1088,7 @@
 	"E1226": "5ed4c9c182",
 	"E1227": "75d4649752",
 	"E1228": "9bd4bf02f2",
-	"E1229": "3ad46f33b2",
+	"E1229": "132dffdd1c",
 	"E1230": "eed4a3eb72",
 	"E1233": "C62DF0C7DC",
 	"E1234": "afd4b47db2",
@@ -1239,7 +1239,7 @@
 	"E1395": "66d450f012",
 	"E1396": "63d4af8a92",
 	"E1398": "43d4b3d6f2",
-	"E1400": "94d4c3b132",
+	"E1400": "092e0e557c",
 	"E1401": "d82e03c93c",
 	"E1402": "58d4b67842",
 	"E1403": "21d45ed972",
@@ -1341,7 +1341,7 @@
 	"E1511": "56a2549939",
 	"E1512": "dfa266f2e9",
 	"E1513": "d8a2a04399",
-	"E1514": "64a23f40b9",
+	"E1514": "BE2E0C009C",
 	"E1515": "baa25eefa9",
 	"E1519": "159d0243c9",
 	"E1520": "972df1377c",
@@ -1416,7 +1416,7 @@
 	"E1599": "33a29aa2a9",
 	"E1600": "9cf36ae8ed",
 	"E1602": "72f38c303d",
-	"E1604": "90a26de6b9",
+	"E1604": "502E0BF98C",
 	"E1605": "c5f37d561d",
 	"E1606": "83a29159e9",
 	"E1607": "5ba25dfd59",
@@ -1664,7 +1664,7 @@
 	"E1870": "a72e07129c",
 	"E1871": "bd2e026dfc",
 	"E1872": "222df0738c",
-	"E1873": "fa2e067eac",
+	"E1873": "e62e02e62c",
 	"E1874": "902def1e4c",
 	"E1875": "682e0b014c",
 	"E1876": "552e06a1dc",
@@ -1781,7 +1781,7 @@
 	"E1987": "192e08635c",
 	"E1988": "db2e04dd2c",
 	"E1989": "002e07052c",
-	"E1990": "7d2e12bdfc",
+	"E1990": "762DFF983C",
 	"E1991": "2d2ce15cbc",
 	"E1992": "2a2e0c747c",
 	"E1993": "842e19bf0c",
@@ -2213,6 +2213,7 @@
 	"E2422": "a62e1226bc",
 	"E2423": "ea2e05dd1c",
 	"E2424": "d42e05738c",
+	"E2425": "9c2e0db30c",
 	"E2426": "ff2e05984c",
 	"E2427": "042e0c6a4c",
 	"E2428": "ca2dff746c",
@@ -2306,17 +2307,23 @@
 	"E2519": "d72e0de81c",
 	"E2520": "042e0284ac",
 	"E2521": "bc2e0f41dc",
+	"E2522": "192e09526c",
+	"E2523": "622e04c48c",
 	"E2524": "782e02a8fc",
 	"E2525": "7e2e039fcc",
+	"E2526": "a42e0533bc",
+	"E2527": "232e04b5bc",
 	"E2528": "7c2e0e90cc",
 	"E2529": "742def7acc",
 	"E2530": "4e2dfff06c",
 	"E2531": "582dfca52c",
 	"E2532": "352dfb6f8c",
+	"E2533": "eb2df0daec",
 	"E2534": "7c2e123c7c",
 	"E2535": "f12e0e1dcc",
 	"E2536": "f52e0235ec",
 	"E2537": "872e0277dc",
+	"E2538": "c92e0cc72c",
 	"E2540": "fb2e0e77ac",
 	"E2541": "e42e05834c",
 	"E2543": "132e1c3d1c",
@@ -2348,11 +2355,13 @@
 	"E2570": "3f2e08a5bc",
 	"E2571": "012e094a6c",
 	"E2572": "d92e0b10ec",
+	"E2574": "632dff7dcc",
 	"E2575": "1a2e0db58c",
 	"E2576": "ee2df0dfec",
 	"E2577": "652e01a6ec",
 	"E2578": "8f2e09842c",
 	"E2580": "7f2dfcf25c",
 	"E2581": "f62e0703dc",
+	"E2582": "d12e0300fc",
 	"E2584": "cd2e126d9c"
 }

scripts/stations.js

@@ -294,7 +294,7 @@ async function updateBikeList() {
 	let i = 0;
 
 	for (const station of stationsArray) {
-		queryString += ` station_${i}: getBikes(input: "${station.serialNumber}") { battery, code, name, kms, serialNumber, type, parent } `;
+		queryString += ` station_${station.serialNumber}: getBikes(input: "${station.serialNumber}") { battery, code, name, kms, serialNumber, type, parent } `;
 		i += 1;
 	}
 
@@ -312,12 +312,11 @@ async function updateBikeList() {
 		const allBikesList = Object.values(response.data).flat(1);
 
 		// get the bikes not in the bikeSerialNumberMapping
-		let missingBikes = allBikesList.filter(({ name }) => !bikeSerialNumberMapping[name]);
+		const missingBikes = allBikesList.map(bike => [bike.name, bike.serialNumber]);
 
 		// compact the missing bikes list
 		const newList = Object.fromEntries(
-			Object.entries(bikeSerialNumberMapping)
-				.concat(missingBikes.map(bike => [bike.name, bike.serialNumber]))
+			[...Object.entries(bikeSerialNumberMapping), ...missingBikes]
 				// Keep only the electric bikes and the classic bikes that don't have an electric one with the same number
 				.filter(([name], _, self) => name.startsWith("E") || !self.find(([b]) => b === name.replace("C", "E")))
 				.sort(([a], [b]) => Number(a.slice(1)) - Number(b.slice(1)))