Merge branch 'more_aprs_info'
This commit is contained in:
commit
c04e8584ef
@ -453,7 +453,8 @@ $(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) {
|
||||||
|
if (marker.weather.wind.speed && (marker.weather.wind.speed>0)) {
|
||||||
weatherString += makeListItem('Wind',
|
weatherString += makeListItem('Wind',
|
||||||
degToCompass(marker.weather.wind.direction) + ' ' +
|
degToCompass(marker.weather.wind.direction) + ' ' +
|
||||||
marker.weather.wind.speed.toFixed(1) + ' km/h '
|
marker.weather.wind.speed.toFixed(1) + ' km/h '
|
||||||
@ -463,6 +464,7 @@ $(function(){
|
|||||||
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)) {
|
||||||
weatherString += makeListItem('Rain',
|
weatherString += makeListItem('Rain',
|
||||||
|
Loading…
Reference in New Issue
Block a user