Various warp-related fixes; setup-resource uses cubicspline for downs…

…amplig; metatile warping uses avg(min, max) if value is unavailable.
melowntech · Oct 21, 2020 · d42fdfc · d42fdfc
1 parent 3241c5a
commit d42fdfc
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 15 deletions.
diff --git a/externals/libgeo b/externals/libgeo
diff --git a/externals/libutility b/externals/libutility
diff --git a/externals/vts-libs b/externals/vts-libs
diff --git a/mapproxy/src/mapproxy/definition/factory.cpp b/mapproxy/src/mapproxy/definition/factory.cpp
@@ -47,9 +47,6 @@ DefinitionBase::pointer definition(const Resource::Generator &type)
     const auto &r(registry());
     auto fregistry(r.find(type));
     if (fregistry == r.end()) {
-        for (const auto &item : registry()) {
-            LOG(info4) << "    " << item.first;
-        }
         LOGTHROW(err1, UnknownGenerator)
             << "Unknown generator type <" << type << ">.";
     }
@@ -60,7 +57,6 @@ void registerDefinition(const Resource::Generator &type
                         , const std::function<DefinitionBase::pointer()>
                         &factory)
 {
-    LOG(info4) << "registering <" << type << ">.";
     registry().insert(Registry::value_type(type, factory));
 }
 

diff --git a/mapproxy/src/mapproxy/gdalsupport/gdalsupport.cpp b/mapproxy/src/mapproxy/gdalsupport/gdalsupport.cpp
@@ -720,6 +720,9 @@ void GdalWarper::Detail::runManager(Process::Id parentId)
 
 void GdalWarper::Detail::killLeviathan()
 {
+    // stop if there are no workers (yet)
+    if (workers_.empty()) { return; }
+
     utility::PidList pids;
     for (const auto &item : workers_) { pids.push_back(item.first); }
 
@@ -767,13 +770,19 @@ void GdalWarper::Detail::killLeviathan()
             << "Killing large GDAL process " << u.pid
             << " occupying " << (double(total) / 1024) << "MB of memory.";
 
-        auto fworkers(workers_.find(u.pid));
-        if (fworkers != workers_.end()) {
-            fworkers->second->terminate();
-        } else {
-            // should not happen
-            Process::kill(u.pid);
+        try {
+            auto fworkers(workers_.find(u.pid));
+            if (fworkers != workers_.end()) {
+                fworkers->second->terminate();
+            } else {
+                // should not happen
+                Process::kill(u.pid);
+            }
+        } catch (const std::exception &e) {
+            LOG(warn2) << "Unable to kill worker process: <"
+                       << e.what() << ">; ignoring.";
         }
+
         total -= u.mem;
     }
 }

diff --git a/mapproxy/src/mapproxy/gdalsupport/operations.cpp b/mapproxy/src/mapproxy/gdalsupport/operations.cpp
@@ -243,7 +243,13 @@ cv::Mat* warpValueMinMax(DatasetCache &cache, ManagedBuffer &mb
         {
             // skip invalid value
             auto value(*id);
-            if (value == ForcedNodata) { continue; }
+            if (value == ForcedNodata) {
+                if ((*idmin == ForcedNodata) || (*idmax == ForcedNodata)) {
+                    continue;
+                }
+                // no value but we have valid min/max -> average
+                value = (*idmin + *idmax) / 2;
+            }
 
             auto &sample(*itile);
             sample[0] = value;

diff --git a/mapproxy/src/mapproxy/generator/metatile.cpp b/mapproxy/src/mapproxy/generator/metatile.cpp
@@ -274,9 +274,15 @@ metatileFromDemImpl(const vts::TileId &tileId, Sink &sink, Arsenal &arsenal
                    << ", size in tiles: " << vts::tileRangesSize(block.view)
                    << ".";
 
+#if 0
 #if GDAL_VERSION_NUM >= 2020000
         // force average since cubicspline is somewhat dubious on GDAL >= 2.2
+        // FIXME: disabled, seems to be working when GDAL is fixed
         const auto resampling(geo::GeoDataset::Resampling::average);
+#else
+        // use "dem" resampling (cubicspline or average)
+        const auto resampling(geo::GeoDataset::Resampling::dem);
+#endif
 #else
         // use "dem" resampling (cubicspline or average)
         const auto resampling(geo::GeoDataset::Resampling::dem);

diff --git a/mapproxy/src/mapproxy/generator/surface-dem.cpp b/mapproxy/src/mapproxy/generator/surface-dem.cpp
@@ -420,6 +420,7 @@ void SurfaceDem::generateNavtile(const vts::TileId &tileId
     const auto *metanode(metatile.get(tileId, std::nothrow));
     if (!metanode) {
         sink.error(utility::makeError<NotFound>("Metatile not found."));
+        return;
     }
 
     const auto heightRange(metanode->heightRange);

diff --git a/mapproxy/src/setup-resource/main.cpp b/mapproxy/src/setup-resource/main.cpp
@@ -587,7 +587,9 @@ fs::path createVrtWO(const calipers::Measurement &cm
         {
             LogLinePrefix linePrefix(" (dem)");
             createVrtWO(datasetPath, rootDir, "dem"
-                        , geo::GeoDataset::Resampling::dem, cm);
+                        // , geo::GeoDataset::Resampling::average
+                        , geo::GeoDataset::Resampling::cubicspline
+                        , cm);
         }
 
         LOG(info4) << "Generating minimum height overviews.";
+3 −0		utility/CMakeLists.txt
+79 −0		utility/atfork-asio.hpp
+76 −23		utility/atfork.cpp
+1 −15		utility/atfork.hpp
+3 −1		utility/cpuinfo.cpp
+4 −1		utility/cpuinfo.hpp
+65 −0		utility/ctrlcommand.hpp
+3 −1		utility/detail/streams.hpp
+0 −3		utility/mysqldb.hpp
+74 −0		utility/po.cpp
+62 −1		utility/po.hpp
+54 −40		utility/process.cpp
+87 −8		utility/process.hpp
+7 −0		utility/procstat.cpp
+22 −0		utility/procstat.hpp
+1 −1		utility/streams.hpp
+15 −4		utility/time.hpp
+2 −2		vts-libs/storage/tilar.cpp
+3 −3		vts-libs/tools-support/repackatlas.cpp
+2 −0		vts-libs/tools-support/tmptileset.cpp
+2 −2		vts-libs/tools-support/tmptsencoder.cpp
+1 −1		vts-libs/tools-support/tmptsencoder.hpp
+2 −0		vts-libs/tools/CMakeLists.txt
+319 −0		vts-libs/tools/repack.cpp
+35 −1		vts-libs/tools/vts.cpp
+12 −6		vts-libs/vts/encoder.cpp
+1 −1		vts-libs/vts/encoder.hpp
+16 −0		vts-libs/vts/meshop.hpp
+2 −1		vts-libs/vts/meshop/merge.cpp