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

Merge branch 'master' of github.com:mapnik/mapnik

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-18 15:01:09 -08:00
commit 11e38b3e1c
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/memory_datasource.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>
// stl // stl
#include <vector> #include <deque>
namespace mapnik { namespace mapnik {
@ -48,7 +48,7 @@ public:
size_t size() const; size_t size() const;
void clear(); void clear();
private: private:
std::vector<feature_ptr> features_; std::deque<feature_ptr> features_;
mapnik::layer_descriptor desc_; mapnik::layer_descriptor desc_;
datasource::datasource_t type_; datasource::datasource_t type_;
bool bbox_check_; bool bbox_check_;

6
include/mapnik/memory_featureset.hpp
View file

@ -45,7 +45,7 @@ public:
bbox_check_(bbox_check) bbox_check_(bbox_check)
{} {}
memory_featureset(box2d<double> const& bbox, std::vector<feature_ptr> const& features, bool bbox_check = true) memory_featureset(box2d<double> const& bbox, std::deque<feature_ptr> const& features, bool bbox_check = true)
: bbox_(bbox), : bbox_(bbox),
pos_(features.begin()), pos_(features.begin()),
end_(features.end()), end_(features.end()),
@ -92,8 +92,8 @@ public:
private: private:
box2d<double> bbox_; box2d<double> bbox_;
std::vector<feature_ptr>::const_iterator pos_; std::deque<feature_ptr>::const_iterator pos_;
std::vector<feature_ptr>::const_iterator end_; std::deque<feature_ptr>::const_iterator end_;
datasource::datasource_t type_; datasource::datasource_t type_;
bool bbox_check_; bool bbox_check_;
}; };

3
plugins/input/csv/csv_datasource.hpp
View file

@ -38,6 +38,7 @@
// stl // stl
#include <vector> #include <vector>
#include <deque>
#include <string> #include <string>
class csv_datasource : public mapnik::datasource class csv_datasource : public mapnik::datasource
@ -66,7 +67,7 @@ private:
std::string inline_string_; std::string inline_string_;
unsigned file_length_; unsigned file_length_;
mapnik::value_integer row_limit_; mapnik::value_integer row_limit_;
std::vector<mapnik::feature_ptr> features_; std::deque<mapnik::feature_ptr> features_;
std::string escape_; std::string escape_;
std::string separator_; std::string separator_;
std::string quote_; std::string quote_;