Merge pull request #31293 from elpaso/json-fix-gcc-list-initialized

Fix nlohman::json array list initializer broken on GCC
qgis · Aug 19, 2019 · ea0b650 · ea0b650
2 parents 8bcfdd3 + 69b1ba5
commit ea0b650
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/core/qgsjsonutils.cpp b/src/core/qgsjsonutils.cpp
@@ -235,8 +235,7 @@ json QgsJsonExporter::exportFeaturesToJsonObject( const QgsFeatureList &features
     { "type", "FeatureCollection" },
     { "features", json::array() }
   };
-  const auto constFeatures = features;
-  for ( const QgsFeature &feature : constFeatures )
+  for ( const QgsFeature &feature : qgis::as_const( features ) )
   {
     data["features"].push_back( exportFeatureToJsonObject( feature ) );
   }

diff --git a/src/server/qgsserverogcapihandler.cpp b/src/server/qgsserverogcapihandler.cpp
@@ -85,7 +85,7 @@ QString QgsServerOgcApiHandler::contentTypeForAccept( const QString &accept ) co
 
 void QgsServerOgcApiHandler::write( json &data, const QgsServerApiContext &context, const json &htmlMetadata ) const
 {
-  const auto contentType { contentTypeFromRequest( context.request() ) };
+  const QgsServerOgcApi::ContentType contentType { contentTypeFromRequest( context.request() ) };
   switch ( contentType )
   {
     case QgsServerOgcApi::ContentType::HTML:
@@ -105,8 +105,8 @@ void QgsServerOgcApiHandler::write( json &data, const QgsServerApiContext &conte
 }
 void QgsServerOgcApiHandler::write( QVariant &data, const QgsServerApiContext &context, const QVariantMap &htmlMetadata ) const
 {
-  json j { QgsJsonUtils::jsonFromVariant( data ) };
-  json jm { QgsJsonUtils::jsonFromVariant( htmlMetadata ) };
+  json j = QgsJsonUtils::jsonFromVariant( data );
+  json jm = QgsJsonUtils::jsonFromVariant( htmlMetadata );
   QgsServerOgcApiHandler::write( j, context, jm );
 }
 
@@ -307,7 +307,11 @@ void QgsServerOgcApiHandler::htmlDump( const json &data, const QgsServerApiConte
     // links_filter( <links>, <key>, <value> )
     env.add_callback( "links_filter", 3, [ = ]( Arguments & args )
     {
-      json links { args.at( 0 )->get<json>( ) };
+      json links = args.at( 0 )->get<json>( );
+      if ( ! links.is_array() )
+      {
+        links = json::array();
+      }
       std::string key { args.at( 1 )->get<std::string>( ) };
       std::string value { args.at( 2 )->get<std::string>( ) };
       json result = json::array();
@@ -344,6 +348,7 @@ void QgsServerOgcApiHandler::htmlDump( const json &data, const QgsServerApiConte
     throw QgsServerApiInternalServerError( QStringLiteral( "Error parsing template file: %1" ).arg( e.what() ) );
   }
 }
+
 QgsServerOgcApi::ContentType QgsServerOgcApiHandler::contentTypeFromRequest( const QgsServerRequest *request ) const
 {
   // Fallback to default

diff --git a/src/server/services/wfs3/qgswfs3handlers.cpp b/src/server/services/wfs3/qgswfs3handlers.cpp
@@ -98,7 +98,7 @@ void QgsWfs3APIHandler::handleRequest( const QgsServerApiContext &context ) cons
   for ( const auto &h : mApi->handlers() )
   {
     // Skip null schema
-    const auto hSchema { h->schema( context ) };
+    const json hSchema = h->schema( context );
     if ( ! hSchema.is_null() )
       paths.merge_patch( hSchema );
   }
@@ -500,7 +500,7 @@ void QgsWfs3DescribeCollectionHandler::handleRequest( const QgsServerApiContext
 
   const std::string title { mapLayer->title().isEmpty() ? mapLayer->name().toStdString() : mapLayer->title().toStdString() };
   const QString shortName { mapLayer->shortName().isEmpty() ? mapLayer->name() : mapLayer->shortName() };
-  json linksList { links( context ) };
+  json linksList = links( context );
   linksList.push_back(
   {
     { "href", href( context, QStringLiteral( "/items" ), QgsServerOgcApi::contentTypeToExtension( QgsServerOgcApi::ContentType::JSON ) )  },
@@ -975,7 +975,7 @@ void QgsWfs3CollectionsItemsHandler::handleRequest( const QgsServerApiContext &c
       }
     }
 
-    json data { exporter.exportFeaturesToJsonObject( featureList ) };
+    json data = exporter.exportFeaturesToJsonObject( featureList );
 
     // Add some metadata
     data["numberMatched"] = matchedFeaturesCount;
@@ -1009,15 +1009,15 @@ void QgsWfs3CollectionsItemsHandler::handleRequest( const QgsServerApiContext &c
     // Add prev - next links
     if ( offset != 0 )
     {
-      auto prevLink { selfLink };
+      json prevLink = selfLink;
       prevLink["href"] = QStringLiteral( "%1&offset=%2&limit=%3" ).arg( cleanedUrl ).arg( std::max<long>( 0, limit - offset ) ).arg( limit ).toStdString();
       prevLink["rel"] = "prev";
       prevLink["name"] = "Previous page";
       data["links"].push_back( prevLink );
     }
     if ( limit + offset < matchedFeaturesCount )
     {
-      auto nextLink { selfLink };
+      json nextLink = selfLink;
       nextLink["href"] = QStringLiteral( "%1&offset=%2&limit=%3" ).arg( cleanedUrl ).arg( std::min<long>( matchedFeaturesCount, limit + offset ) ).arg( limit ).toStdString();
       nextLink["rel"] = "next";
       nextLink["name"] = "Next page";
@@ -1078,7 +1078,7 @@ void QgsWfs3CollectionsFeatureHandler::handleRequest( const QgsServerApiContext
     {
       QgsServerApiInternalServerError( QStringLiteral( "Invalid feature [%1]" ).arg( featureId ) );
     }
-    json data { exporter.exportFeatureToJsonObject( feature ) };
+    json data = exporter.exportFeatureToJsonObject( feature );
     data["links"] = links( context );
     json navigation = json::array();
     const QUrl url { context.request()->url() };