gtfs-actions/generate-shapes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: add missing changes

Browse source
This commit is contained in:
Vlad Vesa 2020-08-19 21:25:58 +03:00
parent fbdec40850
commit fe13982f10
1 changed files with 66 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
src/pfaedle/osm/OsmBuilder.cpp
View file

@ -5,6 +5,7 @@
#include <osmium/io/any_input.hpp> #include <osmium/io/any_input.hpp>
#include <osmium/geom/haversine.hpp> #include <osmium/geom/haversine.hpp>
#include <osmium/visitor.hpp> #include <osmium/visitor.hpp>
#include <osmium/handler.hpp>
#include <algorithm> #include <algorithm>
#include <exception> #include <exception>
@ -51,27 +52,49 @@ using pfaedle::osm::EqSearch;
using pfaedle::osm::BlockSearch; using pfaedle::osm::BlockSearch;
using ad::cppgtfs::gtfs::Stop; using ad::cppgtfs::gtfs::Stop;
class NodeHandler : public osmium::handler::Handler { class Handler: public osmium::handler::Handler
const pfaedle::osm::OsmFilter& _filter; {
const pfaedle::osm::BBoxIdx& _bbox; public:
pfaedle::osm::OsmIdSet& _bboxNodes; Handler(const pfaedle::osm::AttrKeySet& attributes):
pfaedle::osm::OsmIdSet& _noHupNodes; _attributes(attributes)
{}
public: protected:
NodeHandler(const pfaedle::osm::OsmFilter& filter, template<typename T>
const pfaedle::osm::BBoxIdx& bbox, void parseTags(T& obj, const osmium::TagList& tags)
pfaedle::osm::OsmIdSet& bboxNodes, {
pfaedle::osm::OsmIdSet& noHupNodes) : for (const auto& tag : tags) {
if (_attributes.count(tag.key())) {
obj.attrs[tag.key()] = tag.value();
}
}
}
const pfaedle::osm::AttrKeySet& _attributes;
};
class NodeFilteringHandler : public osmium::handler::Handler
{
const pfaedle::osm::OsmFilter &_filter;
const pfaedle::osm::BBoxIdx &_bbox;
pfaedle::osm::OsmIdSet &_bboxNodes;
pfaedle::osm::OsmIdSet &_noHupNodes;
public:
NodeFilteringHandler(const pfaedle::osm::OsmFilter &filter,
const pfaedle::osm::BBoxIdx &bbox,
pfaedle::osm::OsmIdSet &bboxNodes,
pfaedle::osm::OsmIdSet &noHupNodes) :
_filter(filter), _filter(filter),
_bbox(bbox), _bbox(bbox),
_bboxNodes(bboxNodes), _bboxNodes(bboxNodes),
_noHupNodes(noHupNodes) _noHupNodes(noHupNodes) {}
{}
void node(const osmium::Node& node) { void node(const osmium::Node &node)
{
bool ignored = false; bool ignored = false;
for (const auto& tag : node.tags()) { for (const auto &tag : node.tags()) {
if (_filter.nohup(tag.key(), tag.value())) { if (_filter.nohup(tag.key(), tag.value())) {
_noHupNodes.add(node.id()); _noHupNodes.add(node.id());
ignored = true; ignored = true;
@ -473,11 +496,11 @@ class WayHandler: public osmium::handler::Handler {
} }
}; };
class NodeHandler2: public osmium::handler::Handler { class NodeHandler: public osmium::handler::Handler {
pfaedle::trgraph::Graph& _graph; pfaedle::trgraph::Graph& _graph;
const pfaedle::osm::RelLst& rels; const pfaedle::osm::RelLst& rels;
const pfaedle::osm::RelMap& nodeRels; const pfaedle::osm::RelMap& nodeRels;
const pfaedle::osm::OsmFilter& filter; const pfaedle::osm::OsmFilter& _filter;
const pfaedle::osm::OsmIdSet& bBoxNodes; const pfaedle::osm::OsmIdSet& bBoxNodes;
pfaedle::osm::NIdMap& nodes; pfaedle::osm::NIdMap& nodes;
pfaedle::osm::NIdMultMap& multNodes; pfaedle::osm::NIdMultMap& multNodes;
@ -487,7 +510,7 @@ class NodeHandler2: public osmium::handler::Handler {
const pfaedle::osm::OsmReadOpts& opts; const pfaedle::osm::OsmReadOpts& opts;
public: public:
NodeHandler2(Graph &g, NodeHandler(Graph &g,
const pfaedle::osm::RelLst &rels, const pfaedle::osm::RelLst &rels,
const pfaedle::osm::RelMap &nodeRels, const pfaedle::osm::RelMap &nodeRels,
const pfaedle::osm::OsmFilter &filter, const pfaedle::osm::OsmFilter &filter,
@ -501,7 +524,7 @@ class NodeHandler2: public osmium::handler::Handler {
_graph(g), _graph(g),
rels(rels), rels(rels),
nodeRels(nodeRels), nodeRels(nodeRels),
filter(filter), _filter(filter),
bBoxNodes(bBoxNodes), bBoxNodes(bBoxNodes),
nodes(nodes), nodes(nodes),
multNodes(multNodes), multNodes(multNodes),
@ -525,10 +548,10 @@ class NodeHandler2: public osmium::handler::Handler {
bool valid = false; bool valid = false;
if (nd.id && if (nd.id &&
(nodes.count(nd.id) || multNodes.count(nd.id) || (nodes.count(nd.id) || multNodes.count(nd.id) ||
relKeep(nd.id, nodeRels, fl) || filter.keep(nd.attrs, pfaedle::osm::OsmFilter::NODE)) && relKeep(nd.id, nodeRels, fl) || _filter.keep(nd.attrs, pfaedle::osm::OsmFilter::NODE)) &&
(nodes.count(nd.id) || bBoxNodes.has(nd.id)) && (nodes.count(nd.id) || bBoxNodes.has(nd.id)) &&
(nodes.count(nd.id) || multNodes.count(nd.id) || (nodes.count(nd.id) || multNodes.count(nd.id) ||
!filter.drop(nd.attrs, pfaedle::osm::OsmFilter::NODE))) { !_filter.drop(nd.attrs, pfaedle::osm::OsmFilter::NODE))) {
valid = true; valid = true;
} }
@ -541,29 +564,29 @@ class NodeHandler2: public osmium::handler::Handler {
n = nodes[nd.id]; n = nodes[nd.id];
n->pl().setGeom(pos); n->pl().setGeom(pos);
if (filter.station(nd.attrs)) { if (_filter.station(nd.attrs)) {
auto si = getStatInfo(n, nd.id, pos, nd.attrs, &attrGroups, nodeRels, rels, opts); auto si = getStatInfo(n, nd.id, pos, nd.attrs, &attrGroups, nodeRels, rels, opts);
if (!si.isNull()) if (!si.isNull())
n->pl().setSI(si); n->pl().setSI(si);
} else if (filter.blocker(nd.attrs)) { } else if (_filter.blocker(nd.attrs)) {
n->pl().setBlocker(); n->pl().setBlocker();
} }
} else if (multNodes.count(nd.id)) { } else if (multNodes.count(nd.id)) {
for (auto *n : multNodes[nd.id]) { for (auto *n : multNodes[nd.id]) {
n->pl().setGeom(pos); n->pl().setGeom(pos);
if (filter.station(nd.attrs)) { if (_filter.station(nd.attrs)) {
auto si = getStatInfo(n, nd.id, pos, nd.attrs, &attrGroups, nodeRels, rels, opts); auto si = getStatInfo(n, nd.id, pos, nd.attrs, &attrGroups, nodeRels, rels, opts);
if (!si.isNull()) if (!si.isNull())
n->pl().setSI(si); n->pl().setSI(si);
} else if (filter.blocker(nd.attrs)) { } else if (_filter.blocker(nd.attrs)) {
n->pl().setBlocker(); n->pl().setBlocker();
} }
} }
} else { } else {
// these are nodes without any connected edges // these are nodes without any connected edges
if (filter.station(nd.attrs)) { if (_filter.station(nd.attrs)) {
auto tmp = _graph.addNd(NodePL(pos)); auto tmp = _graph.addNd(NodePL(pos));
auto si = getStatInfo(tmp, nd.id, pos, nd.attrs, &attrGroups, nodeRels, rels, opts); auto si = getStatInfo(tmp, nd.id, pos, nd.attrs, &attrGroups, nodeRels, rels, opts);
@ -761,15 +784,15 @@ void OsmBuilder::read(const std::string& path, const OsmReadOpts& opts,
osmium::io::Reader reader_nodes{path, osmium::io::Reader reader_nodes{path,
osmium::osm_entity_bits::node}; osmium::osm_entity_bits::node};
NodeHandler nodeHandler(filter, bbox, bboxNodes, noHupNodes); NodeFilteringHandler filteringHandler(filter, bbox, bboxNodes, noHupNodes);
RelationHandler relationHandler(filter, bbox, attrKeys[2], intmRels, nodeRels, wayRels, rawRests); RelationHandler relationHandler(filter, bbox, attrKeys[2], intmRels, nodeRels, wayRels, rawRests);
WayHandler wayHandler(*g, intmRels, wayRels, filter, bboxNodes, nodes, multNodes, noHupNodes, WayHandler wayHandler(*g, intmRels, wayRels, filter, bboxNodes, nodes, multNodes, noHupNodes,
attrKeys[1], rawRests, *res, intmRels.flat, eTracks, opts); attrKeys[1], rawRests, *res, intmRels.flat, eTracks, opts);
osmium::apply(reader, nodeHandler, relationHandler, wayHandler); osmium::apply(reader, filteringHandler, relationHandler, wayHandler);
NodeHandler2 nodeHandler2(*g, intmRels, nodeRels, filter, bboxNodes, nodes, multNodes, orphanStations, NodeHandler nodeHandler(*g, intmRels, nodeRels, filter, bboxNodes, nodes, multNodes, orphanStations,
attrKeys[0], intmRels.flat, opts); attrKeys[0], intmRels.flat, opts);
osmium::apply(reader_nodes, nodeHandler2); osmium::apply(reader_nodes, nodeHandler);
// we do four passes of the file here to be as memory creedy as possible: // we do four passes of the file here to be as memory creedy as possible:
// - the first pass collects all node IDs which are // - the first pass collects all node IDs which are
@ -1148,7 +1171,7 @@ OsmWay OsmBuilder::nextWayWithId(pfxml::file* xml, osmid wid,
do { do {
const pfxml::tag& cur = xml->get(); const pfxml::tag& cur = xml->get();
if (xml->level() == 2 || xml->level() == 0) { if (xml->level() == 2 || xml->level() == 0) {
if (w.id || strcmp(cur.name, "way")) return w; if (w.id || strcmp(cur.name, "way") != 0) return w;
osmid id = util::atoul(cur.attrs.find("id")->second); osmid id = util::atoul(cur.attrs.find("id")->second);
if (id == wid) w.id = id; if (id == wid) w.id = id;