Skip to content

Commit e2b69c3

Browse files
pblottierepblottiere
committedJul 23, 2018
Add more parameters as enum
·
ltr-3_40final-3_4_0
1 parent 683975c commit e2b69c3

File tree

4 files changed

+66
-10
lines changed

4 files changed

+66
-10
lines changed
 

‎src/server/services/wms/qgswmsparameters.cpp

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,21 @@ namespace QgsWms
393393
const QgsWmsParameter pFilterGeom( QgsWmsParameter::FILTER_GEOM );
394394
save( pFilterGeom );
395395

396+
const QgsWmsParameter pPolygTol( QgsWmsParameter::FI_POLYGON_TOLERANCE,
397+
QVariant::Double,
398+
QVariant( 0.0 ) );
399+
save( pPolygTol );
400+
401+
const QgsWmsParameter pLineTol( QgsWmsParameter::FI_LINE_TOLERANCE,
402+
QVariant::Double,
403+
QVariant( 0.0 ) );
404+
save( pLineTol );
405+
406+
const QgsWmsParameter pPointTol( QgsWmsParameter::FI_POINT_TOLERANCE,
407+
QVariant::Double,
408+
QVariant( 0.0 ) );
409+
save( pPointTol );
410+
396411
const QgsWmsParameter pSelection( QgsWmsParameter::SELECTION );
397412
save( pSelection );
398413

@@ -916,6 +931,36 @@ namespace QgsWms
916931
return mWmsParameters[ QgsWmsParameter::ITEMFONTBOLD ].toString();
917932
}
918933

934+
QString QgsWmsParameters::polygonTolerance() const
935+
{
936+
return mWmsParameters[ QgsWmsParameter::FI_POLYGON_TOLERANCE ].toString();
937+
}
938+
939+
QString QgsWmsParameters::lineTolerance() const
940+
{
941+
return mWmsParameters[ QgsWmsParameter::FI_LINE_TOLERANCE ].toString();
942+
}
943+
944+
QString QgsWmsParameters::pointTolerance() const
945+
{
946+
return mWmsParameters[ QgsWmsParameter::FI_POINT_TOLERANCE ].toString();
947+
}
948+
949+
int QgsWmsParameters::polygonToleranceAsInt() const
950+
{
951+
return mWmsParameters[ QgsWmsParameter::FI_POLYGON_TOLERANCE ].toInt();
952+
}
953+
954+
int QgsWmsParameters::lineToleranceAsInt() const
955+
{
956+
return mWmsParameters[ QgsWmsParameter::FI_LINE_TOLERANCE ].toInt();
957+
}
958+
959+
int QgsWmsParameters::pointToleranceAsInt() const
960+
{
961+
return mWmsParameters[ QgsWmsParameter::FI_POINT_TOLERANCE ].toInt();
962+
}
963+
919964
bool QgsWmsParameters::itemFontBoldAsBool() const
920965
{
921966
return mWmsParameters[ QgsWmsParameter::ITEMFONTBOLD ].toBool();

‎src/server/services/wms/qgswmsparameters.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ namespace QgsWms
116116
SYMBOLWIDTH,
117117
OPACITIES,
118118
SLD,
119+
FI_POLYGON_TOLERANCE,
120+
FI_LINE_TOLERANCE,
121+
FI_POINT_TOLERANCE,
119122
FILTER,
120123
FILTER_GEOM,
121124
FORMAT,
@@ -346,6 +349,18 @@ namespace QgsWms
346349
*/
347350
QList<QgsWmsParametersLayer> layersParameters() const;
348351

352+
QString polygonTolerance() const;
353+
354+
QString lineTolerance() const;
355+
356+
QString pointTolerance() const;
357+
358+
int polygonToleranceAsInt() const;
359+
360+
int lineToleranceAsInt() const;
361+
362+
int pointToleranceAsInt() const;
363+
349364
/**
350365
* Returns FORMAT parameter as a string.
351366
* \returns FORMAT parameter as string

‎src/server/services/wms/qgswmsrenderer.cpp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2307,10 +2307,9 @@ namespace QgsWms
23072307
double mapUnitTolerance = 0.0;
23082308
if ( ml->geometryType() == QgsWkbTypes::PolygonGeometry )
23092309
{
2310-
QMap<QString, QString>::const_iterator tolIt = mParameters.find( QStringLiteral( "FI_POLYGON_TOLERANCE" ) );
2311-
if ( tolIt != mParameters.constEnd() )
2310+
if ( ! mWmsParameters.polygonTolerance().isEmpty() )
23122311
{
2313-
mapUnitTolerance = tolIt.value().toInt() * rct.mapToPixel().mapUnitsPerPixel();
2312+
mapUnitTolerance = mWmsParameters.polygonToleranceAsInt() * rct.mapToPixel().mapUnitsPerPixel();
23142313
}
23152314
else
23162315
{
@@ -2319,10 +2318,9 @@ namespace QgsWms
23192318
}
23202319
else if ( ml->geometryType() == QgsWkbTypes::LineGeometry )
23212320
{
2322-
QMap<QString, QString>::const_iterator tolIt = mParameters.find( QStringLiteral( "FI_LINE_TOLERANCE" ) );
2323-
if ( tolIt != mParameters.constEnd() )
2321+
if ( ! mWmsParameters.lineTolerance().isEmpty() )
23242322
{
2325-
mapUnitTolerance = tolIt.value().toInt() * rct.mapToPixel().mapUnitsPerPixel();
2323+
mapUnitTolerance = mWmsParameters.lineToleranceAsInt() * rct.mapToPixel().mapUnitsPerPixel();
23262324
}
23272325
else
23282326
{
@@ -2331,10 +2329,9 @@ namespace QgsWms
23312329
}
23322330
else //points
23332331
{
2334-
QMap<QString, QString>::const_iterator tolIt = mParameters.find( QStringLiteral( "FI_POINT_TOLERANCE" ) );
2335-
if ( tolIt != mParameters.constEnd() )
2332+
if ( ! mWmsParameters.pointTolerance().isEmpty() )
23362333
{
2337-
mapUnitTolerance = tolIt.value().toInt() * rct.mapToPixel().mapUnitsPerPixel();
2334+
mapUnitTolerance = mWmsParameters.pointToleranceAsInt() * rct.mapToPixel().mapUnitsPerPixel();
23382335
}
23392336
else
23402337
{

‎src/server/services/wms/qgswmsrenderer.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ namespace QgsWms
292292

293293
private:
294294

295-
QgsServerRequest::Parameters mParameters;
296295
const QgsWmsParameters &mWmsParameters;
297296

298297
#ifdef HAVE_SERVER_PYTHON_PLUGINS

0 commit comments

Comments
 (0)
Please sign in to comment.