SET PATH=E:\builds\release-1911\bin;E:\builds\release-1911\bin\curl;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX86\x86;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;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\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\WINDOWS\Microsoft.NET\Framework\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:\ActiveTcl\bin;C:\Perl64\site\bin;C:\Perl64\bin;C:\Program Files\Microsoft MPI\Bin\;E:\app\szekeres\product\11.2.0\dbhome_1\bin;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PrivateAssemblies\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\WINDOWS\system32\config\systemprofile\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Program Files\nodejs\;C:\Program Files (x86)\Microsoft Team Foundation Server 2015 Power Tools\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Microsoft Network Monitor 3\;C:\Program Files\dotnet\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;;C:\Program Files\7-Zip;C:\Program Files (x86)\Certum\proCertum CardManager;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\dotnet\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Users\szekeres\AppData\Roaming\npm;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\AppData\Local\Programs\Fiddler;C:\Users\szekeres\.dotnet\tools;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 if exist E:\builds\release-1911\bin\curl\curl.exe E:\builds\release-1911\bin\curl\curl.exe -o E:\builds\release-1911\bin\curl\curl-ca-bundle.crt "https://curl.haxx.se/ca/cacert.pem" set TERM=msys set "PATH=E:\Git\bin;%PATH%" cd ..\sdk\vc15\mapserver git reset --hard HEAD HEAD is now at 9bd402c3 FindOracle.cmake: complementary fix to find OCI 19 git pull origin Already up to date. git reset --hard HEAD HEAD is now at 9bd402c3 FindOracle.cmake: complementary fix to find OCI 19 git log --pretty=format:%H -n 1 > E:\builds\release-1911\doc\ms_revision.txt type E:\builds\release-1911\doc\ms_revision.txt 9bd402c3596c252195da90a487961b12a15f34c6 cd E:\builds cd ..\sdk\vc15\gdal\gdal git reset --hard HEAD HEAD is now at dc38aa64d7 Merge pull request #3182 from rouault/proj8_merc git pull origin Updating dc38aa64d7..d247f74711 Fast-forward .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu_20.04.yml | 34 +-- .github/workflows/ubuntu_20.04/build-deps.sh | 2 +- .github/workflows/ubuntu_20.04/build.sh | 16 ++ .github/workflows/windows_build.yml | 1 + autotest/gcore/vrtmisc.py | 25 +- autotest/gdrivers/vrtpansharpen.py | 36 +++ autotest/gdrivers/wmts.py | 55 +++++ autotest/gdrivers/xyz.py | 47 +++- autotest/ogr/ogr_elasticsearch.py | 198 +++++++++++++++- autotest/utilities/test_gdal_translate_lib.py | 20 +- gdal/apps/gdal_translate_lib.cpp | 24 +- gdal/data/gdalvrt.xsd | 5 +- gdal/doc/source/drivers/raster/vrt.rst | 16 +- gdal/doc/source/drivers/raster/xyz.rst | 22 +- gdal/doc/source/drivers/vector/elasticsearch.rst | 12 + gdal/frmts/dimap/dimapdataset.cpp | 13 +- gdal/frmts/vrt/vrtdataset.cpp | 7 +- gdal/frmts/vrt/vrtdataset.h | 4 + gdal/frmts/vrt/vrtdriver.cpp | 28 ++- gdal/frmts/vrt/vrtpansharpened.cpp | 16 +- gdal/frmts/vrt/vrtrasterband.cpp | 22 ++ gdal/frmts/vrt/vrtsourcedrasterband.cpp | 16 ++ gdal/frmts/wms/gdalhttp.cpp | 42 +++- gdal/frmts/wms/wmsdriver.cpp | 12 + gdal/frmts/wms/wmsmetadataset.cpp | 3 - gdal/frmts/xyz/xyzdataset.cpp | 272 +++++++++++++++++++++- gdal/gcore/rasterio.cpp | 6 + gdal/ogr/ogrsf_frmts/elastic/ogr_elastic.h | 17 +- gdal/ogr/ogrsf_frmts/elastic/ogrelasticdriver.cpp | 4 + gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp | 174 +++++++++++++- 31 files changed, 1077 insertions(+), 74 deletions(-) git reset --hard HEAD HEAD is now at d247f74711 ubuntu_20.04/build.sh: cache fits in 135 MB, so reduce max ccache size to 200 MB [ci skip] git log --pretty=format:%H -n 1 > E:\builds\release-1911\doc\gdal_revision.txt type E:\builds\release-1911\doc\gdal_revision.txt d247f74711bbd7f8f1d9cf2a8b9d6dceb7733c71 cd E:\builds