Merge branch 'develop/AlternativeRoutes'

Contractor/Contractor.h

@@ -351,7 +351,7 @@ public:
                 for ( int position = firstIndependent ; position < last; ++position ) {
                     NodeID x = remainingNodes[position].first;
                     _Contract< false > ( data, x );
-                    nodePriority[x] = -1;
+                    //nodePriority[x] = -1;
                 }
                 std::sort( data->insertedEdges.begin(), data->insertedEdges.end() );
             }

Contractor/EdgeBasedGraphFactory.cpp

@@ -248,7 +248,7 @@ void EdgeBasedGraphFactory::Run(const char * originalEdgeDataFilename) {
                         if(turnInstruction == TurnInstructions.UTurn)
                             distance += uturnPenalty;
                         if(!edgeData1.isAccessRestricted && edgeData2.isAccessRestricted) {
-                            distance += TurnInstructions.AccessRestrictionPenaly;
+                            distance += TurnInstructions.AccessRestrictionPenalty;
                             turnInstruction |= TurnInstructions.AccessRestrictionFlag;
                         }