[mapserver-commits] r11360 - in trunk: mapserver
msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Tue Mar 29 09:53:00 EDT 2011
Author: tomkralidis
Date: 2011-03-29 06:53:00 -0700 (Tue, 29 Mar 2011)
New Revision: 11360
Modified:
trunk/mapserver/HISTORY.TXT
trunk/mapserver/mapogcsos.c
trunk/msautotest/wxs/expected/sos_cap.xml
trunk/msautotest/wxs/expected/sos_cap0.xml
trunk/msautotest/wxs/expected/sos_cap1.xml
trunk/msautotest/wxs/expected/sos_caps_updatesequence.xml
Log:
report SOS DescribeObservationType in Capabilities (#3777)
Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT 2011-03-29 05:02:03 UTC (rev 11359)
+++ trunk/mapserver/HISTORY.TXT 2011-03-29 13:53:00 UTC (rev 11360)
@@ -15,6 +15,8 @@
Current Version (SVN trunk):
----------------------------
+- report SOS DescribeObservationType in Capabilities (#3777)
+
- Updated lexer to detect time attribute bindings (e.g. `[item]`) in logical expressions
- Fixed layer context expressions (REQUIRES/LABELREQUIRES) (#3737)
Modified: trunk/mapserver/mapogcsos.c
===================================================================
--- trunk/mapserver/mapogcsos.c 2011-03-29 05:02:03 UTC (rev 11359)
+++ trunk/mapserver/mapogcsos.c 2011-03-29 13:53:00 UTC (rev 11360)
@@ -1354,6 +1354,14 @@
psTmpNode = xmlAddChild(psNode, msOWSCommonOperationsMetadataDomainType(ows_version, psNsOws,"Parameter", "outputFormat", (char *)pszSOSDescribeSensorMimeType));
}
+ if (msOWSRequestIsEnabled(map, NULL, "S", "DescribeObservationType", MS_TRUE))
+ {
+ psNode = xmlAddChild(psMainNode, msOWSCommonOperationsMetadataOperation(psNsOws,psNsXLink,"DescribeObservationType", OWS_METHOD_GETPOST, (char *) script_url));
+ psTmpNode = xmlAddChild(psNode, msOWSCommonOperationsMetadataDomainType(ows_version, psNsOws,"Parameter", "service", "SOS"));
+ psTmpNode = xmlAddChild(psNode, msOWSCommonOperationsMetadataDomainType(ows_version, psNsOws,"Parameter", "version", (char *)pszSOSVersion));
+ psTmpNode = xmlAddChild(psNode, msOWSCommonOperationsMetadataDomainType(ows_version, psNsOws,"Parameter", "observedproperty", "urn:ogc:object:observedproperty"));
+ }
+
if (msOWSRequestIsEnabled(map, NULL, "S", "GetObservation", MS_TRUE))
{
psNode = xmlAddChild(psMainNode, msOWSCommonOperationsMetadataOperation(psNsOws,psNsXLink,"GetObservation", OWS_METHOD_GETPOST, (char *) script_url));
Modified: trunk/msautotest/wxs/expected/sos_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_cap.xml 2011-03-29 05:02:03 UTC (rev 11359)
+++ trunk/msautotest/wxs/expected/sos_cap.xml 2011-03-29 13:53:00 UTC (rev 11360)
@@ -89,6 +89,29 @@
</ows:AllowedValues>
</ows:Parameter>
</ows:Operation>
+ <ows:Operation name="DescribeObservationType">
+ <ows:DCP>
+ <ows:HTTP>
+ <ows:Get xlink:type="simple" xlink:href="http://localhost/cgi-bin/sostest?"/>
+ <ows:Post xlink:type="simple" xlink:href="http://localhost/cgi-bin/sostest?"/>
+ </ows:HTTP>
+ </ows:DCP>
+ <ows:Parameter name="service">
+ <ows:AllowedValues>
+ <ows:Value>SOS</ows:Value>
+ </ows:AllowedValues>
+ </ows:Parameter>
+ <ows:Parameter name="version">
+ <ows:AllowedValues>
+ <ows:Value>1.0.0</ows:Value>
+ </ows:AllowedValues>
+ </ows:Parameter>
+ <ows:Parameter name="observedproperty">
+ <ows:AllowedValues>
+ <ows:Value>urn:ogc:object:observedproperty</ows:Value>
+ </ows:AllowedValues>
+ </ows:Parameter>
+ </ows:Operation>
<ows:Operation name="GetObservation">
<ows:DCP>
<ows:HTTP>
Modified: trunk/msautotest/wxs/expected/sos_cap0.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_cap0.xml 2011-03-29 05:02:03 UTC (rev 11359)
+++ trunk/msautotest/wxs/expected/sos_cap0.xml 2011-03-29 13:53:00 UTC (rev 11360)
@@ -89,6 +89,29 @@
</ows:AllowedValues>
</ows:Parameter>
</ows:Operation>
+ <ows:Operation name="DescribeObservationType">
+ <ows:DCP>
+ <ows:HTTP>
+ <ows:Get xlink:type="simple" xlink:href="http://localhost/cgi-bin/sostest?"/>
+ <ows:Post xlink:type="simple" xlink:href="http://localhost/cgi-bin/sostest?"/>
+ </ows:HTTP>
+ </ows:DCP>
+ <ows:Parameter name="service">
+ <ows:AllowedValues>
+ <ows:Value>SOS</ows:Value>
+ </ows:AllowedValues>
+ </ows:Parameter>
+ <ows:Parameter name="version">
+ <ows:AllowedValues>
+ <ows:Value>1.0.0</ows:Value>
+ </ows:AllowedValues>
+ </ows:Parameter>
+ <ows:Parameter name="observedproperty">
+ <ows:AllowedValues>
+ <ows:Value>urn:ogc:object:observedproperty</ows:Value>
+ </ows:AllowedValues>
+ </ows:Parameter>
+ </ows:Operation>
<ows:Operation name="GetObservation">
<ows:DCP>
<ows:HTTP>
Modified: trunk/msautotest/wxs/expected/sos_cap1.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_cap1.xml 2011-03-29 05:02:03 UTC (rev 11359)
+++ trunk/msautotest/wxs/expected/sos_cap1.xml 2011-03-29 13:53:00 UTC (rev 11360)
@@ -89,6 +89,29 @@
</ows:AllowedValues>
</ows:Parameter>
</ows:Operation>
+ <ows:Operation name="DescribeObservationType">
+ <ows:DCP>
+ <ows:HTTP>
+ <ows:Get xlink:type="simple" xlink:href="http://localhost/cgi-bin/sostest?"/>
+ <ows:Post xlink:type="simple" xlink:href="http://localhost/cgi-bin/sostest?"/>
+ </ows:HTTP>
+ </ows:DCP>
+ <ows:Parameter name="service">
+ <ows:AllowedValues>
+ <ows:Value>SOS</ows:Value>
+ </ows:AllowedValues>
+ </ows:Parameter>
+ <ows:Parameter name="version">
+ <ows:AllowedValues>
+ <ows:Value>1.0.0</ows:Value>
+ </ows:AllowedValues>
+ </ows:Parameter>
+ <ows:Parameter name="observedproperty">
+ <ows:AllowedValues>
+ <ows:Value>urn:ogc:object:observedproperty</ows:Value>
+ </ows:AllowedValues>
+ </ows:Parameter>
+ </ows:Operation>
<ows:Operation name="GetObservation">
<ows:DCP>
<ows:HTTP>
Modified: trunk/msautotest/wxs/expected/sos_caps_updatesequence.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_caps_updatesequence.xml 2011-03-29 05:02:03 UTC (rev 11359)
+++ trunk/msautotest/wxs/expected/sos_caps_updatesequence.xml 2011-03-29 13:53:00 UTC (rev 11360)
@@ -89,6 +89,29 @@
</ows:AllowedValues>
</ows:Parameter>
</ows:Operation>
+ <ows:Operation name="DescribeObservationType">
+ <ows:DCP>
+ <ows:HTTP>
+ <ows:Get xlink:type="simple" xlink:href="http://localhost/cgi-bin/sostest?"/>
+ <ows:Post xlink:type="simple" xlink:href="http://localhost/cgi-bin/sostest?"/>
+ </ows:HTTP>
+ </ows:DCP>
+ <ows:Parameter name="service">
+ <ows:AllowedValues>
+ <ows:Value>SOS</ows:Value>
+ </ows:AllowedValues>
+ </ows:Parameter>
+ <ows:Parameter name="version">
+ <ows:AllowedValues>
+ <ows:Value>1.0.0</ows:Value>
+ </ows:AllowedValues>
+ </ows:Parameter>
+ <ows:Parameter name="observedproperty">
+ <ows:AllowedValues>
+ <ows:Value>urn:ogc:object:observedproperty</ows:Value>
+ </ows:AllowedValues>
+ </ows:Parameter>
+ </ows:Operation>
<ows:Operation name="GetObservation">
<ows:DCP>
<ows:HTTP>
More information about the mapserver-commits
mailing list