Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions app/inpututils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ QString InputUtils::geometryLengthAsString( const QgsGeometry &geometry )
{
QgsDistanceArea distanceArea;
distanceArea.setEllipsoid( QStringLiteral( "WGS84" ) );
distanceArea.setSourceCrs( PositionKit::positionCrs2D(), QgsCoordinateTransformContext() );
distanceArea.setSourceCrs( PositionKit::positionCrs2D(), QgsProject::instance()->transformContext() );

qreal length = distanceArea.measureLength( geometry );

Expand Down Expand Up @@ -955,7 +955,7 @@ QgsPoint InputUtils::mapPointToGps( QPointF mapPosition, InputMapSettings *mapSe
const QgsPointXY transformedXY = transformPoint(
mapSettings->destinationCrs(),
PositionKit::positionCrs2D(),
QgsCoordinateTransformContext(),
mapSettings->transformContext(),
positionMapCrs
);

Expand Down
2 changes: 1 addition & 1 deletion app/position/providers/androidpositionprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void jniOnPositionUpdated( JNIEnv *env, jclass clazz, jint instanceId, jobject l
const QgsPoint geoidPosition = InputUtils::transformPoint(
PositionKit::positionCrs3DEllipsoidHeight(),
PositionKit::positionCrs3D(),
QgsCoordinateTransformContext(),
QgsProject::instance()->transformContext(),
{longitude, latitude, value} );
pos.elevation = geoidPosition.z();
}
Expand Down
4 changes: 2 additions & 2 deletions app/projectwizard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ QgsVectorLayer *ProjectWizard::createGpkgLayer( QString const &projectDir, QList
return l;
}

static QgsVectorLayer *createTrackingLayer( const QString &trackingGpkgPath )
QgsVectorLayer *ProjectWizard::createTrackingLayer( const QString &trackingGpkgPath )
{
// based on the code in https://github.com/MerginMaps/qgis-plugin/blob/master/Mergin/utils.py
// (create_tracking_layer(), setup_tracking_layer(), set_tracking_layer_flags())
Expand All @@ -108,7 +108,7 @@ static QgsVectorLayer *createTrackingLayer( const QString &trackingGpkgPath )
fields,
Qgis::WkbType::LineStringZM,
QgsCoordinateReferenceSystem( "EPSG:4326" ),
QgsCoordinateTransformContext(),
mSettings->transformContext(),
options );
delete writer;

Expand Down
1 change: 1 addition & 0 deletions app/projectwizard.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class ProjectWizard : public QObject
void notifySuccess( const QString &message );
private:
QgsVectorLayer *createGpkgLayer( QString const &projectDir, QList<FieldConfiguration> const &fieldsConfig );
QgsVectorLayer *createTrackingLayer( const QString &trackingGpkgPath );
QgsFields createFields( const QList<FieldConfiguration> fieldsConfig ) const;
QgsSingleSymbolRenderer *surveyLayerRenderer();
QVariant::Type parseType( const QString &type ) const;
Expand Down
Loading