From 606943ce60f95fb6a11c4f5f84d246893683c583 Mon Sep 17 00:00:00 2001 From: Vaclav Blazek Date: Wed, 10 Apr 2019 21:04:53 +0200 Subject: [PATCH] terrain: using zero height instead of nodata; generating all tiles above first valid tiles, all level=0 tiles are generated --- externals/libqmf | 2 +- mapproxy/src/mapproxy/cesium/cesium.html | 2 +- mapproxy/src/mapproxy/cesium/cesium.js | 10 ++ mapproxy/src/mapproxy/gdalsupport.hpp | 5 + .../src/mapproxy/gdalsupport/operations.cpp | 45 +++++-- .../src/mapproxy/gdalsupport/requests.cpp | 3 +- .../src/mapproxy/gdalsupport/requests.hpp | 1 + .../src/mapproxy/generator/surface-dem.cpp | 7 +- .../src/mapproxy/generator/surface-dem.hpp | 6 +- .../mapproxy/generator/surface-spheroid.cpp | 6 +- .../mapproxy/generator/surface-spheroid.hpp | 3 +- mapproxy/src/mapproxy/generator/surface.cpp | 127 ++++++++++++++---- mapproxy/src/mapproxy/generator/surface.hpp | 7 +- mapproxy/src/mapproxy/support/cesiumconf.cpp | 7 + mapproxy/src/mapproxy/support/cesiumconf.hpp | 1 + mapproxy/src/mapproxy/support/mesh.hpp | 2 + mapproxy/src/mapproxy/support/metatile.cpp | 10 ++ mapproxy/src/mapproxy/support/metatile.hpp | 13 +- 18 files changed, 202 insertions(+), 55 deletions(-) diff --git a/externals/libqmf b/externals/libqmf index 9107db5..12bf83b 160000 --- a/externals/libqmf +++ b/externals/libqmf @@ -1 +1 @@ -Subproject commit 9107db5eb6351d9b8fac1ec13085c8a08297db78 +Subproject commit 12bf83bcdae705744cfa9aedd15f5369fc5c25f3 diff --git a/mapproxy/src/mapproxy/cesium/cesium.html b/mapproxy/src/mapproxy/cesium/cesium.html index 564b072..d4c5fb1 100644 --- a/mapproxy/src/mapproxy/cesium/cesium.html +++ b/mapproxy/src/mapproxy/cesium/cesium.html @@ -3,7 +3,7 @@ - +