Просмотр исходного кода

Merge pull request #26 from DocSystem/dev

Update Opus bus list + show unknown lines in hex
Luu 1 год назад
Родитель
Сommit
75e16f9a99
2 измененных файлов с 92 добавлено и 8 удалено
  1. 5 4
      api/calypso/transit/opus.c
  2. 87 4
      api/calypso/transit/opus_lists.h

+ 5 - 4
api/calypso/transit/opus.c

@@ -41,12 +41,13 @@ const char* get_opus_transport_line(int route_number) {
     if(OPUS_LINES_LIST[route_number]) {
         return OPUS_LINES_LIST[route_number];
     } else {
-        char* line = malloc(4 * sizeof(char));
-        if(!line) {
+        // Return hex
+        char* route_str = malloc(9 * sizeof(char));
+        if(!route_str) {
             return "Unknown";
         }
-        snprintf(line, 4, "%d", route_number);
-        return line;
+        snprintf(route_str, 9, "0x%02X", route_number);
+        return route_str;
     }
 }
 

+ 87 - 4
api/calypso/transit/opus_lists.h

@@ -230,10 +230,93 @@
 #define OPUS_LISTS_H
 
 static const char* OPUS_LINES_LIST[512] = {
-    [1] = "Green",
-    [2] = "Orange",
-    [3] = "Yellow",
-    [4] = "Blue",
+    [1] = "Green", [2] = "Orange",    [3] = "Yellow", [4] = "Blue",
+
+    [13] = "18",
+
+    [15] = "24",   [16] = "25",       [231] = "26",   [17] = "27",   [18] = "28",
+
+    [22] = "32",   [23] = "33",       [24] = "34",
+
+    [26] = "37",
+
+    [226] = "41",  [29] = "43",       [30] = "44",    [31] = "45",
+
+    [33] = "47",   [34] = "48",       [35] = "49",    [36] = "51",
+
+    [40] = "55",
+
+    [44] = "61",
+
+    [46] = "64",
+
+    [48] = "67",   [49] = "68",       [50] = "69",    [51] = "70",
+
+    [59] = "80",   [60] = "85",       [61] = "86",    [63] = "90",
+
+    [65] = "93",
+
+    [68] = "97",
+
+    [73] = "103",  [74] = "104",      [75] = "105",
+
+    [77] = "107",
+
+    [79] = "109",  [80] = "110",      [81] = "112",   [82] = "113",
+
+    [87] = "121",  [89] = "124",      [90] = "125",
+
+    [92] = "128",  [93] = "129",      [94] = "131",
+
+    [234] = "136", [97] = "138",      [98] = "139",   [99] = "140",  [100] = "141",
+
+    [103] = "146",
+
+    [108] = "161", [109] = "162",     [110] = "164",  [111] = "165",
+
+    [113] = "168",
+
+    [116] = "171",
+
+    [120] = "177", [121] = "179",
+
+    [126] = "185",
+
+    [128] = "187",
+
+    [130] = "189",
+
+    [132] = "191", [134] = "192/193",
+
+    [136] = "195",
+
+    [138] = "197",
+
+    [141] = "201",
+
+    [145] = "205",
+
+    [147] = "207", [148] = "208",     [149] = "209",
+
+    [151] = "211",
+
+    [155] = "216", [156] = "217",
+
+    [237] = "401", [261] = "405",
+
+    [165] = "410",
+
+    [242] = "419",
+
+    [218] = "427",
+
+    [211] = "467",
+
+    [169] = "470",
+
+    [253] = "487",
+
+    [255] = "495", [256] = "496",     [257] = "715",
 
     [219] = "747",
 };