ua1zbe
/
trackdirect2
mirror of https://github.com/qvarforth/trackdirect
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #28 from shackrat/main 

Fix missing altitude on popup
This commit is contained in:
Per Qvarforth 2022-10-09 12:17:46 +02:00 committed by GitHub
parent 71a93298f2 198127e6c8
commit 083830934d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/public/js/trackdirect.min.js vendored
View File

@ -733,7 +733,7 @@ tailDistanceUnit+
"</span>");return distanceDiv;} "</span>");return distanceDiv;}
return null;};trackdirect.models.InfoWindow.prototype._getPacketSpeedAltitudeCourseDiv=function(){if(Math.round(this._marker.packet.speed)!=0||Math.round(this._marker.packet.course)!=0||Math.round(this._marker.packet.altitude)!=0){var speedDiv=$(document.createElement("div"));speedDiv.css("clear","both");speedDiv.css("font-weight","bold");if(this._marker.packet.speed!==null){if(this._defaultMap.state.useImperialUnit){speedDiv.append(Math.round(trackdirect.services.imperialConverter.convertKilometerToMile(this._marker.packet.speed))+" mph ");}else{speedDiv.append(Math.round(this._marker.packet.speed)+" km/h ");}} return null;};trackdirect.models.InfoWindow.prototype._getPacketSpeedAltitudeCourseDiv=function(){if(Math.round(this._marker.packet.speed)!=0||Math.round(this._marker.packet.course)!=0||Math.round(this._marker.packet.altitude)!=0){var speedDiv=$(document.createElement("div"));speedDiv.css("clear","both");speedDiv.css("font-weight","bold");if(this._marker.packet.speed!==null){if(this._defaultMap.state.useImperialUnit){speedDiv.append(Math.round(trackdirect.services.imperialConverter.convertKilometerToMile(this._marker.packet.speed))+" mph ");}else{speedDiv.append(Math.round(this._marker.packet.speed)+" km/h ");}}
if(this._marker.packet.course!==null){speedDiv.append(Math.round(this._marker.packet.course)+"&deg; ");} if(this._marker.packet.course!==null){speedDiv.append(Math.round(this._marker.packet.course)+"&deg; ");}
if(this._marker.packet.course!==null){if(this._defaultMap.state.useImperialUnit){speedDiv.append(" alt "+ if(this._marker.packet.altitude!==null){if(this._defaultMap.state.useImperialUnit){speedDiv.append(" alt "+
Math.round(trackdirect.services.imperialConverter.convertMeterToFeet(this._marker.packet.altitude))+ Math.round(trackdirect.services.imperialConverter.convertMeterToFeet(this._marker.packet.altitude))+
" ft ");}else{speedDiv.append(" alt "+Math.round(this._marker.packet.altitude)+" m ");}} " ft ");}else{speedDiv.append(" alt "+Math.round(this._marker.packet.altitude)+" m ");}}
return speedDiv;} return speedDiv;}

2
jslib/src/trackdirect/models/InfoWindow.js
View File

@ -819,7 +819,7 @@ trackdirect.models.InfoWindow.prototype._getPacketSpeedAltitudeCourseDiv =
speedDiv.append(Math.round(this._marker.packet.course) + "&deg; "); speedDiv.append(Math.round(this._marker.packet.course) + "&deg; ");
} }
if (this._marker.packet.course !== null) { if (this._marker.packet.altitude !== null) {
if (this._defaultMap.state.useImperialUnit) { if (this._defaultMap.state.useImperialUnit) {
speedDiv.append( speedDiv.append(
" alt " + " alt " +