Skip to content

Fix position bugs #4360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Withalion merged 7 commits into from
Mar 2, 2026
Merged

Fix position bugs #4360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e2cbbef
Fix elevation available when it shouldn't be
Withalion Mar 2, 2026
926a020
Fix info button in GPS panel
Withalion Mar 2, 2026
09d26cd
Fix layout
Withalion Mar 2, 2026
a818ab1
Return EGM96 only for not mocked position on iOS
Withalion Mar 2, 2026
a473b64
Fix elevation info
Withalion Mar 2, 2026
2af291e
Update translatable strings
Withalion Mar 2, 2026
00aac6b
Fix formatting
Withalion Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion app/i18n/input_en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,6 +1118,16 @@ Won&apos;t be added to the project.</source>
<source>Altitude</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/gps/MMGpsDataDrawer.qml" line="202"/>
<source>Orthometric height, using %1 geoid</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/gps/MMGpsDataDrawer.qml" line="202"/>
<source>Elevation using unspecified grid</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/gps/MMGpsDataDrawer.qml" line="208"/>
<source>Fix quality</source>
Expand Down Expand Up @@ -2969,7 +2979,7 @@ only allows up to %1 downloaded projects.</source>
<context>
<name>PositionKit</name>
<message>
<location filename="../position/positionkit.cpp" line="116"/>
<location filename="../position/positionkit.cpp" line="122"/>
<source>External (Mock)</source>
<translation type="unfinished"></translation>
</message>
Expand Down
6 changes: 6 additions & 0 deletions app/position/positionkit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ QString PositionKit::positionCrs3DGeoidModelName()
return mVerticalCrs.description();
}

// for internal providers return EGM96 model
if ( mPositionProvider->type() == QStringLiteral( "internal" ) && !mPosition.isMock )
{
return QgsCoordinateReferenceSystem::fromEpsgId( 5773 ).description();
}

return {};
}

Expand Down
10 changes: 10 additions & 0 deletions app/position/positiontransformer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ GeoPosition PositionTransformer::processBluetoothPosition( GeoPosition geoPositi
geoPosition.elevation = geoidPosition.z();
geoPosition.elevation_diff = ellipsoidElevation - geoidPosition.z();
}
else
{
geoPosition.elevation = std::numeric_limits<double>::quiet_NaN();
geoPosition.elevation_diff = std::numeric_limits<double>::quiet_NaN();
}
}

return geoPosition;
Expand All @@ -65,6 +70,11 @@ GeoPosition PositionTransformer::processAndroidPosition( GeoPosition geoPosition
geoPosition.elevation = geoidPosition.z();
geoPosition.elevation_diff = geoidSeparation;
}
else
{
geoPosition.elevation = std::numeric_limits<double>::quiet_NaN();
geoPosition.elevation_diff = std::numeric_limits<double>::quiet_NaN();
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/qml/gps/MMGpsDataDrawer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ MMComponents.MMDrawer {
}

alignmentRight: Positioner.index % 2 === 1
desc: PositionKit.positionCrs3DGeoidModelName().length > 0 ? qsTr(("Orthometric height, using %1 geoid").arg(PositionKit.positionCrs3DGeoidModelName())) : ""
desc: PositionKit.positionCrs3DGeoidModelName().length > 0 ? qsTr("Orthometric height, using %1 geoid").arg(PositionKit.positionCrs3DGeoidModelName()) : qsTr("Elevation using unspecified grid")
}

MMGpsComponents.MMGpsDataText {
Expand Down
Loading