Skip to content

Commit 4659fd4

Browse files
committedNov 29, 2016
WMS 1.3.0 compliance: CRS:84 needs to be supported
1 parent ae64430 commit 4659fd4

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed
 

‎src/server/qgsconfigparserutils.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ void QgsConfigParserUtils::appendCrsElementsToLayer( QDomElement& layerElement,
6565
appendCrsElementToLayer( layerElement, CRSPrecedingElement, crs, doc );
6666
}
6767
}
68+
69+
//Support for CRS:84 is mandatory (equals EPSG:4326 with reversed axis)
70+
appendCrsElementToLayer( layerElement, CRSPrecedingElement, QString( "CRS:84" ), doc );
6871
}
6972

7073
void QgsConfigParserUtils::appendCrsElementToLayer( QDomElement& layerElement, const QDomElement& precedingElement,

‎src/server/qgswmsserver.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2047,6 +2047,11 @@ int QgsWmsServer::configureMapRender( const QPaintDevice* paintDevice ) const
20472047
QgsUnitTypes::DistanceUnit mapUnits = QgsUnitTypes::DistanceDegrees;
20482048

20492049
QString crs = mParameters.value( QStringLiteral( "CRS" ), mParameters.value( QStringLiteral( "SRS" ) ) );
2050+
if ( crs.compare( "CRS:84", Qt::CaseInsensitive ) == 0 )
2051+
{
2052+
crs = QString( "EPSG:4326" );
2053+
mapExtent.invert();
2054+
}
20502055

20512056
QgsCoordinateReferenceSystem outputCRS;
20522057

0 commit comments

Comments
 (0)
Please sign in to comment.