Skip to content

Commit 29d280f

Browse files
rldhontrldhont
committed
[Server] Update deprecated QgsCoordinateTransform instance creation
Using the project as the context for QgsCoordinateTransform instance creation
1 parent 2075141 commit 29d280f

9 files changed

+34
-54
lines changed

‎src/server/services/wcs/qgswcsdescribecoverage.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ namespace QgsWcs
120120
if ( coveNameList.size() == 0 || coveNameList.contains( name ) )
121121
{
122122
QgsRasterLayer *rLayer = qobject_cast<QgsRasterLayer *>( layer );
123-
coveDescElement.appendChild( getCoverageOffering( doc, const_cast<QgsRasterLayer *>( rLayer ) ) );
123+
coveDescElement.appendChild( getCoverageOffering( doc, const_cast<QgsRasterLayer *>( rLayer ), project ) );
124124
}
125125
}
126126
return doc;

‎src/server/services/wcs/qgswcsgetcapabilities.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ namespace QgsWcs
323323
#endif
324324

325325
QgsRasterLayer *rLayer = qobject_cast<QgsRasterLayer *>( layer );
326-
QDomElement layerElem = getCoverageOffering( doc, const_cast<QgsRasterLayer *>( rLayer ), true );
326+
QDomElement layerElem = getCoverageOffering( doc, const_cast<QgsRasterLayer *>( rLayer ), project, true );
327327

328328
contentMetadataElement.appendChild( layerElem );
329329
}

‎src/server/services/wcs/qgswcsgetcoverage.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,7 @@ namespace QgsWcs
165165
// transform rect
166166
if ( requestCRS != rLayer->crs() )
167167
{
168-
Q_NOWARN_DEPRECATED_PUSH
169-
QgsCoordinateTransform t( requestCRS, rLayer->crs() );
170-
Q_NOWARN_DEPRECATED_POP
168+
QgsCoordinateTransform t( requestCRS, rLayer->crs(), project );
171169
rect = t.transformBoundingBox( rect );
172170
}
173171

‎src/server/services/wcs/qgswcsutils.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace QgsWcs
3232
return QStringLiteral( "1.0.0" );
3333
}
3434

35-
QDomElement getCoverageOffering( QDomDocument &doc, const QgsRasterLayer *layer, bool brief )
35+
QDomElement getCoverageOffering( QDomDocument &doc, const QgsRasterLayer *layer, const QgsProject *project, bool brief )
3636
{
3737
QDomElement layerElem;
3838
if ( brief )
@@ -73,9 +73,7 @@ namespace QgsWcs
7373

7474
//lonLatEnvelope
7575
QgsCoordinateReferenceSystem layerCrs = layer->crs();
76-
Q_NOWARN_DEPRECATED_PUSH
77-
QgsCoordinateTransform t( layerCrs, QgsCoordinateReferenceSystem( 4326 ) );
78-
Q_NOWARN_DEPRECATED_POP
76+
QgsCoordinateTransform t( layerCrs, QgsCoordinateReferenceSystem( 4326 ), project );
7977
//transform
8078
QgsRectangle BBox;
8179
try

‎src/server/services/wcs/qgswcsutils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace QgsWcs
4545
/**
4646
* CoverageOffering or CoverageOfferingBrief element
4747
*/
48-
QDomElement getCoverageOffering( QDomDocument &doc, const QgsRasterLayer *layer, bool brief = false );
48+
QDomElement getCoverageOffering( QDomDocument &doc, const QgsRasterLayer *layer, const QgsProject *project, bool brief = false );
4949

5050
/**
5151
* Service URL string

‎src/server/services/wfs/qgswfsgetcapabilities.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -559,9 +559,7 @@ namespace QgsWfs
559559
QgsRectangle wgs84BoundingRect;
560560
if ( !layerExtent.isNull() )
561561
{
562-
Q_NOWARN_DEPRECATED_PUSH
563-
QgsCoordinateTransform exGeoTransform( layer->crs(), wgs84 );
564-
Q_NOWARN_DEPRECATED_POP
562+
QgsCoordinateTransform exGeoTransform( layer->crs(), wgs84, project );
565563
try
566564
{
567565
wgs84BoundingRect = exGeoTransform.transformBoundingBox( layerExtent );

‎src/server/services/wfs/qgswfsgetfeature.cpp

+13-21
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ namespace QgsWfs
6262

6363
QString createFeatureGeoJSON( QgsFeature *feat, const createFeatureParams &params );
6464

65-
QDomElement createFeatureGML2( QgsFeature *feat, QDomDocument &doc, const createFeatureParams &params );
65+
QDomElement createFeatureGML2( QgsFeature *feat, QDomDocument &doc, const createFeatureParams &params, const QgsProject *project );
6666

67-
QDomElement createFeatureGML3( QgsFeature *feat, QDomDocument &doc, const createFeatureParams &params );
67+
QDomElement createFeatureGML3( QgsFeature *feat, QDomDocument &doc, const createFeatureParams &params, const QgsProject *project );
6868

6969
void hitGetFeature( const QgsServerRequest &request, QgsServerResponse &response, const QgsProject *project,
7070
QgsWfsParameters::Format format, int numberOfFeatures, const QStringList &typeNames );
@@ -74,7 +74,7 @@ namespace QgsWfs
7474
QgsRectangle *rect, const QStringList &typeNames );
7575

7676
void setGetFeature( QgsServerResponse &response, QgsWfsParameters::Format format, QgsFeature *feat, int featIdx,
77-
const createFeatureParams &params );
77+
const createFeatureParams &params, const QgsProject *project );
7878

7979
void endGetFeature( QgsServerResponse &response, QgsWfsParameters::Format format );
8080

@@ -155,9 +155,7 @@ namespace QgsWfs
155155
}
156156
else
157157
{
158-
Q_NOWARN_DEPRECATED_PUSH
159-
QgsCoordinateTransform transform( layer->crs(), requestCrs );
160-
Q_NOWARN_DEPRECATED_POP
158+
QgsCoordinateTransform transform( layer->crs(), requestCrs, project );
161159
try
162160
{
163161
if ( requestRect.isEmpty() )
@@ -357,9 +355,7 @@ namespace QgsWfs
357355

358356
if ( !featureRequest.filterRect().isEmpty() )
359357
{
360-
Q_NOWARN_DEPRECATED_PUSH
361-
QgsCoordinateTransform transform( outputCrs, vlayer->crs() );
362-
Q_NOWARN_DEPRECATED_POP
358+
QgsCoordinateTransform transform( outputCrs, vlayer->crs(), project );
363359
try
364360
{
365361
featureRequest.setFilterRect( transform.transform( featureRequest.filterRect() ) );
@@ -405,7 +401,7 @@ namespace QgsWfs
405401

406402
if ( iteratedFeatures >= aRequest.startIndex )
407403
{
408-
setGetFeature( response, aRequest.outputFormat, &feature, sentFeatures, cfp );
404+
setGetFeature( response, aRequest.outputFormat, &feature, sentFeatures, cfp, project );
409405
++sentFeatures;
410406
}
411407
++iteratedFeatures;
@@ -1169,7 +1165,7 @@ namespace QgsWfs
11691165
}
11701166

11711167
void setGetFeature( QgsServerResponse &response, QgsWfsParameters::Format format, QgsFeature *feat, int featIdx,
1172-
const createFeatureParams &params )
1168+
const createFeatureParams &params, const QgsProject *project )
11731169
{
11741170
if ( !feat->isValid() )
11751171
return;
@@ -1196,12 +1192,12 @@ namespace QgsWfs
11961192
QDomElement featureElement;
11971193
if ( format == QgsWfsParameters::Format::GML3 )
11981194
{
1199-
featureElement = createFeatureGML3( feat, gmlDoc, params );
1195+
featureElement = createFeatureGML3( feat, gmlDoc, params, project );
12001196
gmlDoc.appendChild( featureElement );
12011197
}
12021198
else
12031199
{
1204-
featureElement = createFeatureGML2( feat, gmlDoc, params );
1200+
featureElement = createFeatureGML2( feat, gmlDoc, params, project );
12051201
gmlDoc.appendChild( featureElement );
12061202
}
12071203
response.write( gmlDoc.toByteArray() );
@@ -1255,7 +1251,7 @@ namespace QgsWfs
12551251
}
12561252

12571253

1258-
QDomElement createFeatureGML2( QgsFeature *feat, QDomDocument &doc, const createFeatureParams &params )
1254+
QDomElement createFeatureGML2( QgsFeature *feat, QDomDocument &doc, const createFeatureParams &params, const QgsProject *project )
12591255
{
12601256
//gml:FeatureMember
12611257
QDomElement featureElement = doc.createElement( QStringLiteral( "gml:featureMember" )/*wfs:FeatureMember*/ );
@@ -1271,9 +1267,7 @@ namespace QgsWfs
12711267
{
12721268
int prec = params.precision;
12731269
QgsCoordinateReferenceSystem crs = params.crs;
1274-
Q_NOWARN_DEPRECATED_PUSH
1275-
QgsCoordinateTransform mTransform( crs, params.outputCrs );
1276-
Q_NOWARN_DEPRECATED_POP
1270+
QgsCoordinateTransform mTransform( crs, params.outputCrs, project );
12771271
try
12781272
{
12791273
QgsGeometry transformed = geom;
@@ -1352,7 +1346,7 @@ namespace QgsWfs
13521346
return featureElement;
13531347
}
13541348

1355-
QDomElement createFeatureGML3( QgsFeature *feat, QDomDocument &doc, const createFeatureParams &params )
1349+
QDomElement createFeatureGML3( QgsFeature *feat, QDomDocument &doc, const createFeatureParams &params, const QgsProject *project )
13561350
{
13571351
//gml:FeatureMember
13581352
QDomElement featureElement = doc.createElement( QStringLiteral( "gml:featureMember" )/*wfs:FeatureMember*/ );
@@ -1368,9 +1362,7 @@ namespace QgsWfs
13681362
{
13691363
int prec = params.precision;
13701364
QgsCoordinateReferenceSystem crs = params.crs;
1371-
Q_NOWARN_DEPRECATED_PUSH
1372-
QgsCoordinateTransform mTransform( crs, params.outputCrs );
1373-
Q_NOWARN_DEPRECATED_POP
1365+
QgsCoordinateTransform mTransform( crs, params.outputCrs, project );
13741366
try
13751367
{
13761368
QgsGeometry transformed = geom;

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

+13-17
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,12 @@ namespace QgsWms
6161
const QgsProject *project );
6262

6363
void appendLayerBoundingBox( QDomDocument &doc, QDomElement &layerElem, const QgsRectangle &layerExtent,
64-
const QgsCoordinateReferenceSystem &layerCRS, const QString &crsText );
64+
const QgsCoordinateReferenceSystem &layerCRS, const QString &crsText,
65+
const QgsProject *project );
6566

6667
void appendLayerBoundingBoxes( QDomDocument &doc, QDomElement &layerElem, const QgsRectangle &lExtent,
6768
const QgsCoordinateReferenceSystem &layerCRS, const QStringList &crsList,
68-
const QStringList &constrainedCrsList );
69+
const QStringList &constrainedCrsList, const QgsProject *project );
6970

7071
void appendCrsElementToLayer( QDomDocument &doc, QDomElement &layerElement, const QDomElement &precedingElement,
7172
const QString &crsText );
@@ -1037,7 +1038,7 @@ namespace QgsWms
10371038
appendCrsElementsToLayer( doc, layerElem, crsList, outputCrsList );
10381039

10391040
//Ex_GeographicBoundingBox
1040-
appendLayerBoundingBoxes( doc, layerElem, l->extent(), l->crs(), crsList, outputCrsList );
1041+
appendLayerBoundingBoxes( doc, layerElem, l->extent(), l->crs(), crsList, outputCrsList, project );
10411042
}
10421043

10431044
// add details about supported styles of the layer
@@ -1291,7 +1292,7 @@ namespace QgsWms
12911292

12921293
void appendLayerBoundingBoxes( QDomDocument &doc, QDomElement &layerElem, const QgsRectangle &lExtent,
12931294
const QgsCoordinateReferenceSystem &layerCRS, const QStringList &crsList,
1294-
const QStringList &constrainedCrsList )
1295+
const QStringList &constrainedCrsList, const QgsProject *project )
12951296
{
12961297
if ( layerElem.isNull() )
12971298
{
@@ -1315,9 +1316,7 @@ namespace QgsWms
13151316
QgsRectangle wgs84BoundingRect;
13161317
if ( !layerExtent.isNull() )
13171318
{
1318-
Q_NOWARN_DEPRECATED_PUSH
1319-
QgsCoordinateTransform exGeoTransform( layerCRS, wgs84 );
1320-
Q_NOWARN_DEPRECATED_POP
1319+
QgsCoordinateTransform exGeoTransform( layerCRS, wgs84, project );
13211320
try
13221321
{
13231322
wgs84BoundingRect = exGeoTransform.transformBoundingBox( layerExtent );
@@ -1375,21 +1374,22 @@ namespace QgsWms
13751374
{
13761375
for ( int i = constrainedCrsList.size() - 1; i >= 0; --i )
13771376
{
1378-
appendLayerBoundingBox( doc, layerElem, layerExtent, layerCRS, constrainedCrsList.at( i ) );
1377+
appendLayerBoundingBox( doc, layerElem, layerExtent, layerCRS, constrainedCrsList.at( i ), project );
13791378
}
13801379
}
13811380
else //no crs constraint
13821381
{
13831382
Q_FOREACH ( const QString &crs, crsList )
13841383
{
1385-
appendLayerBoundingBox( doc, layerElem, layerExtent, layerCRS, crs );
1384+
appendLayerBoundingBox( doc, layerElem, layerExtent, layerCRS, crs, project );
13861385
}
13871386
}
13881387
}
13891388

13901389

13911390
void appendLayerBoundingBox( QDomDocument &doc, QDomElement &layerElem, const QgsRectangle &layerExtent,
1392-
const QgsCoordinateReferenceSystem &layerCRS, const QString &crsText )
1391+
const QgsCoordinateReferenceSystem &layerCRS, const QString &crsText,
1392+
const QgsProject *project )
13931393
{
13941394
if ( layerElem.isNull() )
13951395
{
@@ -1409,9 +1409,7 @@ namespace QgsWms
14091409
QgsRectangle crsExtent;
14101410
if ( !layerExtent.isNull() )
14111411
{
1412-
Q_NOWARN_DEPRECATED_PUSH
1413-
QgsCoordinateTransform crsTransform( layerCRS, crs );
1414-
Q_NOWARN_DEPRECATED_POP
1412+
QgsCoordinateTransform crsTransform( layerCRS, crs, project );
14151413
try
14161414
{
14171415
crsExtent = crsTransform.transformBoundingBox( layerExtent );
@@ -1524,9 +1522,7 @@ namespace QgsWms
15241522
}
15251523

15261524
//get project crs
1527-
Q_NOWARN_DEPRECATED_PUSH
1528-
QgsCoordinateTransform t( layerCrs, project->crs() );
1529-
Q_NOWARN_DEPRECATED_POP
1525+
QgsCoordinateTransform t( layerCrs, project->crs(), project );
15301526

15311527
//transform
15321528
try
@@ -1629,7 +1625,7 @@ namespace QgsWms
16291625
combinedBBox = mapRect;
16301626
}
16311627
}
1632-
appendLayerBoundingBoxes( doc, groupElem, combinedBBox, groupCRS, combinedCRSSet.toList(), outputCrsList );
1628+
appendLayerBoundingBoxes( doc, groupElem, combinedBBox, groupCRS, combinedCRSSet.toList(), outputCrsList, project );
16331629

16341630
}
16351631

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,7 @@ namespace QgsWms
405405
// update combineBBox
406406
try
407407
{
408-
Q_NOWARN_DEPRECATED_PUSH
409-
QgsCoordinateTransform t( l->crs(), project->crs() );
410-
Q_NOWARN_DEPRECATED_POP
408+
QgsCoordinateTransform t( l->crs(), project->crs(), project );
411409
QgsRectangle BBox = t.transformBoundingBox( l->extent() );
412410
if ( combinedBBox.isEmpty() )
413411
{

0 commit comments

Comments
 (0)