mirror of
https://github.com/osm2pgsql-dev/osm2pgsql.git
synced 2025-08-19 16:28:16 +00:00
b7ec16d858
Middle has three interface classes: middle_query_t, middle_t and slim_middle_t. They inherit from each other. This is problematic when one wants to supply a middle implementation that follows a similar inheritence structure. There is actualy no need that the interfaces for inserting (middle_t and slim_middle_t) inherit from middle_query_t. The code is very clear about which interface is needed by which class. This change splits off the middle_query_t interface and cleans up the code where the clear distinction was still missing. Needs some larger rework of the middle test which did rely on being able to access both interface types. There is now a template class for testing middle that also contains some more common boilerplate code.
103 lines
2.7 KiB
C++
103 lines
2.7 KiB
C++
#include "geometry-processor.hpp"
|
|
#include "processor-line.hpp"
|
|
#include "processor-point.hpp"
|
|
#include "processor-polygon.hpp"
|
|
#include "middle.hpp"
|
|
#include "options.hpp"
|
|
#include "reprojection.hpp"
|
|
|
|
#include <boost/format.hpp>
|
|
#include <boost/optional.hpp>
|
|
#include <stdexcept>
|
|
#include <memory>
|
|
|
|
std::shared_ptr<geometry_processor> geometry_processor::create(const std::string &type,
|
|
const options_t *options) {
|
|
std::shared_ptr<geometry_processor> ptr;
|
|
|
|
if (type == "point") {
|
|
ptr = std::make_shared<processor_point>(options->projection);
|
|
}
|
|
else if (type == "line") {
|
|
ptr = std::make_shared<processor_line>(options->projection);
|
|
}
|
|
else if (type == "polygon") {
|
|
ptr = std::make_shared<processor_polygon>(options->projection);
|
|
}
|
|
else {
|
|
throw std::runtime_error((boost::format("Unable to construct geometry processor "
|
|
"because type `%1%' is not known.")
|
|
% type).str());
|
|
}
|
|
|
|
return ptr;
|
|
}
|
|
|
|
geometry_processor::geometry_processor(int srid, const std::string &type, unsigned int interests)
|
|
: m_srid(srid), m_type(type), m_interests(interests) {
|
|
}
|
|
|
|
geometry_processor::~geometry_processor() = default;
|
|
|
|
int geometry_processor::srid() const {
|
|
return m_srid;
|
|
}
|
|
|
|
const std::string &geometry_processor::column_type() const {
|
|
return m_type;
|
|
}
|
|
|
|
unsigned int geometry_processor::interests() const {
|
|
return m_interests;
|
|
}
|
|
|
|
bool geometry_processor::interests(unsigned int interested) const {
|
|
return (interested & m_interests) == interested;
|
|
}
|
|
|
|
geometry_processor::wkb_t
|
|
geometry_processor::process_node(osmium::Location const &,
|
|
geom::osmium_builder_t *)
|
|
{
|
|
return wkb_t();
|
|
}
|
|
|
|
geometry_processor::wkb_t
|
|
geometry_processor::process_way(osmium::Way const &, geom::osmium_builder_t *)
|
|
{
|
|
return wkb_t();
|
|
}
|
|
|
|
geometry_processor::wkbs_t
|
|
geometry_processor::process_relation(osmium::Relation const &,
|
|
osmium::memory::Buffer const &,
|
|
geom::osmium_builder_t *)
|
|
{
|
|
return wkbs_t();
|
|
}
|
|
|
|
|
|
relation_helper::relation_helper()
|
|
: data(1024, osmium::memory::Buffer::auto_grow::yes)
|
|
{}
|
|
|
|
size_t relation_helper::set(osmium::Relation const &rel,
|
|
middle_query_t const *mid)
|
|
{
|
|
// cleanup
|
|
data.clear();
|
|
roles.clear();
|
|
|
|
// get the nodes and roles of the ways
|
|
auto num_ways = mid->rel_way_members_get(rel, &roles, data);
|
|
|
|
return num_ways;
|
|
}
|
|
|
|
void relation_helper::add_way_locations(middle_query_t const *mid)
|
|
{
|
|
for (auto &w : data.select<osmium::Way>()) {
|
|
mid->nodes_get_list(&(w.nodes()));
|
|
}
|
|
}
|