[mapserver-commits] r13039 - in sandbox/inspire_soc2011: mapserver
msautotest/wxs msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Sat Feb 4 19:38:49 EST 2012
Author: schpidi
Date: 2012-02-04 16:38:49 -0800 (Sat, 04 Feb 2012)
New Revision: 13039
Added:
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_plain.txt
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_xml.txt
Modified:
sandbox/inspire_soc2011/mapserver/mapwms.c
sandbox/inspire_soc2011/msautotest/wxs/wms_inspire.map
Log:
Adjusting Conent-Type of GetFeatureInfo response for WMS 1.3 in inpsire sandbox (#4148).
Modified: sandbox/inspire_soc2011/mapserver/mapwms.c
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapwms.c 2012-02-05 00:04:54 UTC (rev 13038)
+++ sandbox/inspire_soc2011/mapserver/mapwms.c 2012-02-05 00:38:49 UTC (rev 13039)
@@ -4402,7 +4402,7 @@
} else if (strncasecmp(info_format, "GML", 3) == 0 || /* accept GML.1 or GML */
strcasecmp(info_format, "application/vnd.ogc.gml") == 0) {
- if (nVersion <= OWS_1_0_7 || nVersion >= OWS_1_3_0) /* 1.0.0 to 1.0.7 and >=1.3.0*/
+ if (nVersion <= OWS_1_0_7) /* 1.0.0 to 1.0.7 */
if (encoding)
msIO_setHeader("Content-type","text/xml; charset=%s", encoding);
else
Added: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_plain.txt
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_plain.txt (rev 0)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_plain.txt 2012-02-05 00:38:49 UTC (rev 13039)
@@ -0,0 +1,139 @@
+Content-type: text/plain
+
+GetFeatureInfo results:
+
+Layer 'TN.CommonTransportElements.TransportArea'
+ Feature 0:
+ VALIDFROM = '2010-09-01 00:00:00'
+ VALIDTO = ''
+ TRANSPORTA = '41'
+ NETWORKARE = '41'
+ BEGINLIFES = ''
+ ENDLIFESPA = ''
+ INSPIREID = '55da3850-1cf7-11e1-8bc2-0800700c9a67'
+ NETWORKELE = '41'
+ CROSSREFER = '0'
+ NETWORKCON = '0'
+ NETWORKREF = '0'
+ GRAMMATICA = 'common'
+ GRAMMAT_01 = 'singular'
+ LANGUAGE = 'german'
+ NAMESTATUS = 'official'
+ NATIVENESS = 'endonym'
+ PRONUNCIAT = ''
+ SOURCEOFNA = 'DataSpec_TN'
+ SPELLING = 'Bahnhofsgelände'
+ GEOGRAPHIC = '41'
+ TRANSPORTO = '41'
+
+Layer 'TN.CommonTransportElements.TransportLink'
+ Feature 3:
+ VALIDFROM = '2010-02-01 00:00:00'
+ VALIDTO = ''
+ TRANSPORTL = '51'
+ FICTITIOUS = 'F'
+ LINKID = '51'
+ GRADESEPAR = '0'
+ ENDNODE = '0'
+ STARTNODE = '38'
+ GENERALISE = '51'
+ LINKSETID = '0'
+ BEGINLIFES = '*'
+ ENDLIFESPA = ''
+ INSPIREID = ' 55da3850-1cf7-11e1-8bc2-080920039a6'
+ NETWORKELE = '751'
+ CROSSREFER = '0'
+ NETWORKCON = '0'
+ NETWORKREF = '0'
+ GRAMMATICA = '*common'
+ GRAMMAT_01 = ' singular'
+ LANGUAGE = ' german'
+ NAMESTATUS = ' official'
+ NATIVENESS = ' endonym'
+ PRONUNCIAT = ''
+ SOURCEOFNA = ''
+ SPELLING = ''
+ GEOGRAPHIC = '51'
+ TRANSPORTO = '51'
+
+Layer 'TN.CommonTransportElements.TransportNode'
+ Feature 8:
+ VALIDFROM = ''
+ VALIDTO = ''
+ TRANSPORTN = '29'
+ NODEID = '29'
+ BEGINLIFES = ''
+ ENDLIFESPA = ''
+ INSPIREID = '1503b5bc-1fff-11e1-a415-4ae64824019b'
+ NETWORKELE = '29'
+ CROSSREFER = '0'
+ NETWORKCON = '300'
+ NETWORKREF = '0'
+ GRAMMATICA = 'common'
+ GRAMMAT_01 = 'singular'
+ LANGUAGE = 'german'
+ NAMESTATUS = 'official'
+ NATIVENESS = 'endonym'
+ PRONUNCIAT = ''
+ SOURCEOFNA = 'DataSpec_TN'
+ SPELLING = 'Eisenbahnbahnhof Musterstadt'
+ GEOGRAPHIC = '29'
+ TRANSPORTO = '29'
+
+Layer 'TN.RailTransportNetwork.RailwayLink'
+ Feature 2:
+ FICTITIOUS = '?'
+ RAILWAYLIN = '51'
+ VALIDFROM = '2010-02-01 00:00:00'
+ VALIDTO = ''
+ TRANSPORTL = '51'
+ GRAMMATICA = 'common'
+ GRAMMAT_01 = 'singular'
+ LANGUAGE = 'german'
+ NAMESTATUS = 'official'
+ NATIVENESS = 'endonym'
+ PRONUNCIAT = ''
+ SOURCEOFNA = ''
+ SPELLING = ''
+ GEOGRAPHIC = '51'
+ TRANSPORTO = '51'
+ FICTITI_01 = 'F'
+ LINKID = '51'
+ GRADESEPAR = '0'
+ ENDNODE = '39'
+ STARTNODE = '38'
+ GENERALISE = '51'
+ LINKSETID = '0'
+ BEGINLIFES = ''
+ ENDLIFESPA = ''
+ INSPIREID = '55da3850-1cf7-11e1-8bc2-080920039a67'
+ NETWORKELE = '51'
+ CROSSREFER = '0'
+ NETWORKCON = '0'
+ NETWORKREF = '0'
+
+Layer 'TN.RailTransportNetwork.RailwayStationArea'
+ Feature 0:
+ STATIONCOD = ''
+ RAILWAYSTA = '41'
+ VALIDFROM = '2010-09-01 00:00:00'
+ VALIDTO = ''
+ TRANSPORTA = '41'
+ GRAMMATICA = 'common'
+ GRAMMAT_01 = 'singular'
+ LANGUAGE = 'german'
+ NAMESTATUS = 'official'
+ NATIVENESS = 'endonym'
+ PRONUNCIAT = ''
+ SOURCEOFNA = 'DataSpec_TN'
+ SPELLING = 'Bahnhofsgelände'
+ GEOGRAPHIC = '41'
+ TRANSPORTO = '41'
+ NETWORKARE = '41'
+ BEGINLIFES = ''
+ ENDLIFESPA = ''
+ INSPIREID = '55da3850-1cf7-11e1-8bc2-0800700c9a67'
+ NETWORKELE = '41'
+ CROSSREFER = '0'
+ NETWORKCON = '0'
+ NETWORKREF = '0'
Added: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_xml.txt
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_xml.txt (rev 0)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_xml.txt 2012-02-05 00:38:49 UTC (rev 13039)
@@ -0,0 +1,175 @@
+Content-type: application/vnd.ogc.se_xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<msGMLOutput
+ xmlns:gml="http://www.opengis.net/gml"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <TN.CommonTransportElements.TransportArea_layer>
+ <TN.CommonTransportElements.TransportArea_feature>
+ <gml:boundedBy>
+ <gml:Box srsName="EPSG:4326">
+ <gml:coordinates>12.682645,53.430593 12.693456,53.433864</gml:coordinates>
+ </gml:Box>
+ </gml:boundedBy>
+ <VALIDFROM>2010-09-01 00:00:00</VALIDFROM>
+ <VALIDTO></VALIDTO>
+ <TRANSPORTA>41</TRANSPORTA>
+ <NETWORKARE>41</NETWORKARE>
+ <BEGINLIFES></BEGINLIFES>
+ <ENDLIFESPA></ENDLIFESPA>
+ <INSPIREID>55da3850-1cf7-11e1-8bc2-0800700c9a67</INSPIREID>
+ <NETWORKELE>41</NETWORKELE>
+ <CROSSREFER>0</CROSSREFER>
+ <NETWORKCON>0</NETWORKCON>
+ <NETWORKREF>0</NETWORKREF>
+ <GRAMMATICA>common</GRAMMATICA>
+ <GRAMMAT_01>singular</GRAMMAT_01>
+ <LANGUAGE>german</LANGUAGE>
+ <NAMESTATUS>official</NAMESTATUS>
+ <NATIVENESS>endonym</NATIVENESS>
+ <PRONUNCIAT></PRONUNCIAT>
+ <SOURCEOFNA>DataSpec_TN</SOURCEOFNA>
+ <SPELLING>Bahnhofsgelände</SPELLING>
+ <GEOGRAPHIC>41</GEOGRAPHIC>
+ <TRANSPORTO>41</TRANSPORTO>
+ </TN.CommonTransportElements.TransportArea_feature>
+ </TN.CommonTransportElements.TransportArea_layer>
+ <TN.CommonTransportElements.TransportLink_layer>
+ <TN.CommonTransportElements.TransportLink_feature>
+ <gml:boundedBy>
+ <gml:Box srsName="EPSG:4326">
+ <gml:coordinates>12.684322,53.431458 12.691894,53.432677</gml:coordinates>
+ </gml:Box>
+ </gml:boundedBy>
+ <VALIDFROM>2010-02-01 00:00:00</VALIDFROM>
+ <VALIDTO></VALIDTO>
+ <TRANSPORTL>51</TRANSPORTL>
+ <FICTITIOUS>F</FICTITIOUS>
+ <LINKID>51</LINKID>
+ <GRADESEPAR>0</GRADESEPAR>
+ <ENDNODE>0</ENDNODE>
+ <STARTNODE>38</STARTNODE>
+ <GENERALISE>51</GENERALISE>
+ <LINKSETID>0</LINKSETID>
+ <BEGINLIFES>*</BEGINLIFES>
+ <ENDLIFESPA></ENDLIFESPA>
+ <INSPIREID> 55da3850-1cf7-11e1-8bc2-080920039a6</INSPIREID>
+ <NETWORKELE>751</NETWORKELE>
+ <CROSSREFER>0</CROSSREFER>
+ <NETWORKCON>0</NETWORKCON>
+ <NETWORKREF>0</NETWORKREF>
+ <GRAMMATICA>*common</GRAMMATICA>
+ <GRAMMAT_01> singular</GRAMMAT_01>
+ <LANGUAGE> german</LANGUAGE>
+ <NAMESTATUS> official</NAMESTATUS>
+ <NATIVENESS> endonym</NATIVENESS>
+ <PRONUNCIAT></PRONUNCIAT>
+ <SOURCEOFNA></SOURCEOFNA>
+ <SPELLING></SPELLING>
+ <GEOGRAPHIC>51</GEOGRAPHIC>
+ <TRANSPORTO>51</TRANSPORTO>
+ </TN.CommonTransportElements.TransportLink_feature>
+ </TN.CommonTransportElements.TransportLink_layer>
+ <TN.CommonTransportElements.TransportNode_layer>
+ <TN.CommonTransportElements.TransportNode_feature>
+ <gml:boundedBy>
+ <gml:Box srsName="EPSG:4326">
+ <gml:coordinates>12.687376,53.432112 12.687376,53.432112</gml:coordinates>
+ </gml:Box>
+ </gml:boundedBy>
+ <VALIDFROM></VALIDFROM>
+ <VALIDTO></VALIDTO>
+ <TRANSPORTN>29</TRANSPORTN>
+ <NODEID>29</NODEID>
+ <BEGINLIFES></BEGINLIFES>
+ <ENDLIFESPA></ENDLIFESPA>
+ <INSPIREID>1503b5bc-1fff-11e1-a415-4ae64824019b</INSPIREID>
+ <NETWORKELE>29</NETWORKELE>
+ <CROSSREFER>0</CROSSREFER>
+ <NETWORKCON>300</NETWORKCON>
+ <NETWORKREF>0</NETWORKREF>
+ <GRAMMATICA>common</GRAMMATICA>
+ <GRAMMAT_01>singular</GRAMMAT_01>
+ <LANGUAGE>german</LANGUAGE>
+ <NAMESTATUS>official</NAMESTATUS>
+ <NATIVENESS>endonym</NATIVENESS>
+ <PRONUNCIAT></PRONUNCIAT>
+ <SOURCEOFNA>DataSpec_TN</SOURCEOFNA>
+ <SPELLING>Eisenbahnbahnhof Musterstadt</SPELLING>
+ <GEOGRAPHIC>29</GEOGRAPHIC>
+ <TRANSPORTO>29</TRANSPORTO>
+ </TN.CommonTransportElements.TransportNode_feature>
+ </TN.CommonTransportElements.TransportNode_layer>
+ <TN.RailTransportNetwork.RailwayLink_layer>
+ <TN.RailTransportNetwork.RailwayLink_feature>
+ <gml:boundedBy>
+ <gml:Box srsName="EPSG:4326">
+ <gml:coordinates>12.684322,53.431458 12.691894,53.432677</gml:coordinates>
+ </gml:Box>
+ </gml:boundedBy>
+ <FICTITIOUS>?</FICTITIOUS>
+ <RAILWAYLIN>51</RAILWAYLIN>
+ <VALIDFROM>2010-02-01 00:00:00</VALIDFROM>
+ <VALIDTO></VALIDTO>
+ <TRANSPORTL>51</TRANSPORTL>
+ <GRAMMATICA>common</GRAMMATICA>
+ <GRAMMAT_01>singular</GRAMMAT_01>
+ <LANGUAGE>german</LANGUAGE>
+ <NAMESTATUS>official</NAMESTATUS>
+ <NATIVENESS>endonym</NATIVENESS>
+ <PRONUNCIAT></PRONUNCIAT>
+ <SOURCEOFNA></SOURCEOFNA>
+ <SPELLING></SPELLING>
+ <GEOGRAPHIC>51</GEOGRAPHIC>
+ <TRANSPORTO>51</TRANSPORTO>
+ <FICTITI_01>F</FICTITI_01>
+ <LINKID>51</LINKID>
+ <GRADESEPAR>0</GRADESEPAR>
+ <ENDNODE>39</ENDNODE>
+ <STARTNODE>38</STARTNODE>
+ <GENERALISE>51</GENERALISE>
+ <LINKSETID>0</LINKSETID>
+ <BEGINLIFES></BEGINLIFES>
+ <ENDLIFESPA></ENDLIFESPA>
+ <INSPIREID>55da3850-1cf7-11e1-8bc2-080920039a67</INSPIREID>
+ <NETWORKELE>51</NETWORKELE>
+ <CROSSREFER>0</CROSSREFER>
+ <NETWORKCON>0</NETWORKCON>
+ <NETWORKREF>0</NETWORKREF>
+ </TN.RailTransportNetwork.RailwayLink_feature>
+ </TN.RailTransportNetwork.RailwayLink_layer>
+ <TN.RailTransportNetwork.RailwayStationArea_layer>
+ <TN.RailTransportNetwork.RailwayStationArea_feature>
+ <gml:boundedBy>
+ <gml:Box srsName="EPSG:4326">
+ <gml:coordinates>12.682645,53.430593 12.693456,53.433864</gml:coordinates>
+ </gml:Box>
+ </gml:boundedBy>
+ <STATIONCOD></STATIONCOD>
+ <RAILWAYSTA>41</RAILWAYSTA>
+ <VALIDFROM>2010-09-01 00:00:00</VALIDFROM>
+ <VALIDTO></VALIDTO>
+ <TRANSPORTA>41</TRANSPORTA>
+ <GRAMMATICA>common</GRAMMATICA>
+ <GRAMMAT_01>singular</GRAMMAT_01>
+ <LANGUAGE>german</LANGUAGE>
+ <NAMESTATUS>official</NAMESTATUS>
+ <NATIVENESS>endonym</NATIVENESS>
+ <PRONUNCIAT></PRONUNCIAT>
+ <SOURCEOFNA>DataSpec_TN</SOURCEOFNA>
+ <SPELLING>Bahnhofsgelände</SPELLING>
+ <GEOGRAPHIC>41</GEOGRAPHIC>
+ <TRANSPORTO>41</TRANSPORTO>
+ <NETWORKARE>41</NETWORKARE>
+ <BEGINLIFES></BEGINLIFES>
+ <ENDLIFESPA></ENDLIFESPA>
+ <INSPIREID>55da3850-1cf7-11e1-8bc2-0800700c9a67</INSPIREID>
+ <NETWORKELE>41</NETWORKELE>
+ <CROSSREFER>0</CROSSREFER>
+ <NETWORKCON>0</NETWORKCON>
+ <NETWORKREF>0</NETWORKREF>
+ </TN.RailTransportNetwork.RailwayStationArea_feature>
+ </TN.RailTransportNetwork.RailwayStationArea_layer>
+</msGMLOutput>
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire.map 2012-02-05 00:04:54 UTC (rev 13038)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire.map 2012-02-05 00:38:49 UTC (rev 13039)
@@ -101,6 +101,8 @@
#
# GetFeatureInfo all
# RUN_PARMS: wms_inspire_featureinfo_all.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&version=1.3.0&service=WMS&request=GetFeatureInfo&QUERY_LAYERS=TN&LAYERS=TN&CRS=EPSG:4326&BBOX=53.4177,12.6101,53.4404,12.7593&WIDTH=500&HEIGHT=76&I=260&J=25&INFO_FORMAT=application/vnd.ogc.gml" > [RESULT_DEMIME]
+# RUN_PARMS: wms_inspire_featureinfo_all_mime_xml.txt [MAPSERV] QUERY_STRING="map=[MAPFILE]&version=1.3.0&service=WMS&request=GetFeatureInfo&QUERY_LAYERS=TN&LAYERS=TN&CRS=EPSG:4326&BBOX=53.4177,12.6101,53.4404,12.7593&WIDTH=500&HEIGHT=76&I=260&J=25&INFO_FORMAT=application/vnd.ogc.gml" > [RESULT]
+# RUN_PARMS: wms_inspire_featureinfo_all_mime_plain.txt [MAPSERV] QUERY_STRING="map=[MAPFILE]&version=1.3.0&service=WMS&request=GetFeatureInfo&QUERY_LAYERS=TN&LAYERS=TN&CRS=EPSG:4326&BBOX=53.4177,12.6101,53.4404,12.7593&WIDTH=500&HEIGHT=76&I=260&J=25&INFO_FORMAT=text/plain" > [RESULT]
#
# GetFeatureInfo CommonTransportElements all
# RUN_PARMS: wms_inspire_featureinfo_commontransportelements.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&version=1.3.0&service=WMS&request=GetFeatureInfo&QUERY_LAYERS=TN.CommonTransportElements&LAYERS=TN.CommonTransportElements&CRS=EPSG:4326&BBOX=53.4177,12.6101,53.4404,12.7593&WIDTH=500&HEIGHT=76&I=260&J=25&INFO_FORMAT=application/vnd.ogc.gml" > [RESULT_DEMIME]
More information about the mapserver-commits
mailing list