[server] Always export GeoJSON in WGS84 (fix #14609)

nyalldawson · nyalldawson · commit 9ea56acde03a · 2016-05-09T21:19:28.000+10:00
diff --git a/src/server/qgswfsserver.cpp b/src/server/qgswfsserver.cpp
@@ -1864,11 +1864,12 @@ QgsFeatureIds QgsWFSServer::getFeatureIdsFromFilter( const QDomElement& filterEl
   return fids;
 }
 
-QString QgsWFSServer::createFeatureGeoJSON( QgsFeature* feat, int prec, QgsCoordinateReferenceSystem &, const QgsAttributeList& attrIndexes, const QSet<QString>& excludedAttributes ) /*const*/
+QString QgsWFSServer::createFeatureGeoJSON( QgsFeature* feat, int prec, QgsCoordinateReferenceSystem& crs, const QgsAttributeList& attrIndexes, const QSet<QString>& excludedAttributes ) /*const*/
 {
   QString id = QString( "%1.%2" ).arg( mTypeName, FID_TO_STRING( feat->id() ) );
 
   QgsJSONExporter exporter;
+  exporter.setSourceCrs( crs );
   exporter.setPrecision( prec );
 
   //copy feature so we can modify its geometry as required

Original file line number	Diff line number	Diff line change
`@@ -1864,11 +1864,12 @@ QgsFeatureIds QgsWFSServer::getFeatureIdsFromFilter( const QDomElement& filterEl`
`1864`	`1864`	`return fids;`
`1865`	`1865`	`}`
`1866`	`1866`
`1867`		`-QString QgsWFSServer::createFeatureGeoJSON( QgsFeature* feat, int prec, QgsCoordinateReferenceSystem &, const QgsAttributeList& attrIndexes, const QSet<QString>& excludedAttributes ) /const/`
	`1867`	`+QString QgsWFSServer::createFeatureGeoJSON( QgsFeature* feat, int prec, QgsCoordinateReferenceSystem& crs, const QgsAttributeList& attrIndexes, const QSet<QString>& excludedAttributes ) /const/`
`1868`	`1868`	`{`
`1869`	`1869`	`QString id = QString( "%1.%2" ).arg( mTypeName, FID_TO_STRING( feat->id() ) );`
`1870`	`1870`
`1871`	`1871`	`QgsJSONExporter exporter;`
	`1872`	`+ exporter.setSourceCrs( crs );`
`1872`	`1873`	`exporter.setPrecision( prec );`
`1873`	`1874`
`1874`	`1875`	`//copy feature so we can modify its geometry as required`