eb0c089574
Replace Travis for continuous integration with Github Actions. The Github Actions pipeline is functionally equivalent, with all the same build permutations supported. Whilst the Github Actions offering is broadly equivalent to Travis, a few changes have been made as part of the migration. - The 'core' and 'optional' Travis stages have been consolidated into one build matrix. This is due to the current inability in Github Actions to share build steps between jobs, so this avoids having to duplicate the steps. Optional stage jobs will now run in parallel with core jobs, but they still remain optional in the sense that they don't fail the build. - A number of existing Github Action plugins are used to replace functionality provided by Travis or other tools: Node setup, caching, Codecov, publishing release artifacts. - Linux builds are updated to build on Ubuntu 18.04. MacOS builds are updated to run on 10.15. Similar to the Travis Xenial upgrade attempt, some changes are required due to underlying platform and compiler upgrades. This means some Node 10 toolchains will no longer be supported. Whilst there is opportunity to upgrade some dependencies and make the CI steps more idiomatic, I've left this for future changes and just focussed on functional replication.
135 lines
4.1 KiB
C++
135 lines
4.1 KiB
C++
#include "extractor/maneuver_override_relation_parser.hpp"
|
|
#include "extractor/maneuver_override.hpp"
|
|
|
|
#include <boost/optional/optional.hpp>
|
|
#include <boost/ref.hpp>
|
|
|
|
#include <osmium/osm.hpp>
|
|
#include <osmium/tags/filter.hpp>
|
|
#include <osmium/tags/taglist.hpp>
|
|
|
|
#include <algorithm>
|
|
#include <iterator>
|
|
|
|
namespace osrm
|
|
{
|
|
namespace extractor
|
|
{
|
|
|
|
ManeuverOverrideRelationParser::ManeuverOverrideRelationParser() {}
|
|
|
|
/**
|
|
* Parses the `type=maneuver` relation. Reads the fields, and puts data
|
|
* into an InputManeuverOverride object, if the relation is considered
|
|
* valid (i.e. has the minimum tags we expect).
|
|
*/
|
|
boost::optional<InputManeuverOverride>
|
|
ManeuverOverrideRelationParser::TryParse(const osmium::Relation &relation) const
|
|
{
|
|
|
|
// Support both American and British spellings of maneuver/manoeuvre
|
|
osmium::tags::KeyValueFilter filter{false};
|
|
filter.add(true, "type", "maneuver");
|
|
filter.add(true, "type", "manoeuvre");
|
|
|
|
const osmium::TagList &tag_list = relation.tags();
|
|
|
|
if (osmium::tags::match_none_of(tag_list, filter))
|
|
// if it's not a maneuver, continue;
|
|
{
|
|
return boost::none;
|
|
}
|
|
|
|
// we pretend every restriction is a conditional restriction. If we do not find any restriction,
|
|
// we can trim away the vector after parsing
|
|
InputManeuverOverride maneuver_override;
|
|
|
|
// Handle both spellings
|
|
if (relation.tags().has_key("manoeuvre"))
|
|
{
|
|
maneuver_override.maneuver = relation.tags().get_value_by_key("manoeuvre", "");
|
|
}
|
|
else
|
|
{
|
|
maneuver_override.maneuver = relation.tags().get_value_by_key("maneuver", "");
|
|
}
|
|
|
|
maneuver_override.direction = relation.tags().get_value_by_key("direction", "");
|
|
|
|
bool valid_relation = true;
|
|
OSMNodeID via_node = SPECIAL_OSM_NODEID;
|
|
OSMWayID from = SPECIAL_OSM_WAYID, to = SPECIAL_OSM_WAYID;
|
|
std::vector<OSMWayID> via_ways;
|
|
|
|
for (const auto &member : relation.members())
|
|
{
|
|
const char *role = member.role();
|
|
if (strcmp("from", role) != 0 && strcmp("to", role) != 0 && strcmp("via", role) != 0)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
switch (member.type())
|
|
{
|
|
case osmium::item_type::node:
|
|
{
|
|
|
|
// Make sure nodes appear only in the role if a via node
|
|
if (0 == strcmp("from", role) || 0 == strcmp("to", role))
|
|
{
|
|
continue;
|
|
}
|
|
BOOST_ASSERT(0 == strcmp("via", role));
|
|
// set via node id
|
|
valid_relation &= via_node == SPECIAL_OSM_NODEID;
|
|
via_node = OSMNodeID{static_cast<std::uint64_t>(member.ref())};
|
|
break;
|
|
}
|
|
case osmium::item_type::way:
|
|
BOOST_ASSERT(0 == strcmp("from", role) || 0 == strcmp("to", role) ||
|
|
0 == strcmp("via", role));
|
|
if (0 == strcmp("from", role))
|
|
{
|
|
valid_relation &= from == SPECIAL_OSM_WAYID;
|
|
from = OSMWayID{static_cast<std::uint64_t>(member.ref())};
|
|
}
|
|
else if (0 == strcmp("to", role))
|
|
{
|
|
valid_relation &= to == SPECIAL_OSM_WAYID;
|
|
to = OSMWayID{static_cast<std::uint64_t>(member.ref())};
|
|
}
|
|
else if (0 == strcmp("via", role))
|
|
{
|
|
via_ways.push_back(OSMWayID{static_cast<std::uint64_t>(member.ref())});
|
|
}
|
|
break;
|
|
case osmium::item_type::relation:
|
|
// not yet supported, but who knows what the future holds...
|
|
break;
|
|
default:
|
|
// shouldn't ever happen
|
|
break;
|
|
}
|
|
}
|
|
|
|
// Check required roles
|
|
valid_relation &= from != SPECIAL_OSM_WAYID;
|
|
valid_relation &= to != SPECIAL_OSM_WAYID;
|
|
valid_relation &= via_node != SPECIAL_OSM_NODEID;
|
|
|
|
if (valid_relation)
|
|
{
|
|
maneuver_override.via_ways.push_back(from);
|
|
std::copy(via_ways.begin(), via_ways.end(), std::back_inserter(maneuver_override.via_ways));
|
|
maneuver_override.via_ways.push_back(to);
|
|
maneuver_override.via_node = via_node;
|
|
}
|
|
else
|
|
{
|
|
return boost::none;
|
|
}
|
|
return maneuver_override;
|
|
}
|
|
} // namespace extractor
|
|
} // namespace osrm
|