move implementation details out of templat'ized container code

This commit is contained in:
Dennis Luxen 2013-11-22 18:43:01 +01:00
parent 50d6b10be4
commit e35efd001c
2 changed files with 7 additions and 9 deletions

View File

@ -23,6 +23,10 @@ struct EdgeBasedNode {
FixedPointCoordinate & nearest_location, FixedPointCoordinate & nearest_location,
double & r double & r
) const { ) const {
if( ignoreInGrid ) {
return std::numeric_limits<double>::max();
}
const double x = inputPoint.lat/COORDINATE_PRECISION; const double x = inputPoint.lat/COORDINATE_PRECISION;
const double y = inputPoint.lon/COORDINATE_PRECISION; const double y = inputPoint.lon/COORDINATE_PRECISION;
const double a = lat1/COORDINATE_PRECISION; const double a = lat1/COORDINATE_PRECISION;
@ -83,9 +87,9 @@ struct EdgeBasedNode {
return centroid; return centroid;
} }
inline bool isIgnored() const { // inline bool isIgnored() const {
return ignoreInGrid; // return ignoreInGrid;
} // }
NodeID id; NodeID id;
int lat1; int lat1;

View File

@ -675,9 +675,6 @@ public:
) { ) {
continue; continue;
} }
if(current_edge.isIgnored()) {
continue;
}
double current_minimum_distance = ApproximateDistance( double current_minimum_distance = ApproximateDistance(
input_coordinate.lat, input_coordinate.lat,
@ -781,9 +778,6 @@ public:
if(ignore_tiny_components && current_edge.belongsToTinyComponent) { if(ignore_tiny_components && current_edge.belongsToTinyComponent) {
continue; continue;
} }
if(current_edge.isIgnored()) {
continue;
}
double current_ratio = 0.; double current_ratio = 0.;
double current_perpendicular_distance = current_edge.ComputePerpendicularDistance( double current_perpendicular_distance = current_edge.ComputePerpendicularDistance(