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:\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:\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 8b83e6272 Merge pull request #6855 from rouault/fix_ossfuzz_52125 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 8b83e6272 Merge pull request #6855 from rouault/fix_ossfuzz_52125 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 8b83e6272ca3009a8c02846313c2aa45479146ae 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 1d756793ef Merge pull request #7579 from nyalldawson/gpkg_alt_name git fetch git checkout master Your branch is behind 'origin/master' by 37 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 1d756793ef..ad5034af7b Fast-forward .github/workflows/cmake_builds.yml | 5 +- apps/gdalwarp_lib.cpp | 50 +- apps/ogrinfo_lib.cpp | 6 + autotest/alg/rasterize.py | 35 +- autotest/cpp/test_ogr.cpp | 16 + autotest/gcore/basic_test.py | 30 +- autotest/gcore/cog.py | 23 +- autotest/gcore/misc.py | 209 ++- autotest/gcore/rasterio.py | 67 +- autotest/gcore/tiff_read.py | 27 +- autotest/gcore/tiff_srs.py | 5 +- autotest/gcore/tiff_write.py | 228 ++- autotest/gcore/vsifile.py | 5 +- autotest/gcore/vsistdin.py | 5 +- autotest/gcore/vsizip.py | 25 +- autotest/gdrivers/data/netcdf/trajectory.nc | Bin 0 -> 2316 bytes autotest/gdrivers/dted.py | 5 +- autotest/gdrivers/georaster.py | 5 +- autotest/gdrivers/gpkg.py | 183 +-- autotest/gdrivers/grib.py | 5 +- autotest/gdrivers/hfa.py | 16 +- autotest/gdrivers/isis.py | 7 +- autotest/gdrivers/jp2lura.py | 64 +- autotest/gdrivers/jp2openjpeg.py | 330 ++--- autotest/gdrivers/kea.py | 110 +- autotest/gdrivers/lcp.py | 26 +- autotest/gdrivers/mbtiles.py | 5 +- autotest/gdrivers/mem.py | 5 +- autotest/gdrivers/netcdf.py | 70 +- autotest/gdrivers/ngw.py | 34 +- autotest/gdrivers/nitf.py | 58 +- autotest/gdrivers/pcidsk.py | 5 +- autotest/gdrivers/pdf.py | 10 +- autotest/gdrivers/pds.py | 14 +- autotest/gdrivers/plmosaic.py | 241 ++- autotest/gdrivers/png.py | 14 +- autotest/gdrivers/test_validate_jp2.py | 23 +- autotest/gdrivers/usgsdem.py | 25 +- autotest/gdrivers/vrtderived.py | 5 +- autotest/gdrivers/vrtpansharpen.py | 1542 ++++++++++---------- autotest/gdrivers/wms.py | 5 +- autotest/gdrivers/wmts.py | 109 +- autotest/ogr/ogr_carto.py | 5 +- autotest/ogr/ogr_csw.py | 105 +- autotest/ogr/ogr_esrijson.py | 15 +- autotest/ogr/ogr_factory.py | 5 +- autotest/ogr/ogr_feature.py | 25 +- autotest/ogr/ogr_fgdb.py | 169 +-- autotest/ogr/ogr_fgdb_stress_test.py | 6 +- autotest/ogr/ogr_gml_geom.py | 7 +- autotest/ogr/ogr_gml_read.py | 15 +- autotest/ogr/ogr_gpkg.py | 97 +- autotest/ogr/ogr_mem.py | 5 +- autotest/ogr/ogr_mongodbv3.py | 114 +- autotest/ogr/ogr_mysql.py | 10 +- autotest/ogr/ogr_ngw.py | 35 +- autotest/ogr/ogr_oci.py | 332 ++--- autotest/ogr/ogr_openfilegdb.py | 72 +- autotest/ogr/ogr_osm.py | 130 +- autotest/ogr/ogr_pg.py | 94 +- autotest/ogr/ogr_pgdump.py | 34 +- autotest/ogr/ogr_sql_rfc28.py | 19 +- autotest/ogr/ogr_sql_test.py | 20 +- autotest/ogr/ogr_sqlite.py | 50 +- autotest/ogr/ogr_vdv.py | 54 +- autotest/ogr/ogr_wfs.py | 488 +++---- autotest/osr/osr_ct.py | 5 +- autotest/osr/osr_url.py | 27 +- autotest/pymod/gdaltest.py | 5 +- autotest/utilities/test_gdalwarp_lib.py | 17 + data/osmconf.ini | 5 + doc/source/drivers/raster/cog.rst | 6 + doc/source/drivers/raster/vrt.rst | 8 +- doc/source/drivers/vector/netcdf.rst | 8 +- doc/source/drivers/vector/osm.rst | 11 +- doc/source/user/raster_data_model.rst | 2 + frmts/gtiff/cogdriver.cpp | 4 + frmts/gtiff/geotiff.cpp | 81 +- frmts/netcdf/netcdfdataset.cpp | 30 +- frmts/netcdf/netcdfdataset.h | 2 +- frmts/netcdf/netcdflayersg.cpp | 4 +- frmts/raw/lcpdataset.cpp | 93 +- gcore/tilematrixset.cpp | 2 +- ogr/ogr_api.h | 2 + ogr/ogr_feature.h | 11 + ogr/ogrfielddefn.cpp | 78 +- ogr/ogrsf_frmts/generic/ogreditablelayer.cpp | 1 + ogr/ogrsf_frmts/generic/ogremulatedtransaction.cpp | 1 + ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 26 +- ogr/ogrsf_frmts/oci/ogrocidatasource.cpp | 74 +- ogr/ogrsf_frmts/osm/ogr_osm.h | 4 +- ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp | 63 +- ogr/ogrsf_frmts/osm/ogrosmdriver.cpp | 5 + ogr/ogrsf_frmts/osm/ogrosmlayer.cpp | 53 +- port/cpl_minizip_zip.cpp | 5 +- port/cpl_vsi_virtual.h | 23 + port/cpl_vsil.cpp | 15 +- port/cpl_vsil_cache.cpp | 9 +- port/cpl_vsil_gzip.cpp | 15 +- port/cpl_vsil_s3.cpp | 5 +- swig/include/ogr.i | 7 + 101 files changed, 3016 insertions(+), 3249 deletions(-) create mode 100644 autotest/gdrivers/data/netcdf/trajectory.nc git reset --hard HEAD HEAD is now at ad5034af7b ogr_oci.py: remove useless import 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 ad5034af7b3c86ff2a35047e9c7233093e2edf08 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:\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:\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