Export aliases is an option

qgis · Jan 28, 2019 · eee940d · eee940d
1 parent 3b45286
commit eee940d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
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 );