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

fix rebase conflict

Browse source
This commit is contained in:
artemp 2015-10-05 15:25:17 +01:00
parent 860631acc5
commit 287028d3e4
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,15 +40,6 @@
#include "shape_utils.hpp" #include "shape_utils.hpp"
#include <mapnik/util/spatial_index.hpp> #include <mapnik/util/spatial_index.hpp>
// operator>> needed by mapnik::spatial_index<Value, Filter, InputStream>
template <typename InputStream>
InputStream & operator>>(InputStream & in, std::streampos & pos)
{
in.read(reinterpret_cast<char*>(&pos), sizeof(std::streampos));
return in;
}
using mapnik::feature_factory; using mapnik::feature_factory;
template <typename filterT> template <typename filterT>
@ -73,10 +64,9 @@ shape_index_featureset<filterT>::shape_index_featureset(filterT const& filter,
if (index) if (index)
{ {
#ifdef SHAPE_MEMORY_MAPPED_FILE #ifdef SHAPE_MEMORY_MAPPED_FILE
//spatial_index<unsigned, filterT,stream<mapped_file_source> >::query(filter, index->file(), offsets_); mapnik::util::spatial_index<int, filterT,boost::interprocess::ibufferstream>::query(filter, index->file(), offsets_);
mapnik::util::spatial_index<std::streampos, filterT,boost::interprocess::ibufferstream>::query(filter, index->file(), offsets_);
#else #else
mapnik::util::spatial_index<std::streampos, filterT, std::ifstream>::query(filter, index->file(), offsets_); mapnik::util::spatial_index<int, filterT, std::ifstream>::query(filter, index->file(), offsets_);
#endif #endif
} }
std::sort(offsets_.begin(), offsets_.end()); std::sort(offsets_.begin(), offsets_.end());

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

@ -63,8 +63,8 @@ private:
context_ptr ctx_; context_ptr ctx_;
std::unique_ptr<shape_io> shape_ptr_; std::unique_ptr<shape_io> shape_ptr_;
const std::unique_ptr<mapnik::transcoder> tr_; const std::unique_ptr<mapnik::transcoder> tr_;
std::vector<std::streampos> offsets_; std::vector<int> offsets_;
std::vector<std::streampos>::iterator itr_; std::vector<int>::iterator itr_;
std::vector<int> attr_ids_; std::vector<int> attr_ids_;
mapnik::value_integer row_limit_; mapnik::value_integer row_limit_;
mutable int count_; mutable int count_;