Skip to content

Commit f8d1176

Browse files
root676nyalldawson
authored andcommittedOct 24, 2021
run styling script
1 parent 4507337 commit f8d1176

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed
 

‎src/analysis/processing/qgsalgorithmshortestline.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -71,36 +71,36 @@ void QgsShortestLineAlgorithm::initAlgorithm( const QVariantMap & )
7171
{
7272
addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "SOURCE" ), QObject::tr( "Source layer" ), QList<int>() << QgsProcessing::TypeVectorAnyGeometry ) );
7373
addParameter( new QgsProcessingParameterFeatureSource( QStringLiteral( "DESTINATION" ), QObject::tr( "Destination layer" ), QList<int>() << QgsProcessing::TypeVectorAnyGeometry ) );
74-
addParameter( new QgsProcessingParameterNumber( QStringLiteral( "NEIGHBORS" ), QObject::tr( "Maximum number of neighbors" ), QgsProcessingParameterNumber::Integer, 1, false, 1) );
75-
addParameter( new QgsProcessingParameterDistance( QStringLiteral( "DISTANCE"), QObject::tr( "Maximum distance" ), QVariant(), QString("SOURCE"), true ) );
76-
addParameter( new QgsProcessingParameterFeatureSink( QStringLiteral( "OUTPUT" ), QObject::tr("Shortest lines") ) );
74+
addParameter( new QgsProcessingParameterNumber( QStringLiteral( "NEIGHBORS" ), QObject::tr( "Maximum number of neighbors" ), QgsProcessingParameterNumber::Integer, 1, false, 1 ) );
75+
addParameter( new QgsProcessingParameterDistance( QStringLiteral( "DISTANCE" ), QObject::tr( "Maximum distance" ), QVariant(), QString( "SOURCE" ), true ) );
76+
addParameter( new QgsProcessingParameterFeatureSink( QStringLiteral( "OUTPUT" ), QObject::tr( "Shortest lines" ) ) );
7777
}
7878

7979
bool QgsShortestLineAlgorithm::prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback * )
8080
{
81-
mSource.reset( parameterAsSource( parameters, QStringLiteral( "SOURCE" ), context) );
81+
mSource.reset( parameterAsSource( parameters, QStringLiteral( "SOURCE" ), context ) );
8282
if ( !mSource )
8383
throw QgsProcessingException( invalidSourceError( parameters, QStringLiteral( "SOURCE" ) ) );
8484

85-
mDestination.reset( parameterAsSource( parameters, QStringLiteral( "DESTINATION" ), context) );
85+
mDestination.reset( parameterAsSource( parameters, QStringLiteral( "DESTINATION" ), context ) );
8686
if ( !mSource )
8787
throw QgsProcessingException( invalidSourceError( parameters, QStringLiteral( "DESTINATION" ) ) );
8888

8989
mKNeighbors = parameterAsInt( parameters, QStringLiteral( "NEIGHBORS" ), context );
9090

9191
double paramMaxDist = parameterAsDouble( parameters, QStringLiteral( "DISTANCE" ), context ); //defaults to zero if not set
92-
if(paramMaxDist)
92+
if ( paramMaxDist )
9393
mMaxDistance = paramMaxDist;
9494

9595
return true;
9696
}
9797

9898
QVariantMap QgsShortestLineAlgorithm::processAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
9999
{
100-
if(mKNeighbors > mDestination->featureCount())
100+
if ( mKNeighbors > mDestination->featureCount() )
101101
mKNeighbors = mDestination->featureCount();
102102

103-
QgsFields fields = QgsProcessingUtils::combineFields( mSource->fields(), mDestination->fields());
103+
QgsFields fields = QgsProcessingUtils::combineFields( mSource->fields(), mDestination->fields() );
104104
fields.append( QgsField( QStringLiteral( "distance" ), QVariant::Double ) );
105105

106106
QString dest;
@@ -111,46 +111,46 @@ QVariantMap QgsShortestLineAlgorithm::processAlgorithm( const QVariantMap &param
111111
QgsFeatureRequest request = QgsFeatureRequest();
112112
request.setDestinationCrs( mSource->sourceCrs(), context.transformContext() );
113113

114-
QgsSpatialIndex idx = QgsSpatialIndex( mDestination->getFeatures(request), nullptr, QgsSpatialIndex::FlagStoreFeatureGeometries );
114+
QgsSpatialIndex idx = QgsSpatialIndex( mDestination->getFeatures( request ), nullptr, QgsSpatialIndex::FlagStoreFeatureGeometries );
115115

116116
QgsFeatureIterator sourceIterator = mSource->getFeatures();
117117
double step = mSource->featureCount() > 0 ? 100.0 / mSource->featureCount() : 1;
118118

119119
QgsDistanceArea da = QgsDistanceArea();
120-
da.setSourceCrs(mSource->sourceCrs(), context.transformContext());
121-
da.setEllipsoid(context.ellipsoid());
120+
da.setSourceCrs( mSource->sourceCrs(), context.transformContext() );
121+
da.setEllipsoid( context.ellipsoid() );
122122

123123
int i = 0;
124124
QgsFeature sourceFeature;
125125
while ( sourceIterator.nextFeature( sourceFeature ) )
126126
{
127-
if(feedback->isCanceled())
127+
if ( feedback->isCanceled() )
128128
break;
129129

130130

131131
QgsGeometry sourceGeom = sourceFeature.geometry();
132-
QgsFeatureIds nearestIds = idx.nearestNeighbor(sourceGeom, mKNeighbors, mMaxDistance).toSet();
132+
QgsFeatureIds nearestIds = idx.nearestNeighbor( sourceGeom, mKNeighbors, mMaxDistance ).toSet();
133133

134134
QgsFeatureRequest targetRequest = QgsFeatureRequest();
135135
targetRequest.setFilterFids( nearestIds );
136136

137-
QgsFeatureIterator destinationIterator = mDestination->getFeatures(targetRequest);
137+
QgsFeatureIterator destinationIterator = mDestination->getFeatures( targetRequest );
138138
QgsFeature destinationFeature;
139-
while ( destinationIterator.nextFeature(destinationFeature) )
139+
while ( destinationIterator.nextFeature( destinationFeature ) )
140140
{
141141
QgsGeometry destinationGeom = destinationFeature.geometry();
142142

143-
QgsGeometry shortestLine = sourceGeom.shortestLine(destinationGeom);
144-
double dist = da.measureLength(shortestLine);
143+
QgsGeometry shortestLine = sourceGeom.shortestLine( destinationGeom );
144+
double dist = da.measureLength( shortestLine );
145145

146146
QgsFeature f;
147147

148148
QgsAttributes attrs = sourceFeature.attributes();
149149
attrs << destinationFeature.attributes() << dist;
150150

151-
f.setAttributes(attrs);
152-
f.setGeometry(shortestLine);
153-
sink->addFeature(f, QgsFeatureSink::FastInsert);
151+
f.setAttributes( attrs );
152+
f.setGeometry( shortestLine );
153+
sink->addFeature( f, QgsFeatureSink::FastInsert );
154154
}
155155

156156
i++;

0 commit comments

Comments
 (0)
Please sign in to comment.