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

CSV - remove unused params and member vars

Browse source
This commit is contained in:
artemp 2015-08-24 09:30:57 +02:00
parent 4babec802a
commit 5dead08ecc
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/input/csv/csv_datasource.cpp
View file

@ -56,15 +56,12 @@ csv_datasource::csv_datasource(parameters const& params)
extent_(),
filename_(),
inline_string_(),
row_limit_(*params.get<mapnik::value_integer>("row_limit", 0)),
features_(),
escape_(*params.get<std::string>("escape", "")),
separator_(*params.get<std::string>("separator", "")),
quote_(*params.get<std::string>("quote", "")),
headers_(),
manual_headers_(mapnik::util::trim_copy(*params.get<std::string>("headers", ""))),
strict_(*params.get<mapnik::boolean_type>("strict", false)),
filesize_max_(*params.get<double>("filesize_max", 20.0)), // MB
ctx_(std::make_shared<mapnik::context_type>()),
extent_initialized_(false),
tree_(nullptr),
@ -252,15 +249,8 @@ void csv_datasource::parse_csv(T & stream,
{
auto record_offset = pos;
auto record_size = csv_line.length();
pos = stream.tellg();
is_first_row = false;
if ((row_limit_ > 0) && (line_number > row_limit_))
{
MAPNIK_LOG_DEBUG(csv) << "csv_datasource: row limit hit, exiting at feature: " << feature_count;
break;
}
// skip blank lines
unsigned line_length = csv_line.length();
if (line_length <= 10)
@ -451,7 +441,6 @@ void csv_datasource::parse_csv(T & stream,
extent_.expand_to_include(mapnik::geometry::envelope(geom));
}
}
//features_.push_back(feature);
}
else
{

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

@ -121,15 +121,12 @@ private:
mapnik::box2d<double> extent_;
std::string filename_;
std::string inline_string_;
mapnik::value_integer row_limit_;
std::deque<mapnik::feature_ptr> features_;
std::string escape_;
std::string separator_;
std::string quote_;
std::vector<std::string> headers_;
std::string manual_headers_;
bool strict_;
double filesize_max_;
mapnik::context_ptr ctx_;
bool extent_initialized_;
std::unique_ptr<spatial_index_type> tree_;