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

start updating for new mapnik geometry storage

Browse source
This commit is contained in:
Dane Springmeyer 2015-12-02 11:52:21 -05:00
parent 3090111a06
commit b31e027ec4
4 changed files with 109 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ struct value_visitor
tr_(tr),
name_(name) {}
void operator() (std::string const& val) // unicode
void operator() (std::string const& val)
{
feature_.put_new(name_, tr_.transcode(val.c_str()));
}
@ -81,7 +81,6 @@ struct geobuf : mapnik::util::noncopyable
using value_type = mapnik::util::variant<bool, int, double, std::string>;
unsigned dim = 2;
double precision = std::pow(10,6);
bool is_topo = false;
bool transformed = false;
std::size_t lengths = 0;
std::vector<std::string> keys_;
@ -91,7 +90,7 @@ struct geobuf : mapnik::util::noncopyable
mapnik::context_ptr ctx_;
const std::unique_ptr<mapnik::transcoder> tr_;
public:
//ctor
geobuf (unsigned char const* buf, std::size_t size, FeatureCallback & callback)
: pbf_(buf, size),
callback_(callback),
@ -104,7 +103,7 @@ public:
{
switch (pbf_.tag)
{
case 1: // keys
case 1:
{
keys_.push_back(pbf_.string());
break;
@ -127,18 +126,15 @@ public:
}
case 6:
{
pbf_.message();
MAPNIK_LOG_DEBUG(geobuf) << "standalone Geometry is not supported";
break;
}
case 7:
{
pbf_.message();
MAPNIK_LOG_DEBUG(geobuf) << "Topology is not supported";
auto feature = feature_factory::create(ctx_,1);
auto message = pbf_.message();
feature->set_geometry(std::move(read_geometry(message)));
callback_(feature);
break;
}
default:
MAPNIK_LOG_DEBUG(geobuf) << "FIXME tag=" << pbf_.tag;
MAPNIK_LOG_ERROR(geobuf) << "FIXME tag=" << pbf_.tag;
break;
}
}
@ -185,7 +181,7 @@ private:
}
case 6:
{
values_.emplace_back(pbf.string()); // JSON value
values_.emplace_back(pbf.string());
break;
}
default:
@ -221,7 +217,7 @@ private:
case 1:
{
auto message = pbf.message();
read_geometry(message, feature->paths());
feature->set_geometry(std::move(read_geometry(message)));
break;
}
case 11:
@ -242,18 +238,16 @@ private:
}
case 14:
{
// feature props
read_props(pbf, *feature);
break;
}
case 15:
{
// generic props
read_props(pbf, *feature);
break;
}
default:
MAPNIK_LOG_DEBUG(geobuf) << "FAIL tag=" << pbf.tag;
MAPNIK_LOG_ERROR(geobuf) << "FAIL tag=" << pbf.tag;
break;
}
}
@ -290,15 +284,14 @@ private:
}
}
template <typename T, typename GeometryContainer>
void read_point(T & pbf, GeometryContainer & paths)
template <typename T>
mapnik::geometry::point<double> read_point(T & pbf)
{
mapnik::geometry::point<double> point;
auto size = pbf.varint();
std::unique_ptr<geometry_type> point(new geometry_type(mapnik::geometry_type::types::Point));
uint8_t const* end = pbf.data + size;
std::size_t count = 0;
int x, y;
double x, y;
while (pbf.data < end)
{
auto p = pbf.svarint();
@ -310,45 +303,47 @@ private:
else if (index == 1)
{
y = transform(p);
point->move_to(x, y);
return mapnik::geometry::point<double>(x, y);
}
++count;
}
paths.push_back(point.release());
std::clog << "should not get here\n";
return point;
}
template <typename T, typename GeometryContainer>
void read_coords(T & pbf, geometry_type_e type, boost::optional<std::vector<int>> const& lengths, GeometryContainer & paths)
template <typename T>
mapnik::geometry::geometry<double> read_coords(T & pbf, geometry_type_e type, boost::optional<std::vector<int>> const& coord_lengths)
{
mapnik::geometry::geometry<double> geom;
switch (type)
{
case Point:
{
read_point(pbf, paths);
geom = std::move(read_point(pbf));
break;
}
case Polygon:
{
read_polygon(pbf, lengths, paths);
geom = std::move(read_polygon(pbf, coord_lengths));
break;
}
case LineString:
{
read_line_string(pbf,paths);
//geom = std::move(read_line_string(pbf));
break;
}
case MultiPoint:
{
read_multi_point(pbf, paths);
//geom = std::move(read_multi_point(pbf));
break;
}
case MultiLineString:
{
read_multi_linestring(pbf, lengths, paths);
//geom = std::move(read_multi_linestring(pbf, coord_lengths));
}
case MultiPolygon:
{
read_multi_polygon(pbf, lengths, paths);
//geom = std::move(read_multi_polygon(pbf, coord_lengths));
break;
}
case GeometryCollection:
@ -360,19 +355,7 @@ private:
break;
}
}
}
template <typename T>
std::vector<int> read_lengths(T & pbf)
{
std::vector<int> lengths;
auto size = pbf.varint();
uint8_t const* end = pbf.data + size;
while (pbf.data < end)
{
lengths.push_back(pbf.varint());
}
return lengths;
return geom;
}
template <typename T, typename Geometry>
@ -391,19 +374,42 @@ private:
else if (d == 1) y += delta;
}
if (i == 0)
geom.move_to(transform(x), transform(y));
geom.exterior_ring.add_coord(transform(x), transform(y));
else
geom.line_to(transform(x), transform(y));
geom.exterior_ring.add_coord(transform(x), transform(y));
++i;
}
/*
if (polygon)
{
geom.close_path();
}
*/
}
template <typename T, typename GeometryContainer>
void read_multi_point(T & pbf, GeometryContainer & paths)
template <typename T>
mapnik::geometry::polygon<double> read_polygon(T & pbf, boost::optional<std::vector<int>> const& coord_lengths)
{
mapnik::geometry::polygon<double> poly;
auto size = pbf.varint();
if (!coord_lengths)
{
read_linear_ring(pbf, 0, size, poly, true);
}
else
{
for (auto len : *coord_lengths)
{
read_linear_ring(pbf, len, size, poly, true);
}
}
return poly;
}
/*
template <typename T>
void read_multi_point(T & pbf)
{
int x = 0.0;
int y = 0.0;
@ -411,7 +417,7 @@ private:
uint8_t const* end = pbf.data + size;
while (pbf.data < end)
{
std::unique_ptr<geometry_type> point(new geometry_type(mapnik::geometry_type::types::Point));
auto point = std::make_shared<mapnik::geometry::geometry<double>>(mapnik::geometry::geometry_type::Point);
for (int d = 0; d < dim; ++d)
{
if (d == 0) x += pbf.svarint();
@ -422,22 +428,22 @@ private:
}
}
template <typename T, typename GeometryContainer>
void read_line_string(T & pbf, GeometryContainer & paths)
template <typename T>
void read_line_string(T & pbf)
{
std::unique_ptr<geometry_type> line(new geometry_type(mapnik::geometry_type::types::LineString));
auto line = std::make_shared<mapnik::geometry::geometry<double>>(mapnik::geometry::geometry_type::LineString);
auto size = pbf.varint();
read_linear_ring(pbf, 0, size, *line);
paths.push_back(line.release());
}
template <typename T, typename GeometryContainer>
void read_multi_linestring(T & pbf, boost::optional<std::vector<int>> const& lengths, GeometryContainer & paths)
template <typename T>
void read_multi_linestring(T & pbf, boost::optional<std::vector<int>> const& lengths)
{
auto size = pbf.varint();
if (!lengths)
{
std::unique_ptr<geometry_type> line(new geometry_type(mapnik::geometry_type::types::LineString));
auto line = std::make_shared<mapnik::geometry::geometry<double>>(mapnik::geometry::geometry_type::LineString);
read_linear_ring(pbf, 0, size, *line);
paths.push_back(line.release());
}
@ -445,39 +451,21 @@ private:
{
for (auto len : *lengths)
{
std::unique_ptr<geometry_type> line(new geometry_type(mapnik::geometry_type::types::LineString));
auto line = std::make_shared<mapnik::geometry::geometry<double>>(mapnik::geometry::geometry_type::LineString);
read_linear_ring(pbf, len, size, *line);
paths.push_back(line.release());
}
}
}
template <typename T, typename GeometryContainer>
void read_polygon(T & pbf, boost::optional<std::vector<int>> const& lengths, GeometryContainer & paths)
{
std::unique_ptr<geometry_type> poly(new geometry_type(mapnik::geometry_type::types::Polygon));
auto size = pbf.varint();
if (!lengths)
{
read_linear_ring(pbf, 0, size, *poly, true);
}
else
{
for (auto len : *lengths)
{
read_linear_ring(pbf, len, size, *poly, true);
}
}
paths.push_back(poly.release());
}
template <typename T, typename GeometryContainer>
void read_multi_polygon(T & pbf, boost::optional<std::vector<int>> const& lengths, GeometryContainer & paths)
template <typename T>
void read_multi_polygon(T & pbf, boost::optional<std::vector<int>> const& lengths)
{
auto size = pbf.varint();
if (!lengths)
{
std::unique_ptr<geometry_type> poly(new geometry_type(mapnik::geometry_type::types::Polygon));
auto poly = std::make_shared<mapnik::geometry::geometry<double>>(mapnik::geometry::geometry_type::Polygon);
read_linear_ring(pbf, 0, size, *poly, true);
paths.push_back(poly.release());
}
@ -486,7 +474,7 @@ private:
int j = 1;
for (int i = 0; i < (*lengths)[0]; ++i)
{
std::unique_ptr<geometry_type> poly(new geometry_type(mapnik::geometry_type::types::Polygon));
auto poly = std::make_shared<mapnik::geometry::geometry<double>>(mapnik::geometry::geometry_type::Polygon);
for (int k = 0; k < (*lengths)[j]; ++k)
{
read_linear_ring(pbf, (*lengths)[j + 1 + k], size, *poly, true);
@ -497,45 +485,62 @@ private:
}
}
template <typename T, typename GeometryContainer>
void read_geometry(T & pbf, GeometryContainer & paths)
*/
template <typename T>
std::vector<int> read_lengths(T & pbf)
{
std::vector<int> coord_lengths;
auto size = pbf.varint();
uint8_t const* end = pbf.data + size;
while (pbf.data < end)
{
coord_lengths.push_back(pbf.varint());
}
return coord_lengths;
}
template <typename T>
mapnik::geometry::geometry<double> read_geometry(T & pbf)
{
mapnik::geometry::geometry<double> geom;
geometry_type_e type = Unknown;
boost::optional<std::vector<int>> lengths;
boost::optional<std::vector<int>> coord_lengths;
while (pbf.next())
{
switch (pbf.tag)
{
case 1: // type
case 1:
{
type = static_cast<geometry_type_e>(pbf.varint());
break;
}
case 2:
{
lengths = std::move(read_lengths(pbf));
coord_lengths = std::move(read_lengths(pbf));
break;
}
case 3:
{
read_coords(pbf, type, lengths, paths);
geom = std::move(read_coords(pbf, type, coord_lengths));
break;
}
case 4:
{
MAPNIK_LOG_DEBUG(geobuf) << "fixme read geometry=?";
MAPNIK_LOG_ERROR(geobuf) << "fixme read geometry=?";
break;
}
case 11:
{
auto geom_id = pbf.string();
MAPNIK_LOG_DEBUG(geobuf) << "geometry id's are not supported geom_id=" << geom_id ;
MAPNIK_LOG_ERROR(geobuf) << "geometry id's are not supported geom_id=" << geom_id ;
break;
}
case 12:
{
auto geom_id = pbf.template varint<std::int64_t>();
MAPNIK_LOG_DEBUG(geobuf) << "geometry id's are not supported geom_id=" << geom_id ;
MAPNIK_LOG_ERROR(geobuf) << "geometry id's are not supported geom_id=" << geom_id ;
break;
}
case 13:
@ -554,6 +559,7 @@ private:
break;
}
}
return geom;
}
};

38
plugins/input/geobuf/geobuf_datasource.cpp
View file

@ -28,13 +28,13 @@
#include <algorithm>
#include <functional>
// boost
#pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>
#include <boost/algorithm/string.hpp>
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/unicode.hpp>
#include <mapnik/utils.hpp>
#include <mapnik/feature.hpp>
#include <mapnik/feature_kv_iterator.hpp>
#include <mapnik/value_types.hpp>
@ -144,14 +144,9 @@ void geobuf_datasource::parse_geobuf(std::uint8_t const* data, std::size_t size)
push_feature_callback callback(features_);
mapnik::util::geobuf<push_feature_callback> buf(data, size, callback);
buf.read();
std::cerr << "Num of features = " << features_.size() << std::endl;
#if BOOST_VERSION >= 105600
using values_container = std::vector< std::pair<box_type, std::pair<std::size_t, std::size_t>>>;
values_container values;
values.reserve(features_.size());
#else
tree_ = std::make_unique<spatial_index_type>(16, 4);
#endif
std::size_t geometry_index = 0;
for (mapnik::feature_ptr const& f : features_)
@ -174,18 +169,12 @@ void geobuf_datasource::parse_geobuf(std::uint8_t const* data, std::size_t size)
extent_.expand_to_include(box);
}
}
#if BOOST_VERSION >= 105600
values.emplace_back(box, std::make_pair(geometry_index,0));
#else
tree_->insert(box, std::make_pair(geometry_index));
#endif
++geometry_index;
}
#if BOOST_VERSION >= 105600
// packing algorithm
tree_ = std::make_unique<spatial_index_type>(values);
#endif
}
geobuf_datasource::~geobuf_datasource() {}
@ -195,20 +184,20 @@ const char * geobuf_datasource::name()
return "geobuf";
}
boost::optional<mapnik::datasource::geometry_t> geobuf_datasource::get_geometry_type() const
boost::optional<mapnik::datasource_geometry_t> geobuf_datasource::get_geometry_type() const
{
boost::optional<mapnik::datasource::geometry_t> result;
boost::optional<mapnik::datasource_geometry_t> result;
int multi_type = 0;
unsigned num_features = features_.size();
for (unsigned i = 0; i < num_features && i < 5; ++i)
{
mapnik::util::to_ds_type(features_[i]->paths(),result);
result = mapnik::util::to_ds_type(features_[i]->get_geometry());
if (result)
{
int type = static_cast<int>(*result);
if (multi_type > 0 && multi_type != type)
{
result.reset(mapnik::datasource::Collection);
result.reset(mapnik::datasource_geometry_t::Collection);
return result;
}
multi_type = type;
@ -238,7 +227,6 @@ mapnik::featureset_ptr geobuf_datasource::features(mapnik::query const& q) const
mapnik::box2d<double> const& box = q.get_bbox();
if (extent_.intersects(box))
{
#if BOOST_VERSION >= 105600
geobuf_featureset::array_type index_array;
if (tree_)
{
@ -246,12 +234,6 @@ mapnik::featureset_ptr geobuf_datasource::features(mapnik::query const& q) const
return std::make_shared<geobuf_featureset>(features_, std::move(index_array));
}
}
#else
if (tree_)
{
return std::make_shared<geobuf_featureset>(features_, tree_->find(box));
}
#endif
return mapnik::featureset_ptr();
}
@ -261,11 +243,9 @@ mapnik::featureset_ptr geobuf_datasource::features_at_point(mapnik::coord2d cons
query_bbox.pad(tol);
mapnik::query q(query_bbox);
std::vector<mapnik::attribute_descriptor> const& desc = desc_.get_descriptors();
std::vector<mapnik::attribute_descriptor>::const_iterator itr = desc.begin();
std::vector<mapnik::attribute_descriptor>::const_iterator end = desc.end();
for ( ;itr!=end;++itr)
for (auto const& item : desc)
{
q.add_property_name(itr->get_name());
q.add_property_name(item.get_name());
}
return features(q);
}

19
plugins/input/geobuf/geobuf_datasource.hpp
View file

@ -32,20 +32,14 @@
#include <mapnik/coord.hpp>
#include <mapnik/feature_layer_desc.hpp>
#include <mapnik/unicode.hpp>
#include <mapnik/util/boost_geometry_adapters.hpp>
// boost
#include <boost/optional.hpp>
#include <mapnik/geometry_adapters.hpp>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
#include <mapnik/warning_ignore.hpp>
#include <boost/optional.hpp>
#include <boost/geometry.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION >= 105600
#include <boost/geometry/index/rtree.hpp>
#else
#include <boost/geometry/extensions/index/rtree/rtree.hpp>
#endif
#pragma GCC diagnostic pop
// stl
@ -55,7 +49,6 @@
#include <map>
#include <deque>
#if BOOST_VERSION >= 105600
template <std::size_t Max, std::size_t Min>
struct geojson_linear : boost::geometry::index::linear<Max,Min> {};
@ -79,8 +72,6 @@ struct options_type<geojson_linear<Max,Min> >
}}}}}
#endif //BOOST_VERSION >= 105600
class geobuf_datasource : public mapnik::datasource
{
public:
@ -97,7 +88,7 @@ public:
mapnik::featureset_ptr features_at_point(mapnik::coord2d const& pt, double tol = 0) const;
mapnik::box2d<double> envelope() const;
mapnik::layer_descriptor get_descriptor() const;
boost::optional<mapnik::datasource::geometry_t> get_geometry_type() const;
boost::optional<mapnik::datasource_geometry_t> get_geometry_type() const;
void parse_geobuf(std::uint8_t const* buffer, std::size_t size);
private:
mapnik::datasource::datasource_t type_;

4
plugins/input/geobuf/geobuf_featureset.cpp
View file

@ -43,14 +43,10 @@ mapnik::feature_ptr geobuf_featureset::next()
{
if (index_itr_ != index_end_)
{
#if BOOST_VERSION >= 105600
geobuf_datasource::item_type const& item = *index_itr_++;
std::size_t index = item.second.first;
//std::size_t size = item.second.second;
//std::cerr << file_offset << " (" << size << ") " << item.first << std::endl;
#else
std::size_t index = *index_itr_++;
#endif
if ( index < features_.size())
{
return features_.at(index);