Update to allowed modes part

jibeproject · Dec 26, 2023 · dbb7366 · dbb7366
1 parent 9dbff70
commit dbb7366
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/network/CreateMatsimNetworkRoad.java b/src/main/java/network/CreateMatsimNetworkRoad.java
@@ -187,17 +187,16 @@ private static void addLinkToNetwork(int edgeID, SimpleFeature edge, Network net
 
             // ALLOWED MODES
             Set<String> allowedModesOut = Sets.newHashSet(linkModes.split(","));
-            l1.setAllowedModes(allowedModesOut);
 
             // If allows walk but not bike, add bike but specify must dismount
-            boolean walkNotBike = allowedModesOut.contains("walk") && !allowedModesOut.contains("bike");
+            boolean walkNotBike = allowedModesOut.contains(walk) && !allowedModesOut.contains(bike);
             boolean dismount = walkNotBike || roadType.contains("Cycling Forbidden") || cycleosm.equals("dismount");
 
             l1.getAttributes().putAttribute("dismount",dismount);
             l2.getAttributes().putAttribute("dismount",dismount);
 
             // Add back cycling (dismounted) if walking is allowed
-            if(walkNotBike) allowedModesOut.add("bike");
+            if(walkNotBike) allowedModesOut.add(bike);
 
             // Allowed modes return
             Set<String> allowedModesRtn = new HashSet<>(allowedModesOut);
@@ -219,6 +218,9 @@ private static void addLinkToNetwork(int edgeID, SimpleFeature edge, Network net
                     }
                 }
             }
+
+            // Set allowed modes
+            l1.setAllowedModes(allowedModesOut);
             l2.setAllowedModes(allowedModesRtn);
 
             // Are cars allowed on this link? (necessary for mode-specific filtered networks)