WMS 1.3.0 compliance: CRS:84 needs to be supported

qgis · Dec 12, 2016 · f1cfd0c372826181af04462beaa754169ab511aa · f1cfd0c
1 parent 46b012f
commit f1cfd0c372826181af04462beaa754169ab511aa
Unified Split

Showing with 8 additions and 0 deletions.

+3 −0 src/server/qgsconfigparserutils.cpp

+5 −0 src/server/qgswmsserver.cpp
diff --git a/src/server/qgsconfigparserutils.cpp b/src/server/qgsconfigparserutils.cpp
@@ -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,

diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2038,6 +2038,11 @@ int QgsWMSServer::configureMapRender( const QPaintDevice* paintDevice ) const
   QGis::UnitType mapUnits = QGis::Degrees;
 
   QString crs = mParameters.value( "CRS", mParameters.value( "SRS" ) );
+  if ( crs.compare( "CRS:84", Qt::CaseInsensitive ) == 0 )
+  {
+    crs = QString( "EPSG:4326" );
+    mapExtent.invert();
+  }
 
   QgsCoordinateReferenceSystem outputCRS;