[mapserver-commits] r12023 - trunk/msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Sat Aug 6 11:39:12 EDT 2011
Author: warmerdam
Date: 2011-08-06 08:39:12 -0700 (Sat, 06 Aug 2011)
New Revision: 12023
Modified:
trunk/msautotest/wxs/expected/wfsogr10_csvstream.txt
trunk/msautotest/wxs/expected/wfsogr10_multi.xml
trunk/msautotest/wxs/expected/wfsogr10_ograuto.xml
trunk/msautotest/wxs/expected/wfsogr10_ogrgml.xml
trunk/msautotest/wxs/expected/wfsogr11_ogrgml.xml
trunk/msautotest/wxs/expected/wfsogr_wms_getfeatureinfo.xml
Log:
we no longer produce zero Z values by default in OGR output (#3906)
Modified: trunk/msautotest/wxs/expected/wfsogr10_csvstream.txt
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_csvstream.txt 2011-08-06 15:33:12 UTC (rev 12022)
+++ trunk/msautotest/wxs/expected/wfsogr10_csvstream.txt 2011-08-06 15:39:12 UTC (rev 12023)
@@ -1,4 +1,4 @@
Content-Type: text/csv; streamed
WKT,FNODE_,TNODE_,LPOLY_,RPOLY_,LENGTH,ROAD_ID,F_CODE,NAME_E,NAME_F
-"LINESTRING (2589745.5 402556.25 0,2588416.5 401601.0625 0,2587278.5 400455.71875 0,2585757.5 399880.53125 0,2582523.25 399110.65625 0,2581190.5 399107.1875 0,2579286.75 399102.1875 0,2577761.5 399669.40625 0,2576803.5 401189.875 0)",613,1511,0,0, 14862.892,1521,67,,
+"LINESTRING (2589745.5 402556.25,2588416.5 401601.0625,2587278.5 400455.71875,2585757.5 399880.53125,2582523.25 399110.65625,2581190.5 399107.1875,2579286.75 399102.1875,2577761.5 399669.40625,2576803.5 401189.875)",613,1511,0,0, 14862.892,1521,67,,
Modified: trunk/msautotest/wxs/expected/wfsogr10_multi.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_multi.xml 2011-08-06 15:33:12 UTC (rev 12022)
+++ trunk/msautotest/wxs/expected/wfsogr10_multi.xml 2011-08-06 15:39:12 UTC (rev 12023)
@@ -17,10 +17,10 @@
<gml:coord><gml:X>100</gml:X><gml:Y>100</gml:Y></gml:coord>
</gml:Box>
</gml:boundedBy>
-
+
<gml:featureMember>
<ogr:multi fid="F0">
- <ogr:geometryProperty><gml:MultiPolygon><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0,0 0,10,0 10,0,0 0,0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs><gml:innerBoundaryIs><gml:LinearRing><gml:coordinates>1,1,0 2,2,0 2,1,0 1,1,0</gml:coordinates></gml:LinearRing></gml:innerBoundaryIs></gml:Polygon></gml:polygonMember><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>100,50,0 50,100,0 100,100,0 100,50,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>
+ <ogr:geometryProperty><gml:MultiPolygon><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0 0,10 10,0 0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs><gml:innerBoundaryIs><gml:LinearRing><gml:coordinates>1,1 2,2 2,1 1,1</gml:coordinates></gml:LinearRing></gml:innerBoundaryIs></gml:Polygon></gml:polygonMember><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>100,50 50,100 100,100 100,50</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>
<ogr:ID>4</ogr:ID>
<ogr:NAME>mp</ogr:NAME>
<ogr:WKT>MULTIPOLYGON(((0 0,0 10,10 0,0 0),(1 1,2 2,2 1,1 1)),((100 50,50 100,100 100)))</ogr:WKT>
@@ -28,7 +28,7 @@
</gml:featureMember>
<gml:featureMember>
<ogr:multi fid="F1">
- <ogr:geometryProperty><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>30,0,0 30,10,0 40,10,0 40,0,0 3,0,0 30,0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs><gml:innerBoundaryIs><gml:LinearRing><gml:coordinates>31,1,0 32,2,0 32,1,0 31,1,0</gml:coordinates></gml:LinearRing></gml:innerBoundaryIs></gml:Polygon></ogr:geometryProperty>
+ <ogr:geometryProperty><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>30,0 30,10 40,10 40,0 3,0 30,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs><gml:innerBoundaryIs><gml:LinearRing><gml:coordinates>31,1 32,2 32,1 31,1</gml:coordinates></gml:LinearRing></gml:innerBoundaryIs></gml:Polygon></ogr:geometryProperty>
<ogr:ID>5</ogr:ID>
<ogr:NAME>poly</ogr:NAME>
<ogr:WKT>POLYGON((30 0,30 10,40 10,40 0,3 0),(31 1,32 2,32 1,31 1))</ogr:WKT>
Modified: trunk/msautotest/wxs/expected/wfsogr10_ograuto.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_ograuto.xml 2011-08-06 15:33:12 UTC (rev 12022)
+++ trunk/msautotest/wxs/expected/wfsogr10_ograuto.xml 2011-08-06 15:39:12 UTC (rev 12023)
@@ -17,10 +17,10 @@
<gml:coord><gml:X>2281604.25</gml:X><gml:Y>340848.9375</gml:Y></gml:coord>
</gml:Box>
</gml:boundedBy>
-
+
<gml:featureMember>
<ogr:popplace fid="F0">
- <ogr:geometryProperty><gml:Point><gml:coordinates>2281604.25,340848.9375,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2281604.25,340848.9375</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:UNIQUE_KEY>BACMK</ogr:UNIQUE_KEY>
<ogr:NAME>Tignish</ogr:NAME>
<ogr:CAPITAL>0</ogr:CAPITAL>
Modified: trunk/msautotest/wxs/expected/wfsogr10_ogrgml.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr10_ogrgml.xml 2011-08-06 15:33:12 UTC (rev 12022)
+++ trunk/msautotest/wxs/expected/wfsogr10_ogrgml.xml 2011-08-06 15:39:12 UTC (rev 12023)
@@ -17,10 +17,10 @@
<gml:coord><gml:X>2589745.5</gml:X><gml:Y>402556.25</gml:Y></gml:coord>
</gml:Box>
</gml:boundedBy>
-
+
<gml:featureMember>
<ogr:road fid="F0">
- <ogr:geometryProperty><gml:LineString><gml:coordinates>2589745.5,402556.25,0 2588416.5,401601.0625,0 2587278.5,400455.71875,0 2585757.5,399880.53125,0 2582523.25,399110.65625,0 2581190.5,399107.1875,0 2579286.75,399102.1875,0 2577761.5,399669.40625,0 2576803.5,401189.875,0</gml:coordinates></gml:LineString></ogr:geometryProperty>
+ <ogr:geometryProperty><gml:LineString><gml:coordinates>2589745.5,402556.25 2588416.5,401601.0625 2587278.5,400455.71875 2585757.5,399880.53125 2582523.25,399110.65625 2581190.5,399107.1875 2579286.75,399102.1875 2577761.5,399669.40625 2576803.5,401189.875</gml:coordinates></gml:LineString></ogr:geometryProperty>
<ogr:FNODE_>613</ogr:FNODE_>
<ogr:TNODE_>1511</ogr:TNODE_>
<ogr:LPOLY_>0</ogr:LPOLY_>
Modified: trunk/msautotest/wxs/expected/wfsogr11_ogrgml.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr11_ogrgml.xml 2011-08-06 15:33:12 UTC (rev 12022)
+++ trunk/msautotest/wxs/expected/wfsogr11_ogrgml.xml 2011-08-06 15:39:12 UTC (rev 12023)
@@ -17,10 +17,10 @@
<gml:coord><gml:X>2503805.5</gml:X><gml:Y>427872.65625</gml:Y></gml:coord>
</gml:Box>
</gml:boundedBy>
-
+
<gml:featureMember>
<ogr:popplace fid="F0">
- <ogr:geometryProperty><gml:Point><gml:coordinates>2503805.5,427872.65625,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2503805.5,427872.65625</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:UNIQUE_KEY>CAGYX</ogr:UNIQUE_KEY>
<ogr:NAME>Cheticamp</ogr:NAME>
<ogr:CAPITAL>0</ogr:CAPITAL>
@@ -29,7 +29,7 @@
</gml:featureMember>
<gml:featureMember>
<ogr:popplace fid="F1">
- <ogr:geometryProperty><gml:Point><gml:coordinates>2499190.0,194088.234375,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2499190.0,194088.234375</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:UNIQUE_KEY>CBIKA</ogr:UNIQUE_KEY>
<ogr:NAME>Sheet Harbour</ogr:NAME>
<ogr:CAPITAL>0</ogr:CAPITAL>
@@ -38,7 +38,7 @@
</gml:featureMember>
<gml:featureMember>
<ogr:popplace fid="F2">
- <ogr:geometryProperty><gml:Point><gml:coordinates>2434957.0,347013.59375,0</gml:coordinates></gml:Point></ogr:geometryProperty>
+ <ogr:geometryProperty><gml:Point><gml:coordinates>2434957.0,347013.59375</gml:coordinates></gml:Point></ogr:geometryProperty>
<ogr:UNIQUE_KEY>BACII</ogr:UNIQUE_KEY>
<ogr:NAME>Souris</ogr:NAME>
<ogr:CAPITAL>0</ogr:CAPITAL>
Modified: trunk/msautotest/wxs/expected/wfsogr_wms_getfeatureinfo.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfsogr_wms_getfeatureinfo.xml 2011-08-06 15:33:12 UTC (rev 12022)
+++ trunk/msautotest/wxs/expected/wfsogr_wms_getfeatureinfo.xml 2011-08-06 15:39:12 UTC (rev 12023)
@@ -2,4 +2,4 @@
Content-Type: text/csv
WKT,FNODE_,TNODE_,LPOLY_,RPOLY_,LENGTH,ROAD_ID,F_CODE,NAME_E,NAME_F
-"LINESTRING (2338814.75 297360.0625 0,2337206.5 298730.84375 0,2336062.5 299108.15625 0,2334345.5 300245.8125 0,2333200.75 301004.125 0,2331102.75 302330.9375 0,2329958.25 302898.84375 0,2328811.25 304800.1875 0,2328808.0 306324.40625 0,2329948.25 307661.75 0,2331091.25 307856.0625 0,2332233.25 308050.15625 0,2333376.5 308053.875 0,2334520.0 307867.15625 0,2336046.75 306538.46875 0,2337192.75 305208.5625 0,2337957.25 304258.40625 0,2339102.5 303309.5 0,2340245.75 302932.1875 0,2342722.5 302940.21875 0,2344055.0 303515.96875 0,2345959.0 304284.34375 0,2347290.5 305241.28125 0,2350142.25 308108.21875 0,2350900.5 310015.90625 0,2351851 310781 0,2353565.75 310977.15625 0,2355283.5 309458.5 0,2356047.5 308317.9375 0,2357381.75 307941.25 0,2359477.75 307948.03125 0,2361573.5 308145.25 0,2362716.0 308148.9375 0,2364240.75 308153.90625 0,2365382.75 308348.1875 0,2367668.0 308927.21875 0,2369189.5 310075.1875 0,2370906.0 309509.125 0,2372240.25 309132.4375 0,2373386.0 307993.125 0,23
74150.75 306471.375 0,2374915.25 305521.21875 0,2376255.25 302477.28125 0,2376921.25 301464.28125 0)",709,698,3,3, 74599.219,458,68,,
+"LINESTRING (2338814.75 297360.0625,2337206.5 298730.84375,2336062.5 299108.15625,2334345.5 300245.8125,2333200.75 301004.125,2331102.75 302330.9375,2329958.25 302898.84375,2328811.25 304800.1875,2328808.0 306324.40625,2329948.25 307661.75,2331091.25 307856.0625,2332233.25 308050.15625,2333376.5 308053.875,2334520.0 307867.15625,2336046.75 306538.46875,2337192.75 305208.5625,2337957.25 304258.40625,2339102.5 303309.5,2340245.75 302932.1875,2342722.5 302940.21875,2344055.0 303515.96875,2345959.0 304284.34375,2347290.5 305241.28125,2350142.25 308108.21875,2350900.5 310015.90625,2351851 310781,2353565.75 310977.15625,2355283.5 309458.5,2356047.5 308317.9375,2357381.75 307941.25,2359477.75 307948.03125,2361573.5 308145.25,2362716.0 308148.9375,2364240.75 308153.90625,2365382.75 308348.1875,2367668.0 308927.21875,2369189.5 310075.1875,2370906.0 309509.125,2372240.25 309132.4375,2373386.0 307993.125,2374150.75 306471.375,2374915.25 305521.21875,2376255.25 302477.28125,2376921.25 3
01464.28125)",709,698,3,3, 74599.219,458,68,,
More information about the mapserver-commits
mailing list