| ').addClass('adsb-table__header').text(col)); + }); + $thead.append($headerRow); + $table.append($thead); + $table.append($(' |
|---|
| ').attr('colspan', 9).addClass('adsb-table__empty').text('No vehicles') + ) + ); + return; + } + + // Remove extra rows if vehicle count decreased + var existingRows = $tbody.find('tr'); + if (existingRows.length > FC.ADSB_VEHICLES.vehicles.length) { + existingRows.slice(FC.ADSB_VEHICLES.vehicles.length).remove(); + } + + FC.ADSB_VEHICLES.vehicles.forEach(function(v, i) { + var cells = [ + v.callsign || '—', + '0x' + (v.icao >>> 0).toString(16).toUpperCase().padStart(6, '0'), + (v.lat / 1e7).toFixed(5), + (v.lon / 1e7).toFixed(5), + (v.altCM / 100).toFixed(0) + 'm', + v.headingDegrees + '°', + v.tslc + 's', + v.ttl, + v.emitterType + ]; + + var isAlert = FC.ADSB_WARNING_ICAO.icao == v.icao && FC.ADSB_WARNING_ICAO.isAlert == 1; + var isWarning = FC.ADSB_WARNING_ICAO.icao == v.icao && FC.ADSB_WARNING_ICAO.isAlert != 1; + var rowClass = isAlert ? 'adsb-table__row--alert' : isWarning ? 'adsb-table__row--warning' : 'adsb-table__row--normal'; + + var $row = $tbody.find('tr').eq(i); + + if ($row.length === 0) { + // Row doesn't exist yet — create it + $row = $(' |
| ').addClass('adsb-table__cell'));
+ });
+ $tbody.append($row);
+ }
+
+ // Update classes and cell values without rebuilding the DOM
+ $row.removeClass('adsb-table__row--alert adsb-table__row--warning adsb-table__row--normal adsb-table__row--stale');
+ $row.addClass(rowClass);
+ if (v.tslc > 10) $row.addClass('adsb-table__row--stale');
+
+ $row.find('td').each(function(j) {
+ $(this).text(cells[j]);
+ });
+ });
+
+ $('.adsbVehicleListRow').show();
+ }
+
async function process_html(settingsPromise) {
// Wait for settings to finish loading to avoid race conditions
// where user changes are overwritten by background setting loads
@@ -434,14 +523,15 @@ TABS.gps.initialize = function (callback) {
if (feature && feature.get('data') && feature.get('name')) {
TABS.gps.toolboxAdsbVehicle.setContent(
- `callsign: ` + feature.get('name') + ` ` - + `lat: `+ (feature.get('data').lat / 10000000) + ` ` - + `lon: `+ (feature.get('data').lon / 10000000) + ` ` - + `ASL: `+ (feature.get('data').altCM ) / 100 + `m ` - + `heading: `+ feature.get('data').headingDegrees + `° ` - + `type: `+ ADSB_VEHICLE_TYPE[feature.get('data').emitterType].name + `` + `ICAO: 0x${(feature.get('data').icao >>> 0).toString(16).toUpperCase().padStart(6, '0')} + ${i18n.getMessage('adsbCallsign')}: ${feature.get('name')} + ${i18n.getMessage('gpsLat')}: ${feature.get('data').lat / 10000000} + ${i18n.getMessage('gpsLon')}: ${feature.get('data').lon / 10000000} + ${i18n.getMessage('adsbAsl')}: ${(feature.get('data').altCM) / 100}m + ${i18n.getMessage('adsbHeading')}: ${feature.get('data').headingDegrees}° + ${i18n.getMessage('adsbType')}: ${ADSB_VEHICLE_TYPE[feature.get('data').emitterType].name}` ).open(); - }else{ + } else { TABS.gps.toolboxAdsbVehicle.close(); } }); @@ -463,7 +553,15 @@ TABS.gps.initialize = function (callback) { } function get_raw_adsb_data() { - MSP.send_message(MSPCodes.MSP2_ADSB_VEHICLE_LIST, false, false, update_adsb_ui); + MSP.send_message(MSPCodes.MSP2_ADSB_VEHICLE_LIST, false, false, get_adsb_warning); + } + + function get_adsb_warning() { + if(FC.ADSB_VEHICLES.vehiclesCount > 0) { + MSP.send_message(MSPCodes.MSP2_ADSB_WARNING_VEHICLE_ICAO, false, false, update_adsb_ui); + } else { + update_adsb_ui(); + } } function update_gps_ui() { @@ -550,6 +648,20 @@ TABS.gps.initialize = function (callback) { $('.adsbVehicleTotalMessages').html(FC.ADSB_VEHICLES.vehiclePacketCount); $('.adsbHeartbeatTotalMessages').html(FC.ADSB_VEHICLES.heartbeatPacketCount); + if(FC.ADSB_VEHICLES.vehiclePacketCount > 0){ + $('.adsbWarningIcao').html('0x' + (FC.ADSB_WARNING_ICAO.icao >>> 0).toString(16).toUpperCase().padStart(6, '0')); + $('.adsbWarningType').html(FC.ADSB_WARNING_ICAO.icao != 0 ? (FC.ADSB_WARNING_ICAO.isAlert == 1 ? i18n.getMessage('adsbAlert') : i18n.getMessage('adsbWarning')) : i18n.getMessage('adsbNoWarning')); + + $('.adsbWarningIcaoRow').show(); + $('.adsbWarningTypeRow').show(); + renderAdsbListTable(); + }else{ + $('.adsbWarningIcaoRow').hide(); + $('.adsbWarningTypeRow').hide(); + $('.adsbVehicleListRow').hide(); + } + + for (let key in FC.ADSB_VEHICLES.vehicles) { let vehicle = FC.ADSB_VEHICLES.vehicles[key]; @@ -572,6 +684,7 @@ TABS.gps.initialize = function (callback) { rotation: vehicle.headingDegrees * (Math.PI / 180), scale: 0.8, anchor: [0.5, 0.5], + color: ((FC.ADSB_WARNING_ICAO.icao != 0 && FC.ADSB_WARNING_ICAO.icao == vehicle.icao) ? (FC.ADSB_WARNING_ICAO.isAlert == 1 ? '#C81B1B' : '#FFA500') : '#ffffff'), src: ADSB_VEHICLE_TYPE[vehicle.emitterType].icon, })), text: new Text(({ @@ -598,6 +711,54 @@ TABS.gps.initialize = function (callback) { vehicleVectorSource.addFeature(iconFeature); } } + + ///////////////////////////////////////////////////////////////////////////////// + if (FC.GPS_DATA.fix >= 2 && vehiclesCursorInitialized && FC.ADSB_LIMITS.adsb_distance_alert > 0 && FC.ADSB_LIMITS.adsb_distance_warning > 0){ + let lat = FC.GPS_DATA.lat / 10000000; + let lon = FC.GPS_DATA.lon / 10000000; + + let circleWarning = circular( + [lon, lat], + FC.ADSB_LIMITS.adsb_distance_warning, + 64 + ); + circleWarning.transform('EPSG:4326', 'EPSG:3857'); + + let featureWarning = new Feature({ geometry: circleWarning }); + featureWarning.setStyle(new Style({ + fill: new Fill({ + color: 'rgba(255, 255, 0, 0.15)' + }), + stroke: new Stroke({ + color: '#ffff00', + width: 2 + }) + })); + + vehicleVectorSource.addFeature(featureWarning); + + let circleAlert = circular( + [lon, lat], + FC.ADSB_LIMITS.adsb_distance_alert, + 64 + ); + + circleAlert.transform('EPSG:4326', 'EPSG:3857'); + + let featureAlert = new Feature({ geometry: circleAlert }); + featureAlert.setStyle(new Style({ + fill: new Fill({ + color: 'rgba(255, 0, 0, 0.15)' + }), + stroke: new Stroke({ + color: '#ff0000', + width: 2 + }) + })); + + vehicleVectorSource.addFeature(featureAlert); + } +/////////////////////////////////////////////////////////////////////////////// } /* |