Minor typo/bug fixes

jibeproject · Dec 18, 2023 · d14d1ad · d14d1ad
1 parent 036b4a7
commit d14d1ad
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 25 deletions.
diff --git a/src/main/java/network/WriteNetworkGpkg.java b/src/main/java/network/WriteNetworkGpkg.java
@@ -231,6 +231,11 @@ public static void write(Network network, String outputEdgesFilePath) throws IOE
                 ArrayUtils.reverse(coords);
             }
 
+            // Allows certain modes
+            boolean allowsCar = link.getAllowedModes().contains(TransportMode.car);
+            boolean allowsBike = link.getAllowedModes().contains(TransportMode.bike);
+            boolean allowsWalk = link.getAllowedModes().contains(TransportMode.walk);
+
             // Geometry
             featureBuilder.add(geometryFactory.createLineString(coords));
 
@@ -255,17 +260,17 @@ public static void write(Network network, String outputEdgesFilePath) throws IOE
             featureBuilder.add(link.getAttributes().getAttribute("aadtFwd"));
             featureBuilder.add(link.getAttributes().getAttribute("aadtFwd_car"));
             featureBuilder.add(link.getAttributes().getAttribute("aadtFwd_truck"));
-            featureBuilder.add(link.getAllowedModes().contains(TransportMode.car));
-            featureBuilder.add(link.getAllowedModes().contains(TransportMode.bike));
-            featureBuilder.add(link.getAllowedModes().contains(TransportMode.walk));
+            featureBuilder.add(allowsCar);
+            featureBuilder.add(allowsBike);
+            featureBuilder.add(allowsWalk);
             featureBuilder.add(link.getAttributes().getAttribute("motorway"));
             featureBuilder.add(link.getAttributes().getAttribute("trunk"));
             featureBuilder.add(link.getAttributes().getAttribute("dismount"));
 //            featureBuilder.add(link.getAttributes().getAttribute("disconnected_"+ TransportMode.car));
 //            featureBuilder.add(link.getAttributes().getAttribute("disconnected_"+ TransportMode.bike));
 //            featureBuilder.add(link.getAttributes().getAttribute("disconnected_"+ TransportMode.walk));
             featureBuilder.add(Gradient.getGradient(link));
-            featureBuilder.add(CycleProtection.getType(link).toString());
+            featureBuilder.add((allowsBike || allowsWalk) ? CycleProtection.getType(link).toString() : "null");
 //            featureBuilder.add(link.getAttributes().getAttribute("endsAtJct"));
 //            featureBuilder.add(link.getAttributes().getAttribute("crossVehicles"));
 //            featureBuilder.add(Crossing.getType(link,"bike").toString());
@@ -290,7 +295,7 @@ public static void write(Network network, String outputEdgesFilePath) throws IOE
             featureBuilder.add(link.getAttributes().getAttribute("hgvPOIs"));
 //            featureBuilder.add(LinkAmbience.getDayAmbience(link));
 //            featureBuilder.add(LinkAmbience.getNightAmbience(link));
-            featureBuilder.add(link.getAllowedModes().contains(TransportMode.bike) ? LinkStressDiscrete.getCycleStress(link).toString() : "null");
+            featureBuilder.add(allowsBike ? LinkStressDiscrete.getCycleStress(link).toString() : "null");
             featureBuilder.add(LinkStress.getStress(link, TransportMode.bike));
             featureBuilder.add(JctStress.getStress(link,TransportMode.bike));
             featureBuilder.add(LinkStress.getStress(link,TransportMode.walk));

diff --git a/src/main/java/resources/example.properties b/src/main/java/resources/example.properties
@@ -30,26 +30,26 @@ decay.percentile = 0.85
 
 # Trip Diary
 diary.file = TfGM/tripsWithXY.csv
-diary.delimiter = ";"
-diary.household.id = "IDNumber"
-diary.person.id = "PersonNumber"
-diary.trip.id = "TripNumber"
-diary.start.time = "StartTime"
-diary.main.mode = "MainMode"
-diary.origin.purpose = "StartPurpose"
-diary.destination.purpose = "EndPurpose"
-diary.home.zone = "OutputArea"
-diary.main.zone = "MainOutputArea"
-diary.origin.zone = "StartOutputArea"
-diary.destination.zone = "EndOutputArea"
-diary.home.x = "HomeEasting"
-diary.home.y = "HomeNorthing"
-diary.main.x = "MainEasting"
-diary.main.y = "MainNorthing"
-diary.origin.x = "StartEasting"
-diary.origin.y = "StartNorthing"
-diary.destination.x = "EndEasting"
-diary.destination.y = "EndNorthing"
+diary.delimiter = ;
+diary.household.id = IDNumber
+diary.person.id = PersonNumber
+diary.trip.id = TripNumber
+diary.start.time = StartTime
+diary.main.mode = MainMode
+diary.origin.purpose = StartPurpose
+diary.destination.purpose = EndPurpose
+diary.home.zone = OutputArea
+diary.main.zone = MainOutputArea
+diary.origin.zone = StartOutputArea
+diary.destination.zone = EndOutputArea
+diary.home.x = HomeEasting
+diary.home.y = HomeNorthing
+diary.main.x = MainEasting
+diary.main.y = MainNorthing
+diary.origin.x = StartEasting
+diary.origin.y = StartNorthing
+diary.destination.x = EndEasting
+diary.destination.y = EndNorthing
 
 # Default parameters for walk JIBE routing
 mc.walk.gradient = 3