Merge pull request #8150 from elpaso/bugfix-20053-json-exporter-values

elpaso · web-flow · commit b80c95c71a34 · 2018-10-10T09:56:52.000+02:00
Fixes #20053 decimal separator in csv files
diff --git a/src/core/qgsjsonutils.cpp b/src/core/qgsjsonutils.cpp
@@ -70,6 +70,7 @@ QgsCoordinateReferenceSystem QgsJsonExporter::sourceCrs() const
 QString QgsJsonExporter::exportFeature( const QgsFeature &feature, const QVariantMap &extraProperties,
                                         const QVariant &id ) const
 {
+
   QString s = QStringLiteral( "{\n   \"type\":\"Feature\",\n" );
 
   // ID
@@ -119,6 +120,12 @@ QString QgsJsonExporter::exportFeature( const QgsFeature &feature, const QVarian
     if ( mIncludeAttributes )
     {
       QgsFields fields = mLayer ? mLayer->fields() : feature.fields();
+      // List of formatters through we want to pass the values
+      QStringList formattersWhiteList;
+      formattersWhiteList << QStringLiteral( "KeyValue" )
+                          << QStringLiteral( "List" )
+                          << QStringLiteral( "ValueRelation" )
+                          << QStringLiteral( "ValueMap" );
 
       for ( int i = 0; i < fields.count(); ++i )
       {
@@ -133,7 +140,7 @@ QString QgsJsonExporter::exportFeature( const QgsFeature &feature, const QVarian
         {
           QgsEditorWidgetSetup setup = fields.at( i ).editorWidgetSetup();
           QgsFieldFormatter *fieldFormatter = QgsApplication::fieldFormatterRegistry()->fieldFormatter( setup.type() );
-          if ( fieldFormatter != QgsApplication::fieldFormatterRegistry()->fallbackFieldFormatter() )
+          if ( formattersWhiteList.contains( fieldFormatter->id() ) )
             val = fieldFormatter->representValue( mLayer.data(), i, setup.config(), QVariant(), val );
         }
 
diff --git a/tests/src/python/test_qgsjsonutils.py b/tests/src/python/test_qgsjsonutils.py
@@ -31,7 +31,7 @@
                        QgsRelation,
                        QgsEditorWidgetSetup
                        )
-from qgis.PyQt.QtCore import QVariant, QTextCodec
+from qgis.PyQt.QtCore import QVariant, QTextCodec, QLocale
 
 start_app()
 codec = QTextCodec.codecForName("System")
@@ -676,6 +676,56 @@ def testExportFeatures(self):
 ]}"""
         self.assertEqual(exporter.exportFeatures([feature, feature2]), expected)
 
+    def testExportFeaturesWithLocale_regression20053(self):
+        """ Test exporting feature export with range widgets and locale different than C
+        Regression: https://issues.qgis.org/issues/20053 - decimal separator in csv files
+        """
+
+        source = QgsVectorLayer("Point?field=name:string&field=cost:double&field=population:int&field=date:date",
+                                "parent", "memory")
+        self.assertTrue(source.isValid())
+        fields = source.fields()
+
+        feature = QgsFeature(fields, 5)
+        feature.setGeometry(QgsGeometry(QgsPoint(5, 6)))
+        feature.setAttributes(['Valsier Peninsula', 6.8, 198000, '2018-09-10'])
+
+        exporter = QgsJsonExporter()
+
+        # single feature
+        expected = """{ "type": "FeatureCollection",
+    "features":[
+{
+   "type":"Feature",
+   "id":5,
+   "geometry":
+   {"type": "Point", "coordinates": [5, 6]},
+   "properties":{
+      "name":"Valsier Peninsula",
+      "cost":6.8,
+      "population":198000,
+      "date":"2018-09-10"
+   }
+}
+]}"""
+        self.assertEqual(exporter.exportFeatures([feature]), expected)
+
+        setup = QgsEditorWidgetSetup('Range', {
+            'AllowNull': True,
+            'Max': 2147483647,
+            'Min': -2147483648,
+            'Precision': 4,
+            'Step': 1,
+            'Style': 'SpinBox'
+        }
+        )
+        source.setEditorWidgetSetup(1, setup)
+        source.setEditorWidgetSetup(2, setup)
+
+        QLocale.setDefault(QLocale('it'))
+        exporter.setVectorLayer(source)
+        self.assertEqual(exporter.exportFeatures([feature]), expected)
+
 
 if __name__ == "__main__":
     unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ QgsCoordinateReferenceSystem QgsJsonExporter::sourceCrs() const`
`70`	`70`	`QString QgsJsonExporter::exportFeature( const QgsFeature &feature, const QVariantMap &extraProperties,`
`71`	`71`	`const QVariant &id ) const`
`72`	`72`	`{`
	`73`	`+`
`73`	`74`	`QString s = QStringLiteral( "{\n \"type\":\"Feature\",\n" );`
`74`	`75`
`75`	`76`	`// ID`
`@@ -119,6 +120,12 @@ QString QgsJsonExporter::exportFeature( const QgsFeature &feature, const QVarian`
`119`	`120`	`if ( mIncludeAttributes )`
`120`	`121`	`{`
`121`	`122`	`QgsFields fields = mLayer ? mLayer->fields() : feature.fields();`
	`123`	`+ // List of formatters through we want to pass the values`
	`124`	`+ QStringList formattersWhiteList;`
	`125`	`+ formattersWhiteList << QStringLiteral( "KeyValue" )`
	`126`	`+ << QStringLiteral( "List" )`
	`127`	`+ << QStringLiteral( "ValueRelation" )`
	`128`	`+ << QStringLiteral( "ValueMap" );`
`122`	`129`
`123`	`130`	`for ( int i = 0; i < fields.count(); ++i )`
`124`	`131`	`{`
`@@ -133,7 +140,7 @@ QString QgsJsonExporter::exportFeature( const QgsFeature &feature, const QVarian`
`133`	`140`	`{`
`134`	`141`	`QgsEditorWidgetSetup setup = fields.at( i ).editorWidgetSetup();`
`135`	`142`	`QgsFieldFormatter *fieldFormatter = QgsApplication::fieldFormatterRegistry()->fieldFormatter( setup.type() );`
`136`		`- if ( fieldFormatter != QgsApplication::fieldFormatterRegistry()->fallbackFieldFormatter() )`
	`143`	`+ if ( formattersWhiteList.contains( fieldFormatter->id() ) )`
`137`	`144`	`val = fieldFormatter->representValue( mLayer.data(), i, setup.config(), QVariant(), val );`
`138`	`145`	`}`
`139`	`146`