allow converting nodes with sidewalks to geometry refs #457

git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@21008 afbd958f-9f77-42d5-a016-97a22340ccf4
eclipse-sumo · Jun 20, 2016 · 871b4c3 · 871b4c3
1 parent 473ddd4
commit 871b4c3
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/sumo/src/netbuild/NBEdge.cpp b/sumo/src/netbuild/NBEdge.cpp
@@ -2237,9 +2237,7 @@ NBEdge::expandableBy(NBEdge* possContinuation) const {
         case EDGE2EDGES: {
             // the following edge must be connected
             const EdgeVector& conn = getConnectedEdges();
-            if (find(conn.begin(), conn.end(), possContinuation)
-                    == conn.end()) {
-
+            if (find(conn.begin(), conn.end(), possContinuation) == conn.end()) {
                 return false;
             }
         }
@@ -2254,7 +2252,8 @@ NBEdge::expandableBy(NBEdge* possContinuation) const {
             }
             // all lanes must go to the possible continuation
             std::vector<int> conns = getConnectionLanes(possContinuation);
-            if (conns.size() != myLanes.size()) {
+            const int offset = MAX2(0, getFirstNonPedestrianLaneIndex(NBNode::FORWARD, true));
+            if (conns.size() != myLanes.size() - offset) {
                 return false;
             }
         }