Cache result of checking whether axis should be inverted for wms laye…

…rs. Greatly improves speed of connecting to wms layers when a wms server has many available layers.
qgis · Mar 21, 2014 · ca26231 · ca26231
1 parent baa6cbd
commit ca26231
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -4951,12 +4951,23 @@ bool QgsWmsProvider::shouldInvertAxisOrientation( const QString& ogcCrs )
   bool changeXY = false;
   if ( !mIgnoreAxisOrientation && ( mCapabilities.version == "1.3.0" || mCapabilities.version == "1.3" ) )
   {
+
+    //have we already checked this crs?
+    if ( mCrsInvertAxis.contains( ogcCrs ) )
+    {
+      //if so, return previous result to save time
+      return mCrsInvertAxis[ ogcCrs ];
+    }
+
     //create CRS from string
     QgsCoordinateReferenceSystem theSrs;
     if ( theSrs.createFromOgcWmsCrs( ogcCrs ) && theSrs.axisInverted() )
     {
       changeXY = true;
     }
+
+    //cache result to speed up future checks
+    mCrsInvertAxis[ ogcCrs ] = changeXY;
   }
 
   if ( mInvertAxisOrientation )

diff --git a/src/providers/wms/qgswmsprovider.h b/src/providers/wms/qgswmsprovider.h
@@ -1173,6 +1173,9 @@ class QgsWmsProvider : public QgsRasterDataProvider
 
     QgsCoordinateReferenceSystem mCrs;
 
+    //temporarily caches invert axis setting for each crs
+    QHash<QString, bool> mCrsInvertAxis;
+
 };