found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1916-x64\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft SDKs\TypeScript\3.1;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\;C:\ActiveTcl\bin;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\7-Zip;C:\php;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\.dotnet\tools;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja git config --global core.autocrlf false if not exist src\mapserver-vc15x64 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-vc15x64 cd src\mapserver-vc15x64 git reset --hard HEAD HEAD is now at ceba66213 Apply const qualifiers in Mapscript for strings (#6908) git fetch git checkout main Your branch is up to date with 'origin/main'. git pull origin main Already up to date. git reset --hard HEAD HEAD is now at ceba66213 Apply const qualifiers in Mapscript for strings (#6908) git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\ms_revision.txt type E:\buildsystem\release-1916-x64\doc\ms_revision.txt ceba66213e53695872f4ae4dbf1c8ca50a417feb cd E:\buildsystem git config --global core.autocrlf false if not exist src\gdal-vc15x64 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc15x64 cd src\gdal-vc15x64 git reset --hard HEAD HEAD is now at 517beeabd4 tiledbsparse.cpp: fix compiler warning with MSVC git fetch git checkout master Your branch is behind 'origin/master' by 25 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 517beeabd4..6e268bb61c Fast-forward .github/workflows/cmake_builds.yml | 3 +- apps/ogr2ogr_lib.cpp | 19 +- apps/test_ogrsf.cpp | 1 + autotest/gdrivers/gmt.py | 74 -- .../ogr/data/jsonfg/crs_32631_fc_4326_feat.json | 16 + .../ogr/data/jsonfg/crs_32631_fc_and_feat.json | 16 + .../data/jsonfg/crs_32631_fc_geometry_null.json | 15 + .../ogr/data/jsonfg/crs_32631_fc_mixed_feat.json | 25 + autotest/ogr/data/jsonfg/crs_32631_fc_only.json | 15 + .../ogr/data/jsonfg/crs_32631_fc_place_null.json | 15 + autotest/ogr/data/jsonfg/crs_32631_feat.json | 10 + autotest/ogr/data/jsonfg/crs_32631_feat_only.json | 15 + autotest/ogr/data/jsonfg/crs_32631_geom_only.json | 14 + .../ogr/data/jsonfg/crs_4326_fc_32631_feat.json | 16 + autotest/ogr/data/jsonfg/crs_4326_fc_and_feat.json | 16 + autotest/ogr/data/jsonfg/crs_4326_fc_only.json | 15 + .../ogr/data/jsonfg/crs_4326_fc_place_null.json | 15 + autotest/ogr/data/jsonfg/crs_4326_feat_only.json | 15 + autotest/ogr/data/jsonfg/crs_none.json | 14 + .../ogr/data/jsonfg/crs_none_fc_mixed_feat.json | 24 + .../ogr/data/jsonfg/feature_type_top_level.json | 15 + autotest/ogr/data/jsonfg/fence.json | 33 + .../ogr/data/jsonfg/prism_with_polygon_base.json | 18 + autotest/ogr/data/jsonfg/pylon.json | 27 + autotest/ogr/data/jsonfg/two_feature_types.json | 33 + autotest/ogr/ogr_jsonfg.py | 1170 ++++++++++++++++++ autotest/pymod/gdaltest.py | 10 +- autotest/pyscripts/test_gdal_edit.py | 4 +- autotest/pyscripts/test_gdal_merge.py | 178 ++- autotest/pyscripts/test_gdal_pansharpen.py | 76 +- autotest/pyscripts/test_gdal_retile.py | 326 ++--- autotest/utilities/test_gdal_contour.py | 140 +-- autotest/utilities/test_gdal_footprint.py | 3 +- autotest/utilities/test_gdal_grid.py | 742 ++++-------- autotest/utilities/test_gdal_rasterize.py | 11 +- autotest/utilities/test_gdal_translate.py | 6 +- autotest/utilities/test_gdaladdo.py | 7 +- autotest/utilities/test_gdalbuildvrt.py | 516 ++++---- autotest/utilities/test_gdaldem.py | 44 +- autotest/utilities/test_gdaltindex.py | 10 +- autotest/utilities/test_gdalwarp.py | 272 ++--- autotest/utilities/test_gdalwarp_lib.py | 84 +- autotest/utilities/test_gnmutils.py | 1 + autotest/utilities/test_nearblack.py | 14 +- autotest/utilities/test_ogrlineref.py | 50 +- autotest/utilities/test_ogrtindex.py | 33 +- cmake/template/pytest.ini.in | 1 + doc/source/drivers/vector/geojson.rst | 1 + doc/source/drivers/vector/index.rst | 1 + doc/source/drivers/vector/jsonfg.rst | 186 +++ frmts/drivers.ini | 1 + ogr/ogrsf_frmts/CMakeLists.txt | 1 + ogr/ogrsf_frmts/generic/ogrregisterall.cpp | 3 + ogr/ogrsf_frmts/geojson/CMakeLists.txt | 1 + ogr/ogrsf_frmts/geojson/directedacyclicgraph.hpp | 13 +- ogr/ogrsf_frmts/geojson/ogr_geojson.h | 6 + ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp | 2 +- ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp | 13 +- ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp | 817 +++---------- ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h | 16 +- ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp | 106 ++ ogr/ogrsf_frmts/geojson/ogrgeojsonutils.h | 2 + ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp | 91 +- ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.h | 3 + .../geojson/ogrjsoncollectionstreamingparser.cpp | 519 ++++++++ .../geojson/ogrjsoncollectionstreamingparser.h | 138 +++ ogr/ogrsf_frmts/jsonfg/CMakeLists.txt | 21 + ogr/ogrsf_frmts/jsonfg/ogr_jsonfg.h | 537 +++++++++ ogr/ogrsf_frmts/jsonfg/ogrjsonfgdataset.cpp | 610 ++++++++++ ogr/ogrsf_frmts/jsonfg/ogrjsonfgdriver.cpp | 162 +++ ogr/ogrsf_frmts/jsonfg/ogrjsonfgmemlayer.cpp | 120 ++ ogr/ogrsf_frmts/jsonfg/ogrjsonfgreader.cpp | 1269 ++++++++++++++++++++ ogr/ogrsf_frmts/jsonfg/ogrjsonfgstreamedlayer.cpp | 204 ++++ .../jsonfg/ogrjsonfgstreamingparser.cpp | 129 ++ ogr/ogrsf_frmts/jsonfg/ogrjsonfgwritelayer.cpp | 433 +++++++ ogr/ogrsf_frmts/mem/ogr_mem.h | 3 +- ogr/ogrsf_frmts/mem/ogrmemlayer.cpp | 3 +- ogr/ogrsf_frmts/ogrsf_frmts.h | 1 + ogr/ogrspatialreference.cpp | 76 +- .../gdal-utils/osgeo_utils/gdal_pansharpen.py | 9 +- 80 files changed, 7435 insertions(+), 2239 deletions(-) delete mode 100755 autotest/gdrivers/gmt.py create mode 100644 autotest/ogr/data/jsonfg/crs_32631_fc_4326_feat.json create mode 100644 autotest/ogr/data/jsonfg/crs_32631_fc_and_feat.json create mode 100644 autotest/ogr/data/jsonfg/crs_32631_fc_geometry_null.json create mode 100644 autotest/ogr/data/jsonfg/crs_32631_fc_mixed_feat.json create mode 100644 autotest/ogr/data/jsonfg/crs_32631_fc_only.json create mode 100644 autotest/ogr/data/jsonfg/crs_32631_fc_place_null.json create mode 100644 autotest/ogr/data/jsonfg/crs_32631_feat.json create mode 100644 autotest/ogr/data/jsonfg/crs_32631_feat_only.json create mode 100644 autotest/ogr/data/jsonfg/crs_32631_geom_only.json create mode 100644 autotest/ogr/data/jsonfg/crs_4326_fc_32631_feat.json create mode 100644 autotest/ogr/data/jsonfg/crs_4326_fc_and_feat.json create mode 100644 autotest/ogr/data/jsonfg/crs_4326_fc_only.json create mode 100644 autotest/ogr/data/jsonfg/crs_4326_fc_place_null.json create mode 100644 autotest/ogr/data/jsonfg/crs_4326_feat_only.json create mode 100644 autotest/ogr/data/jsonfg/crs_none.json create mode 100644 autotest/ogr/data/jsonfg/crs_none_fc_mixed_feat.json create mode 100644 autotest/ogr/data/jsonfg/feature_type_top_level.json create mode 100644 autotest/ogr/data/jsonfg/fence.json create mode 100644 autotest/ogr/data/jsonfg/prism_with_polygon_base.json create mode 100644 autotest/ogr/data/jsonfg/pylon.json create mode 100644 autotest/ogr/data/jsonfg/two_feature_types.json create mode 100755 autotest/ogr/ogr_jsonfg.py create mode 100644 doc/source/drivers/vector/jsonfg.rst create mode 100644 ogr/ogrsf_frmts/geojson/ogrjsoncollectionstreamingparser.cpp create mode 100644 ogr/ogrsf_frmts/geojson/ogrjsoncollectionstreamingparser.h create mode 100644 ogr/ogrsf_frmts/jsonfg/CMakeLists.txt create mode 100644 ogr/ogrsf_frmts/jsonfg/ogr_jsonfg.h create mode 100644 ogr/ogrsf_frmts/jsonfg/ogrjsonfgdataset.cpp create mode 100644 ogr/ogrsf_frmts/jsonfg/ogrjsonfgdriver.cpp create mode 100644 ogr/ogrsf_frmts/jsonfg/ogrjsonfgmemlayer.cpp create mode 100644 ogr/ogrsf_frmts/jsonfg/ogrjsonfgreader.cpp create mode 100644 ogr/ogrsf_frmts/jsonfg/ogrjsonfgstreamedlayer.cpp create mode 100644 ogr/ogrsf_frmts/jsonfg/ogrjsonfgstreamingparser.cpp create mode 100644 ogr/ogrsf_frmts/jsonfg/ogrjsonfgwritelayer.cpp git reset --hard HEAD HEAD is now at 6e268bb61c Merge pull request #8061 from rouault/jsonfg git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\gdal_revision.txt type E:\buildsystem\release-1916-x64\doc\gdal_revision.txt 6e268bb61c95462d2704dca2ec0cad7d95d32df1 cd E:\buildsystem set PATH=E:\buildsystem\release-1916-x64\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft SDKs\TypeScript\3.1;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\;C:\ActiveTcl\bin;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\7-Zip;C:\php;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\.dotnet\tools;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja git config --global core.autocrlf false if not exist src\mapcache-vc15x64 git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-vc15x64 cd src\mapcache-vc15x64 git reset --hard HEAD HEAD is now at 0cb6c00 change Migration Guide to markdown (#305) git fetch git checkout main Your branch is up to date with 'origin/main'. git pull origin main Already up to date. git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\mapcache_revision.txt type E:\buildsystem\release-1916-x64\doc\mapcache_revision.txt 0cb6c00d19708cab7fbb1719eac62a738aa5405d cd E:\buildsystem