More coherent version string handling in qgis server

mhugent · mhugent · commit 5d62af343a08 · 2013-03-18T17:58:43.000+01:00
diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
@@ -574,7 +574,14 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
         QString minScaleString = QString::number( currentLayer->minimumScale() );
         QString maxScaleString = QString::number( currentLayer->maximumScale() );
 
-        if ( version == "1.3.0" )
+        if ( version == "1.1.1" )
+        {
+          QDomElement scaleHintElem = doc.createElement( "ScaleHint" );
+          scaleHintElem.setAttribute( "min", minScaleString );
+          scaleHintElem.setAttribute( "max", maxScaleString );
+          layerElem.appendChild( scaleHintElem );
+        }
+        else
         {
           QDomElement minScaleElem = doc.createElement( "MinScaleDenominator" );
           QDomText minScaleText = doc.createTextNode( minScaleString );
@@ -585,13 +592,6 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
           maxScaleElem.appendChild( maxScaleText );
           layerElem.appendChild( maxScaleElem );
         }
-        else if ( version == "1.1.1" )
-        {
-          QDomElement scaleHintElem = doc.createElement( "ScaleHint" );
-          scaleHintElem.setAttribute( "min", minScaleString );
-          scaleHintElem.setAttribute( "max", maxScaleString );
-          layerElem.appendChild( scaleHintElem );
-        }
       }
 
       if ( fullProjectSettings )
@@ -2386,7 +2386,7 @@ QgsRectangle QgsProjectParser::layerBoundingBoxInProjectCRS( const QDomElement&
 
   BBox.set( minx, miny, maxx, maxy );
 
-  if ( version == "1.3.0" && layerCrs.axisInverted() )
+  if ( version != "1.1.1" && layerCrs.axisInverted() )
   {
     BBox.invert();
   }
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -1107,7 +1107,7 @@ int QgsWMSServer::configureMapRender( const QPaintDevice* paintDevice ) const
 
   // Change x- and y- of BBOX for WMS 1.3.0 if axis inverted
   QString version = mParameterMap.value( "VERSION", "1.3.0" );
-  if ( version == "1.3.0" && outputCRS.axisInverted() )
+  if ( version != "1.1.1" && outputCRS.axisInverted() )
   {
     //switch coordinates of extent
     double tmp;

Original file line number	Diff line number	Diff line change
`@@ -1107,7 +1107,7 @@ int QgsWMSServer::configureMapRender( const QPaintDevice* paintDevice ) const`
`1107`	`1107`
`1108`	`1108`	`// Change x- and y- of BBOX for WMS 1.3.0 if axis inverted`
`1109`	`1109`	`QString version = mParameterMap.value( "VERSION", "1.3.0" );`
`1110`		`- if ( version == "1.3.0" && outputCRS.axisInverted() )`
	`1110`	`+ if ( version != "1.1.1" && outputCRS.axisInverted() )`
`1111`	`1111`	`{`
`1112`	`1112`	`//switch coordinates of extent`
`1113`	`1113`	`double tmp;`