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

csv.input - read first line of data to update descriptor (disk-index) + remove stderr

Browse source 
§
This commit is contained in:
artemp 2015-10-06 16:37:54 +01:00
parent 8ec1e3e73d
commit e727fb3877
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -291,8 +291,6 @@ void csv_datasource::parse_csv(T & stream)
}
}
if (has_disk_index_) return;
std::vector<item_type> boxes;
while (is_first_row || csv_utils::getline_csv(stream, csv_line, newline, quote_))
{
@ -460,6 +458,8 @@ void csv_datasource::parse_csv(T & stream)
MAPNIK_LOG_ERROR(csv) << s.str();
}
}
// return early if *.index is present
if (has_disk_index_) return;
}
// bulk insert initialise r-tree
tree_ = std::make_unique<spatial_index_type>(boxes);
@ -542,7 +542,6 @@ boost::optional<mapnik::datasource_geometry_t> csv_datasource::get_geometry_type
int multi_type = 0;
for (auto const& val : positions)
{
std::cerr << val.first << ":" << val.second << std::endl;
stream.seekg(val.first);
std::vector<char> record;
record.resize(val.second);