switch to QgsJsonUtils + QStringLiterals + typo

qgis · Apr 25, 2020 · ccaf379 · ccaf379
1 parent 6f746b5
commit ccaf379
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/src/core/qgsmbtilesreader.h b/src/core/qgsmbtilesreader.h
@@ -35,7 +35,7 @@ class QgsRectangle;
 class CORE_EXPORT QgsMBTilesReader
 {
   public:
-    //! Contructs MBTiles reader (but it does not open the file yet)
+    //! Constructs MBTiles reader (but it does not open the file yet)
     explicit QgsMBTilesReader( const QString &filename );
 
     //! Tries to open the file, returns true on success

diff --git a/src/core/vectortile/qgsvectortilewriter.cpp b/src/core/vectortile/qgsvectortilewriter.cpp
@@ -17,17 +17,18 @@
 
 #include "qgsdatasourceuri.h"
 #include "qgsfeedback.h"
+#include "qgsjsonutils.h"
 #include "qgsmbtilesreader.h"
 #include "qgstiles.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectortilemvtencoder.h"
 #include "qgsvectortileutils.h"
 
+#include <nlohmann/json.hpp>
+
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
-#include <QJsonDocument>
-#include <QJsonArray>
 #include <QUrl>
 
 
@@ -196,38 +197,36 @@ bool QgsVectorTileWriter::writeTileFileXYZ( const QString &sourcePath, QgsTileXY
   return true;
 }
 
+
 QString QgsVectorTileWriter::mbtilesJsonSchema()
 {
-  QJsonArray arrayLayers;
+  QVariantList arrayLayers;
   for ( const Layer &layer : qgis::as_const( mLayers ) )
   {
     QgsVectorLayer *vl = layer.layer();
     const QgsFields fields = vl->fields();
 
-    QJsonObject fieldsObj;
+    QVariantMap fieldsObj;
     for ( const QgsField &field : fields )
     {
       QString fieldTypeStr;
       if ( field.type() == QVariant::Bool )
-        fieldTypeStr = "Boolean";
+        fieldTypeStr = QStringLiteral( "Boolean" );
       else if ( field.type() == QVariant::Int || field.type() == QVariant::Double )
-        fieldTypeStr = "Number";
+        fieldTypeStr = QStringLiteral( "Number" );
       else
-        fieldTypeStr = "String";
+        fieldTypeStr = QStringLiteral( "String" );
 
-      fieldsObj["field"] = fieldTypeStr;
+      fieldsObj[field.name()] = fieldTypeStr;
     }
 
-    QJsonObject layerObj;
+    QVariantMap layerObj;
     layerObj["id"] = vl->name();
     layerObj["fields"] = fieldsObj;
     arrayLayers.append( layerObj );
   }
 
-  QJsonObject rootObj;
+  QVariantMap rootObj;
   rootObj["vector_layers"] = arrayLayers;
-
-  QJsonDocument doc;
-  doc.setObject( rootObj );
-  return doc.toJson();
+  return QString::fromStdString( QgsJsonUtils::jsonFromVariant( rootObj ).dump() );
 }