|
1 | | -import { routes, stops_layer } from './app'; |
| 1 | +import { routes, cache } from './app'; |
2 | 2 | import { occupancy_mappings, VIRTUAL_BOARD_URL, occupancy_mappings, BG_TYPES } from './config'; |
3 | 3 | import { get_route_classes, calculate_diff } from './utils'; |
4 | 4 | import { determine_time_ago } from './map'; |
@@ -175,14 +175,16 @@ function display_stop_times(stop_routes) { |
175 | 175 | const row = document.createElement('tr'); |
176 | 176 | row.classList.add('text-center', 'align-middle'); |
177 | 177 | { |
178 | | - for(const { actual_time, scheduled_time, occupancy: vehicle_occupancy, inv_number, next_stop } of route.times) { |
| 178 | + for(const { actual_time, scheduled_time, occupancy: vehicle_occupancy, cgm_vehicle_id, next_stop } of route.times) { |
179 | 179 | const td = document.createElement('td'); |
180 | 180 | const r = display_hours(scheduled_time, actual_time); |
181 | | - const vehicle = cache.find(v => v.inv_number == inv_number && v.type == type); |
182 | | - const model = inv_number ? get_vehicle_model(vehicle) : null; |
| 181 | + const vehicle = cache.find(v => v.cgm_id == cgm_vehicle_id); |
| 182 | + console.log(vehicle) |
| 183 | + const model = vehicle ? get_vehicle_model(vehicle) : null; |
183 | 184 |
|
184 | 185 | let popover_content = ``; |
185 | | - popover_content += `${BG_TYPES[type]} ${inv_number ?? 'неизвестен'}<br>`; |
| 186 | + console.log(vehicle) |
| 187 | + popover_content += `${BG_TYPES[type]} ${vehicle?.inv_number ?? 'неизвестен'}<br>`; |
186 | 188 | popover_content += model ? `Модел: ${get_model_name(model)}<br>` : ''; |
187 | 189 |
|
188 | 190 | const extras_icons = { |
|
0 commit comments