Merge branch 'more_aprs_info'

This commit is contained in:
Marat Fayzullin 2022-12-05 23:19:24 -05:00
commit c04e8584ef

View File

@ -453,15 +453,17 @@ $(function(){
weatherString += makeListItem('Pressure', marker.weather.barometricpressure.toFixed(1) + ' mbar'); weatherString += makeListItem('Pressure', marker.weather.barometricpressure.toFixed(1) + ' mbar');
} }
if (marker.weather.wind && (marker.weather.wind.speed>0)) { if (marker.weather.wind) {
weatherString += makeListItem('Wind', if (marker.weather.wind.speed && (marker.weather.wind.speed>0)) {
degToCompass(marker.weather.wind.direction) + ' ' + weatherString += makeListItem('Wind',
marker.weather.wind.speed.toFixed(1) + ' km/h ' degToCompass(marker.weather.wind.direction) + ' ' +
); marker.weather.wind.speed.toFixed(1) + ' km/h '
} );
}
if (marker.weather.wind.gust && (marker.weather.wind.gust>0)) { if (marker.weather.wind.gust && (marker.weather.wind.gust>0)) {
weatherString += makeListItem('Gusts', marker.weather.wind.gust.toFixed(1) + ' km/h'); weatherString += makeListItem('Gusts', marker.weather.wind.gust.toFixed(1) + ' km/h');
}
} }
if (marker.weather.rain && (marker.weather.rain.day>0)) { if (marker.weather.rain && (marker.weather.rain.day>0)) {