Skip to content

Commit

Permalink
WMS 1.3.0 compliance: CRS:84 needs to be supported
Browse files Browse the repository at this point in the history
  • Loading branch information
mhugent committed Nov 29, 2016
1 parent ae64430 commit 4659fd4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/server/qgsconfigparserutils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ void QgsConfigParserUtils::appendCrsElementsToLayer( QDomElement& layerElement,
appendCrsElementToLayer( layerElement, CRSPrecedingElement, crs, doc );
}
}

//Support for CRS:84 is mandatory (equals EPSG:4326 with reversed axis)
appendCrsElementToLayer( layerElement, CRSPrecedingElement, QString( "CRS:84" ), doc );
}

void QgsConfigParserUtils::appendCrsElementToLayer( QDomElement& layerElement, const QDomElement& precedingElement,
Expand Down
5 changes: 5 additions & 0 deletions src/server/qgswmsserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2047,6 +2047,11 @@ int QgsWmsServer::configureMapRender( const QPaintDevice* paintDevice ) const
QgsUnitTypes::DistanceUnit mapUnits = QgsUnitTypes::DistanceDegrees;

QString crs = mParameters.value( QStringLiteral( "CRS" ), mParameters.value( QStringLiteral( "SRS" ) ) );
if ( crs.compare( "CRS:84", Qt::CaseInsensitive ) == 0 )
{
crs = QString( "EPSG:4326" );
mapExtent.invert();
}

QgsCoordinateReferenceSystem outputCRS;

Expand Down

0 comments on commit 4659fd4

Please sign in to comment.