Export aliases is an option

pblottiere · pblottiere · commit eee940dc8f45 · 2019-01-28T11:42:14.000Z
diff --git a/src/core/qgsjsonutils.cpp b/src/core/qgsjsonutils.cpp
@@ -145,7 +145,13 @@ QString QgsJsonExporter::exportFeature( const QgsFeature &feature, const QVarian
             val = fieldFormatter->representValue( mLayer.data(), i, setup.config(), QVariant(), val );
         }
 
-        properties += QStringLiteral( "      \"%1\":%2" ).arg( mLayer->attributeDisplayName( i ), QgsJsonUtils::encodeValue( val ) );
+        QString name = fields.at( i ).name();
+        if ( mAttributeDisplayName )
+        {
+          name = mLayer->attributeDisplayName( i );
+        }
+
+        properties += QStringLiteral( "      \"%1\":%2" ).arg( name, QgsJsonUtils::encodeValue( val ) );
 
         ++attributeCounter;
       }
diff --git a/src/core/qgsjsonutils.h b/src/core/qgsjsonutils.h
@@ -118,6 +118,20 @@ class CORE_EXPORT QgsJsonExporter
      */
     bool includeRelated() const { return mIncludeRelatedAttributes; }
 
+    /**
+     * Sets whether to print original names of attributes or aliases if
+     * defined.
+     * \since QGIS 3.6
+     */
+    void setAttributeDisplayName( bool displayName ) { mAttributeDisplayName = displayName; };
+
+    /**
+     * Returns whether original names of attributes or aliases are printed.
+     * \since QGIS 3.6
+     */
+
+    bool attributeDisplayName() const { return mAttributeDisplayName; }
+
     /**
      * Sets the associated vector layer (required for related attribute export). This will automatically
      * update the sourceCrs() to match.
@@ -239,6 +253,8 @@ class CORE_EXPORT QgsJsonExporter
     QgsCoordinateTransform mTransform;
 
     bool mIncludeName = false;
+
+    bool mAttributeDisplayName = false;
 };
 
 /**
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -2337,6 +2337,7 @@ namespace QgsWms
 
         // export
         QgsJsonExporter exporter( vl );
+        exporter.setAttributeDisplayName( true );
         exporter.setAttributes( attributes );
         exporter.setIncludeGeometry( withGeometry );
         exporter.setIncludeName( true );

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,13 @@ QString QgsJsonExporter::exportFeature( const QgsFeature &feature, const QVarian`
`145`	`145`	`val = fieldFormatter->representValue( mLayer.data(), i, setup.config(), QVariant(), val );`
`146`	`146`	`}`
`147`	`147`
`148`		`- properties += QStringLiteral( " \"%1\":%2" ).arg( mLayer->attributeDisplayName( i ), QgsJsonUtils::encodeValue( val ) );`
	`148`	`+ QString name = fields.at( i ).name();`
	`149`	`+ if ( mAttributeDisplayName )`
	`150`	`+ {`
	`151`	`+ name = mLayer->attributeDisplayName( i );`
	`152`	`+ }`
	`153`	`+`
	`154`	`+ properties += QStringLiteral( " \"%1\":%2" ).arg( name, QgsJsonUtils::encodeValue( val ) );`
`149`	`155`
`150`	`156`	`++attributeCounter;`
`151`	`157`	`}`