Bug #9797 Add a precision setting for GetFeatureInfo geometry attributes

rldhont · mhugent · commit 324826e6d36e · 2014-08-22T13:45:52.000+02:00
Add precision to QgsGeometry method exportToWKT and use it in GetFeatureInfo
diff --git a/python/core/qgsgeometry.sip b/python/core/qgsgeometry.sip
@@ -364,10 +364,11 @@ class QgsGeometry
     /** Returns a Geometry representing the points making up this Geometry that do not make up other. */
     QgsGeometry* symDifference( QgsGeometry* geometry ) /Factory/;
 
-    /** Exports the geometry to mWkt
+    /** Exports the geometry to WKT
+     *  @note precision parameter added in 2.4
      *  @return true in case of success and false else
      */
-    QString exportToWkt() const;
+    QString exportToWkt( const int &precision = 17 ) const;
 
     /** Exports the geometry to GeoJSON
      *  @return a QString representing the geometry as GeoJSON
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -3536,7 +3536,7 @@ bool QgsGeometry::crosses( const QgsGeometry* geometry ) const
   return geosRelOp( GEOSCrosses, this, geometry );
 }
 
-QString QgsGeometry::exportToWkt() const
+QString QgsGeometry::exportToWkt( const int &precision ) const
 {
   QgsDebugMsg( "entered." );
 
@@ -3566,7 +3566,7 @@ QString QgsGeometry::exportToWkt() const
     {
       double x, y;
       wkbPtr >> x >> y;
-      wkt += "POINT(" + qgsDoubleToString( x ) + " " + qgsDoubleToString( y ) + ")";
+      wkt += "POINT(" + qgsDoubleToString( x, precision ) + " " + qgsDoubleToString( y, precision ) + ")";
       return wkt;
     }
 
@@ -3589,7 +3589,7 @@ QString QgsGeometry::exportToWkt() const
         if ( idx != 0 )
           wkt += ", ";
 
-        wkt += qgsDoubleToString( x ) + " " + qgsDoubleToString( y );
+        wkt += qgsDoubleToString( x, precision ) + " " + qgsDoubleToString( y, precision );
       }
       wkt += ")";
       return wkt;
@@ -3626,7 +3626,7 @@ QString QgsGeometry::exportToWkt() const
           if ( hasZValue )
             wkbPtr += sizeof( double );
 
-          wkt += qgsDoubleToString( x ) + " " + qgsDoubleToString( y );
+          wkt += qgsDoubleToString( x, precision ) + " " + qgsDoubleToString( y, precision );
         }
         wkt += ")";
       }
@@ -3653,7 +3653,7 @@ QString QgsGeometry::exportToWkt() const
         if ( hasZValue )
           wkbPtr += sizeof( double );
 
-        wkt += qgsDoubleToString( x ) + " " + qgsDoubleToString( y );
+        wkt += qgsDoubleToString( x, precision ) + " " + qgsDoubleToString( y, precision );
       }
       wkt += ")";
       return wkt;
@@ -3686,7 +3686,7 @@ QString QgsGeometry::exportToWkt() const
           if ( hasZValue )
             wkbPtr += sizeof( double );
 
-          wkt += qgsDoubleToString( x ) + " " + qgsDoubleToString( y );
+          wkt += qgsDoubleToString( x, precision ) + " " + qgsDoubleToString( y, precision );
         }
         wkt += ")";
       }
@@ -3729,7 +3729,7 @@ QString QgsGeometry::exportToWkt() const
             if ( hasZValue )
               wkbPtr += sizeof( double );
 
-            wkt += qgsDoubleToString( x ) + " " + qgsDoubleToString( y );
+            wkt += qgsDoubleToString( x, precision ) + " " + qgsDoubleToString( y, precision );
           }
           wkt += ")";
         }
diff --git a/src/core/qgsgeometry.h b/src/core/qgsgeometry.h
@@ -406,10 +406,11 @@ class CORE_EXPORT QgsGeometry
     /** Returns a Geometry representing the points making up this Geometry that do not make up other. */
     QgsGeometry* symDifference( QgsGeometry* geometry );
 
-    /** Exports the geometry to mWkt
+    /** Exports the geometry to WKT
+     *  @note precision parameter added in 2.4
      *  @return true in case of success and false else
      */
-    QString exportToWkt() const;
+    QString exportToWkt( const int &precision = 17 ) const;
 
     /** Exports the geometry to GeoJSON
      *  @return a QString representing the geometry as GeoJSON
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -1286,11 +1286,11 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
       int gmlVersion = infoFormat.startsWith( "application/vnd.ogc.gml/3" ) ? 3 : 2;
       if ( gmlVersion < 3 )
       {
-        boxElem = QgsOgcUtils::rectangleToGMLBox( featuresRect, result );
+        boxElem = QgsOgcUtils::rectangleToGMLBox( featuresRect, result, 8 );
       }
       else
       {
-        boxElem = QgsOgcUtils::rectangleToGMLEnvelope( featuresRect, result );
+        boxElem = QgsOgcUtils::rectangleToGMLEnvelope( featuresRect, result, 8 );
       }
 
       QgsCoordinateReferenceSystem crs = mMapRenderer->destinationCrs();
@@ -1305,10 +1305,10 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
     {
       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() ) );
+      bBoxElem.setAttribute( "minx", qgsDoubleToString( featuresRect->xMinimum(), 8 ) );
+      bBoxElem.setAttribute( "maxx", qgsDoubleToString( featuresRect->xMaximum(), 8 ) );
+      bBoxElem.setAttribute( "miny", qgsDoubleToString( featuresRect->yMinimum(), 8 ) );
+      bBoxElem.setAttribute( "maxy", qgsDoubleToString( featuresRect->yMaximum(), 8 ) );
       getFeatureInfoElement.insertBefore( bBoxElem, QDomNode() ); //insert as first child
     }
   }
@@ -1830,10 +1830,10 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
       {
         QDomElement bBoxElem = infoDocument.createElement( "BoundingBox" );
         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() ) );
+        bBoxElem.setAttribute( "minx", qgsDoubleToString( box.xMinimum(), 8 ) );
+        bBoxElem.setAttribute( "maxx", qgsDoubleToString( box.xMaximum(), 8 ) );
+        bBoxElem.setAttribute( "miny", qgsDoubleToString( box.yMinimum(), 8 ) );
+        bBoxElem.setAttribute( "maxy", qgsDoubleToString( box.yMaximum(), 8 ) );
         featureElement.appendChild( bBoxElem );
       }
 
@@ -1851,7 +1851,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
         }
         QDomElement geometryElement = infoDocument.createElement( "Attribute" );
         geometryElement.setAttribute( "name", "geometry" );
-        geometryElement.setAttribute( "value", geom->exportToWkt() );
+        geometryElement.setAttribute( "value", geom->exportToWkt( 8 ) );
         geometryElement.setAttribute( "type", "derived" );
         featureElement.appendChild( geometryElement );
       }
@@ -2836,11 +2836,11 @@ QDomElement QgsWMSServer::createFeatureGML(
     QDomElement boxElem;
     if ( version < 3 )
     {
-      boxElem = QgsOgcUtils::rectangleToGMLBox( &box, doc );
+      boxElem = QgsOgcUtils::rectangleToGMLBox( &box, doc, 8 );
     }
     else
     {
-      boxElem = QgsOgcUtils::rectangleToGMLEnvelope( &box, doc );
+      boxElem = QgsOgcUtils::rectangleToGMLEnvelope( &box, doc, 8 );
     }
 
     if ( crs.isValid() )
@@ -2864,11 +2864,11 @@ QDomElement QgsWMSServer::createFeatureGML(
     QDomElement gmlElem;
     if ( version < 3 )
     {
-      gmlElem = QgsOgcUtils::geometryToGML( geom, doc );
+      gmlElem = QgsOgcUtils::geometryToGML( geom, doc, 8 );
     }
     else
     {
-      gmlElem = QgsOgcUtils::geometryToGML( geom, doc, "GML3" );
+      gmlElem = QgsOgcUtils::geometryToGML( geom, doc, "GML3", 8 );
     }
 
     if ( !gmlElem.isNull() )

Original file line number	Diff line number	Diff line change
`@@ -3536,7 +3536,7 @@ bool QgsGeometry::crosses( const QgsGeometry* geometry ) const`
`3536`	`3536`	`return geosRelOp( GEOSCrosses, this, geometry );`
`3537`	`3537`	`}`
`3538`	`3538`
`3539`		`-QString QgsGeometry::exportToWkt() const`
	`3539`	`+QString QgsGeometry::exportToWkt( const int &precision ) const`
`3540`	`3540`	`{`
`3541`	`3541`	`QgsDebugMsg( "entered." );`
`3542`	`3542`
`@@ -3566,7 +3566,7 @@ QString QgsGeometry::exportToWkt() const`
`3566`	`3566`	`{`
`3567`	`3567`	`double x, y;`
`3568`	`3568`	`wkbPtr >> x >> y;`
`3569`		`- wkt += "POINT(" + qgsDoubleToString( x ) + " " + qgsDoubleToString( y ) + ")";`
	`3569`	`+ wkt += "POINT(" + qgsDoubleToString( x, precision ) + " " + qgsDoubleToString( y, precision ) + ")";`
`3570`	`3570`	`return wkt;`
`3571`	`3571`	`}`
`3572`	`3572`
`@@ -3589,7 +3589,7 @@ QString QgsGeometry::exportToWkt() const`
`3589`	`3589`	`if ( idx != 0 )`
`3590`	`3590`	`wkt += ", ";`
`3591`	`3591`
`3592`		`- wkt += qgsDoubleToString( x ) + " " + qgsDoubleToString( y );`
	`3592`	`+ wkt += qgsDoubleToString( x, precision ) + " " + qgsDoubleToString( y, precision );`
`3593`	`3593`	`}`
`3594`	`3594`	`wkt += ")";`
`3595`	`3595`	`return wkt;`
`@@ -3626,7 +3626,7 @@ QString QgsGeometry::exportToWkt() const`
`3626`	`3626`	`if ( hasZValue )`
`3627`	`3627`	`wkbPtr += sizeof( double );`
`3628`	`3628`
`3629`		`- wkt += qgsDoubleToString( x ) + " " + qgsDoubleToString( y );`
	`3629`	`+ wkt += qgsDoubleToString( x, precision ) + " " + qgsDoubleToString( y, precision );`
`3630`	`3630`	`}`
`3631`	`3631`	`wkt += ")";`
`3632`	`3632`	`}`
`@@ -3653,7 +3653,7 @@ QString QgsGeometry::exportToWkt() const`
`3653`	`3653`	`if ( hasZValue )`
`3654`	`3654`	`wkbPtr += sizeof( double );`
`3655`	`3655`
`3656`		`- wkt += qgsDoubleToString( x ) + " " + qgsDoubleToString( y );`
	`3656`	`+ wkt += qgsDoubleToString( x, precision ) + " " + qgsDoubleToString( y, precision );`
`3657`	`3657`	`}`
`3658`	`3658`	`wkt += ")";`
`3659`	`3659`	`return wkt;`
`@@ -3686,7 +3686,7 @@ QString QgsGeometry::exportToWkt() const`
`3686`	`3686`	`if ( hasZValue )`
`3687`	`3687`	`wkbPtr += sizeof( double );`
`3688`	`3688`
`3689`		`- wkt += qgsDoubleToString( x ) + " " + qgsDoubleToString( y );`
	`3689`	`+ wkt += qgsDoubleToString( x, precision ) + " " + qgsDoubleToString( y, precision );`
`3690`	`3690`	`}`
`3691`	`3691`	`wkt += ")";`
`3692`	`3692`	`}`
`@@ -3729,7 +3729,7 @@ QString QgsGeometry::exportToWkt() const`
`3729`	`3729`	`if ( hasZValue )`
`3730`	`3730`	`wkbPtr += sizeof( double );`
`3731`	`3731`
`3732`		`- wkt += qgsDoubleToString( x ) + " " + qgsDoubleToString( y );`
	`3732`	`+ wkt += qgsDoubleToString( x, precision ) + " " + qgsDoubleToString( y, precision );`
`3733`	`3733`	`}`
`3734`	`3734`	`wkt += ")";`
`3735`	`3735`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1286,11 +1286,11 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )`
`1286`	`1286`	`int gmlVersion = infoFormat.startsWith( "application/vnd.ogc.gml/3" ) ? 3 : 2;`
`1287`	`1287`	`if ( gmlVersion < 3 )`
`1288`	`1288`	`{`
`1289`		`- boxElem = QgsOgcUtils::rectangleToGMLBox( featuresRect, result );`
	`1289`	`+ boxElem = QgsOgcUtils::rectangleToGMLBox( featuresRect, result, 8 );`
`1290`	`1290`	`}`
`1291`	`1291`	`else`
`1292`	`1292`	`{`
`1293`		`- boxElem = QgsOgcUtils::rectangleToGMLEnvelope( featuresRect, result );`
	`1293`	`+ boxElem = QgsOgcUtils::rectangleToGMLEnvelope( featuresRect, result, 8 );`
`1294`	`1294`	`}`
`1295`	`1295`
`1296`	`1296`	`QgsCoordinateReferenceSystem crs = mMapRenderer->destinationCrs();`
`@@ -1305,10 +1305,10 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )`
`1305`	`1305`	`{`
`1306`	`1306`	`QDomElement bBoxElem = result.createElement( "BoundingBox" );`
`1307`	`1307`	`bBoxElem.setAttribute( "CRS", mMapRenderer->destinationCrs().authid() );`
`1308`		`- bBoxElem.setAttribute( "minx", QString::number( featuresRect->xMinimum() ) );`
`1309`		`- bBoxElem.setAttribute( "maxx", QString::number( featuresRect->xMaximum() ) );`
`1310`		`- bBoxElem.setAttribute( "miny", QString::number( featuresRect->yMinimum() ) );`
`1311`		`- bBoxElem.setAttribute( "maxy", QString::number( featuresRect->yMaximum() ) );`
	`1308`	`+ bBoxElem.setAttribute( "minx", qgsDoubleToString( featuresRect->xMinimum(), 8 ) );`
	`1309`	`+ bBoxElem.setAttribute( "maxx", qgsDoubleToString( featuresRect->xMaximum(), 8 ) );`
	`1310`	`+ bBoxElem.setAttribute( "miny", qgsDoubleToString( featuresRect->yMinimum(), 8 ) );`
	`1311`	`+ bBoxElem.setAttribute( "maxy", qgsDoubleToString( featuresRect->yMaximum(), 8 ) );`
`1312`	`1312`	`getFeatureInfoElement.insertBefore( bBoxElem, QDomNode() ); //insert as first child`
`1313`	`1313`	`}`
`1314`	`1314`	`}`
`@@ -1830,10 +1830,10 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,`
`1830`	`1830`	`{`
`1831`	`1831`	`QDomElement bBoxElem = infoDocument.createElement( "BoundingBox" );`
`1832`	`1832`	`bBoxElem.setAttribute( version == "1.1.1" ? "SRS" : "CRS", outputCrs.authid() );`
`1833`		`- bBoxElem.setAttribute( "minx", QString::number( box.xMinimum() ) );`
`1834`		`- bBoxElem.setAttribute( "maxx", QString::number( box.xMaximum() ) );`
`1835`		`- bBoxElem.setAttribute( "miny", QString::number( box.yMinimum() ) );`
`1836`		`- bBoxElem.setAttribute( "maxy", QString::number( box.yMaximum() ) );`
	`1833`	`+ bBoxElem.setAttribute( "minx", qgsDoubleToString( box.xMinimum(), 8 ) );`
	`1834`	`+ bBoxElem.setAttribute( "maxx", qgsDoubleToString( box.xMaximum(), 8 ) );`
	`1835`	`+ bBoxElem.setAttribute( "miny", qgsDoubleToString( box.yMinimum(), 8 ) );`
	`1836`	`+ bBoxElem.setAttribute( "maxy", qgsDoubleToString( box.yMaximum(), 8 ) );`
`1837`	`1837`	`featureElement.appendChild( bBoxElem );`
`1838`	`1838`	`}`
`1839`	`1839`
`@@ -1851,7 +1851,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,`
`1851`	`1851`	`}`
`1852`	`1852`	`QDomElement geometryElement = infoDocument.createElement( "Attribute" );`
`1853`	`1853`	`geometryElement.setAttribute( "name", "geometry" );`
`1854`		`- geometryElement.setAttribute( "value", geom->exportToWkt() );`
	`1854`	`+ geometryElement.setAttribute( "value", geom->exportToWkt( 8 ) );`
`1855`	`1855`	`geometryElement.setAttribute( "type", "derived" );`
`1856`	`1856`	`featureElement.appendChild( geometryElement );`
`1857`	`1857`	`}`
`@@ -2836,11 +2836,11 @@ QDomElement QgsWMSServer::createFeatureGML(`
`2836`	`2836`	`QDomElement boxElem;`
`2837`	`2837`	`if ( version < 3 )`
`2838`	`2838`	`{`
`2839`		`- boxElem = QgsOgcUtils::rectangleToGMLBox( &box, doc );`
	`2839`	`+ boxElem = QgsOgcUtils::rectangleToGMLBox( &box, doc, 8 );`
`2840`	`2840`	`}`
`2841`	`2841`	`else`
`2842`	`2842`	`{`
`2843`		`- boxElem = QgsOgcUtils::rectangleToGMLEnvelope( &box, doc );`
	`2843`	`+ boxElem = QgsOgcUtils::rectangleToGMLEnvelope( &box, doc, 8 );`
`2844`	`2844`	`}`
`2845`	`2845`
`2846`	`2846`	`if ( crs.isValid() )`
`@@ -2864,11 +2864,11 @@ QDomElement QgsWMSServer::createFeatureGML(`
`2864`	`2864`	`QDomElement gmlElem;`
`2865`	`2865`	`if ( version < 3 )`
`2866`	`2866`	`{`
`2867`		`- gmlElem = QgsOgcUtils::geometryToGML( geom, doc );`
	`2867`	`+ gmlElem = QgsOgcUtils::geometryToGML( geom, doc, 8 );`
`2868`	`2868`	`}`
`2869`	`2869`	`else`
`2870`	`2870`	`{`
`2871`		`- gmlElem = QgsOgcUtils::geometryToGML( geom, doc, "GML3" );`
	`2871`	`+ gmlElem = QgsOgcUtils::geometryToGML( geom, doc, "GML3", 8 );`
`2872`	`2872`	`}`
`2873`	`2873`
`2874`	`2874`	`if ( !gmlElem.isNull() )`