[mapserver-commits] r10634 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Tue Oct 19 20:31:00 EDT 2010
Author: warmerdam
Date: 2010-10-19 17:31:00 -0700 (Tue, 19 Oct 2010)
New Revision: 10634
Modified:
trunk/msautotest/wxs/expected/wfsogr10_caps.xml
trunk/msautotest/wxs/expected/wfsogr10_template.xml
trunk/msautotest/wxs/expected/wfsogr11_caps.xml
trunk/msautotest/wxs/wfs_ogr.map
Log:
test support for startindex and maxfeatures (#3590)
Modified: trunk/msautotest/wxs/expected/wfsogr10_caps.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_caps.xml 2010-10-19 23:59:37 UTC (rev 10633)
+++ trunk/msautotest/wxs/expected/wfsogr10_caps.xml 2010-10-20 00:31:00 UTC (rev 10634)
@@ -61,6 +61,7 @@
<OGRGML/>
<SHAPEZIP/>
<MIDMIF/>
+ <geojson/>
</ResultFormat>
<DCPType>
<HTTP>
Modified: trunk/msautotest/wxs/expected/wfsogr10_template.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_template.xml 2010-10-19 23:59:37 UTC (rev 10633)
+++ trunk/msautotest/wxs/expected/wfsogr10_template.xml 2010-10-20 00:31:00 UTC (rev 10634)
@@ -0,0 +1,408 @@
+Content-type: application/json; subtype=geojson
+
+
+{
+ "type": "FeatureCollection",
+ "crs": {
+ "type": "EPSG",
+ "properties": {
+ "code": 42304,
+ "coordinate_order": [1,0]
+ }
+ },
+ "features": [
+ {
+ "type": "Feature",
+ "id": "BACMK",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [640200, 465700]
+ },
+ "properties": {
+ "NAME": "Tignish",
+ "CAPITAL": 0,
+ "POP_RANGE": 1
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CAGYX",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [610100, 463800]
+ },
+ "properties": {
+ "NAME": "Cheticamp",
+ "CAPITAL": 0,
+ "POP_RANGE": 2
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CBIKA",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [623200, 445500]
+ },
+ "properties": {
+ "NAME": "Sheet Harbour",
+ "CAPITAL": 0,
+ "POP_RANGE": 2
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "BACII",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [621500, 462100]
+ },
+ "properties": {
+ "NAME": "Souris",
+ "CAPITAL": 0,
+ "POP_RANGE": 2
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CAGBW",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [610000, 452000]
+ },
+ "properties": {
+ "NAME": "Canso",
+ "CAPITAL": 0,
+ "POP_RANGE": 2
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CBELL",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [612100, 453700]
+ },
+ "properties": {
+ "NAME": "Port Hawkesbury",
+ "CAPITAL": 0,
+ "POP_RANGE": 2
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CAATB",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [620000, 453700]
+ },
+ "properties": {
+ "NAME": "Antigonish",
+ "CAPITAL": 0,
+ "POP_RANGE": 2
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CBKDH",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [640300, 453900]
+ },
+ "properties": {
+ "NAME": "Springhill",
+ "CAPITAL": 0,
+ "POP_RANGE": 2
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CBPAK",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [640800, 445900]
+ },
+ "properties": {
+ "NAME": "Windsor",
+ "CAPITAL": 0,
+ "POP_RANGE": 2
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CAWAZ",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [641900, 442300]
+ },
+ "properties": {
+ "NAME": "Lunenburg",
+ "CAPITAL": 0,
+ "POP_RANGE": 2
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CAUWZ",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [644300, 440200]
+ },
+ "properties": {
+ "NAME": "Liverpool",
+ "CAPITAL": 0,
+ "POP_RANGE": 2
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CAZHC",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [650400, 445700]
+ },
+ "properties": {
+ "NAME": "Middleton",
+ "CAPITAL": 0,
+ "POP_RANGE": 2
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CAJOA",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [654600, 443700]
+ },
+ "properties": {
+ "NAME": "Digby",
+ "CAPITAL": 0,
+ "POP_RANGE": 2
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CBIKP",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [651900, 434600]
+ },
+ "properties": {
+ "NAME": "Shelburne",
+ "CAPITAL": 0,
+ "POP_RANGE": 2
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "BADSZ",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [634720, 462345]
+ },
+ "properties": {
+ "NAME": "Summerside",
+ "CAPITAL": 0,
+ "POP_RANGE": 3
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CBQFA",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [595700, 461200]
+ },
+ "properties": {
+ "NAME": "Glace Bay",
+ "CAPITAL": 0,
+ "POP_RANGE": 3
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CBBJR",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [623900, 453500]
+ },
+ "properties": {
+ "NAME": "New Glasgow",
+ "CAPITAL": 0,
+ "POP_RANGE": 3
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CBMKT",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [631600, 452200]
+ },
+ "properties": {
+ "NAME": "Truro",
+ "CAPITAL": 0,
+ "POP_RANGE": 3
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CAAOO",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [641200, 455000]
+ },
+ "properties": {
+ "NAME": "Amherst",
+ "CAPITAL": 0,
+ "POP_RANGE": 3
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CASWE",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [643000, 450500]
+ },
+ "properties": {
+ "NAME": "Kentville",
+ "CAPITAL": 0,
+ "POP_RANGE": 3
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CAFBR",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [643100, 442300]
+ },
+ "properties": {
+ "NAME": "Bridgewater",
+ "CAPITAL": 0,
+ "POP_RANGE": 3
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CBPIB",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [660700, 435000]
+ },
+ "properties": {
+ "NAME": "Yarmouth",
+ "CAPITAL": 0,
+ "POP_RANGE": 3
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CBLHE",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [601400, 461400]
+ },
+ "properties": {
+ "NAME": "Sydney Mines",
+ "CAPITAL": 0,
+ "POP_RANGE": 3
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CBLGX",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [601100, 460900]
+ },
+ "properties": {
+ "NAME": "Sydney",
+ "CAPITAL": 0,
+ "POP_RANGE": 4
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CAIYJ",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [633400, 444000]
+ },
+ "properties": {
+ "NAME": "Dartmouth",
+ "CAPITAL": 0,
+ "POP_RANGE": 5
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "EGIIG",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [615300, 472400]
+ },
+ "properties": {
+ "NAME": "Fatima",
+ "CAPITAL": 0,
+ "POP_RANGE": 2
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "BAARG",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [630805, 461425]
+ },
+ "properties": {
+ "NAME": "Charlottetown",
+ "CAPITAL": 2,
+ "POP_RANGE": 3
+ }
+ },
+ {
+ "type": "Feature",
+ "id": "CAPHL",
+ "geometry": {
+ "type": "Point",
+ "coordinates":
+ [633600, 443900]
+ },
+ "properties": {
+ "NAME": "Halifax",
+ "CAPITAL": 2,
+ "POP_RANGE": 6
+ }
+ }
+ ]
+}
+
Modified: trunk/msautotest/wxs/expected/wfsogr11_caps.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr11_caps.xml 2010-10-19 23:59:37 UTC (rev 10633)
+++ trunk/msautotest/wxs/expected/wfsogr11_caps.xml 2010-10-20 00:31:00 UTC (rev 10634)
@@ -92,6 +92,7 @@
<ows:Value>text/xml; subtype=gml/2.1.2; driver=ogr</ows:Value>
<ows:Value>application/shapefile</ows:Value>
<ows:Value>MIDMIF</ows:Value>
+ <ows:Value>application/json; subtype=geojson</ows:Value>
</ows:Parameter>
</ows:Operation>
</ows:OperationsMetadata>
@@ -126,6 +127,7 @@
<Format>text/xml; subtype=gml/2.1.2; driver=ogr</Format>
<Format>application/shapefile</Format>
<Format>MIDMIF</Format>
+ <Format>application/json; subtype=geojson</Format>
</OutputFormats>
<ows:WGS84BoundingBox dimensions="2">
<ows:LowerCorner>-66.328616887533 42.5631251681</ows:LowerCorner>
Modified: trunk/msautotest/wxs/wfs_ogr.map
===================================================================
--- trunk/msautotest/wxs/wfs_ogr.map 2010-10-19 23:59:37 UTC (rev 10633)
+++ trunk/msautotest/wxs/wfs_ogr.map 2010-10-20 00:31:00 UTC (rev 10634)
@@ -39,7 +39,7 @@
# RUN_PARMS: wfsogr11_caps.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.1.0&REQUEST=GetCapabilities" > [RESULT_DEVERSION]
#
# WFS 1.1 request in EPSG:3978
-# RUN_PARMS: wfsogr11_ogrgml.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=popplace&OUTPUTFORMAT=text/xml; subtype=gml/2.1.2; driver=ogr&srsName=urn:ogc:def:crs:EPSG::3978" > [RESULT]
+# RUN_PARMS: wfsogr11_ogrgml.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=popplace&OUTPUTFORMAT=text/xml; subtype=gml/2.1.2; driver=ogr&srsName=urn:ogc:def:crs:EPSG::3978&maxfeatures=3&startindex=2" > [RESULT]
#
# WFS 1.1 request in EPSG:4326
# RUN_PARMS: wfsogr11_ogrgml_ll.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.1.0&REQUEST=GetFeature&TYPENAME=popplace&OUTPUTFORMAT=text/xml; subtype=gml/2.1.2; driver=ogr&srsName=urn:ogc:def:crs:EPSG::4326" > [RESULT]
More information about the mapserver-commits
mailing list