Merge pull request #35880 from pblottiere/fix_ogc_api_def_3_10

Fixes double type in ogcapif api document
qgis · Apr 21, 2020 · a38e715 · a38e715
2 parents 8cbd1e4 + f124e6b
commit a38e715
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/server/qgsserverquerystringparameter.cpp b/src/server/qgsserverquerystringparameter.cpp
@@ -123,6 +123,10 @@ json QgsServerQueryStringParameter::data() const
   {
     dataType = "string";
   }
+  else if ( dataType == "double" )
+  {
+    dataType = "number";
+  }
   return
   {
     { "name", nameString },

diff --git a/tests/src/server/testqgsserverquerystringparameter.cpp b/tests/src/server/testqgsserverquerystringparameter.cpp
@@ -118,6 +118,7 @@ void TestQgsServerQueryStringParameter::testArguments()
   QCOMPARE( p.value( ctx ).type(), QVariant::Double );
   request.setUrl( QStringLiteral( "http://www.qgis.org/api/?parameter1=a%20string" ) );
   QVERIFY_EXCEPTION_THROWN( p.value( ctx ), QgsServerApiBadRequestException );
+  QCOMPARE( QString::fromStdString( p.data()["schema"]["type"] ), QString( "number" ) );
 
   // Test list
   p.mType = QgsServerQueryStringParameter::Type::List;