Mapserver: fixed inconsistencies int WMS GetFeatureInfo response

Marcel Dancak · mhugent · commit 8f3532fcdfe1 · 2014-03-09T09:46:27.000+01:00
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -1052,13 +1052,38 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
 
   if ( featuresRect )
   {
-    QDomElement bBoxElem = result.createElement( "BoundingBox" );
-    bBoxElem.setAttribute( "CRS", mMapRenderer->destinationCrs().authid() );
-    bBoxElem.setAttribute( "minx", QString::number( featuresRect->xMinimum() ) );
-    bBoxElem.setAttribute( "maxx", QString::number( featuresRect->xMaximum() ) );
-    bBoxElem.setAttribute( "miny", QString::number( featuresRect->yMinimum() ) );
-    bBoxElem.setAttribute( "maxy", QString::number( featuresRect->yMaximum() ) );
-    getFeatureInfoElement.insertBefore( bBoxElem, QDomNode() ); //insert as first child
+    if ( infoFormat.startsWith( "application/vnd.ogc.gml" ) )
+    {
+      QDomElement bBoxElem = result.createElement( "gml:boundedBy" );
+      QDomElement boxElem;
+      int gmlVersion = infoFormat.startsWith( "application/vnd.ogc.gml/3" ) ? 3 : 2;
+      if ( gmlVersion < 3 )
+      {
+        boxElem = QgsOgcUtils::rectangleToGMLBox( featuresRect, result );
+      }
+      else
+      {
+        boxElem = QgsOgcUtils::rectangleToGMLEnvelope( featuresRect, result );
+      }
+
+      QgsCoordinateReferenceSystem crs = mMapRenderer->destinationCrs();
+      if ( crs.isValid() )
+      {
+        boxElem.setAttribute( "srsName", crs.authid() );
+      }
+      bBoxElem.appendChild( boxElem );
+      getFeatureInfoElement.insertBefore( bBoxElem, QDomNode() ); //insert as first child
+    }
+    else
+    {
+      QDomElement bBoxElem = result.createElement( "BoundingBox" );
+      bBoxElem.setAttribute( "CRS", mMapRenderer->destinationCrs().authid() );
+      bBoxElem.setAttribute( "minx", QString::number( featuresRect->xMinimum() ) );
+      bBoxElem.setAttribute( "maxx", QString::number( featuresRect->xMaximum() ) );
+      bBoxElem.setAttribute( "miny", QString::number( featuresRect->yMinimum() ) );
+      bBoxElem.setAttribute( "maxy", QString::number( featuresRect->yMaximum() ) );
+      getFeatureInfoElement.insertBefore( bBoxElem, QDomNode() ); //insert as first child
+    }
   }
 
   if ( sia2045 && infoFormat.compare( "text/xml", Qt::CaseInsensitive ) == 0 )
@@ -1460,7 +1485,8 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
   const QSet<QString>& excludedAttributes = layer->excludeAttributesWMS();
 
   QgsFeatureRequest fReq;
-  fReq.setFlags((( addWktGeometry || featureBBox ) ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) | QgsFeatureRequest::ExactIntersect );
+  bool hasGeometry = addWktGeometry || featureBBox;
+  fReq.setFlags((( hasGeometry ) ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) | QgsFeatureRequest::ExactIntersect );
   if ( !searchRect.isEmpty() )
   {
     fReq.setFilterRect( searchRect );
@@ -1491,12 +1517,34 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
       continue;
     }
 
+    QgsRectangle box;
+    if ( hasGeometry )
+    {
+      box = mapRender->layerExtentToOutputExtent( layer, feature.geometry()->boundingBox() );
+      if ( featureBBox ) //extend feature info bounding box if requested
+      {
+        if ( featureBBox->isEmpty() )
+        {
+          *featureBBox = box;
+        }
+        else
+        {
+          featureBBox->combineExtentWith( &box );
+        }
+      }
+    }
+
+    QgsCoordinateReferenceSystem outputCrs = layer->crs();
+    if ( hasGeometry && layer->crs() != mapRender->destinationCrs() && mapRender->hasCrsTransformEnabled() )
+    {
+      outputCrs = mapRender->destinationCrs();
+    }
+
     if ( infoFormat == "application/vnd.ogc.gml" )
     {
-      QgsCoordinateReferenceSystem layerCrs = layer->crs();
-      bool withGeom = layer->wkbType() != QGis::WKBNoGeometry;
+      bool withGeom = layer->wkbType() != QGis::WKBNoGeometry && addWktGeometry;
       int version = infoFormat.startsWith( "application/vnd.ogc.gml/3" ) ? 3 : 2;
-      QDomElement elem = createFeatureGML( &feature, layer, infoDocument, layerCrs, layer->name(), withGeom, version );
+      QDomElement elem = createFeatureGML( &feature, layer, infoDocument, outputCrs, layer->name(), withGeom, version );
       QDomElement featureMemberElem = infoDocument.createElement( "gml:featureMember"/*wfs:FeatureMember*/ );
       featureMemberElem.appendChild( elem );
       layerElement.appendChild( featureMemberElem );
@@ -1527,37 +1575,36 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
         featureElement.appendChild( attributeElement );
       }
 
-      //also append the wkt geometry as an attribute
-      QgsGeometry* geom = feature.geometry();
-      if ( addWktGeometry && geom )
-      {
-        QDomElement geometryElement = infoDocument.createElement( "Attribute" );
-        geometryElement.setAttribute( "name", "geometry" );
-        geometryElement.setAttribute( "value", geom->exportToWkt() );
-        geometryElement.setAttribute( "type", "derived" );
-        featureElement.appendChild( geometryElement );
-      }
-      if ( featureBBox && geom && mapRender ) //extend feature info bounding box if requested
+      //append feature bounding box to feature info xml
+      if ( hasGeometry && mapRender )
       {
-        QgsRectangle box = mapRender->layerExtentToOutputExtent( layer, geom->boundingBox() );
-        if ( featureBBox->isEmpty() )
-        {
-          *featureBBox = box;
-        }
-        else
-        {
-          featureBBox->combineExtentWith( &box );
-        }
-
-        //append feature bounding box to feature info xml
         QDomElement bBoxElem = infoDocument.createElement( "BoundingBox" );
-        bBoxElem.setAttribute( version == "1.1.1" ? "SRS" : "CRS", mapRender->destinationCrs().authid() );
+        bBoxElem.setAttribute( version == "1.1.1" ? "SRS" : "CRS", outputCrs.authid() );
         bBoxElem.setAttribute( "minx", QString::number( box.xMinimum() ) );
         bBoxElem.setAttribute( "maxx", QString::number( box.xMaximum() ) );
         bBoxElem.setAttribute( "miny", QString::number( box.yMinimum() ) );
         bBoxElem.setAttribute( "maxy", QString::number( box.yMaximum() ) );
         featureElement.appendChild( bBoxElem );
       }
+
+      //also append the wkt geometry as an attribute
+      if ( addWktGeometry && hasGeometry )
+      {
+         QgsGeometry* geom = feature.geometry();
+        if ( layer->crs() != outputCrs )
+        {
+          const QgsCoordinateTransform *transform = mapRender->transformation( layer );
+          if ( transform )
+          {
+            geom->transform( *transform );
+          }
+        }
+        QDomElement geometryElement = infoDocument.createElement( "Attribute" );
+        geometryElement.setAttribute( "name", "geometry" );
+        geometryElement.setAttribute( "value", geom->exportToWkt() );
+        geometryElement.setAttribute( "type", "derived" );
+        featureElement.appendChild( geometryElement );
+      }
     }
   }
 
@@ -2510,10 +2557,50 @@ QDomElement QgsWMSServer::createFeatureGML(
   QDomElement typeNameElement = doc.createElement( "qgs:" + typeName /*qgs:%TYPENAME%*/ );
   typeNameElement.setAttribute( "fid", typeName + "." + QString::number( feat->id() ) );
 
-  if ( withGeom )
+  const QgsCoordinateTransform* transform = 0;
+  if ( layer && layer->crs() != crs)
+  {
+    transform = mMapRenderer->transformation( layer );
+  }
+
+  QgsGeometry* geom = feat->geometry();
+
+  // always add bounding box info if feature contains geometry
+  if ( geom && geom->type() != QGis::UnknownGeometry &&  geom->type() != QGis::NoGeometry)
+  {
+     QgsRectangle box = feat->geometry()->boundingBox();
+     if ( transform )
+     {
+       box = transform->transformBoundingBox( box );
+     }
+
+     QDomElement bbElem = doc.createElement( "gml:boundedBy" );
+     QDomElement boxElem;
+     if ( version < 3 )
+     {
+       boxElem = QgsOgcUtils::rectangleToGMLBox( &box, doc );
+     }
+     else
+     {
+       boxElem = QgsOgcUtils::rectangleToGMLEnvelope( &box, doc );
+     }
+
+     if ( crs.isValid() )
+     {
+       boxElem.setAttribute( "srsName", crs.authid() );
+     }
+     bbElem.appendChild( boxElem );
+     typeNameElement.appendChild( bbElem );
+  }
+
+  if ( withGeom)
   {
     //add geometry column (as gml)
-    QgsGeometry* geom = feat->geometry();
+
+    if ( transform )
+    {
+      geom->transform( *transform );
+    }
 
     QDomElement geomElem = doc.createElement( "qgs:geometry" );
     QDomElement gmlElem;
@@ -2528,27 +2615,10 @@ QDomElement QgsWMSServer::createFeatureGML(
 
     if ( !gmlElem.isNull() )
     {
-      QgsRectangle box = geom->boundingBox();
-      QDomElement bbElem = doc.createElement( "gml:boundedBy" );
-      QDomElement boxElem;
-      if ( version < 3 )
-      {
-        boxElem = QgsOgcUtils::rectangleToGMLBox( &box, doc );
-      }
-      else
-      {
-        boxElem = QgsOgcUtils::rectangleToGMLEnvelope( &box, doc );
-      }
-
       if ( crs.isValid() )
       {
-        boxElem.setAttribute( "srsName", crs.authid() );
         gmlElem.setAttribute( "srsName", crs.authid() );
       }
-
-      bbElem.appendChild( boxElem );
-      typeNameElement.appendChild( bbElem );
-
       geomElem.appendChild( gmlElem );
       typeNameElement.appendChild( geomElem );
     }
