[mapguide-commits] r9244 - in sandbox/jng/ogc/UnitTest: TestData/Wfs WebTier/MapAgent/MapAgentForms
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Oct 6 09:08:24 PDT 2017
Author: jng
Date: 2017-10-06 09:08:24 -0700 (Fri, 06 Oct 2017)
New Revision: 9244
Modified:
sandbox/jng/ogc/UnitTest/TestData/Wfs/WfsTest.dump
sandbox/jng/ogc/UnitTest/WebTier/MapAgent/MapAgentForms/getfeatureinfowmsform.html
Log:
- Update WFS capability unit test expected output
- Fix bad mime type on WMS GetFeatureInfo test form
Modified: sandbox/jng/ogc/UnitTest/TestData/Wfs/WfsTest.dump
===================================================================
--- sandbox/jng/ogc/UnitTest/TestData/Wfs/WfsTest.dump 2017-10-06 13:49:24 UTC (rev 9243)
+++ sandbox/jng/ogc/UnitTest/TestData/Wfs/WfsTest.dump 2017-10-06 16:08:24 UTC (rev 9244)
@@ -239,6 +239,7 @@
<ows:Parameter>
<ows:Value>GML2</ows:Value>
<ows:Value>GML3</ows:Value>
+ <ows:Value>application/json</ows:Value>
<ows:Value>text/xml; subtype=gml/2.1.2</ows:Value>
<ows:Value>text/xml; subtype=gml/3.1.1</ows:Value>
</ows:Parameter>
@@ -330,6 +331,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -350,6 +352,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -370,6 +373,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -388,6 +392,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -406,6 +411,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -424,6 +430,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -440,6 +447,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -456,6 +464,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -522,6 +531,7 @@
<ows:Parameter>
<ows:Value>GML2</ows:Value>
<ows:Value>GML3</ows:Value>
+ <ows:Value>application/json</ows:Value>
<ows:Value>text/xml; subtype=gml/2.1.2</ows:Value>
<ows:Value>text/xml; subtype=gml/3.1.1</ows:Value>
</ows:Parameter>
@@ -613,6 +623,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -633,6 +644,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -653,6 +665,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -671,6 +684,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -689,6 +703,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -707,6 +722,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -723,6 +739,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -739,6 +756,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -805,6 +823,7 @@
<ows:Parameter>
<ows:Value>GML2</ows:Value>
<ows:Value>GML3</ows:Value>
+ <ows:Value>application/json</ows:Value>
<ows:Value>text/xml; subtype=gml/2.1.2</ows:Value>
<ows:Value>text/xml; subtype=gml/3.1.1</ows:Value>
</ows:Parameter>
@@ -896,6 +915,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -916,6 +936,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -936,6 +957,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -954,6 +976,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -972,6 +995,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -990,6 +1014,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1006,6 +1031,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1022,6 +1048,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1088,6 +1115,7 @@
<ows:Parameter>
<ows:Value>GML2</ows:Value>
<ows:Value>GML3</ows:Value>
+ <ows:Value>application/json</ows:Value>
<ows:Value>text/xml; subtype=gml/2.1.2</ows:Value>
<ows:Value>text/xml; subtype=gml/3.1.1</ows:Value>
</ows:Parameter>
@@ -1179,6 +1207,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1199,6 +1228,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1219,6 +1249,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1237,6 +1268,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1255,6 +1287,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1273,6 +1306,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1289,6 +1323,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1305,6 +1340,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1371,6 +1407,7 @@
<ows:Parameter>
<ows:Value>GML2</ows:Value>
<ows:Value>GML3</ows:Value>
+ <ows:Value>application/json</ows:Value>
<ows:Value>text/xml; subtype=gml/2.1.2</ows:Value>
<ows:Value>text/xml; subtype=gml/3.1.1</ows:Value>
</ows:Parameter>
@@ -1462,6 +1499,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1482,6 +1520,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1502,6 +1541,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1520,6 +1560,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1538,6 +1579,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1556,6 +1598,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1572,6 +1615,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
@@ -1588,6 +1632,7 @@
<wfs:OutputFormats>
<Format>GML2</Format>
<Format>GML3</Format>
+ <Format>application/json</Format>
<Format>text/xml; subtype=gml/2.1.2</Format>
<Format>text/xml; subtype=gml/3.1.1</Format>
</wfs:OutputFormats>
Modified: sandbox/jng/ogc/UnitTest/WebTier/MapAgent/MapAgentForms/getfeatureinfowmsform.html
===================================================================
--- sandbox/jng/ogc/UnitTest/WebTier/MapAgent/MapAgentForms/getfeatureinfowmsform.html 2017-10-06 13:49:24 UTC (rev 9243)
+++ sandbox/jng/ogc/UnitTest/WebTier/MapAgent/MapAgentForms/getfeatureinfowmsform.html 2017-10-06 16:08:24 UTC (rev 9244)
@@ -21,7 +21,7 @@
<p> Info Format:
<select name="INFO_FORMAT">
<option value="text/xml">text/xml</option>
-<option value="itext/html">text/html</option>
+<option value="text/html">text/html</option>
<option value="text/plain">text/plain</option>
</select>
<p> Map Layers (comma-separated):
More information about the mapguide-commits
mailing list