Skip to content
Permalink
Browse files

Merge pull request #34925 from pblottiere/ogcapif_fix

Fix landing page test for OGC API Features certification
  • Loading branch information
pblottiere committed Mar 11, 2020
2 parents ab1755c + 0cf9a81 commit 174e00a91f9b1b8f1952fb0f6217177eb9dca9a4
@@ -33,7 +33,7 @@ QMap<QgsServerOgcApi::ContentType, QStringList> QgsServerOgcApi::sContentTypeMim
QStringLiteral( "application/geojson" )
};
map[QgsServerOgcApi::ContentType::HTML] = QStringList { QStringLiteral( "text/html" ) };
map[QgsServerOgcApi::ContentType::OPENAPI3] = QStringList { QStringLiteral( "application/openapi+json;version=3.0" ) };
map[QgsServerOgcApi::ContentType::OPENAPI3] = QStringList { QStringLiteral( "application/vnd.oai.openapi+json;version=3.0" ) };
map[QgsServerOgcApi::ContentType::XML] = QStringList { QStringLiteral( "application/xml" ) };
return map;
}();
@@ -169,7 +169,7 @@ json QgsWfs3APIHandler::schema( const QgsServerApiContext &context ) const
{
"content", {
{
"application/openapi+json;version=3.0", {
"application/vnd.oai.openapi+json;version=3.0", {
{
"schema", {
{ "type", "object" }
@@ -301,7 +301,7 @@ void QgsWfs3LandingPageHandler::handleRequest( const QgsServerApiContext &contex
} );
data["links"].push_back(
{
{ "href", href( context, "/api" )},
{ "href", href( context, "/api.json" )},
{ "rel", QgsServerOgcApi::relToString( QgsServerOgcApi::Rel::service_desc ) },
{ "type", QgsServerOgcApi::mimeType( QgsServerOgcApi::ContentType::OPENAPI3 ) },
{ "title", "API description" },
@@ -1,4 +1,4 @@
Content-Type: application/openapi+json;version=3.0
Content-Type: application/vnd.oai.openapi+json;version=3.0

{
"components": {
@@ -563,7 +563,7 @@ Content-Type: application/openapi+json;version=3.0
"responses": {
"200": {
"content": {
"application/openapi+json;version=3.0": {
"application/vnd.oai.openapi+json;version=3.0": {
"schema": {
"type": "object"
}
@@ -2164,4 +2164,4 @@ Content-Type: application/openapi+json;version=3.0
}
],
"timeStamp": "2019-07-05T12:27:07Z"
}
}
@@ -28,7 +28,7 @@

<link rel="conformance" href="http://server.qgis.org/wfs3/conformance" title="Conformance classes" type="application/json">

<link rel="service-desc" href="http://server.qgis.org/wfs3/api" title="API description" type="application/openapi+json;version=3.0">
<link rel="service-desc" href="http://server.qgis.org/wfs3/api.json" title="API description" type="application/vnd.oai.openapi+json;version=3.0">



@@ -83,7 +83,7 @@ <h2>Available services</h2>



<li><a rel="service-desc" href="http://server.qgis.org/wfs3/api">API description</a></li>
<li><a rel="service-desc" href="http://server.qgis.org/wfs3/api.json">API description</a></li>



@@ -27,11 +27,11 @@ Content-Type: application/json
"type": "application/json"
},
{
"href": "http://server.qgis.org/wfs3/api",
"href": "http://server.qgis.org/wfs3/api.json",
"rel": "service-desc",
"title": "API description",
"type": "application/openapi+json;version=3.0"
"type": "application/vnd.oai.openapi+json;version=3.0"
}
],
"timeStamp": "2019-07-05T12:27:07Z"
}
}

0 comments on commit 174e00a

Please sign in to comment.
You can’t perform that action at this time.