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

deduce box_type from T

Browse source
This commit is contained in:
artemp 2016-04-05 18:26:31 +02:00
parent 0e07e5b5aa
commit 2cbb9f480a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
utils/mapnik-index/process_csv_file.cpp
View file

@ -46,6 +46,7 @@ namespace mapnik { namespace detail {
template <typename T>
std::pair<bool,typename T::value_type::first_type> process_csv_file(T & boxes, std::string const& filename, std::string const& manual_headers, char separator, char quote)
{
using box_type = typename T::value_type::first_type;
csv_utils::csv_file_parser p;
p.manual_headers_ = manual_headers;
p.separator_ = separator;
@ -65,7 +66,7 @@ std::pair<bool,typename T::value_type::first_type> process_csv_file(T & boxes, s
else
{
std::clog << "Error : cannot mmap " << filename << std::endl;
return std::make_pair(false, box2d<float>(p.extent_));
return std::make_pair(false, box_type(p.extent_));
}
#else
#if defined(_WINDOWS)
@ -76,18 +77,18 @@ std::pair<bool,typename T::value_type::first_type> process_csv_file(T & boxes, s
if (!csv_file.is_open())
{
std::clog << "Error : cannot open " << filename << std::endl;
return std::make_pair(false, box2d<float>(p.extent_));
return std::make_pair(false, box_type(p.extent_));
}
#endif
try
{
p.parse_csv_and_boxes(csv_file, boxes);
return std::make_pair(true, box2d<float>(p.extent_));
return std::make_pair(true, box_type(p.extent_));
}
catch (std::exception const& ex)
{
std::clog << ex.what() << std::endl;
return std::make_pair(false, box2d<float>(p.extent_));
return std::make_pair(false, box_type(p.extent_));
}
}