drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 21:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed altitude tiles cache bug.

Browse Source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako
2022-08-28 22:49:10 +03:00
committed by zyphlar
parent b4cc6b140b
commit 623c4ed9fe
4 changed files with 68 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
generator/srtm_parser.hpp
View File

@@ -2,15 +2,18 @@
#include "geometry/latlon.hpp"
#include "indexer/feature_altitude.hpp"
#include "geometry/point_with_altitude.hpp"
#include "base/macros.hpp"
#include <boost/container_hash/hash.hpp>
#include <cstdint>
#include <string>
#include <unordered_map>
#include <utility>
#include <vector>
namespace generator
{
@@ -31,8 +34,10 @@ public:
geometry::Altitude GetTriangleHeight(ms::LatLon const & coord) const;
/// @}
using LatLonKey = std::pair<int32_t, int32_t>;
static LatLonKey GetKey(ms::LatLon const & coord);
static std::string GetBase(ms::LatLon const & coord);
static ms::LatLon GetCenter(ms::LatLon const & coord);
static std::string GetPath(std::string const & dir, std::string const & base);
/// Used in unit tests only to prepare mock tile.
@@ -76,20 +81,20 @@ public:
void Purge();
private:
using LatLonKey = std::pair<int32_t, int32_t>;
static LatLonKey GetKey(ms::LatLon const & coord);
std::string m_dir;
struct Hash
{
size_t operator()(LatLonKey const & key) const
size_t operator()(SrtmTile::LatLonKey const & key) const
{
return (static_cast<size_t>(key.first) << 32u) | static_cast<size_t>(key.second);
size_t seed = 0;
boost::hash_combine(seed, key.first);
boost::hash_combine(seed, key.second);
return seed;
}
};
using MapT = std::unordered_map<LatLonKey, SrtmTile, Hash>;
using MapT = std::unordered_map<SrtmTile::LatLonKey, SrtmTile, Hash>;
MapT m_tiles;
DISALLOW_COPY(SrtmTileManager);