[BUGFIX] 13118 QGIS Server - WFS - GeoJSON and escaping line breaks

rldhont · rldhont · commit 25db1cc33c65 · 2015-11-11T20:14:14.000+01:00
Line breaks are not properly handled in GeoJSON results when making GetFeature requests.
Line breaks should be replaced by \\n.
diff --git a/src/server/qgswfsserver.cpp b/src/server/qgswfsserver.cpp
@@ -1751,7 +1751,10 @@ QString QgsWFSServer::createFeatureGeoJSON( QgsFeature* feat, int prec, QgsCoord
     else
     {
       fStr += "\"";
-      fStr +=  val.toString().replace( QString( "\"" ), QString( "\\\"" ) );
+      fStr +=  val.toString()
+                  .replace( QString( "\"" ), QString( "\\\"" ) )
+                  .replace( QString( "\r" ), QString( "\\r" ) )
+                  .replace( QString( "\n" ), QString( "\\n" ) );
       fStr += "\"";
     }
     fStr += "\n";

Original file line number	Diff line number	Diff line change
`@@ -1751,7 +1751,10 @@ QString QgsWFSServer::createFeatureGeoJSON( QgsFeature* feat, int prec, QgsCoord`
`1751`	`1751`	`else`
`1752`	`1752`	`{`
`1753`	`1753`	`fStr += "\"";`
`1754`		`- fStr += val.toString().replace( QString( "\"" ), QString( "\\\"" ) );`
	`1754`	`+ fStr += val.toString()`
	`1755`	`+ .replace( QString( "\"" ), QString( "\\\"" ) )`
	`1756`	`+ .replace( QString( "\r" ), QString( "\\r" ) )`
	`1757`	`+ .replace( QString( "\n" ), QString( "\\n" ) );`
`1755`	`1758`	`fStr += "\"";`
`1756`	`1759`	`}`
`1757`	`1760`	`fStr += "\n";`