Skip to content

Commit 707ab4e

Browse files
committed
Add Service online resource element to WMS capability response. This element is mandatory according to the 1.3 spec
1 parent c9bb721 commit 707ab4e

File tree

3 files changed

+32
-8
lines changed

3 files changed

+32
-8
lines changed

src/app/qgsprojectproperties.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa
168168
mWMSContactMail->setText( QgsProject::instance()->readEntry( "WMSContactMail", "/", "" ) );
169169
mWMSContactPhone->setText( QgsProject::instance()->readEntry( "WMSContactPhone", "/", "" ) );
170170
mWMSAbstract->setPlainText( QgsProject::instance()->readEntry( "WMSServiceAbstract", "/", "" ) );
171+
mWMSOnlineResourceLineEdit->setText( QgsProject::instance()->readEntry( "WMSOnlineResource", "/", "" ) );
171172

172173
bool ok;
173174
QStringList values;
@@ -372,6 +373,7 @@ void QgsProjectProperties::apply()
372373
QgsProject::instance()->writeEntry( "WMSContactMail", "/", mWMSContactMail->text() );
373374
QgsProject::instance()->writeEntry( "WMSContactPhone", "/", mWMSContactPhone->text() );
374375
QgsProject::instance()->writeEntry( "WMSServiceAbstract", "/", mWMSAbstract->toPlainText() );
376+
QgsProject::instance()->writeEntry( "WMSOnlineResource", "/", mWMSOnlineResourceLineEdit->text() );
375377

376378
if ( grpWMSExt->isChecked() )
377379
{

src/mapserver/qgsprojectparser.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,6 +1284,18 @@ void QgsProjectParser::serviceCapabilities( QDomElement& parentElement, QDomDocu
12841284
serviceElem.appendChild( wmsAbstractElem );
12851285
}
12861286

1287+
//OnlineResource element is mandatory according to the WMS specification
1288+
QDomElement wmsOnlineResourceElem = propertiesElem.firstChildElement( "WMSOnlineResource" );
1289+
QDomElement onlineResourceElem = doc.createElement( "OnlineResource" );
1290+
onlineResourceElem.setAttribute( "xmlns:xlink", "http://www.w3.org/1999/xlink" );
1291+
onlineResourceElem.setAttribute( "xlink:type", "simple" );
1292+
if ( !wmsOnlineResourceElem.isNull() )
1293+
{
1294+
onlineResourceElem.setAttribute( "xlink:href", wmsOnlineResourceElem.text() );
1295+
}
1296+
1297+
serviceElem.appendChild( onlineResourceElem );
1298+
12871299
//Contact information
12881300
QDomElement contactInfoElem = doc.createElement( "ContactInformation" );
12891301

src/ui/qgsprojectpropertiesbase.ui

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@
393393
<item row="0" column="2">
394394
<widget class="QLineEdit" name="mWMSTitle"/>
395395
</item>
396-
<item row="2" column="0">
396+
<item row="3" column="0">
397397
<widget class="QLabel" name="label_7">
398398
<property name="text">
399399
<string>Person</string>
@@ -403,10 +403,10 @@
403403
</property>
404404
</widget>
405405
</item>
406-
<item row="2" column="2">
406+
<item row="3" column="2">
407407
<widget class="QLineEdit" name="mWMSContactPerson"/>
408408
</item>
409-
<item row="5" column="0">
409+
<item row="6" column="0">
410410
<widget class="QLabel" name="label_8">
411411
<property name="text">
412412
<string>Phone</string>
@@ -416,13 +416,13 @@
416416
</property>
417417
</widget>
418418
</item>
419-
<item row="5" column="2">
419+
<item row="6" column="2">
420420
<widget class="QLineEdit" name="mWMSContactPhone"/>
421421
</item>
422-
<item row="7" column="2">
422+
<item row="8" column="2">
423423
<widget class="QTextEdit" name="mWMSAbstract"/>
424424
</item>
425-
<item row="7" column="0">
425+
<item row="8" column="0">
426426
<widget class="QLabel" name="label_5">
427427
<property name="text">
428428
<string>Abstract</string>
@@ -432,14 +432,14 @@
432432
</property>
433433
</widget>
434434
</item>
435-
<item row="4" column="0">
435+
<item row="5" column="0">
436436
<widget class="QLabel" name="label_13">
437437
<property name="text">
438438
<string>E-Mail</string>
439439
</property>
440440
</widget>
441441
</item>
442-
<item row="4" column="2">
442+
<item row="5" column="2">
443443
<widget class="QLineEdit" name="mWMSContactMail"/>
444444
</item>
445445
<item row="1" column="0">
@@ -455,6 +455,16 @@
455455
<item row="1" column="2">
456456
<widget class="QLineEdit" name="mWMSContactOrganization"/>
457457
</item>
458+
<item row="2" column="2">
459+
<widget class="QLineEdit" name="mWMSOnlineResourceLineEdit"/>
460+
</item>
461+
<item row="2" column="0">
462+
<widget class="QLabel" name="mWMSOnlineResourceLabel">
463+
<property name="text">
464+
<string>Online resource</string>
465+
</property>
466+
</widget>
467+
</item>
458468
</layout>
459469
</widget>
460470
</item>

0 commit comments

Comments
 (0)