From 1ed7dfab6cdd41162568dff1b22e9d4fd7705b49 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 9 Mar 2021 19:26:50 +0100 Subject: [PATCH] msautotest: replace OGR/BNA with OGR/CSV, as OGR/BNA will be removed in GDAL 3.3 --- msautotest/wxs/expected/wfsogr10_bnazip.zip | Bin 339 -> 0 bytes msautotest/wxs/expected/wfsogr10_caps.xml | 2 +- msautotest/wxs/expected/wfsogr10_csvzip.zip | Bin 0 -> 426 bytes msautotest/wxs/expected/wfsogr11_caps.xml | 8 +++---- .../expected/wfsogr11_caps.xml.alternative | 8 +++---- .../wxs/expected/wfsogr_addfiles_onelayer.zip | Bin 907 -> 994 bytes msautotest/wxs/wfs_ogr.map | 21 +++++++++--------- 7 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 msautotest/wxs/expected/wfsogr10_bnazip.zip create mode 100644 msautotest/wxs/expected/wfsogr10_csvzip.zip diff --git a/msautotest/wxs/expected/wfsogr10_bnazip.zip b/msautotest/wxs/expected/wfsogr10_bnazip.zip deleted file mode 100644 index e0706818d3e7f4366535ae1f147f99bd43217782..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 339 zcmZ?H&nrpIE75hyEH20|&Me8y&$CiUEGbD$&d3FdTPvhx=A`B&=BC;fr52awl;|bp zCF)gW7VvU8Lv@B!7Ni2T6cprSCMSaQ>w~3vxdObIS#%i~7&w5Kfk8x}?P(s6z6r!! z3?d8&;}{tPKnhTR?Kwlf!v;Lg7xy0jFo$bVPS>Ts`qxyzjJS zTGz*0ZBA@?ki2!mdPUi1J3|*%T@}xCdYRg_tFkP7XJOLygEPM0dE5~FX$`|$>-N*< zI;^yO+aI3~N;*C>_q9#nwDW)YuYTKNAK=Z%1au+L1=!q*;xHfw;qm})RyL3 - + diff --git a/msautotest/wxs/expected/wfsogr10_csvzip.zip b/msautotest/wxs/expected/wfsogr10_csvzip.zip new file mode 100644 index 0000000000000000000000000000000000000000..3e93c070ffb98dc68dbd088d3b701e1204d86895 GIT binary patch literal 426 zcmZ?H&nrpIE75hyEH20|&Me8y&$CiUEGbD$&d3FdTPvhx=A`B&=BC;fr52awl;|ZF zm+4hy7VvU8Lv@B!7Ni2T6cprSCMSaQ>w~3vxdObIS#%i~7&w5Kf#F--{?emB+LMui zfr~+e0bv{?g8*0sGGW_yI_ro5kL&l(qRwHu5{W0T9X`F#bJ@a`!IvCfp8Ee^yfo=@ zYsteG1sBgBfB0-qZ*ZY|_t)&``tIA&Yl7?K-sjzyOOA9ipT1pd=bs;Qy!wBdt?{0> zufO)>`QO|dReO1A`sdAH?TAek3)E|SB)G?9)snJ6`I(LvzZ_b#Mznp(8JmIwX~MxP zO4Z%JDBOt_n4E7_)f%^`)5pPjS^XNV8z~c6Hr6jnvfJ|if>6l!(t_rM71EL$+wz+) xwj2text/csv; streamed text/xml; subtype=gml/2.1.2; driver=ogr application/gpx+xml; streamed - application/zip; driver=ogr/bna + application/zip; driver=ogr/csv application/shapefile MIDMIF MultiMIDMIF @@ -113,7 +113,7 @@ Content-Type: text/xml; charset=UTF-8 text/csv; streamed text/xml; subtype=gml/2.1.2; driver=ogr application/gpx+xml; streamed - application/zip; driver=ogr/bna + application/zip; driver=ogr/csv application/shapefile MIDMIF MultiMIDMIF @@ -153,7 +153,7 @@ Content-Type: text/xml; charset=UTF-8 text/csv; streamed text/xml; subtype=gml/2.1.2; driver=ogr application/gpx+xml; streamed - application/zip; driver=ogr/bna + application/zip; driver=ogr/csv application/shapefile MIDMIF MultiMIDMIF @@ -174,7 +174,7 @@ Content-Type: text/xml; charset=UTF-8 text/csv; streamed text/xml; subtype=gml/2.1.2; driver=ogr application/gpx+xml; streamed - application/zip; driver=ogr/bna + application/zip; driver=ogr/csv application/shapefile MIDMIF MultiMIDMIF diff --git a/msautotest/wxs/expected/wfsogr11_caps.xml.alternative b/msautotest/wxs/expected/wfsogr11_caps.xml.alternative index e814e5920f..0b33b68534 100644 --- a/msautotest/wxs/expected/wfsogr11_caps.xml.alternative +++ b/msautotest/wxs/expected/wfsogr11_caps.xml.alternative @@ -91,7 +91,7 @@ Content-Type: text/xml; charset=UTF-8 text/csv; streamed text/xml; subtype=gml/2.1.2; driver=ogr application/gpx+xml; streamed - application/zip; driver=ogr/bna + application/zip; driver=ogr/csv application/shapefile MIDMIF MultiMIDMIF @@ -113,7 +113,7 @@ Content-Type: text/xml; charset=UTF-8 text/csv; streamed text/xml; subtype=gml/2.1.2; driver=ogr application/gpx+xml; streamed - application/zip; driver=ogr/bna + application/zip; driver=ogr/csv application/shapefile MIDMIF MultiMIDMIF @@ -153,7 +153,7 @@ Content-Type: text/xml; charset=UTF-8 text/csv; streamed text/xml; subtype=gml/2.1.2; driver=ogr application/gpx+xml; streamed - application/zip; driver=ogr/bna + application/zip; driver=ogr/csv application/shapefile MIDMIF MultiMIDMIF @@ -174,7 +174,7 @@ Content-Type: text/xml; charset=UTF-8 text/csv; streamed text/xml; subtype=gml/2.1.2; driver=ogr application/gpx+xml; streamed - application/zip; driver=ogr/bna + application/zip; driver=ogr/csv application/shapefile MIDMIF MultiMIDMIF diff --git a/msautotest/wxs/expected/wfsogr_addfiles_onelayer.zip b/msautotest/wxs/expected/wfsogr_addfiles_onelayer.zip index 86a322b140d56c96fb13a8cbe36d76fba12eca38..c06d9e52bc43f906fc31fe8a73bad3df50481d65 100644 GIT binary patch delta 323 zcmeBXf5bk)kU6=yY@&&2{kOXPrAHYU7(5vn7`PZj7>ZJhOLI!}fU=AX0zh$8VB2>( z>xco5>-W#1&SAO|i6^feKE2R$*}|2ufO)>`QO|dReO1A`sdAH z?TAek3)E|SB)G?9)snJ6`I(LvzZ_b#Mznp(8JmIwX~MxPO4Z%JDBOt_n4E7_)f%^` z)5pPjS^XNV8z~c6Hr6jnvfJ|if>6l!(t_rM71EL$+wz+)wj2z>% delta 265 zcmaFF-pxM2kU1$YaiWQ7y@*2F(>w+ShMPdl#UR2^lv-SxQ=$iyWn>TlilGAAbB26} z4S1X{?mhlt4%ecbu1kOQuc?^rva1o0>9kzO$n^NvH}#0Mu8+6coY?XpdFzDrin7mk zhAynSDxT@|GPP@0Wm)*n!ldg5XMDf&xFPz}8X1PS*6pXyby#Wnwm&`}lyrP%?rWRC zY3Kj)U;Vaab2MWSqduw&QQgCUpMkWRZk;#dS;(W-eRxwOgWOieen4H1v#n?M} NGqWZeH&7u10{~+oRs;Y5 diff --git a/msautotest/wxs/wfs_ogr.map b/msautotest/wxs/wfs_ogr.map index 82c7209267..abfa4994a5 100644 --- a/msautotest/wxs/wfs_ogr.map +++ b/msautotest/wxs/wfs_ogr.map @@ -23,8 +23,8 @@ # Generate dump streamed directly to GPX (test #4776) # RUN_PARMS: wfsogr10_gpx.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road&featureid=road.1521&OUTPUTFORMAT=OGRGPX" > [RESULT_DEVERSION] # -# Generate dump to BNA in ZIP (test #4933) -# RUN_PARMS: wfsogr10_bnazip.zip [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road&featureid=road.1521&OUTPUTFORMAT=OGRBNAZIP" > [RESULT_DEVERSION] +# Generate dump to CSV in ZIP (test #4933) +# RUN_PARMS: wfsogr10_csvzip.zip [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road&featureid=road.1521&OUTPUTFORMAT=OGRCSVZIP" > [RESULT_DEVERSION] # # Generate dump to SHAPEZIP # RUN_PARMS: wfsogr10_shapezip.zip [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road&featureid=road.1521&OUTPUTFORMAT=SHAPEZIP" > [RESULT] @@ -91,7 +91,7 @@ # # Test wfs_additional_files_in_output # RUN_PARMS: wfsogr_addfiles_onelayer.txt [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road_with_addfiles&featureid=road_with_addfiles.1521&OUTPUTFORMAT=OGRGML" > [RESULT_DEVERSION] -# RUN_PARMS: wfsogr_addfiles_onelayer.zip [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road_with_addfiles&featureid=road_with_addfiles.1521&OUTPUTFORMAT=OGRBNAZIP" > [RESULT_DEVERSION] +# RUN_PARMS: wfsogr_addfiles_onelayer.zip [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road_with_addfiles&featureid=road_with_addfiles.1521&OUTPUTFORMAT=OGRCSVZIP" > [RESULT_DEVERSION] # RUN_PARMS: wfsogr_addfiles_twolayers.txt [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=road_with_addfiles,road2_with_addfiles&featureid=road_with_addfiles.1521,road2_with_addfiles.1521&OUTPUTFORMAT=OGRGML" > [RESULT_DEVERSION] MAP @@ -151,12 +151,13 @@ OUTPUTFORMAT END OUTPUTFORMAT - NAME "OGRBNAZIP" - DRIVER "OGR/BNA" - MIMETYPE "application/zip; driver=ogr/bna" + NAME "OGRCSVZIP" + DRIVER "OGR/CSV" + MIMETYPE "application/zip; driver=ogr/csv" + FORMATOPTION "LCO:GEOMETRY=AS_WKT" FORMATOPTION "STORAGE=memory" FORMATOPTION "FORM=zip" - FORMATOPTION "FILENAME=result.bna.zip" + FORMATOPTION "FILENAME=result.csv.zip" END @@ -245,7 +246,7 @@ LAYER "ows_title" "road" "ows_description" "road" "wfs_featureid" "ROAD_ID" - "wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgpx,ogrbnazip,ogrgmlstream,shapezip,midmif,multimidmif" + "wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgpx,ogrcsvzip,ogrgmlstream,shapezip,midmif,multimidmif" "gml_include_items" "all" "gml_exclude_items" "ROAD_" "gml_types" "auto" @@ -292,7 +293,7 @@ LAYER "ows_title" "road_with_addfiles" "ows_description" "road_with_addfiles" "wfs_featureid" "ROAD_ID" - "wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgpx,ogrbnazip,ogrgmlstream,shapezip,midmif,multimidmif" + "wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgpx,ogrcsvzip,ogrgmlstream,shapezip,midmif,multimidmif" "wfs_additional_files_in_output" "wfs_ogr_common_addfile.txt,wfs_ogr_common_addfile.txt,addfiles/,addfiles,road_with_addfiles.txt" "gml_include_items" "all" "gml_exclude_items" "ROAD_" @@ -316,7 +317,7 @@ LAYER "ows_title" "road2_with_addfiles" "ows_description" "road2_with_addfiles" "wfs_featureid" "ROAD_ID" - "wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgpx,ogrbnazip,ogrgmlstream,shapezip,midmif,multimidmif" + "wfs_getfeature_formatlist" "csv,csvstream,ogrgml,ogrgpx,ogrcsvzip,ogrgmlstream,shapezip,midmif,multimidmif" "wfs_additional_files_in_output" "road2_with_addfiles.txt,nonexistingfile" "gml_include_items" "all" "gml_exclude_items" "ROAD_"