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

Ferries are now extracted with 25 kph average speed.

Browse Source
This commit is contained in:
Dennis Luxen 2010-08-12 16:49:59 +00:00
parent 106155a97a
commit 3bdfd1437b
2 changed files with 326 additions and 300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

621
DataStructures/extractorStructs.h
View File

@ -38,355 +38,378 @@ or see http://www.gnu.org/licenses/agpl.txt.
residential 40 residential 40
living_street 10 living_street 10
service 30 service 30
ferry 25
*/ */
string names[13] = { "motorway", "motorway_link", "trunk", "trunk_link", "primary", "primary_link", "secondary", "secondary_link", "tertiary", "unclassified", "residential", "living_street", "service" }; string names[14] = { "motorway", "motorway_link", "trunk", "trunk_link", "primary", "primary_link", "secondary", "secondary_link", "tertiary", "unclassified", "residential", "living_street", "service", "ferry" };
double speeds[13] = { 110, 90, 90, 70, 70, 60, 60, 50, 55, 50, 40 , 10, 30}; double speeds[14] = { 110, 90, 90, 70, 70, 60, 60, 50, 55, 50, 40 , 10, 30, 25};
struct _Node : NodeInfo{ struct _Node : NodeInfo{
bool trafficSignal; bool trafficSignal;
_Node(int _lat, int _lon, unsigned int _id) : NodeInfo(_lat, _lon, _id) {} _Node(int _lat, int _lon, unsigned int _id) : NodeInfo(_lat, _lon, _id) {}
_Node() {} _Node() {}
static _Node min_value() static _Node min_value()
{ {
return _Node(0,0,0); return _Node(0,0,0);
} }
static _Node max_value() static _Node max_value()
{ {
return _Node(numeric_limits<int>::max(), numeric_limits<int>::max(), numeric_limits<unsigned int>::max()); return _Node(numeric_limits<int>::max(), numeric_limits<int>::max(), numeric_limits<unsigned int>::max());
} }
NodeID key() const NodeID key() const
{ {
return id; return id;
} }
}; };
struct _Coordinate { struct _Coordinate {
int lat; int lat;
int lon; int lon;
_Coordinate () : lat(INT_MIN), lon(INT_MIN) {}; _Coordinate () : lat(INT_MIN), lon(INT_MIN) {};
}; };
struct _Way { struct _Way {
std::vector< NodeID > path; std::vector< NodeID > path;
enum { enum {
notSure = 0, oneway, bidirectional, opposite notSure = 0, oneway, bidirectional, opposite
} direction; } direction;
double maximumSpeed; double maximumSpeed;
bool usefull:1; bool usefull:1;
bool access:1; bool access:1;
short type; short type;
};
struct _Relation {
enum {
unknown = 0, ferry
} type;
}; };
struct _Edge { struct _Edge {
_Edge() {}; _Edge() {};
_Edge(NodeID s, NodeID t) : start(s), target(t) { } _Edge(NodeID s, NodeID t) : start(s), target(t) { }
NodeID start; NodeID start;
NodeID target; NodeID target;
short type; short type;
short direction; short direction;
double speed; double speed;
_Coordinate startCoord; _Coordinate startCoord;
_Coordinate targetCoord; _Coordinate targetCoord;
}; };
struct Settings { struct Settings {
struct SpeedProfile { struct SpeedProfile {
vector< double > speed; vector< double > speed;
vector< string > names; vector< string > names;
} speedProfile; } speedProfile;
vector<string> accessList; vector<string> accessList;
int trafficLightPenalty; int trafficLightPenalty;
int indexInAccessListOf( const string & key) int indexInAccessListOf( const string & key)
{ {
for(int i = 0; i< accessList.size(); i++) for(int i = 0; i< accessList.size(); i++)
{ {
if(accessList[i] == key) if(accessList[i] == key)
return i; return i;
} }
return -1; return -1;
} }
}; };
struct Cmp : public std::binary_function<NodeID, NodeID, bool> struct Cmp : public std::binary_function<NodeID, NodeID, bool>
{ {
typedef NodeID value_type; typedef NodeID value_type;
bool operator () (const NodeID & a, const NodeID & b) const bool operator () (const NodeID & a, const NodeID & b) const
{ {
return a < b; return a < b;
} }
value_type max_value() value_type max_value()
{ {
return 0xffffffff; return 0xffffffff;
} }
value_type min_value() value_type min_value()
{ {
return 0x0; return 0x0;
} }
}; };
struct CompareEdgeByStart : public std::binary_function<_Edge, _Edge, bool> struct CompareEdgeByStart : public std::binary_function<_Edge, _Edge, bool>
{ {
typedef _Edge value_type; typedef _Edge value_type;
bool operator () (const _Edge & a, const _Edge & b) const bool operator () (const _Edge & a, const _Edge & b) const
{ {
return a.start < b.start; return a.start < b.start;
} }
value_type max_value() value_type max_value()
{ {
return _Edge(UINT_MAX, UINT_MAX); return _Edge(UINT_MAX, UINT_MAX);
} }
value_type min_value() value_type min_value()
{ {
return _Edge(0, 0); return _Edge(0, 0);
} }
}; };
struct CompareEdgeByTarget : public std::binary_function<_Edge, _Edge, bool> struct CompareEdgeByTarget : public std::binary_function<_Edge, _Edge, bool>
{ {
typedef _Edge value_type; typedef _Edge value_type;
bool operator () (const _Edge & a, const _Edge & b) const bool operator () (const _Edge & a, const _Edge & b) const
{ {
return a.target < b.target; return a.target < b.target;
} }
value_type max_value() value_type max_value()
{ {
return _Edge(UINT_MAX, UINT_MAX); return _Edge(UINT_MAX, UINT_MAX);
} }
value_type min_value() value_type min_value()
{ {
return _Edge(0, 0); return _Edge(0, 0);
} }
}; };
_Way _ReadXMLWay( xmlTextReaderPtr& inputReader, Settings& settings ) { _Way _ReadXMLWay( xmlTextReaderPtr& inputReader, Settings& settings ) {
_Way way; _Way way;
way.direction = _Way::notSure; way.direction = _Way::notSure;
way.maximumSpeed = -1; way.maximumSpeed = -1;
way.type = -1; way.type = -1;
way.usefull = false; way.usefull = false;
way.access = true; way.access = true;
if ( xmlTextReaderIsEmptyElement( inputReader ) != 1 ) { if ( xmlTextReaderIsEmptyElement( inputReader ) != 1 ) {
const int depth = xmlTextReaderDepth( inputReader ); const int depth = xmlTextReaderDepth( inputReader );
while ( xmlTextReaderRead( inputReader ) == 1 ) { while ( xmlTextReaderRead( inputReader ) == 1 ) {
const int childType = xmlTextReaderNodeType( inputReader ); const int childType = xmlTextReaderNodeType( inputReader );
if ( childType != 1 && childType != 15 ) if ( childType != 1 && childType != 15 )
continue; continue;
const int childDepth = xmlTextReaderDepth( inputReader ); const int childDepth = xmlTextReaderDepth( inputReader );
xmlChar* childName = xmlTextReaderName( inputReader ); xmlChar* childName = xmlTextReaderName( inputReader );
if ( childName == NULL ) if ( childName == NULL )
continue; continue;
if ( depth == childDepth && childType == 15 && xmlStrEqual( childName, ( const xmlChar* ) "way" ) == 1 ) { if ( depth == childDepth && childType == 15 && xmlStrEqual( childName, ( const xmlChar* ) "way" ) == 1 ) {
xmlFree( childName ); xmlFree( childName );
break; break;
} }
if ( childType != 1 ) { if ( childType != 1 ) {
xmlFree( childName ); xmlFree( childName );
continue; continue;
} }
if ( xmlStrEqual( childName, ( const xmlChar* ) "tag" ) == 1 ) { if ( xmlStrEqual( childName, ( const xmlChar* ) "tag" ) == 1 ) {
xmlChar* k = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "k" ); xmlChar* k = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "k" );
xmlChar* value = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "v" ); xmlChar* value = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "v" );
if ( k != NULL && value != NULL ) { if ( k != NULL && value != NULL ) {
if ( xmlStrEqual( k, ( const xmlChar* ) "oneway" ) == 1 ) { if ( xmlStrEqual( k, ( const xmlChar* ) "oneway" ) == 1 ) {
if ( xmlStrEqual( value, ( const xmlChar* ) "no" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "false" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "0" ) == 1 ) if ( xmlStrEqual( value, ( const xmlChar* ) "no" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "false" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "0" ) == 1 )
way.direction = _Way::bidirectional; way.direction = _Way::bidirectional;
else if ( xmlStrEqual( value, ( const xmlChar* ) "yes" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "true" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "1" ) == 1 ) else if ( xmlStrEqual( value, ( const xmlChar* ) "yes" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "true" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "1" ) == 1 )
way.direction = _Way::oneway; way.direction = _Way::oneway;
else if ( xmlStrEqual( value, ( const xmlChar* ) "-1" ) == 1 ) else if ( xmlStrEqual( value, ( const xmlChar* ) "-1" ) == 1 )
way.direction = _Way::opposite; way.direction = _Way::opposite;
} else if ( xmlStrEqual( k, ( const xmlChar* ) "junction" ) == 1 ) { } else if ( xmlStrEqual( k, ( const xmlChar* ) "junction" ) == 1 ) {
if ( xmlStrEqual( value, ( const xmlChar* ) "roundabout" ) == 1 ) { if ( xmlStrEqual( value, ( const xmlChar* ) "roundabout" ) == 1 ) {
if ( way.direction == _Way::notSure ) { if ( way.direction == _Way::notSure ) {
way.direction = _Way::oneway; way.direction = _Way::oneway;
} }
if ( way.maximumSpeed == -1 ) if ( way.maximumSpeed == -1 )
way.maximumSpeed = 10; way.maximumSpeed = 10;
way.usefull = true; way.usefull = true;
} }
} else if ( xmlStrEqual( k, ( const xmlChar* ) "highway" ) == 1 ) { } else if ( xmlStrEqual( k, ( const xmlChar* ) "route" ) == 1 ) {
string name( ( const char* ) value ); string route( (const char* ) value );
for ( int i = 0; i < settings.speedProfile.names.size(); i++ ) { if (route == "ferry") {
if ( name == settings.speedProfile.names[i] ) { for ( int i = 0; i < settings.speedProfile.names.size(); i++ ) {
way.type = i; way.maximumSpeed = 25;
way.usefull = true; way.usefull = true;
break; way.direction == _Way::oneway;
} }
} }
if ( name == "motorway" ) { } else if ( xmlStrEqual( k, ( const xmlChar* ) "highway" ) == 1 ) {
if ( way.direction == _Way::notSure ) { string name( ( const char* ) value );
way.direction = _Way::oneway; for ( int i = 0; i < settings.speedProfile.names.size(); i++ ) {
} if ( name == settings.speedProfile.names[i] ) {
} else if ( name == "motorway_link" ) { way.type = i;
if ( way.direction == _Way::notSure ) { way.usefull = true;
way.direction = _Way::oneway; break;
} }
} }
} else if ( xmlStrEqual( k, ( const xmlChar* ) "maxspeed" ) == 1 ) { if ( name == "motorway" ) {
double maxspeed = atof(( const char* ) value ); if ( way.direction == _Way::notSure ) {
way.direction = _Way::oneway;
}
} else if ( name == "motorway_link" ) {
if ( way.direction == _Way::notSure ) {
way.direction = _Way::oneway;
}
}
} else if ( xmlStrEqual( k, ( const xmlChar* ) "maxspeed" ) == 1 ) {
double maxspeed = atof(( const char* ) value );
xmlChar buffer[100]; xmlChar buffer[100];
xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lf", maxspeed ); xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lf", maxspeed );
if ( xmlStrEqual( value, buffer ) == 1 ) { if ( xmlStrEqual( value, buffer ) == 1 ) {
way.maximumSpeed = maxspeed; way.maximumSpeed = maxspeed;
} else { } else {
xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lf kmh", maxspeed ); xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lf kmh", maxspeed );
if ( xmlStrEqual( value, buffer ) == 1 ) { if ( xmlStrEqual( value, buffer ) == 1 ) {
way.maximumSpeed = maxspeed; way.maximumSpeed = maxspeed;
} else { } else {
xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lfkmh", maxspeed ); xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lfkmh", maxspeed );
if ( xmlStrEqual( value, buffer ) == 1 ) { if ( xmlStrEqual( value, buffer ) == 1 ) {
way.maximumSpeed = maxspeed; way.maximumSpeed = maxspeed;
} else { } else {
xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lf km/h", maxspeed ); xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lf km/h", maxspeed );
if ( xmlStrEqual( value, buffer ) == 1 ) { if ( xmlStrEqual( value, buffer ) == 1 ) {
way.maximumSpeed = maxspeed; way.maximumSpeed = maxspeed;
} else { } else {
xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lfkm/h", maxspeed ); xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lfkm/h", maxspeed );
if ( xmlStrEqual( value, buffer ) == 1 ) { if ( xmlStrEqual( value, buffer ) == 1 ) {
way.maximumSpeed = maxspeed; way.maximumSpeed = maxspeed;
} else { } else {
xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lf mph", maxspeed ); xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lf mph", maxspeed );
if ( xmlStrEqual( value, buffer ) == 1 ) { if ( xmlStrEqual( value, buffer ) == 1 ) {
way.maximumSpeed = maxspeed; way.maximumSpeed = maxspeed;
} else { } else {
xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lfmph", maxspeed ); xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lfmph", maxspeed );
if ( xmlStrEqual( value, buffer ) == 1 ) { if ( xmlStrEqual( value, buffer ) == 1 ) {
way.maximumSpeed = maxspeed; way.maximumSpeed = maxspeed;
} else { } else {
xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lf mp/h", maxspeed ); xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lf mp/h", maxspeed );
if ( xmlStrEqual( value, buffer ) == 1 ) { if ( xmlStrEqual( value, buffer ) == 1 ) {
way.maximumSpeed = maxspeed; way.maximumSpeed = maxspeed;
} else { } else {
xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lfmp/h", maxspeed ); xmlStrPrintf( buffer, 100, ( const xmlChar* ) "%.lfmp/h", maxspeed );
if ( xmlStrEqual( value, buffer ) == 1 ) { if ( xmlStrEqual( value, buffer ) == 1 ) {
way.maximumSpeed = maxspeed; way.maximumSpeed = maxspeed;
} }
} }
} }
} }
} }
} }
} }
} }
} }
} else { } else {
if ( xmlStrEqual( value, ( const xmlChar* ) "private" ) == 1 if ( xmlStrEqual( value, ( const xmlChar* ) "private" ) == 1
|| xmlStrEqual( value, ( const xmlChar* ) "no" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "no" ) == 1
|| xmlStrEqual( value, ( const xmlChar* ) "agricultural" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "agricultural" ) == 1
|| xmlStrEqual( value, ( const xmlChar* ) "forestry" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "forestry" ) == 1
|| xmlStrEqual( value, ( const xmlChar* ) "delivery" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "delivery" ) == 1
) { ) {
way.access = false; way.access = false;
} }
else if ( xmlStrEqual( value, ( const xmlChar* ) "yes" ) == 1 else if ( xmlStrEqual( value, ( const xmlChar* ) "yes" ) == 1
|| xmlStrEqual( value, ( const xmlChar* ) "designated" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "designated" ) == 1
|| xmlStrEqual( value, ( const xmlChar* ) "official" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "official" ) == 1
|| xmlStrEqual( value, ( const xmlChar* ) "permissive" ) == 1 || xmlStrEqual( value, ( const xmlChar* ) "permissive" ) == 1
) { ) {
way.access = true; way.access = true;
} }
} }
if ( k != NULL ) if ( k != NULL )
xmlFree( k ); xmlFree( k );
if ( value != NULL ) if ( value != NULL )
xmlFree( value ); xmlFree( value );
} }
} else if ( xmlStrEqual( childName, ( const xmlChar* ) "nd" ) == 1 ) { } else if ( xmlStrEqual( childName, ( const xmlChar* ) "nd" ) == 1 ) {
xmlChar* ref = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "ref" ); xmlChar* ref = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "ref" );
if ( ref != NULL ) { if ( ref != NULL ) {
way.path.push_back( atoi(( const char* ) ref ) ); way.path.push_back( atoi(( const char* ) ref ) );
xmlFree( ref ); xmlFree( ref );
} }
} }
xmlFree( childName ); xmlFree( childName );
} }
} }
return way; return way;
} }
_Node _ReadXMLNode( xmlTextReaderPtr& inputReader ) { _Node _ReadXMLNode( xmlTextReaderPtr& inputReader ) {
_Node node; _Node node;
node.trafficSignal = false; node.trafficSignal = false;
xmlChar* attribute = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "lat" ); xmlChar* attribute = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "lat" );
if ( attribute != NULL ) { if ( attribute != NULL ) {
node.lat = static_cast<NodeID>(100000*atof(( const char* ) attribute ) ); node.lat = static_cast<NodeID>(100000*atof(( const char* ) attribute ) );
xmlFree( attribute ); xmlFree( attribute );
} }
attribute = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "lon" ); attribute = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "lon" );
if ( attribute != NULL ) { if ( attribute != NULL ) {
node.lon = static_cast<NodeID>(100000*atof(( const char* ) attribute )); node.lon = static_cast<NodeID>(100000*atof(( const char* ) attribute ));
xmlFree( attribute ); xmlFree( attribute );
} }
attribute = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "id" ); attribute = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "id" );
if ( attribute != NULL ) { if ( attribute != NULL ) {
node.id = atoi(( const char* ) attribute ); node.id = atoi(( const char* ) attribute );
xmlFree( attribute ); xmlFree( attribute );
} }
if ( xmlTextReaderIsEmptyElement( inputReader ) != 1 ) { if ( xmlTextReaderIsEmptyElement( inputReader ) != 1 ) {
const int depth = xmlTextReaderDepth( inputReader ); const int depth = xmlTextReaderDepth( inputReader );
while ( xmlTextReaderRead( inputReader ) == 1 ) { while ( xmlTextReaderRead( inputReader ) == 1 ) {
const int childType = xmlTextReaderNodeType( inputReader ); const int childType = xmlTextReaderNodeType( inputReader );
// 1 = Element, 15 = EndElement // 1 = Element, 15 = EndElement
if ( childType != 1 && childType != 15 ) if ( childType != 1 && childType != 15 )
continue; continue;
const int childDepth = xmlTextReaderDepth( inputReader ); const int childDepth = xmlTextReaderDepth( inputReader );
xmlChar* childName = xmlTextReaderName( inputReader ); xmlChar* childName = xmlTextReaderName( inputReader );
if ( childName == NULL ) if ( childName == NULL )
continue; continue;
if ( depth == childDepth && childType == 15 && xmlStrEqual( childName, ( const xmlChar* ) "node" ) == 1 ) { if ( depth == childDepth && childType == 15 && xmlStrEqual( childName, ( const xmlChar* ) "node" ) == 1 ) {
xmlFree( childName ); xmlFree( childName );
break; break;
} }
if ( childType != 1 ) { if ( childType != 1 ) {
xmlFree( childName ); xmlFree( childName );
continue; continue;
} }
if ( xmlStrEqual( childName, ( const xmlChar* ) "tag" ) == 1 ) { if ( xmlStrEqual( childName, ( const xmlChar* ) "tag" ) == 1 ) {
xmlChar* k = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "k" ); xmlChar* k = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "k" );
xmlChar* value = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "v" ); xmlChar* value = xmlTextReaderGetAttribute( inputReader, ( const xmlChar* ) "v" );
if ( k != NULL && value != NULL ) { if ( k != NULL && value != NULL ) {
if ( xmlStrEqual( k, ( const xmlChar* ) "highway" ) == 1 ) { if ( xmlStrEqual( k, ( const xmlChar* ) "highway" ) == 1 ) {
if ( xmlStrEqual( value, ( const xmlChar* ) "traffic_signals" ) == 1 ) if ( xmlStrEqual( value, ( const xmlChar* ) "traffic_signals" ) == 1 )
node.trafficSignal = true; node.trafficSignal = true;
} }
} }
if ( k != NULL ) if ( k != NULL )
xmlFree( k ); xmlFree( k );
if ( value != NULL ) if ( value != NULL )
xmlFree( value ); xmlFree( value );
} }
xmlFree( childName ); xmlFree( childName );
} }
} }
return node; return node;
}
_Relation _ReadXMLRelation ( xmlTextReaderPtr& inputReader ) {
_Relation relation;
relation.type = _Relation::unknown;
return relation;
} }
double ApproximateDistance( const int lat1, const int lon1, const int lat2, const int lon2 ) { double ApproximateDistance( const int lat1, const int lon1, const int lat2, const int lon2 ) {
static const double DEG_TO_RAD = 0.017453292519943295769236907684886; static const double DEG_TO_RAD = 0.017453292519943295769236907684886;
///Earth's quatratic mean radius for WGS-84 ///Earth's quatratic mean radius for WGS-84
static const double EARTH_RADIUS_IN_METERS = 6372797.560856; static const double EARTH_RADIUS_IN_METERS = 6372797.560856;
double latitudeArc = ( lat1/100000. - lat2/100000. ) * DEG_TO_RAD; double latitudeArc = ( lat1/100000. - lat2/100000. ) * DEG_TO_RAD;
double longitudeArc = ( lon1/100000. - lon2/100000. ) * DEG_TO_RAD; double longitudeArc = ( lon1/100000. - lon2/100000. ) * DEG_TO_RAD;
double latitudeH = sin( latitudeArc * 0.5 ); double latitudeH = sin( latitudeArc * 0.5 );
latitudeH *= latitudeH; latitudeH *= latitudeH;
double lontitudeH = sin( longitudeArc * 0.5 ); double lontitudeH = sin( longitudeArc * 0.5 );
lontitudeH *= lontitudeH; lontitudeH *= lontitudeH;
double tmp = cos( lat1/100000. * DEG_TO_RAD ) * cos( lat2/100000. * DEG_TO_RAD ); double tmp = cos( lat1/100000. * DEG_TO_RAD ) * cos( lat2/100000. * DEG_TO_RAD );
double distanceArc = 2.0 * asin( sqrt( latitudeH + tmp * lontitudeH ) ); double distanceArc = 2.0 * asin( sqrt( latitudeH + tmp * lontitudeH ) );
return EARTH_RADIUS_IN_METERS * distanceArc; return EARTH_RADIUS_IN_METERS * distanceArc;
} }
#endif /* EXTRACTORSTRUCTS_H_ */ #endif /* EXTRACTORSTRUCTS_H_ */

5
extractLargeNetwork.cpp
View File

@ -88,7 +88,7 @@ int main (int argc, char *argv[])
SignalNodes.push_back( node.id ); SignalNodes.push_back( node.id );
} }
else if ( xmlStrEqual( currentName, ( const xmlChar* ) "way" ) == 1 ) { if ( xmlStrEqual( currentName, ( const xmlChar* ) "way" ) == 1 ) {
_Way way = _ReadXMLWay( inputReader, settings ); _Way way = _ReadXMLWay( inputReader, settings );
if ( way.usefull && way.access && way.path.size() ) { if ( way.usefull && way.access && way.path.size() ) {
@ -117,6 +117,9 @@ int main (int argc, char *argv[])
} }
} }
} }
}
if ( xmlStrEqual( currentName, ( const xmlChar* ) "relation" ) == 1 ) {
} }
xmlFree( currentName ); xmlFree( currentName );
} }