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

remove unused old headers

Browse source
This commit is contained in:
artemp 2016-11-29 10:48:48 +01:00
parent 36eb7f61bd
commit d88bf9e1ef
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/input/geojson/geojson_datasource.cpp
View file

@ -49,7 +49,6 @@
#include <mapnik/util/geometry_to_ds_type.hpp> #include <mapnik/util/geometry_to_ds_type.hpp>
#include <mapnik/make_unique.hpp> #include <mapnik/make_unique.hpp>
#include <mapnik/geometry/boost_adapters.hpp> #include <mapnik/geometry/boost_adapters.hpp>
#include <mapnik/json/feature_collection_grammar.hpp>
#include <mapnik/util/fs.hpp> #include <mapnik/util/fs.hpp>
#include <mapnik/util/spatial_index.hpp> #include <mapnik/util/spatial_index.hpp>
#include <mapnik/geom_util.hpp> #include <mapnik/geom_util.hpp>

4
plugins/input/geojson/geojson_memory_index_featureset.cpp
View file

@ -25,11 +25,10 @@
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/feature_factory.hpp> #include <mapnik/feature_factory.hpp>
#include <mapnik/json/feature_grammar.hpp>
#include <mapnik/util/utf_conv_win.hpp> #include <mapnik/util/utf_conv_win.hpp>
#include <mapnik/geometry/is_empty.hpp> #include <mapnik/geometry/is_empty.hpp>
#include <mapnik/json/parse_feature.hpp> #include <mapnik/json/parse_feature.hpp>
//#include <mapnik/json/json_grammar_config.hpp>
// stl // stl
#include <string> #include <string>
#include <vector> #include <vector>
@ -67,7 +66,6 @@ mapnik::feature_ptr geojson_memory_index_featureset::next()
chr_iterator_type start = json.data(); chr_iterator_type start = json.data();
chr_iterator_type end = start + json.size(); chr_iterator_type end = start + json.size();
static const mapnik::transcoder tr("utf8"); static const mapnik::transcoder tr("utf8");
static const mapnik::json::feature_grammar<chr_iterator_type,mapnik::feature_impl> grammar(tr);
mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_, feature_id_++)); mapnik::feature_ptr feature(mapnik::feature_factory::create(ctx_, feature_id_++));
mapnik::json::parse_feature(start, end, *feature, tr); // throw on failure mapnik::json::parse_feature(start, end, *feature, tr); // throw on failure
// skip empty geometries // skip empty geometries