Skip to content

Commit df03b63

Browse files
committed
[Server][Feature][needs-docs] Add ability to define ResourceURL for WMTS
1 parent d9095e0 commit df03b63

File tree

6 files changed

+39
-1
lines changed

6 files changed

+39
-1
lines changed

python/server/auto_generated/qgsserverprojectutils.sip.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,15 @@ Returns the Layer ids list defined in a QGIS project as published in WCS.
413413
:param project: the QGIS project
414414

415415
:return: the Layer ids list.
416+
%End
417+
418+
QString wmtsServiceUrl( const QgsProject &project );
419+
%Docstring
420+
Returns the WMTS service url defined in a QGIS project.
421+
422+
:param project: the QGIS project
423+
424+
:return: url if defined in project, an empty string otherwise.
416425
%End
417426
};
418427

src/app/qgsprojectproperties.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,6 +662,8 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
662662
mWMSImageQualitySpinBox->setValue( imageQuality );
663663
}
664664

665+
mWMTSUrlLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMTSUrl" ), QStringLiteral( "/" ), QLatin1String( "" ) ) );
666+
665667
bool wmtsProject = QgsProject::instance()->readBoolEntry( QStringLiteral( "WMTSLayers" ), QStringLiteral( "Project" ) );
666668
bool wmtsPngProject = QgsProject::instance()->readBoolEntry( QStringLiteral( "WMTSPngLayers" ), QStringLiteral( "Project" ) );
667669
bool wmtsJpegProject = QgsProject::instance()->readBoolEntry( QStringLiteral( "WMTSJpegLayers" ), QStringLiteral( "Project" ) );
@@ -1262,6 +1264,7 @@ void QgsProjectProperties::apply()
12621264
QgsProject::instance()->writeEntry( QStringLiteral( "WMSImageQuality" ), QStringLiteral( "/" ), imageQualityValue );
12631265
}
12641266

1267+
QgsProject::instance()->writeEntry( QStringLiteral( "WMTSUrl" ), QStringLiteral( "/" ), mWMTSUrlLineEdit->text() );
12651268
bool wmtsProject = false;
12661269
bool wmtsPngProject = false;
12671270
bool wmtsJpegProject = false;

src/server/qgsserverprojectutils.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,3 +331,8 @@ QStringList QgsServerProjectUtils::wcsLayerIds( const QgsProject &project )
331331
{
332332
return project.readListEntry( QStringLiteral( "WCSLayers" ), QStringLiteral( "/" ) );
333333
}
334+
335+
QString QgsServerProjectUtils::wmtsServiceUrl( const QgsProject &project )
336+
{
337+
return project.readEntry( QStringLiteral( "WMTSSUrl" ), QStringLiteral( "/" ), "" );
338+
}

src/server/qgsserverprojectutils.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,13 @@ namespace QgsServerProjectUtils
347347
* \returns the Layer ids list.
348348
*/
349349
SERVER_EXPORT QStringList wcsLayerIds( const QgsProject &project );
350+
351+
/**
352+
* Returns the WMTS service url defined in a QGIS project.
353+
* \param project the QGIS project
354+
* \returns url if defined in project, an empty string otherwise.
355+
*/
356+
SERVER_EXPORT QString wmtsServiceUrl( const QgsProject &project );
350357
};
351358

352359
#endif

src/server/services/wmts/qgswmtsutils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace QgsWmts
5959
QString href;
6060
if ( project )
6161
{
62-
href = QgsServerProjectUtils::wmsServiceUrl( *project );
62+
href = QgsServerProjectUtils::wmtsServiceUrl( *project );
6363
}
6464

6565
// Build default url

src/ui/qgsprojectpropertiesbase.ui

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2502,6 +2502,20 @@
25022502
</column>
25032503
</widget>
25042504
</item>
2505+
<item row="2" column="0">
2506+
<layout class="QHBoxLayout" name="horizontalLayout_15">
2507+
<item>
2508+
<widget class="QLabel" name="mWMTSUrlLabel">
2509+
<property name="text">
2510+
<string>Advertised URL</string>
2511+
</property>
2512+
</widget>
2513+
</item>
2514+
<item>
2515+
<widget class="QLineEdit" name="mWMTSUrlLineEdit"/>
2516+
</item>
2517+
</layout>
2518+
</item>
25052519
</layout>
25062520
</widget>
25072521
</item>

0 commit comments

Comments
 (0)