Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

adjust geojson logger to changes in extractor

Browse Source
This commit is contained in:
Moritz Kobitzsch 2017-07-26 11:31:55 +02:00
parent 8a6dba46b1
commit e9c9c87bbc
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/util/geojson_debug_policies.hpp
View File

@ -18,13 +18,13 @@ namespace util
struct NodeIdVectorToLineString struct NodeIdVectorToLineString
{ {
NodeIdVectorToLineString(const std::vector<extractor::QueryNode> &node_coordinates); NodeIdVectorToLineString(const std::vector<util::Coordinate> &node_coordinates);
// converts a vector of node ids into a linestring geojson feature // converts a vector of node ids into a linestring geojson feature
util::json::Object operator()(const std::vector<NodeID> &node_ids, util::json::Object operator()(const std::vector<NodeID> &node_ids,
const boost::optional<json::Object> &properties = {}) const; const boost::optional<json::Object> &properties = {}) const;
const std::vector<extractor::QueryNode> &node_coordinates; const std::vector<util::Coordinate> &node_coordinates;
}; };
struct CoordinateVectorToLineString struct CoordinateVectorToLineString
@ -36,13 +36,13 @@ struct CoordinateVectorToLineString
struct NodeIdVectorToMultiPoint struct NodeIdVectorToMultiPoint
{ {
NodeIdVectorToMultiPoint(const std::vector<extractor::QueryNode> &node_coordinates); NodeIdVectorToMultiPoint(const std::vector<util::Coordinate> &node_coordinates);
// converts a vector of node ids into a linestring geojson feature // converts a vector of node ids into a linestring geojson feature
util::json::Object operator()(const std::vector<NodeID> &node_ids, util::json::Object operator()(const std::vector<NodeID> &node_ids,
const boost::optional<json::Object> &properties = {}) const; const boost::optional<json::Object> &properties = {}) const;
const std::vector<extractor::QueryNode> &node_coordinates; const std::vector<util::Coordinate> &node_coordinates;
}; };
struct CoordinateVectorToMultiPoint struct CoordinateVectorToMultiPoint

4
include/util/geojson_debug_policy_toolkit.hpp
View File

@ -69,12 +69,12 @@ struct CoordinateToJsonArray
struct NodeIdToCoordinate struct NodeIdToCoordinate
{ {
NodeIdToCoordinate(const std::vector<extractor::QueryNode> &node_coordinates) NodeIdToCoordinate(const std::vector<util::Coordinate> &node_coordinates)
: node_coordinates(node_coordinates) : node_coordinates(node_coordinates)
{ {
} }
const std::vector<extractor::QueryNode> &node_coordinates; const std::vector<util::Coordinate> &node_coordinates;
util::json::Array operator()(const NodeID nid) util::json::Array operator()(const NodeID nid)
{ {

4
src/util/geojson_debug_policies.cpp
View File

@ -11,7 +11,7 @@ namespace util
//---------------------------------------------------------------- //----------------------------------------------------------------
NodeIdVectorToLineString::NodeIdVectorToLineString( NodeIdVectorToLineString::NodeIdVectorToLineString(
const std::vector<extractor::QueryNode> &node_coordinates) const std::vector<util::Coordinate> &node_coordinates)
: node_coordinates(node_coordinates) : node_coordinates(node_coordinates)
{ {
} }
@ -32,7 +32,7 @@ operator()(const std::vector<NodeID> &node_ids,
//---------------------------------------------------------------- //----------------------------------------------------------------
NodeIdVectorToMultiPoint::NodeIdVectorToMultiPoint( NodeIdVectorToMultiPoint::NodeIdVectorToMultiPoint(
const std::vector<extractor::QueryNode> &node_coordinates) const std::vector<util::Coordinate> &node_coordinates)
: node_coordinates(node_coordinates) : node_coordinates(node_coordinates)
{ {
} }