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

Merge branch 'master' into bbox-index

Browse source
This commit is contained in:
Artem Pavlenko 2017-09-11 17:59:23 +01:00
commit 797e8c7553
2 changed files with 3 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
plugins/input/geobuf/geobuf.hpp
View file

@ -83,7 +83,7 @@ struct geobuf : util::noncopyable
double precision = std::pow(10,6);
bool is_topo = false;
bool transformed = false;
//std::size_t lengths = 0;
std::size_t lengths = 0;
std::vector<std::string> keys_;
std::vector<value_type> values_;
protozero::pbf_reader reader_;
@ -429,11 +429,6 @@ private:
template <typename T>
geometry::multi_line_string<double> read_multi_linestring(T & reader, boost::optional<std::vector<std::uint32_t>> const& lengths)
{
if (!lengths) {
std::clog << "rml not set!\n";
} else {
std::clog << "rml lengths: " << lengths->size() << "\n";
}
geometry::multi_line_string<double> multi_line;
multi_line.reserve(!lengths ? 1 : lengths->size());
auto pi = reader.get_packed_sint64();
@ -460,11 +455,6 @@ private:
geometry::polygon<double> read_polygon(T & reader, boost::optional<std::vector<std::uint32_t>> const& lengths)
{
geometry::polygon<double> poly;
if (!lengths) {
std::clog << "rp not set!\n";
} else {
std::clog << "rp lengths: " << lengths->size() << "\n";
}
poly.reserve(!lengths ? 1 : lengths->size());
auto pi = reader.get_packed_sint64();
if (!lengths)
@ -490,11 +480,6 @@ private:
geometry::multi_polygon<double> read_multi_polygon(T & reader, boost::optional<std::vector<std::uint32_t>> const& lengths)
{
geometry::multi_polygon<double> multi_poly;
if (!lengths) {
std::clog << "rmp not set!\n";
} else {
std::clog << "rmp lengths: " << lengths->size() << "\n";
}
if (!lengths)
{
auto poly = read_polygon(reader, lengths);
@ -539,12 +524,8 @@ private:
}
case 2:
{
std::clog << "here\n";
auto val = read_lengths(reader);
if (!val.empty()) {
std::clog << "lenghts " << val.size() << "\n";
lengths = std::move(val);
}
if (!val.empty()) lengths = std::move(val);
break;
}
case 3:

9
test/unit/datasource/geojson.cpp
View file

@ -108,14 +108,7 @@ TEST_CASE("geojson") {
params["type"] = "geojson";
params["file"] = "./test/data/json/empty_featurecollection.json";
params["cache_features"] = cache_features;
auto ds = mapnik::datasource_cache::instance().create(params);
CHECK(ds != nullptr);
auto fs = all_features(ds);
REQUIRE(!mapnik::is_valid(fs));
while (auto f = fs->next())
{
CHECK(false); // shouldn't get here
}
REQUIRE_THROWS(mapnik::datasource_cache::instance().create(params));
}
}