sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-03 00:02:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

address review comments

Browse Source
This commit is contained in:
Alexander Bruy 2020-04-29 08:05:57 +03:00
parent 9a53837946
commit 744d2d6b6d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/analysis/processing/qgsalgorithmserviceareafromlayer.cpp
View File

@ -86,12 +86,12 @@ QVariantMap QgsServiceAreaFromLayerAlgorithm::processAlgorithm( const QVariantMa
if ( !startPoints )
throw QgsProcessingException( invalidSourceError( parameters, QStringLiteral( "START_POINTS" ) ) );
double travelCost = parameterAsDouble( parameters, QStringLiteral( "TRAVEL_COST" ), context );
if ( !travelCost )
travelCost = parameterAsDouble( parameters, QStringLiteral( "TRAVEL_COST2" ), context );
// use older deprecated travel cost style if specified, to maintain old api
const bool useOldTravelCost = parameters.value( QStringLiteral( "TRAVEL_COST" ) ).isValid();
double travelCost = parameterAsDouble( parameters, useOldTravelCost ? QStringLiteral( "TRAVEL_COST" ) : QStringLiteral( "TRAVEL_COST2" ), context );
int strategy = parameterAsInt( parameters, QStringLiteral( "STRATEGY" ), context );
if ( strategy )
if ( strategy && !useOldTravelCost )
travelCost *= mMultiplier;
bool includeBounds = true; // default to true to maintain 3.0 API

9
src/analysis/processing/qgsalgorithmserviceareafrompoint.cpp
View File

@ -83,12 +83,13 @@ QVariantMap QgsServiceAreaFromPointAlgorithm::processAlgorithm( const QVariantMa
loadCommonParams( parameters, context, feedback );
QgsPointXY startPoint = parameterAsPoint( parameters, QStringLiteral( "START_POINT" ), context, mNetwork->sourceCrs() );
double travelCost = parameterAsDouble( parameters, QStringLiteral( "TRAVEL_COST" ), context );
if ( !travelCost )
travelCost = parameterAsDouble( parameters, QStringLiteral( "TRAVEL_COST2" ), context );
// use older deprecated travel cost style if specified, to maintain old api
const bool useOldTravelCost = parameters.value( QStringLiteral( "TRAVEL_COST" ) ).isValid();
double travelCost = parameterAsDouble( parameters, useOldTravelCost ? QStringLiteral( "TRAVEL_COST" ) : QStringLiteral( "TRAVEL_COST2" ), context );
int strategy = parameterAsInt( parameters, QStringLiteral( "STRATEGY" ), context );
if ( strategy )
if ( strategy && !useOldTravelCost )
travelCost *= mMultiplier;
bool includeBounds = true; // default to true to maintain 3.0 API