@@ -34,7 +34,20 @@ QString QgsServerProjectUtils::owsServiceAbstract( const QgsProject &project )
34
34
35
35
QStringList QgsServerProjectUtils::owsServiceKeywords ( const QgsProject &project )
36
36
{
37
- return project.readListEntry ( QStringLiteral ( " WMSKeywordList" ), QStringLiteral ( " /" ) );
37
+ QStringList keywordList;
38
+ QStringList list = project.readListEntry ( QStringLiteral ( " WMSKeywordList" ), QStringLiteral ( " /" ), QStringList () );
39
+ if ( !list.isEmpty () )
40
+ {
41
+ for ( int i = 0 ; i < list.size (); ++i )
42
+ {
43
+ QString keyword = list.at ( i );
44
+ if ( !keyword.isEmpty () )
45
+ {
46
+ keywordList.append ( keyword );
47
+ }
48
+ }
49
+ }
50
+ return keywordList;
38
51
}
39
52
40
53
QString QgsServerProjectUtils::owsServiceOnlineResource ( const QgsProject &project )
@@ -141,7 +154,19 @@ QStringList QgsServerProjectUtils::wmsRestrictedComposers( const QgsProject &pro
141
154
142
155
QStringList QgsServerProjectUtils::wmsOutputCrsList ( const QgsProject &project )
143
156
{
144
- QStringList crsList = project.readListEntry ( QStringLiteral ( " WMSCrsList" ), QStringLiteral ( " /" ), QStringList () );
157
+ QStringList crsList;
158
+ QStringList wmsCrsList = project.readListEntry ( QStringLiteral ( " WMSCrsList" ), QStringLiteral ( " /" ), QStringList () );
159
+ if ( !wmsCrsList.isEmpty () )
160
+ {
161
+ for ( int i = 0 ; i < wmsCrsList.size (); ++i )
162
+ {
163
+ QString crs = wmsCrsList.at ( i );
164
+ if ( !crs.isEmpty () )
165
+ {
166
+ crsList.append ( crs );
167
+ }
168
+ }
169
+ }
145
170
if ( crsList.isEmpty () )
146
171
{
147
172
QStringList valueList = project.readListEntry ( QStringLiteral ( " WMSEpsgList" ), QStringLiteral ( " /" ), QStringList () );
0 commit comments