Merge pull request #9830 from qgis/backport-9826-to-release-3_4

rldhont · web-flow · commit d16bf3f4791f · 2019-04-18T23:12:28.000+02:00
[Backport release-3_4] [Bugfix][Server] WMTS: read the service url from project
diff --git a/src/server/qgsserverprojectutils.cpp b/src/server/qgsserverprojectutils.cpp
@@ -335,5 +335,5 @@ QStringList QgsServerProjectUtils::wcsLayerIds( const QgsProject &project )
 
 QString QgsServerProjectUtils::wmtsServiceUrl( const QgsProject &project )
 {
-  return project.readEntry( QStringLiteral( "WMTSSUrl" ), QStringLiteral( "/" ), "" );
+  return project.readEntry( QStringLiteral( "WMTSUrl" ), QStringLiteral( "/" ), "" );
 }

Original file line number	Diff line number	Diff line change
`@@ -335,5 +335,5 @@ QStringList QgsServerProjectUtils::wcsLayerIds( const QgsProject &project )`
`335`	`335`
`336`	`336`	`QString QgsServerProjectUtils::wmtsServiceUrl( const QgsProject &project )`
`337`	`337`	`{`
`338`		`- return project.readEntry( QStringLiteral( "WMTSSUrl" ), QStringLiteral( "/" ), "" );`
	`338`	`+ return project.readEntry( QStringLiteral( "WMTSUrl" ), QStringLiteral( "/" ), "" );`
`339`	`339`	`}`