using v5 metatiles

melowntech · Mar 12, 2021 · 103f5d9 · 103f5d9
1 parent af2019a
commit 103f5d9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/externals/libmath b/externals/libmath
diff --git a/externals/vts-libs b/externals/vts-libs
diff --git a/mapproxy/src/mapproxy/generator/metatile.cpp b/mapproxy/src/mapproxy/generator/metatile.cpp
@@ -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)
@@ -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);
@@ -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;
@@ -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);

diff --git a/mapproxy/src/mapproxy/generator/surface-spheroid.cpp b/mapproxy/src/mapproxy/generator/surface-spheroid.cpp
@@ -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);
@@ -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;
                         }
 
@@ -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);
+0 −18		vts-libs/registry/referenceframe.cpp
+21 −7		vts-libs/registry/referenceframe.hpp
+0 −3		vts-libs/tools/vts.cpp
+4 −0		vts-libs/vts/csconvertor.hpp
+31 −1		vts-libs/vts/geomextents.hpp
+6 −1		vts-libs/vts/io.hpp
+5 −3		vts-libs/vts/mesh.cpp
+39 −141		vts-libs/vts/metatile.cpp
+8 −9		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
+2 −1		vts-libs/vts/tileset/detail.hpp
+2 −0		vts-libs/vts/tileset/driver/delivery.cpp
+11 −7		vts-libs/vts/tileset/merge/support.hpp
+20 −11		vts-libs/vts/tileset/tileset.cpp