Skip to content

Commit f1cfd0c

Browse files
mhugentrldhont
authored andcommitted
WMS 1.3.0 compliance: CRS:84 needs to be supported
1 parent 46b012f commit f1cfd0c

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
@@ -2038,6 +2038,11 @@ int QgsWMSServer::configureMapRender( const QPaintDevice* paintDevice ) const
20382038
QGis::UnitType mapUnits = QGis::Degrees;
20392039

20402040
QString crs = mParameters.value( "CRS", mParameters.value( "SRS" ) );
2041+
if ( crs.compare( "CRS:84", Qt::CaseInsensitive ) == 0 )
2042+
{
2043+
crs = QString( "EPSG:4326" );
2044+
mapExtent.invert();
2045+
}
20412046

20422047
QgsCoordinateReferenceSystem outputCRS;
20432048

0 commit comments

Comments
 (0)