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

shapeindex - make index node 32-bytes (uint64_t, int32_t, int32_t)

Browse source
This commit is contained in:
artemp 2017-08-18 16:58:20 +01:00
parent 541c1a35a0
commit d81a7610d3
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/input/shape/shape_index_featureset.cpp
View file

@ -87,7 +87,7 @@ feature_ptr shape_index_featureset<filterT>::next()
while ( itr_ != offsets_.end())
{
int offset = itr_->offset;
std::uint64_t offset = itr_->offset;
shape_ptr_->move_to(offset);
std::vector<std::pair<int,int>> parts;
while (itr_ != offsets_.end() && itr_->offset == offset)

8
plugins/input/shape/shape_index_featureset.hpp
View file

@ -50,13 +50,13 @@ namespace mapnik { namespace detail
struct node
{
node() = default;
node(int offset_, int start_, int end_)
node(std::uint64_t offset_, std::int32_t start_, std::int32_t end_)
: offset(offset_),
start(start_),
end(end_) {}
int offset;
int start;
int end;
std::uint64_t offset;
std::int32_t start;
std::int32_t end;
};
}} // ns

1
utils/shapeindex/shapeindex.cpp
View file

@ -26,6 +26,7 @@
#include <mapnik/version.hpp>
#include <mapnik/util/fs.hpp>
#include <mapnik/quad_tree.hpp>
#include <mapnik/util/spatial_index.hpp>
#include <mapnik/geometry/envelope.hpp>
#include "shapefile.hpp"
#include "shape_io.hpp"