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

mapnik-index - output failed feature JSON when both --validate-features and --verbose options present.

Browse source
This commit is contained in:
artemp 2015-12-14 11:36:21 +00:00
parent 5e2f3ce61d
commit 6ca0e34a80
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/mapnik-index/mapnik-index.cpp
View file

@ -186,7 +186,7 @@ int main (int argc, char** argv)
else if (mapnik::detail::is_geojson(filename))
{
std::clog << "processing '" << filename << "' as GeoJSON\n";
auto result = mapnik::detail::process_geojson_file(boxes, filename, validate_features);
auto result = mapnik::detail::process_geojson_file(boxes, filename, validate_features, verbose);
if (!result.first)
{
std::clog << "Error: failed to process " << filename << std::endl;

5
utils/mapnik-index/process_geojson_file.cpp
View file

@ -66,7 +66,7 @@ const mapnik::json::feature_grammar_callback<base_iterator_type, mapnik::feature
namespace mapnik { namespace detail {
template <typename T>
std::pair<bool,box2d<double>> process_geojson_file(T & boxes, std::string const& filename, bool validate_features)
std::pair<bool,box2d<double>> process_geojson_file(T & boxes, std::string const& filename, bool validate_features, bool verbose)
{
mapnik::box2d<double> extent;
#if defined(MAPNIK_MEMORY_MAPPED_FILE)
@ -131,6 +131,7 @@ std::pair<bool,box2d<double>> process_geojson_file(T & boxes, std::string const&
space);
if (!result || feat_itr != feat_end)
{
if (verbose) std::clog << std::string(start + item.second.first, feat_end ) << std::endl;
return std::make_pair(false, extent);
}
}
@ -142,6 +143,6 @@ std::pair<bool,box2d<double>> process_geojson_file(T & boxes, std::string const&
using box_type = mapnik::box2d<double>;
using item_type = std::pair<box_type, std::pair<std::size_t, std::size_t>>;
using boxes_type = std::vector<item_type>;
template std::pair<bool,box2d<double>> process_geojson_file(boxes_type&, std::string const&, bool);
template std::pair<bool,box2d<double>> process_geojson_file(boxes_type&, std::string const&, bool, bool);
}}

2
utils/mapnik-index/process_geojson_file.hpp
View file

@ -29,7 +29,7 @@
namespace mapnik { namespace detail {
template <typename T>
std::pair<bool, box2d<double>> process_geojson_file(T & boxes, std::string const& filename, bool validate_features);
std::pair<bool, box2d<double>> process_geojson_file(T & boxes, std::string const& filename, bool validate_features, bool verbose);
}}