Skip to content

Commit

Permalink
Readability
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Mar 25, 2024
1 parent 4d44244 commit 5bc06fe
Showing 1 changed file with 25 additions and 21 deletions.
46 changes: 25 additions & 21 deletions src/core/providers/sensorthings/qgssensorthingsshareddata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,32 +45,36 @@ QgsSensorThingsSharedData::QgsSensorThingsSharedData( const QString &uri )

if ( QgsSensorThingsUtils::entityTypeHasGeometry( mEntityType ) )
{
const QString geometryType = uriParts.value( QStringLiteral( "geometryType" ) ).toString();
if ( geometryType.compare( QLatin1String( "point" ), Qt::CaseInsensitive ) == 0 )
if ( uriParts.contains( QStringLiteral( "geometryType" ) ) )
{
mGeometryType = Qgis::WkbType::PointZ;
}
else if ( geometryType.compare( QLatin1String( "multipoint" ), Qt::CaseInsensitive ) == 0 )
{
mGeometryType = Qgis::WkbType::MultiPointZ;
}
else if ( geometryType.compare( QLatin1String( "line" ), Qt::CaseInsensitive ) == 0 )
{
mGeometryType = Qgis::WkbType::MultiLineStringZ;
}
else if ( geometryType.compare( QLatin1String( "polygon" ), Qt::CaseInsensitive ) == 0 )
{
mGeometryType = Qgis::WkbType::MultiPolygonZ;
const QString geometryType = uriParts.value( QStringLiteral( "geometryType" ) ).toString();
if ( geometryType.compare( QLatin1String( "point" ), Qt::CaseInsensitive ) == 0 )
{
mGeometryType = Qgis::WkbType::PointZ;
}
else if ( geometryType.compare( QLatin1String( "multipoint" ), Qt::CaseInsensitive ) == 0 )
{
mGeometryType = Qgis::WkbType::MultiPointZ;
}
else if ( geometryType.compare( QLatin1String( "line" ), Qt::CaseInsensitive ) == 0 )
{
mGeometryType = Qgis::WkbType::MultiLineStringZ;
}
else if ( geometryType.compare( QLatin1String( "polygon" ), Qt::CaseInsensitive ) == 0 )
{
mGeometryType = Qgis::WkbType::MultiPolygonZ;
}

if ( mGeometryType != Qgis::WkbType::NoGeometry )
{
// geometry is always GeoJSON spec (for now, at least), so CRS will always be WGS84
mSourceCRS = QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:4326" ) );
}
}
else if ( !uriParts.contains( QStringLiteral( "geometryType" ) ) )
else
{
mGeometryType = Qgis::WkbType::NoGeometry;
}
if ( mGeometryType != Qgis::WkbType::NoGeometry )
{
// geometry is always GeoJSON spec (for now, at least), so CRS will always be WGS84
mSourceCRS = QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:4326" ) );
}
}
else
{
Expand Down

0 comments on commit 5bc06fe

Please sign in to comment.