Skip to content
This repository has been archived by the owner on Aug 22, 2023. It is now read-only.

Commit

Permalink
Merge pull request #14 from melowntech/meta/v5
Browse files Browse the repository at this point in the history 
meta/v5: generating metatile version 5
  • Loading branch information
@vaclavblazek
vaclavblazek authored Mar 31, 2021
2 parents af2019a + 16b3a6c commit 33fab01
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 24 deletions.
2 changes: 1 addition & 1 deletion externals/buildsys/cmake
Submodule cmake updated 20 files
+1 −0 Modules/FindEXIF.cmake
+219 −0 Modules/FindHwloc.cmake
+344 −0 Modules/FindIlmBase.cmake
+1 −1 Modules/FindJsonCPP.cmake
+38 −0 Modules/FindMETIS.cmake
+73 −0 Modules/FindOpenEXR.cmake
+724 −0 Modules/FindOpenVDB.cmake
+36 −0 Modules/FindPyTorch.cmake
+18 −0 Modules/FindPyTorch.py
+121 −0 Modules/FindReleaseAndDebug.cmake
+42 −0 Modules/FindTensorFlow.cmake
+35 −0 Modules/FindTensorFlow.py
+140 −0 Modules/OpenVDBUtils.cmake
+3 −1 buildsys.cmake
+1 −0 include/debian.mk
+24 −3 macros/cuda.cmake
+1 −3 macros/openmp.cmake
+10 −3 macros/python.cmake
+20 −0 macros/tensorflow.cmake
+22 −0 macros/torch.cmake
2 changes: 1 addition & 1 deletion externals/buildsys/common
Submodule common updated 2 files
+1 −1 deb-prepare.sh
+6 −0 include/python.mk
2 changes: 1 addition & 1 deletion externals/libgeo
Submodule libgeo updated 4 files
+14 −6 geo/featurelayers.cpp
+10 −8 geo/geodataset.cpp
+2 −0 geo/python/gdsblockwriter.cpp
+4 −0 geo/srsdef.cpp
2 changes: 1 addition & 1 deletion externals/libgeometry
Submodule libgeometry updated 12 files
+1 −1 geometry/CMakeLists.txt
+14 −17 geometry/bvh.hpp
+7 −7 geometry/estimate-point-normals.cpp
+1 −0 geometry/kdtree.hpp
+5 −0 geometry/mesh.hpp
+1 −1 geometry/meshop-gts.cpp
+28 −12 geometry/meshop-openmesh.cpp
+67 −22 geometry/meshop.cpp
+10 −6 geometry/meshop.hpp
+1 −1 geometry/smoothcloud.cpp
+2 −2 geometry/triclip.hpp
+13 −1 geometry/volume.hpp
2 changes: 1 addition & 1 deletion externals/libhttp
Submodule libhttp updated 2 files
+3 −2 http/http.cpp
+7 −4 http/sink.hpp
2 changes: 1 addition & 1 deletion externals/libmath
Submodule libmath updated 2 files
+43 −9 math/geometry_core.hpp
+1 −0 math/math.hpp
2 changes: 1 addition & 1 deletion externals/libutility
Submodule libutility updated 5 files
+3 −1 utility/CMakeLists.txt
+1 −1 utility/detail/memoryfile.linux.cpp
+12 −5 utility/python/importsupport.py
+98 −0 utility/small_list.hpp
+84 −0 utility/test/small_list.cpp
2 changes: 1 addition & 1 deletion externals/vts-libs
Submodule vts-libs updated 22 files
+10 −2 vts-libs/CMakeLists.txt
+19 −18 vts-libs/registry/referenceframe.cpp
+41 −8 vts-libs/registry/referenceframe.hpp
+21 −0 vts-libs/registry/stringdict.hpp
+10 −1 vts-libs/tools/mapconfig.cpp
+7 −1 vts-libs/tools/vts.cpp
+34 −0 vts-libs/vts/csconvertor.cpp
+19 −0 vts-libs/vts/csconvertor.hpp
+42 −1 vts-libs/vts/geomextents.hpp
+6 −1 vts-libs/vts/io.hpp
+5 −3 vts-libs/vts/mesh.cpp
+86 −140 vts-libs/vts/metatile.cpp
+34 −27 vts-libs/vts/metatile.hpp
+1 −1 vts-libs/vts/nodeinfo.cpp
+10 −0 vts-libs/vts/tileop.hpp
+1 −1 vts-libs/vts/tileop3.hpp
+14 −0 vts-libs/vts/tileset/delivery.hpp
+4 −1 vts-libs/vts/tileset/detail.hpp
+2 −0 vts-libs/vts/tileset/driver/delivery.cpp
+19 −10 vts-libs/vts/tileset/merge.cpp
+53 −17 vts-libs/vts/tileset/merge/support.hpp
+63 −12 vts-libs/vts/tileset/tileset.cpp
9 changes: 8 additions & 1 deletion mapproxy/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,17 @@ enable_OpenMP()

find_package(Boost 1.46 REQUIRED
COMPONENTS thread program_options filesystem system date_time
serialization regex chrono iostreams)
serialization regex chrono iostreams)
link_directories(${Boost_LIBRARY_DIRS})
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})

if(${Boost_VERSION_MAJOR}.${Boost_VERSION_MINOR} VERSION_GREATER_EQUAL 1.73)
# Since Boost.Python and Boost.Iostreams in Boost >=1.73 still include
# deprecated headers we need to silence compiler
add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS
-DBOOST_ALLOW_DEPRECATED_HEADERS)
endif()

find_package(OpenCV REQUIRED)

find_package(GDAL REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion mapproxy/src/mapproxy/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ define_module(LIBRARY mapproxy-core
DEPENDS
qmf semantic
pysupport pydbglog
vts-libs>=2.4 http>=1.0 geo>=1.28 geometry>=1.7
vts-libs>=2.18 http>=1.0 geo>=1.28 geometry>=1.7
jsoncpp>=2.1

Boost_SERIALIZATION
Expand Down
19 changes: 11 additions & 8 deletions mapproxy/src/mapproxy/generator/metatile.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,13 @@ struct Sample {
, max(conv(math::Point3(x, y, value[2])))
, heightRange(navConv(math::Point3(x, y, value[1]))(2)
, navConv(math::Point3(x, y, value[2]))(2))
, ge(geConv(math::Point3(x, y, value[1]))(2)
, geConv(math::Point3(x, y, value[2]))(2)
, geConv(math::Point3(x, y, value[0]))(2))
{}
{
// ge is invalid so far, update it with extremes
vts::update(ge, geConv(math::Point3(x, y, value[1])));
vts::update(ge, geConv(math::Point3(x, y, value[2])));
// set surrogate
ge.surrogate = geConv(math::Point3(x, y, value[0]))(2);
}
};

const Sample* getSample(const Sample &sample)
Expand Down Expand Up @@ -356,7 +359,7 @@ metatileFromDemImpl(const vts::TileId &tileId, Sink &sink, Arsenal &arsenal

// compute tile extents and height range
auto heightRange(HeightRange::emptyRange());
math::Extents3 te(math::InvalidExtents{});
// math::Extents3 te(math::InvalidExtents{});
double area(0.0);
int triangleCount(0);
double avgHeightSum(0.f);
Expand All @@ -373,8 +376,8 @@ metatileFromDemImpl(const vts::TileId &tileId, Sink &sink, Arsenal &arsenal
// update tile extents (if sample valid)
if (p) {
// update by both minimum and maximum
math::update(te, p->min);
math::update(te, p->max);
// math::update(te, p->min);
// math::update(te, p->max);
vts::update(node.geomExtents, p->ge);
avgHeightSum += p->ge.surrogate;
++avgHeightCount;
Expand Down Expand Up @@ -403,7 +406,7 @@ metatileFromDemImpl(const vts::TileId &tileId, Sink &sink, Arsenal &arsenal
setChildren(block, nodeId, node);

// set extents
node.extents = vr::normalizedExtents(rf, te);
// node.extents = vr::normalizedExtents(rf, te);

// build height range
node.heightRange.min = std::floor(heightRange.min);
Expand Down
12 changes: 6 additions & 6 deletions mapproxy/src/mapproxy/generator/surface-spheroid.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ void SurfaceSpheroid::generateMetatile(const vts::TileId &tileId

// compute tile extents and height range
auto heightRange(vs::Range<double>::emptyRange());
math::Extents3 te(math::InvalidExtents{});
// math::Extents3 te(math::InvalidExtents{});
double area(0);
int triangleCount(0);
double avgHeightSum(0.f);
Expand All @@ -383,14 +383,14 @@ void SurfaceSpheroid::generateMetatile(const vts::TileId &tileId

// update tile extents (if point valid)
if (p) {
math::update(te, *p);
// math::update(te, *p);
// convert point to proper SDS
const auto sdsHeight(geConv(*p)[2]);
const auto sdPoint(geConv(*p));
// update geom extents
vts::update(node.geomExtents, sdsHeight);
vts::update(node.geomExtents, sdPoint);

// accumulate average height (surrogate) calculator
avgHeightSum += sdsHeight;
avgHeightSum += sdPoint(2);
++avgHeightCount;
}

Expand Down Expand Up @@ -424,7 +424,7 @@ void SurfaceSpheroid::generateMetatile(const vts::TileId &tileId
}

// set extents
node.extents = vr::normalizedExtents(rf, te);
// node.extents = vr::normalizedExtents(rf, te);

// build height range
node.heightRange.min = std::floor(heightRange.min);
Expand Down

0 comments on commit 33fab01

Please sign in to comment.