[QGIS Commit] r15457 - in trunk/qgis/src: app providers/wms

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-03-12 14:10:09 -0800 (Sat, 12 Mar 2011)
New Revision: 15457

Modified:
   trunk/qgis/src/app/qgswmssourceselect.cpp
   trunk/qgis/src/providers/wms/qgswmsprovider.cpp
Log:
fix #3585

Modified: trunk/qgis/src/app/qgswmssourceselect.cpp
===================================================================
--- trunk/qgis/src/app/qgswmssourceselect.cpp	2011-03-12 21:50:44 UTC (rev 15456)
+++ trunk/qgis/src/app/qgswmssourceselect.cpp	2011-03-12 22:10:09 UTC (rev 15457)
@@ -597,7 +597,7 @@
       connArgs += "GetFeatureInfo";
     }
 
-    if ( connInfo.startsWith( "username=" ) )
+    if ( connInfo.startsWith( "username=" ) || connInfo.startsWith( "tiled=" ) )
     {
       connInfo.prepend( connArgs + "," );
     }

Modified: trunk/qgis/src/providers/wms/qgswmsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2011-03-12 21:50:44 UTC (rev 15456)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2011-03-12 22:10:09 UTC (rev 15457)
@@ -567,8 +567,8 @@
     double ymax = qMin( viewExtent.yMaximum(), layerExtent.yMaximum() );
 
     // snap to tile coordinates
-    double x0 = floor(( xmin - layerExtent.xMinimum() ) / mTileWidth / tres ) * mTileWidth * tres + layerExtent.xMinimum() + mTileWidth * tres * 0.001;
-    double y0 = floor(( ymin - layerExtent.yMinimum() ) / mTileHeight / tres ) * mTileHeight * tres + layerExtent.yMinimum() + mTileHeight * tres * 0.001;
+    double x0 = floor(( xmin - layerExtent.xMinimum() ) / mTileWidth / tres ) * mTileWidth * tres + layerExtent.xMinimum(); // + mTileWidth * tres * 0.001;
+    double y0 = floor(( ymin - layerExtent.yMinimum() ) / mTileHeight / tres ) * mTileHeight * tres + layerExtent.yMinimum(); // + mTileHeight * tres * 0.001;
 
 #ifdef QGISDEBUG
     // calculate number of tiles
@@ -2095,7 +2095,7 @@
     {
       if ( tilesetsSupported[i].layers.join( "," ) == layers &&
            tilesetsSupported[i].styles.join( "," ) == styles &&
-           tilesetsSupported[i].boundingBox.crs == imageCrs )
+           tilesetsSupported[i].crs == imageCrs )
       {
         layerExtent = tilesetsSupported[i].boundingBox.box;
         return true;
@@ -2104,7 +2104,7 @@
       QgsDebugMsg( QString( "mismatch layers=%1, styles=%2 and crs=%3." )
                    .arg( tilesetsSupported[i].layers.join( "," ) )
                    .arg( tilesetsSupported[i].styles.join( "," ) )
-                   .arg( tilesetsSupported[i].boundingBox.crs ) );
+                   .arg( tilesetsSupported[i].crs ) );
     }
 
     QgsDebugMsg( "no extent for layer" );