found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1930-x64\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.39.33519\bin\HostX64\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\VCPackages;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\DiagnosticsHub\Collector;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\Microsoft Visual Studio\2022\Community\\MSBuild\Current\Bin\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ActiveTcl\bin;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\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe git config --global core.autocrlf false if not exist src\mapserver-vc17x64 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-vc17x64 cd src\mapserver-vc17x64 git reset --hard HEAD HEAD is now at 5d7fbf726 update history 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 5d7fbf726 update history git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930-x64\doc\ms_revision.txt type E:\buildsystem\release-1930-x64\doc\ms_revision.txt 5d7fbf7267153667c748962eca2161daccc27e19 cd E:\buildsystem git config --global core.autocrlf false if not exist src\gdal-vc17x64 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc17x64 cd src\gdal-vc17x64 git reset --hard HEAD HEAD is now at 031a209526 spelling_wordlist.txt: add word git fetch git checkout master Your branch is behind 'origin/master' by 32 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 031a209526..33dd00c631 Fast-forward .github/workflows/alpine_numpy2/Dockerfile.ci | 4 +- Doxyfile | 1 + alg/CMakeLists.txt | 7 +- alg/contour.cpp | 52 +- alg/gdal_alg.h | 3 + alg/gdalgeoloc_dataset_accessor.h | 30 +- alg/viewshed.cpp | 1064 ------------------------- alg/viewshed.h | 262 ------ alg/viewshed/combiner.cpp | 78 ++ alg/viewshed/combiner.h | 69 ++ alg/viewshed/cumulative.cpp | 219 +++++ alg/viewshed/cumulative.h | 76 ++ alg/viewshed/notifyqueue.h | 136 ++++ alg/viewshed/progress.cpp | 81 ++ alg/viewshed/progress.h | 56 ++ alg/viewshed/util.cpp | 104 +++ alg/viewshed/util.h | 38 + alg/viewshed/viewshed.cpp | 359 +++++++++ alg/viewshed/viewshed.h | 102 +++ alg/viewshed/viewshed_executor.cpp | 685 ++++++++++++++++ alg/viewshed/viewshed_executor.h | 103 +++ alg/viewshed/viewshed_types.h | 173 ++++ apps/gdal_contour.cpp | 23 + apps/gdal_viewshed.cpp | 244 ++++-- autotest/cpp/test_viewshed.cpp | 59 +- autotest/gcore/vsicurl.py | 86 ++ autotest/gcore/vsis3.py | 106 +++ autotest/gdrivers/data/grib/minx_180.grib2 | Bin 0 -> 23207 bytes autotest/gdrivers/grib.py | 7 + autotest/gdrivers/netcdf_multidim.py | 53 ++ autotest/gdrivers/srtmhgt.py | 3 + autotest/ogr/ogr_dgn.py | 29 + autotest/utilities/test_gdal_contour.py | 25 + autotest/utilities/test_gdal_viewshed.py | 37 +- autotest/utilities/test_gdalwarp_lib.py | 3 +- ci/travis/conda/setup.sh | 4 +- doc/source/drivers/raster/srtmhgt.rst | 3 + doc/source/drivers/vector/dgn.rst | 33 + doc/source/programs/gdal_contour.rst | 11 +- doc/source/programs/gdal_rasterize.rst | 14 +- doc/source/programs/gdal_viewshed.rst | 29 +- doc/source/software_using_gdal.rst | 1 + frmts/grib/gribdataset.cpp | 7 + frmts/gtiff/libtiff/tif_color.c | 22 +- frmts/gtiff/libtiff/tif_dirread.c | 42 +- frmts/gtiff/libtiff/tif_luv.c | 8 +- frmts/gtiff/libtiff/tif_open.c | 8 + frmts/gtiff/libtiff/tif_strip.c | 5 + frmts/mrsid/mrsiddataset.cpp | 12 +- frmts/netcdf/netcdfdataset.cpp | 3 + frmts/srtmhgt/srtmhgtdataset.cpp | 37 +- gcore/gdalmultidim.cpp | 6 + ogr/ogrsf_frmts/dgn/ogr_dgn.h | 30 +- ogr/ogrsf_frmts/dgn/ogrdgndatasource.cpp | 53 +- ogr/ogrsf_frmts/dgn/ogrdgndriver.cpp | 15 +- ogr/ogrsf_frmts/dgn/ogrdgnlayer.cpp | 50 +- ogr/ogrsf_frmts/miramon/mm_gdal_functions.c | 112 +++ port/cpl_vsil_curl.cpp | 13 +- swig/include/java/typemaps_java.i | 114 ++- swig/include/ogr.i | 141 +++- swig/java/CMakeLists.txt | 15 +- swig/java/apps/OGRTest.java | 47 ++ swig/java/javadoc.java | 76 +- swig/java/test_data/iso_8859_1.csv | 2 + 64 files changed, 3703 insertions(+), 1587 deletions(-) delete mode 100644 alg/viewshed.cpp delete mode 100644 alg/viewshed.h create mode 100644 alg/viewshed/combiner.cpp create mode 100644 alg/viewshed/combiner.h create mode 100644 alg/viewshed/cumulative.cpp create mode 100644 alg/viewshed/cumulative.h create mode 100644 alg/viewshed/notifyqueue.h create mode 100644 alg/viewshed/progress.cpp create mode 100644 alg/viewshed/progress.h create mode 100644 alg/viewshed/util.cpp create mode 100644 alg/viewshed/util.h create mode 100644 alg/viewshed/viewshed.cpp create mode 100644 alg/viewshed/viewshed.h create mode 100644 alg/viewshed/viewshed_executor.cpp create mode 100644 alg/viewshed/viewshed_executor.h create mode 100644 alg/viewshed/viewshed_types.h create mode 100644 autotest/gdrivers/data/grib/minx_180.grib2 create mode 100644 swig/java/apps/OGRTest.java create mode 100644 swig/java/test_data/iso_8859_1.csv git reset --hard HEAD HEAD is now at 33dd00c631 Add support for cumulative viewshed (#10674) git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930-x64\doc\gdal_revision.txt type E:\buildsystem\release-1930-x64\doc\gdal_revision.txt 33dd00c63155250afce04092c77cb225570efa64 cd E:\buildsystem set PATH=E:\buildsystem\release-1930-x64\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.39.33519\bin\HostX64\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\VCPackages;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\DiagnosticsHub\Collector;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\Microsoft Visual Studio\2022\Community\\MSBuild\Current\Bin\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ActiveTcl\bin;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\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe git config --global core.autocrlf false if not exist src\mapcache-vc17x64 git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-vc17x64 cd src\mapcache-vc17x64 git reset --hard HEAD HEAD is now at 339008f handle CMake deprecation warning (#342) 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-1930-x64\doc\mapcache_revision.txt type E:\buildsystem\release-1930-x64\doc\mapcache_revision.txt 339008f3d010364a4c0489bb4b8f0dc68039ca79 cd E:\buildsystem