Add layers tag and their names in exported json

pblottiere · pblottiere · commit f9eba37b1071 · 2019-01-28T11:42:14.000Z
diff --git a/src/core/qgsjsonutils.cpp b/src/core/qgsjsonutils.cpp
@@ -237,7 +237,11 @@ QString QgsJsonExporter::exportFeatures( const QgsFeatureList &features ) const
     featureJSON << exportFeature( feature );
   }
 
-  return QStringLiteral( "{ \"type\": \"FeatureCollection\",\n    \"features\":[\n%1\n]}" ).arg( featureJSON.join( QStringLiteral( ",\n" ) ) );
+  QString layerName;
+  if ( mIncludeLayerName )
+    layerName.append( QStringLiteral( "\n \"name\": \"%1\",\n" ).arg( mLayer->name() ) );
+
+  return QStringLiteral( "{%1 \"type\": \"FeatureCollection\",\n    \"features\":[\n%2\n]}" ).arg( layerName, featureJSON.join( QStringLiteral( ",\n" ) ) );
 }
 
 
diff --git a/src/core/qgsjsonutils.h b/src/core/qgsjsonutils.h
@@ -75,6 +75,10 @@ class CORE_EXPORT QgsJsonExporter
      */
     bool includeGeometry() const { return mIncludeGeometry; }
 
+    void setIncludeLayerName( bool includeLayerName ) { mIncludeLayerName = includeLayerName; }
+
+    bool includeLayerName() const { return mIncludeLayerName; }
+
     /**
      * Sets whether to include attributes in the JSON exports.
      * \param includeAttributes set to false to prevent attribute inclusion
@@ -223,6 +227,7 @@ class CORE_EXPORT QgsJsonExporter
 
     QgsCoordinateTransform mTransform;
 
+    bool mIncludeLayerName = false;
 };
 
 /**
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -2281,6 +2281,8 @@ namespace QgsWms
   QByteArray QgsRenderer::convertFeatureInfoToJson( const QList<QgsMapLayer *> &layers, const QDomDocument &doc ) const
   {
     QString json;
+    json.append( "{" );
+    json.append( ( "\"layers\":[" ) );
 
     const bool withGeometry = ( QgsServerProjectUtils::wmsFeatureInfoAddWktGeometry( *mProject ) && mWmsParameters.withGeometry() );
 
@@ -2338,13 +2340,20 @@ namespace QgsWms
         QgsJsonExporter exporter( vl );
         exporter.setAttributes( attributes );
         exporter.setIncludeGeometry( withGeometry );
+        exporter.setIncludeLayerName( true );
+
+        if ( i > 0 )
+          json.append( "," );
+
         json.append( exporter.exportFeatures( features ) );
       }
       else // raster layer
       {
       }
     }
 
+    json.append( ( "]}" ) );
+
     return json.toUtf8();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,11 @@ QString QgsJsonExporter::exportFeatures( const QgsFeatureList &features ) const`
`237`	`237`	`featureJSON << exportFeature( feature );`
`238`	`238`	`}`
`239`	`239`
`240`		`- return QStringLiteral( "{ \"type\": \"FeatureCollection\",\n \"features\":[\n%1\n]}" ).arg( featureJSON.join( QStringLiteral( ",\n" ) ) );`
	`240`	`+ QString layerName;`
	`241`	`+ if ( mIncludeLayerName )`
	`242`	`+ layerName.append( QStringLiteral( "\n \"name\": \"%1\",\n" ).arg( mLayer->name() ) );`
	`243`	`+`
	`244`	`+ return QStringLiteral( "{%1 \"type\": \"FeatureCollection\",\n \"features\":[\n%2\n]}" ).arg( layerName, featureJSON.join( QStringLiteral( ",\n" ) ) );`
`241`	`245`	`}`
`242`	`246`
`243`	`247`
Original file line number	Diff line number	Diff line change
`@@ -2281,6 +2281,8 @@ namespace QgsWms`
`2281`	`2281`	`QByteArray QgsRenderer::convertFeatureInfoToJson( const QList<QgsMapLayer *> &layers, const QDomDocument &doc ) const`
`2282`	`2282`	`{`
`2283`	`2283`	`QString json;`
	`2284`	`+ json.append( "{" );`
	`2285`	`+ json.append( ( "\"layers\":[" ) );`
`2284`	`2286`
`2285`	`2287`	`const bool withGeometry = ( QgsServerProjectUtils::wmsFeatureInfoAddWktGeometry( *mProject ) && mWmsParameters.withGeometry() );`
`2286`	`2288`
`@@ -2338,13 +2340,20 @@ namespace QgsWms`
`2338`	`2340`	`QgsJsonExporter exporter( vl );`
`2339`	`2341`	`exporter.setAttributes( attributes );`
`2340`	`2342`	`exporter.setIncludeGeometry( withGeometry );`
	`2343`	`+ exporter.setIncludeLayerName( true );`
	`2344`	`+`
	`2345`	`+ if ( i > 0 )`
	`2346`	`+ json.append( "," );`
	`2347`	`+`
`2341`	`2348`	`json.append( exporter.exportFeatures( features ) );`
`2342`	`2349`	`}`
`2343`	`2350`	`else // raster layer`
`2344`	`2351`	`{`
`2345`	`2352`	`}`
`2346`	`2353`	`}`
`2347`	`2354`
	`2355`	`+ json.append( ( "]}" ) );`
	`2356`	`+`
`2348`	`2357`	`return json.toUtf8();`
`2349`	`2358`	`}`
`2350`	`2359`