Fix for trac ticket #4. (Tested on DEMIS site.)

morb_au · morb_au · commit 9b6c654632c5 · 2006-07-17T00:50:54.000Z
With the Identify tool on a WMS layer, now send a query to the WMS server *only* on those layers that the WMS server had already declared queryable. This avoids the server returning an error on un-queryable layers. Also, QgsWmsProvider::identifyAsHtml() is renamed to QgsWmsProvider::identifyAsText() to better identify what it does. Commentary, and other dependent variable and function names have also been updated to suit. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5606 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsrasterdataprovider.h b/src/core/qgsrasterdataprovider.h
@@ -138,15 +138,15 @@ class QgsRasterDataProvider : public QgsDataProvider
      *
      * \param point[in]  The pixel coordinate (as it was displayed locally on screen)
      *
-     * \retval  An HTML document containing the return from the WMS server
+     * \return  A text document containing the return from the WMS server
      *
      * \note WMS Servers prefer to receive coordinates in image space, therefore
      *       this function expects coordinates in that format.
      *
      * \note  The arbitraryness of the returned document is enforced by WMS standards
      *        up to at least v1.3.0
      */
-    virtual QString identifyAsHtml(const QgsPoint& point) = 0;
+    virtual QString identifyAsText(const QgsPoint& point) = 0;
 
     /**
      * \brief   Returns the caption error text for the last error in this provider
diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp
@@ -157,9 +157,9 @@ void QgsMapToolIdentify::identifyRasterWmsLayer(QgsRasterLayer* layer, const Qgs
     return;
   }
 
-  QString html = layer->identifyAsHtml(point);
+  QString text = layer->identifyAsText(point);
 
-  if (html.isEmpty())
+  if (text.isEmpty())
   {
     showError(layer);
     return;
@@ -171,8 +171,7 @@ void QgsMapToolIdentify::identifyRasterWmsLayer(QgsRasterLayer* layer, const Qgs
   }
 
   mViewer->setCaption( layer->name() );
-  mViewer->setMessageAsPlainText( html );
-//  mViewer->setMessageAsHtml( html );
+  mViewer->setMessageAsPlainText( text );
 
 //  mViewer->exec();
   mViewer->show();
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -2294,27 +2294,36 @@ QString QgsWmsProvider::getMetadata()
 }
 
 
-QString QgsWmsProvider::identifyAsHtml(const QgsPoint& point)
+QString QgsWmsProvider::identifyAsText(const QgsPoint& point)
 {
 #ifdef QGISDEBUG
-  std::cout << "QgsWmsProvider::identifyAsHtml: entering." << std::endl;
+  std::cout << "QgsWmsProvider::identifyAsText: entering." << std::endl;
 #endif
 
   // Collect which layers to query on
 
-  QStringList visibleLayers = QStringList();
+  QStringList queryableLayers = QStringList();
 
-  for ( QStringList::Iterator it  = activeSubLayers.begin(); 
-                              it != activeSubLayers.end(); 
-                            ++it ) 
+  // Test for which layers are suitable for querying with
+  for ( QStringList::const_iterator it  = activeSubLayers.begin(); 
+                                    it != activeSubLayers.end(); 
+                                  ++it )
   {
+    // Is sublayer visible?
     if (TRUE == activeSubLayerVisibility.find( *it )->second)
     {
-      visibleLayers += *it;
+      // Is sublayer queryable?
+      if (TRUE == mQueryableForLayer.find( *it )->second)
+      {
+#ifdef QGISDEBUG
+  std::cout << "QgsWmsProvider::identifyAsText: '" << (*it).toLocal8Bit().data() << "' is queryable." << std::endl;
+#endif
+        queryableLayers += *it;
+      }
     }
   }
 
-  QString layers = visibleLayers.join(",");
+  QString layers = queryableLayers.join(",");
   Q3Url::encode( layers );
 
   // Compose request to WMS server
@@ -2343,18 +2352,13 @@ QString QgsWmsProvider::identifyAsHtml(const QgsPoint& point)
   requestUrl += QString( "Y=%1" )
                    .arg( point.y() );
 
-  QString html = retrieveUrl(requestUrl);
-
-  if (html.isEmpty())
-  {
-    return QString();
-  }
+  QString text = retrieveUrl(requestUrl);
 
 #ifdef QGISDEBUG
-  std::cout << "QgsWmsProvider::identifyAsHtml: exiting with '"
-            << html.toLocal8Bit().data() << "'." << std::endl;
+  std::cout << "QgsWmsProvider::identifyAsText: exiting with '"
+            << text.toLocal8Bit().data() << "'." << std::endl;
 #endif
-  return html;
+  return text;
 }
 
 
diff --git a/src/providers/wms/qgswmsprovider.h b/src/providers/wms/qgswmsprovider.h
@@ -528,15 +528,15 @@ class QgsWmsProvider : public QgsRasterDataProvider
    *
    * \param point[in]  The pixel coordinate (as it was displayed locally on screen)
    *
-   * \retval  An HTML document containing the return from the WMS server
+   * \return  A text document containing the return from the WMS server
    *
    * \note WMS Servers prefer to receive coordinates in image space, therefore
    *       this function expects coordinates in that format.
    *
    * \note  The arbitraryness of the returned document is enforced by WMS standards
    *        up to at least v1.3.0
    */
-  QString identifyAsHtml(const QgsPoint& point);
+  QString identifyAsText(const QgsPoint& point);
 
   /**
    * \brief   Returns the caption error text for the last error in this provider
diff --git a/src/raster/qgsrasterlayer.cpp b/src/raster/qgsrasterlayer.cpp
@@ -4827,15 +4827,15 @@ void QgsRasterLayer::identify(const QgsPoint& point, std::map<QString,QString>&
 } // void QgsRasterLayer::identify
 
 
-QString QgsRasterLayer::identifyAsHtml(const QgsPoint& point)
+QString QgsRasterLayer::identifyAsText(const QgsPoint& point)
 {
   if (mProviderKey != "wms")
   {
     // Currently no meaning for anything other than OGC WMS layers
     return QString();
   }
 
-  return (dataProvider->identifyAsHtml(point));
+  return (dataProvider->identifyAsText(point));
 }
 
 void QgsRasterLayer::populateHistogram(int theBandNoInt, int theBinCountInt,bool theIgnoreOutOfRangeFlag,bool theHistogramEstimatedFlag)
diff --git a/src/raster/qgsrasterlayer.h b/src/raster/qgsrasterlayer.h
@@ -285,12 +285,12 @@ class QgsRasterLayer : public QgsMapLayer
      *
      * \param point[in]  an image pixel coordinate in the last requested extent of layer.
      *
-     * \retval  An HTML document containing the return from the WMS server
+     * \return  A text document containing the return from the WMS server
      *
      * \note  The arbitraryness of the returned document is enforced by WMS standards
      *        up to at least v1.3.0
      */
-    QString identifyAsHtml(const QgsPoint& point);
+    QString identifyAsText(const QgsPoint& point);
 
     /** \brief Query gdal to find out the WKT projection string for this layer. This implements the virtual method of the same name defined in QgsMapLayer*/
     QString getProjectionWKT();

Original file line number	Diff line number	Diff line change
`@@ -138,15 +138,15 @@ class QgsRasterDataProvider : public QgsDataProvider`
`138`	`138`	`*`
`139`	`139`	`* \param point[in] The pixel coordinate (as it was displayed locally on screen)`
`140`	`140`	`*`
`141`		`- * \retval An HTML document containing the return from the WMS server`
	`141`	`+ * \return A text document containing the return from the WMS server`
`142`	`142`	`*`
`143`	`143`	`* \note WMS Servers prefer to receive coordinates in image space, therefore`
`144`	`144`	`* this function expects coordinates in that format.`
`145`	`145`	`*`
`146`	`146`	`* \note The arbitraryness of the returned document is enforced by WMS standards`
`147`	`147`	`* up to at least v1.3.0`
`148`	`148`	`*/`
`149`		`- virtual QString identifyAsHtml(const QgsPoint& point) = 0;`
	`149`	`+ virtual QString identifyAsText(const QgsPoint& point) = 0;`
`150`	`150`
`151`	`151`	`/**`
`152`	`152`	`* \brief Returns the caption error text for the last error in this provider`
Original file line number	Diff line number	Diff line change
`@@ -157,9 +157,9 @@ void QgsMapToolIdentify::identifyRasterWmsLayer(QgsRasterLayer* layer, const Qgs`
`157`	`157`	`return;`
`158`	`158`	`}`
`159`	`159`
`160`		`- QString html = layer->identifyAsHtml(point);`
	`160`	`+ QString text = layer->identifyAsText(point);`
`161`	`161`
`162`		`- if (html.isEmpty())`
	`162`	`+ if (text.isEmpty())`
`163`	`163`	`{`
`164`	`164`	`showError(layer);`
`165`	`165`	`return;`
`@@ -171,8 +171,7 @@ void QgsMapToolIdentify::identifyRasterWmsLayer(QgsRasterLayer* layer, const Qgs`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`mViewer->setCaption( layer->name() );`
`174`		`- mViewer->setMessageAsPlainText( html );`
`175`		`-// mViewer->setMessageAsHtml( html );`
	`174`	`+ mViewer->setMessageAsPlainText( text );`
`176`	`175`
`177`	`176`	`// mViewer->exec();`
`178`	`177`	`mViewer->show();`
Original file line number	Diff line number	Diff line change
`@@ -528,15 +528,15 @@ class QgsWmsProvider : public QgsRasterDataProvider`
`528`	`528`	`*`
`529`	`529`	`* \param point[in] The pixel coordinate (as it was displayed locally on screen)`
`530`	`530`	`*`
`531`		`- * \retval An HTML document containing the return from the WMS server`
	`531`	`+ * \return A text document containing the return from the WMS server`
`532`	`532`	`*`
`533`	`533`	`* \note WMS Servers prefer to receive coordinates in image space, therefore`
`534`	`534`	`* this function expects coordinates in that format.`
`535`	`535`	`*`
`536`	`536`	`* \note The arbitraryness of the returned document is enforced by WMS standards`
`537`	`537`	`* up to at least v1.3.0`
`538`	`538`	`*/`
`539`		`- QString identifyAsHtml(const QgsPoint& point);`
	`539`	`+ QString identifyAsText(const QgsPoint& point);`
`540`	`540`
`541`	`541`	`/**`
`542`	`542`	`* \brief Returns the caption error text for the last error in this provider`
Original file line number	Diff line number	Diff line change
`@@ -4827,15 +4827,15 @@ void QgsRasterLayer::identify(const QgsPoint& point, std::map<QString,QString>&`
`4827`	`4827`	`} // void QgsRasterLayer::identify`
`4828`	`4828`
`4829`	`4829`
`4830`		`-QString QgsRasterLayer::identifyAsHtml(const QgsPoint& point)`
	`4830`	`+QString QgsRasterLayer::identifyAsText(const QgsPoint& point)`
`4831`	`4831`	`{`
`4832`	`4832`	`if (mProviderKey != "wms")`
`4833`	`4833`	`{`
`4834`	`4834`	`// Currently no meaning for anything other than OGC WMS layers`
`4835`	`4835`	`return QString();`
`4836`	`4836`	`}`
`4837`	`4837`
`4838`		`- return (dataProvider->identifyAsHtml(point));`
	`4838`	`+ return (dataProvider->identifyAsText(point));`
`4839`	`4839`	`}`
`4840`	`4840`
`4841`	`4841`	`void QgsRasterLayer::populateHistogram(int theBandNoInt, int theBinCountInt,bool theIgnoreOutOfRangeFlag,bool theHistogramEstimatedFlag)`
Original file line number	Diff line number	Diff line change
`@@ -285,12 +285,12 @@ class QgsRasterLayer : public QgsMapLayer`
`285`	`285`	`*`
`286`	`286`	`* \param point[in] an image pixel coordinate in the last requested extent of layer.`
`287`	`287`	`*`
`288`		`- * \retval An HTML document containing the return from the WMS server`
	`288`	`+ * \return A text document containing the return from the WMS server`
`289`	`289`	`*`
`290`	`290`	`* \note The arbitraryness of the returned document is enforced by WMS standards`
`291`	`291`	`* up to at least v1.3.0`
`292`	`292`	`*/`
`293`		`- QString identifyAsHtml(const QgsPoint& point);`
	`293`	`+ QString identifyAsText(const QgsPoint& point);`
`294`	`294`
`295`	`295`	`/** \brief Query gdal to find out the WKT projection string for this layer. This implements the virtual method of the same name defined in QgsMapLayer*/`
`296`	`296`	`QString getProjectionWKT();`