sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mapnik::Map ctor/operator= - initialise proj transforms

Browse source
This commit is contained in:
Artem Pavlenko 2021-03-04 10:19:44 +00:00
parent 554556e4d5
commit b532beccde
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/map.hpp
View file

@ -523,6 +523,7 @@ public:
private:
friend void swap(Map & rhs, Map & lhs);
void fixAspectRatio();
void init_proj_transforms();
};
DEFINE_ENUM(aspect_fix_mode_e,Map::aspect_fix_mode);

24
src/map.cpp
View file

@ -112,7 +112,10 @@ Map::Map(Map const& rhs)
font_file_mapping_(rhs.font_file_mapping_),
// on copy discard memory caches
font_memory_cache_(),
proj_cache_() {}
proj_cache_()
{
init_proj_transforms();
}
Map::Map(Map && rhs)
@ -142,6 +145,7 @@ Map::~Map() {}
Map& Map::operator=(Map rhs)
{
swap(*this, rhs);
init_proj_transforms();
return *this;
}
@ -375,6 +379,7 @@ void Map::remove_all()
fontsets_.clear();
font_file_mapping_.clear();
font_memory_cache_.clear();
proj_cache_.clear();
}
layer const& Map::get_layer(size_t index) const
@ -442,6 +447,7 @@ std::string const& Map::srs() const
void Map::set_srs(std::string const& _srs)
{
srs_ = _srs;
init_proj_transforms();
}
void Map::set_buffer_size(int _buffer_size)
@ -790,4 +796,20 @@ void Map::set_extra_parameters(parameters& params)
extra_params_ = params;
}
void Map::init_proj_transforms()
{
for (auto const& l : layers_)
{
compatible_key_type key = std::make_pair<boost::string_view, boost::string_view>(srs_, l.srs());
auto itr = proj_cache_.find(key, compatible_hash{}, compatible_predicate{});
if (itr == proj_cache_.end())
{
mapnik::projection source(srs_, true);
mapnik::projection dest(l.srs(), true);
proj_cache_.emplace(std::make_pair(srs_, l.srs()),
std::make_unique<proj_transform>(source, dest));
}
}
}
}